deployment ready

Author: g4ze

.env.postgres

@@ -4,4 +4,4 @@ POSTGRES_DB=postgres
 POSTGRES_HOST=postgres
 POSTGRES_PORT=5432
 DATABASE_URL=postgresql://postgres:Welcome@localhost:5432/postgres
-# if you run using docker run --name pgsql-dev -e POSTGRES_PASSWORD=Welcome -p 5432:5432 postgres:latest
+# if you run using docker run --name byoc_postgres -e POSTGRES_PASSWORD=Welcome -p 5432:5432 postgres:latest

.env.template

@@ -0,0 +1,6 @@
+# for localhost
+# DATABASE_URL=postgresql://postgres:Welcome@localhost:5432/postgres 
+# for docker
+DATABASE_URL="postgresql://postgres:Welcome@db:5432/postgres"
+GIN_MODE=release
+FE_URL=http://localhost:3000

Dockerfile

@@ -0,0 +1,25 @@
+# Build stage
+FROM golang:1.22.5 AS builder
+
+WORKDIR /app
+
+# Copy go.mod and go.sum
+COPY go.mod go.sum ./
+RUN go mod download
+
+# Copy the rest of the code
+COPY . .
+
+# Build the application
+RUN CGO_ENABLED=0 GOOS=linux go build -o main ./cmd/main.go
+
+# Final stage
+FROM golang:1.22.5
+
+WORKDIR /root/
+
+COPY --from=builder /app/main .
+
+EXPOSE 2001
+
+CMD ["./main"]

README.md

@@ -10,21 +10,24 @@ i should add ci linters, the code quality is crap, oops
 
 ## Database setup etc
 ### in the pkg/database dir
-setup the db `docker run --name pgsql-dev -e POSTGRES_PASSWORD=Welcome -p 5432:5432 postgres:latest`
+setup the db `docker run --name byoc_postgres -e POSTGRES_PASSWORD=Welcome -p 5432:5432 postgres:latest`
 First time cmd:
 [run db push to synchronize your schema with your database. It will also create the database if it doesn't exist.]
 `go run github.com/steebchen/prisma-client-go db push`
 
 Everytime model is changed, migrate your database and re-generate your prisma code:
 `go run github.com/steebchen/prisma-client-go migrate dev --name add_comment_model`
 
+Access the databse using:
+`docker exec -it psql-dev psql -U postgres -d postgres`
+
 
 `mkdir data`
 `
 docker run -e POSTGRES_PASSWORD=mysecretpassword  -p 5432:5432 -v ./data:/var/lib/postgresql/data --name byoc-postgres -d postgres
 `
 ```
-docker run --name pgsql-dev \
+docker run --name byoc_postgres \
   -e POSTGRES_PASSWORD=Welcome \
   -p 5432:5432 \
   -v byoc_pg:/var/lib/postgresql/data \

cmd/main.go

@@ -1,14 +1,19 @@
 package main
 
 import (
+	"log"
+	"os"
+
 	"github.com/g4ze/byoc/pkg/routes"
 	"github.com/joho/godotenv"
 )
 
 func main() {
-	err := godotenv.Load("./.env.postgres")
-	if err != nil {
-		panic(err)
+	if os.Getenv("GIN_MODE") != "release" {
+		err := godotenv.Load()
+		if err != nil {
+			log.Fatalf("Error loading .env file: %v", err)
+		}
 	}
 	routes.Server()
 }

compose.yml

@@ -0,0 +1,37 @@
+version: '3.8'
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "80:2001"
+    depends_on:
+      - db
+    env_file:
+      - ./.env  
+    
+    volumes:
+      - .:/app
+    networks:
+      - byoc-network
+
+  db:
+    image: postgres:latest
+    container_name: byoc_postgres
+    environment:
+      - POSTGRES_PASSWORD=Welcome
+    ports:
+      - "5432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    networks:
+      - byoc-network
+
+volumes:
+  postgres_data:
+  
+networks:
+  byoc-network:
+    driver: bridge

docs/deployment_changes.md

@@ -0,0 +1,3 @@
+# Get your fork ready for deployment
+I'll go ahead and document what changes i will be making to  the repo for deploying it to AWS.
+ 

fe/app.log

@@ -0,0 +1,54 @@
+{"level":"info","message":"Home Page called ","timestamp":"2024-07-08T17:08:44.260Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:09:15.640Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:09:18.278Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:10:05.824Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:10:29.617Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:10:36.997Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:11:55.161Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:12:13.610Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:12:16.322Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:12:25.669Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:12:41.656Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:12:43.907Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:12:51.076Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:13:22.233Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:18:01.775Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:18:02.617Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:18:22.190Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:19:15.909Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:19:30.827Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:19:43.846Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:23:37.959Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:23:37.962Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:23:37.972Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:23:37.992Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:23:38.020Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:23:37.978Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:23:37.974Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:23:37.991Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:23:38.009Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:23:38.035Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:30:55.846Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T17:31:33.515Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:05:23.589Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:05:32.965Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:07:14.927Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:15:18.957Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:21:58.454Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:25:10.841Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:25:11.039Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:25:11.371Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:25:11.550Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:25:28.394Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:25:28.472Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:25:28.521Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:25:28.681Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:26:12.532Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:26:17.060Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:28:01.676Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:28:01.864Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:28:02.153Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:28:02.331Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:28:06.986Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:30:26.976Z"}
+{"level":"info","message":"NEXT_PUBLIC_BE_URL: ","timestamp":"2024-07-08T18:31:36.112Z"}

fe/app/layout.tsx

@@ -2,7 +2,7 @@ import type { Metadata } from "next";
 import { Inter } from "next/font/google";
 import "./globals.css";
 import Earth3D from "@/components/Earth3D";
-
+import {logger} from "@/logger";
 const inter = Inter({ subsets: ["latin"] });
 
 export const metadata: Metadata = {
@@ -15,6 +15,7 @@ export default function RootLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
+  logger.info("NEXT_PUBLIC_BE_URL: ", process.env.NEXT_PUBLIC_BE_URL);
   return (
     <html lang="en">
       <body className={inter.className}>

fe/app/login/page.tsx

@@ -11,7 +11,7 @@ export default function Login() {
   const [username, setUsername] = useState("");
   // URL of the login endpoint
   const loginEndpoint = "/login";
-  const hosturl ="http://localhost:2001";
+  const hosturl = process.env.NEXT_PUBLIC_BE_URL || "http://localhost:2001";
   return (
     <section className="h-screen">
       <div className="flex justify-center items-center h-screen  ">
@@ -79,7 +79,7 @@ export default function Login() {
               </div>
             </form>
             <div className="text-center mt-4">
-                Don't have an account? Sign Up
+                Don&apos;t have an account? <a onClick={() => router.push("/signup")}>Sign Up</a>
             </div>
           </div>
         </div>