Chi & Templ

Author: Ujstor

.air.toml

@@ -17,7 +17,4 @@
 # Go workspace file
 go.work
 tmp/
-
-# IDE specific files
-.vscode
-.idea
+*templ.go

.env

@@ -1,4 +1,4 @@
-FROM golang:1.22-alpine as base
+FROM golang:1.22-alpine as build
 
 RUN apk add --no-cache make
 
@@ -9,17 +9,12 @@ RUN go mod download
 
 COPY . .
 
-FROM base as dev
-RUN make build
-EXPOSE ${PORT}
-CMD [ "sh", "-c", "echo 'y' | make watch" ]
-
-FROM base as build
+RUN go install github.com/a-h/templ/cmd/templ@latest
+RUN templ generate
 RUN go build -o main cmd/api/main.go
 
-FROM alpine:3.19.0 as prod
+FROM alpine:3.20.1 as prod
 WORKDIR /app
 COPY --from=build /app/main /app/main
-COPY cmd/web cmd/web
-EXPOSE ${PORT}
-CMD ["./main"]
+EXPOSE 5000
+CMD ["./main"]

.github/workflows/go-test.yml

@@ -7,7 +7,7 @@ pipeline {
         DOCKER_HUB_USERNAME = 'ujstor'
         DOCKER_REPO_NAME = 'portfolio-web-go'
         BRANCH = 'master'
-        VERSION_PART = 'Minor' // Patch, Minor, Major
+        VERSION_PART = 'Patch' // Patch, Minor, Major
         DOCKER_JENKINS_CERDIDENTALS_ID = 'be9636c4-b828-41af-ad0b-46d4182dfb06'
         TAG = '' // Generated automatically
     }
@@ -21,14 +21,6 @@ pipeline {
             }
         }
 
-        stage('Test') {
-            steps {
-                script {
-                    sh "go test -v ./... ${WORKSPACE}/internal/server"
-                }
-            }
-        }
-
         stage('chmod Tag sh') {
             steps {
                 script {
@@ -109,4 +101,4 @@ pipeline {
             echo "Pipeline completed successfully"
         }
     }
-}
+}

.gitignore

@@ -1,10 +1,9 @@
-# Simple Makefile for a Go project
-
 # Build the application
 all: build
 
 build:
 	@echo "Building..."
+	@templ generate
 	@go build -o main cmd/api/main.go
 
 docker-build:
@@ -21,31 +20,9 @@ docker-run:
 push:
 	@docker push ujstor/portfolio-web-go
 
-# Test the application
-test:
-	@echo "Testing..."
-	@go test ./...
-
 # Clean the binary
 clean:
 	@echo "Cleaning..."
 	@rm -f main
 
-# Live Reload
-watch:
-	@if [ -x "$(GOPATH)/bin/air" ]; then \
-	    "$(GOPATH)/bin/air"; \
-		@echo "Watching...";\
-	else \
-	    read -p "air is not installed. Do you want to install it now? (y/n) " choice; \
-	    if [ "$$choice" = "y" ]; then \
-			go install github.com/cosmtrek/air@latest; \
-	        "$(GOPATH)/bin/air"; \
-				@echo "Watching...";\
-	    else \
-	        echo "You chose not to install air. Exiting..."; \
-	        exit 1; \
-	    fi; \
-	fi
-
-.PHONY: all build docker-build run docker-run push test clea watch
+.PHONY: all build docker-build run docker-run push clean 

Dockerfile

@@ -1,35 +1,16 @@
 # Portfolio Website
 
-This static website is built using HTML, CSS, and JavaScript and served using a Go or Flask web server. It's designed to showcase your personal or professional projects, skills, and any other information you'd like to share with the world.
-
-The website is containerized using Docker Compose for easy deployment and scaling.
-
-## Docker Compose
-
-Build image and start the Docker containers using Docker Compose:
-
-```bash
-docker compose up web-prod --build -d
-```
-
-This command will build the Docker image for your website and start the container.
-
-You can now access your portfolio website by navigating to `http://localhost:5000` in your web browser.
-
+This static website is built with Go and Templ.
 
 
 ## Jenkins Pipeline
 The pipeline is designed to automate the processes of testing, building, and deploying a web application using Docker.
