feat: Update swarm docker

Author: AJackTi

broker-service/cmd/api/main.go

@@ -11,7 +11,7 @@ import (
 	amqp "github.com/rabbitmq/amqp091-go"
 )
 
-const webPort = "80"
+const webPort = "8080"
 
 type Config struct {
 	Rabbit *amqp.Connection

front-end/cmd/web/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"embed"
 	"fmt"
 	"html/template"
 	"log"
@@ -12,27 +13,30 @@ func main() {
 		render(w, "test.page.gohtml")
 	})
 
-	fmt.Println("Starting front end service on port 80")
+	fmt.Println("Starting front end service on port 8081")
 
-	err := http.ListenAndServe(":80", nil)
+	err := http.ListenAndServe(":8081", nil)
 	if err != nil {
 		log.Panic(err)
 	}
 }
 
+//go:embed templates
+var templateFS embed.FS
+
 func render(w http.ResponseWriter, t string) {
 	partials := []string{
-		"./cmd/web/templates/base.layout.gohtml",
-		"./cmd/web/templates/header.partial.gohtml",
-		"./cmd/web/templates/footer.partial.gohtml",
+		"templates/base.layout.gohtml",
+		"templates/header.partial.gohtml",
+		"templates/footer.partial.gohtml",
 	}
 
 	var templateSlice []string
-	templateSlice = append(templateSlice, fmt.Sprintf("./cmd/web/templates/%s", t))
+	templateSlice = append(templateSlice, fmt.Sprintf("templates/%s", t))
 
 	templateSlice = append(templateSlice, partials...)
 
-	tmpl, err := template.ParseFiles(templateSlice...)
+	tmpl, err := template.ParseFS(templateFS, templateSlice...)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return

front-end/cmd/web/templates/test.page.gohtml

@@ -76,7 +76,7 @@
                 }
             })
             .catch((error) => {
-                output.innerHTML += "<br><br>Eror: " + error;
+                output.innerHTML += "<br><br>Error: " + error;
             })
     })
 

mail-service/cmd/api/mailer.go

@@ -15,7 +15,7 @@ type Mail struct {
 	Port        int
 	Username    string
 	Password    string
-	Encrytion   string
+	Encryption   string
 	FromAddress string
 	FromName    string
 }
@@ -59,7 +59,7 @@ func (m *Mail) SendSMTPMessage(msg Message) error {
 	server.Port = m.Port
 	server.Username = m.Username
 	server.Password = m.Password
-	server.Encryption = m.getEncryption(m.Encrytion)
+	server.Encryption = m.getEncryption(m.Encryption)
 	server.KeepAlive = false
 	server.ConnectTimeout = 10 * time.Second
 	server.SendTimeout = 10 * time.Second

mail-service/cmd/api/main.go

@@ -40,7 +40,7 @@ func createMail() Mail {
 		Port:        port,
 		Username:    os.Getenv("MAIL_USERNAME"),
 		Password:    os.Getenv("MAIL_PASSWORD"),
-		Encrytion:   os.Getenv("MAIL_ENCRYPTION"),
+		Encryption:   os.Getenv("MAIL_ENCRYPTION"),
 		FromName:    os.Getenv("FROM_NAME"),
 		FromAddress: os.Getenv("FROM_ADDRESS"),
 	}

project/Makefile

@@ -12,7 +12,7 @@ up:
 	@echo "Docker images started!"
 
 ## up_build: stops docker-compose (if running), builds all projects and starts docker compose
-up_build: build_broker build_auth build_logger build_mail build_listener
+up_build: build_broker build_auth build_logger build_mail build_listener build_front_linux
 	@echo "Stopping docker images (if running...)"
 	docker-compose down
 	@echo "Building (when required) and starting docker images..."
@@ -25,6 +25,12 @@ down:
 	docker-compose down
 	@echo "Done!"
 
+## build_front_linux: builds the front end binary as a linux executable
+build_front_linux:
+	@echo "Building front end linux binary..."
+	cd ../front-end && set GOOS=linux && set GOARCH=amd64 && set CGO_ENABLED=0 go build -o ${FRONT_END_BINARY} ./cmd/web
+	@echo "Done!"
+
 ## build_broker: builds the broker binary as a linux executable
 build_broker:
 	@echo "Building broker binary..."