-It creates an image and pushes it to DockerHub. This simplifies deployment with Docker Compose. Additionally,
-the pipeline is configured to perform these tasks when certain conditions are met, such as specific branch.
+It creates an image and pushes it to DockerHub. 
 
 ![](https://i.imgur.com/llEoE4e.png)
 
-
 ## Deployment
-Application deployment can be achieved through the utilization of either a `Go` or `Flask` server, orchestrated using docker-compose,
-and hosted on the cloud self-hosting service provided by [Collify](https://coolify.io/docs/installation). Please note that the Flask server resides on a distinct branch.
-
+Deployment can be achieved through self-hosting service provided by [Collify](https://coolify.io/docs/installation). 
 
 <br>
 <br>
@@ -38,47 +19,29 @@ and hosted on the cloud self-hosting service provided by [Collify](https://cooli
 
 ## MakeFile
 
-run all make commands with clean tests
 ```bash
-make all build
-```
+all: build
 
-build the application
-```bash
-make build
-```
+build:
+	@echo "Building..."
+	@templ generate
+	@go build -o main cmd/api/main.go
 
-build docker image
-```bash
-make docker-build
-```
+docker-build:
+	@docker build -t ujstor/portfolio-web-go .
 
-run the application
-```bash
-make run
-```
+run:
+	@go run cmd/api/main.go
 
-run docker image
-```bash
-make docker-run
-```
+docker-run:
+	@docker run -p 5000:5000 ujstor/portfolio-web-go
 
-push image to DockerHub
-```bash
-make push
-```
+push:
+	@docker push ujstor/portfolio-web-go
 
-live reload the application
-```bash
-make watch
-```
+clean:
+	@echo "Cleaning..."
+	@rm -f main
 
-run the test suite
-```bash
-make test
+.PHONY: all build docker-build run docker-run push clean 
 ```
-
-clean up binary from the last build
-```bash
-make clean
-```

Jenkinsfile

@@ -1,22 +1,16 @@
 package main
 
 import (
-	"fiber/internal/server"
 	"fmt"
-	"os"
-	"strconv"
-
-	_ "github.com/joho/godotenv/autoload"
+	"portfolio-web/internal/server"
 )
 
 func main() {
 
-	server := server.New()
+	server := server.NewServer()
 
-	server.RegisterFiberRoutes()
-	port, _ := strconv.Atoi(os.Getenv("PORT"))
-	err := server.Listen(fmt.Sprintf(":%d", port))
+	err := server.ListenAndServe()
 	if err != nil {
-		panic("cannot start server")
+		panic(fmt.Sprintf("cannot start server: %s", err))
 	}
 }

Makefile

@@ -0,0 +1,45 @@
+package web
+
+templ Base() {
+	<!DOCTYPE html>
+	<html lang="en">
+	  <head>
+	    <!-- Metadata of the Webpage -->
+	    <!-- Character-set Metadata -->
+	    <meta charset="utf-8" />
+	    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+	    <!-- Viewport Metadata -->
+	    <meta name="viewport" content="width=device-width, initial-scale=1" />
+	    <!-- Description Metadata-->
+	    <meta name="description" content="Portfolio Website" />
+	    <!-- Author Metadata -->
+	    <meta name="author" content="Aleksandar Stipan" />
+	    <!-- Keyword Metadata -->
+	    <meta
+	      name="keywords"
+	      content="aleksandar stipan, programmer, coder, backend developer,
+	      devops, hetzner, aws, python, go, ujstor, stipan, aleksandar"
+	    />
+	    <!-- Webpage Logo -->
+	    <link rel="shortcut icon" href="./assets/img/favicon.ico" />
+	    <!-- Webpage Title -->
+	    <title>Aleksandar Stipan</title>
+	    <!-- Import CSS: Main Stylesheet -->
+	    <link rel="stylesheet" href="./assets/css/main.css" />
+	    <script defer data-domain="astipan.com" src="https://analytics.ujstor.com/js/script.js"></script>
+	  </head>
+	  <body>
+		{ children... }
+	    <footer class="footer">
+	      <p>&copy; Aleksandar Stipan, 2024</p>
+	    </footer>
+
+	    <!-- Import JS: Particles Theme -->
+	    <script src="https://cdn.jsdelivr.net/particles.js/2.0.0/particles.min.js"></script>
+	    <!-- Import JS: Sweet Scroll -->
+	    <script src="./assets/js/sweet-scroll.min.js"></script>
+	    <!-- Import JS: Main Script -->
+	    <script src="./assets/js/main.js"></script>
+	  </body>
+	</html>
+}

README.md

@@ -0,0 +1,6 @@
+package web
+
+import "embed"
+
+//go:embed "assets"
+var Files embed.FS