From df38c610695bcc126e68d8bc5e7194eeab844392 Mon Sep 17 00:00:00 2001 From: Leons Aleksandrovs <58330666+Skrazzo@users.noreply.github.com> Date: Thu, 3 Jul 2025 15:04:27 +0300 Subject: [PATCH 1/4] Added backend dockerfile --- Dockerfile.backend | 20 ++++++++++++++++++++ Dockerfile.frontend | 0 backend/go.mod | 3 +++ backend/main.go | 11 +++++++++++ caddy/Caddyfile | 4 ++++ docker-compose.yml | 14 ++++++++++++++ 6 files changed, 52 insertions(+) create mode 100644 Dockerfile.backend create mode 100644 Dockerfile.frontend create mode 100644 backend/go.mod create mode 100644 caddy/Caddyfile create mode 100644 docker-compose.yml diff --git a/Dockerfile.backend b/Dockerfile.backend new file mode 100644 index 0000000..5378694 --- /dev/null +++ b/Dockerfile.backend @@ -0,0 +1,20 @@ +FROM golang:1.24.4-alpine3.22@sha256:68932fa6d4d4059845c8f40ad7e654e626f3ebd3706eef7846f319293ab5cb7a as base + +# Set up workdir +WORKDIR /app + +# Install dependencies +# COPY go.mod go.sum ./ +COPY go.mod ./ +RUN go mod download + +# Copy code, and compile +COPY . . +RUN go build -o server main.go + +# Expose 8080 port +EXPOSE 8080 + +# Run server binary on start +CMD ["./server"] + diff --git a/Dockerfile.frontend b/Dockerfile.frontend new file mode 100644 index 0000000..e69de29 diff --git a/backend/go.mod b/backend/go.mod new file mode 100644 index 0000000..da3dbf5 --- /dev/null +++ b/backend/go.mod @@ -0,0 +1,3 @@ +module backend + +go 1.24.4 diff --git a/backend/main.go b/backend/main.go index e69de29..849021c 100644 --- a/backend/main.go +++ b/backend/main.go @@ -0,0 +1,11 @@ +package main + +import "time" + +func main() { + println("Hello, world!") + + for { + time.Sleep(1 * time.Second) + } +} diff --git a/caddy/Caddyfile b/caddy/Caddyfile new file mode 100644 index 0000000..2287bd6 --- /dev/null +++ b/caddy/Caddyfile @@ -0,0 +1,4 @@ +{ + admin off + auto_https off +} diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..a0f8ac9 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,14 @@ +services: + backend: + build: + context: ./backend + dockerfile: ../Dockerfile.backend + + container_name: cover-letter-backend + + networks: + - cover-letter-network + +networks: + cover-letter-network: + driver: bridge From 6130fc8abfa4e04868e5b756f588c57229733a89 Mon Sep 17 00:00:00 2001 From: Leons Aleksandrovs <58330666+Skrazzo@users.noreply.github.com> Date: Thu, 3 Jul 2025 17:55:15 +0300 Subject: [PATCH 2/4] Started BE structure / docker for FE dev --- Dockerfile.backend | 5 +- Dockerfile.frontend | 14 +++ README.md | 55 ++++++++++ backend/config/config.go | 20 ++++ backend/go.mod | 2 + backend/go.sum | 2 + backend/main.go | 19 +++- backend/routes/routes.go | 19 ++++ docker-compose.yml | 16 +++ frontend/.dockerignore | 1 + frontend/package.json | 8 +- frontend/src/routeTree.gen.ts | 122 ++++++++++++++++++++++ frontend/src/routes/demo.form.address.tsx | 2 +- frontend/src/routes/demo.form.simple.tsx | 2 +- frontend/src/routes/index.tsx | 10 +- 15 files changed, 278 insertions(+), 19 deletions(-) create mode 100644 README.md create mode 100644 backend/config/config.go create mode 100644 backend/go.sum create mode 100644 backend/routes/routes.go create mode 100644 frontend/.dockerignore create mode 100644 frontend/src/routeTree.gen.ts diff --git a/Dockerfile.backend b/Dockerfile.backend index 5378694..181ee11 100644 --- a/Dockerfile.backend +++ b/Dockerfile.backend @@ -1,11 +1,10 @@ -FROM golang:1.24.4-alpine3.22@sha256:68932fa6d4d4059845c8f40ad7e654e626f3ebd3706eef7846f319293ab5cb7a as base +FROM golang:1.24.4-alpine3.22@sha256:68932fa6d4d4059845c8f40ad7e654e626f3ebd3706eef7846f319293ab5cb7a AS base # Set up workdir WORKDIR /app # Install dependencies -# COPY go.mod go.sum ./ -COPY go.mod ./ +COPY go.mod go.sum ./ RUN go mod download # Copy code, and compile diff --git a/Dockerfile.frontend b/Dockerfile.frontend index e69de29..97292e3 100644 --- a/Dockerfile.frontend +++ b/Dockerfile.frontend @@ -0,0 +1,14 @@ +# ------ Dependencies stage ------ +FROM oven/bun:1.2.18-alpine@sha256:a7df687a2f684ee2f7404e2592039e192d75d26a04f843e60d9fc342741187d0 AS deps +WORKDIR /app + +# Install dependencies +COPY package.json bun.lock ./ +RUN bun install --frozen-lockfile + +# ------ Development stage ------ +FROM deps AS dev + +# Run +CMD ["bun", "run", "dev"] + diff --git a/README.md b/README.md new file mode 100644 index 0000000..da2eb68 --- /dev/null +++ b/README.md @@ -0,0 +1,55 @@ +# Cover letter templater + +Generates cover letters based on a template, and job listening using OpenAI. + +## Stack + +- Frontend: + - `Reactjs` + - `Tailwindcss` + - `Mantine` component library + - TanStack `Router` + `Query` + `Forms` +- Backend: `Golang` +- Database: `PostgreSQL` +- Deployment: `Docker` + +## Backend + +### Structure example (TODO: Replace with actual one) + +```sh +backend/ +├── main.go # Entry point +├── api/ # Route handlers grouped by domain +│ ├── auth.go +│ └── coverletters.go +├── routes/ # HTTP route registration +│ └── routes.go +├── middleware/ # Custom middleware (logging, auth) +│ └── auth.go +├── models/ # Data models, structs, db access +│ ├── user.go +│ └── coverletter.go +├── services/ # Business logic (e.g. OpenAI integration) +│ ├── auth_service.go +│ └── coverletter_service.go +├── utils/ # Shared helpers/utilities +│ └── jwt.go +└── config/ # Env loading, settings + └── config.go + +``` + +## Frontend + +### Structure example + +TODO: ADD STRUCTURE EXAMPLE + +## Deployement + +TODO: ADD DEPLOYMENT INSTRUCTIONS + +## Development + +TODO: ADD DEV INSTRUCTIONS diff --git a/backend/config/config.go b/backend/config/config.go new file mode 100644 index 0000000..48dd76a --- /dev/null +++ b/backend/config/config.go @@ -0,0 +1,20 @@ +package config + +import "os" + +func defaultValue(val string, def string) string { + if val == "" { + return def + } + return val +} + +func LoadEnv() map[string]string { + // Create object where to store used variables + env := make(map[string]string, 1) + + // Get env variables that will be used while server is running + env["port"] = defaultValue(os.Getenv("PORT"), "8080") + + return env +} diff --git a/backend/go.mod b/backend/go.mod index da3dbf5..7ea5871 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -1,3 +1,5 @@ module backend go 1.24.4 + +require github.com/go-chi/chi/v5 v5.2.2 diff --git a/backend/go.sum b/backend/go.sum new file mode 100644 index 0000000..ed9ec89 --- /dev/null +++ b/backend/go.sum @@ -0,0 +1,2 @@ +github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618= +github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops= diff --git a/backend/main.go b/backend/main.go index 849021c..12a9138 100644 --- a/backend/main.go +++ b/backend/main.go @@ -1,11 +1,20 @@ package main -import "time" +import ( + "backend/config" + "backend/routes" + "log" + "net/http" +) func main() { - println("Hello, world!") + // Load env variables + env := config.LoadEnv() - for { - time.Sleep(1 * time.Second) - } + // Setup routes + routes := routes.SetupRoutes() + + // Listen on port smth + log.Printf("Starting server on %s PORT\n", env["port"]) + log.Fatal(http.ListenAndServe(":"+env["port"], routes)) } diff --git a/backend/routes/routes.go b/backend/routes/routes.go new file mode 100644 index 0000000..33bd9f0 --- /dev/null +++ b/backend/routes/routes.go @@ -0,0 +1,19 @@ +package routes + +import ( + "net/http" + + "github.com/go-chi/chi/v5" + "github.com/go-chi/chi/v5/middleware" +) + +func SetupRoutes() http.Handler { + r := chi.NewRouter() + r.Use(middleware.Logger) + + r.Get("/", func(w http.ResponseWriter, r *http.Request) { + w.Write([]byte("Hello World!")) + }) + + return r +} diff --git a/docker-compose.yml b/docker-compose.yml index a0f8ac9..9ad2221 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,23 @@ services: dockerfile: ../Dockerfile.backend container_name: cover-letter-backend + environment: + - PORT=8080 # Internal container port + networks: + - cover-letter-network + frontend: + build: + context: ./frontend + dockerfile: ../Dockerfile.frontend + target: dev # Development stage + container_name: cover-letter-frontend + volumes: + - "./frontend:/app" # Mount frontend + - "/app/node_modules" # Ignore node_modules + + ports: + - 3000:3000 networks: - cover-letter-network diff --git a/frontend/.dockerignore b/frontend/.dockerignore new file mode 100644 index 0000000..8d87b1d --- /dev/null +++ b/frontend/.dockerignore @@ -0,0 +1 @@ +node_modules/* diff --git a/frontend/package.json b/frontend/package.json index 9041d9f..86d14ae 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,10 +1,9 @@ { - "name": ".", + "name": "Cover letter frontend", "private": true, "type": "module", "scripts": { - "dev": "vite --port 3000", - "start": "vite --port 3000", + "dev": "vite --port 3000 --host", "build": "vite build && tsc", "serve": "vite preview", "test": "vitest run" @@ -34,4 +33,5 @@ "vitest": "^3.0.5", "web-vitals": "^4.2.4" } -} \ No newline at end of file +} + diff --git a/frontend/src/routeTree.gen.ts b/frontend/src/routeTree.gen.ts new file mode 100644 index 0000000..8d244c0 --- /dev/null +++ b/frontend/src/routeTree.gen.ts @@ -0,0 +1,122 @@ +/* eslint-disable */ + +// @ts-nocheck + +// noinspection JSUnusedGlobalSymbols + +// This file was automatically generated by TanStack Router. +// You should NOT make any changes in this file as it will be overwritten. +// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. + +import { Route as rootRouteImport } from './routes/__root' +import { Route as IndexRouteImport } from './routes/index' +import { Route as DemoTanstackQueryRouteImport } from './routes/demo.tanstack-query' +import { Route as DemoFormSimpleRouteImport } from './routes/demo.form.simple' +import { Route as DemoFormAddressRouteImport } from './routes/demo.form.address' + +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) +const DemoTanstackQueryRoute = DemoTanstackQueryRouteImport.update({ + id: '/demo/tanstack-query', + path: '/demo/tanstack-query', + getParentRoute: () => rootRouteImport, +} as any) +const DemoFormSimpleRoute = DemoFormSimpleRouteImport.update({ + id: '/demo/form/simple', + path: '/demo/form/simple', + getParentRoute: () => rootRouteImport, +} as any) +const DemoFormAddressRoute = DemoFormAddressRouteImport.update({ + id: '/demo/form/address', + path: '/demo/form/address', + getParentRoute: () => rootRouteImport, +} as any) + +export interface FileRoutesByFullPath { + '/': typeof IndexRoute + '/demo/tanstack-query': typeof DemoTanstackQueryRoute + '/demo/form/address': typeof DemoFormAddressRoute + '/demo/form/simple': typeof DemoFormSimpleRoute +} +export interface FileRoutesByTo { + '/': typeof IndexRoute + '/demo/tanstack-query': typeof DemoTanstackQueryRoute + '/demo/form/address': typeof DemoFormAddressRoute + '/demo/form/simple': typeof DemoFormSimpleRoute +} +export interface FileRoutesById { + __root__: typeof rootRouteImport + '/': typeof IndexRoute + '/demo/tanstack-query': typeof DemoTanstackQueryRoute + '/demo/form/address': typeof DemoFormAddressRoute + '/demo/form/simple': typeof DemoFormSimpleRoute +} +export interface FileRouteTypes { + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: + | '/' + | '/demo/tanstack-query' + | '/demo/form/address' + | '/demo/form/simple' + fileRoutesByTo: FileRoutesByTo + to: '/' | '/demo/tanstack-query' | '/demo/form/address' | '/demo/form/simple' + id: + | '__root__' + | '/' + | '/demo/tanstack-query' + | '/demo/form/address' + | '/demo/form/simple' + fileRoutesById: FileRoutesById +} +export interface RootRouteChildren { + IndexRoute: typeof IndexRoute + DemoTanstackQueryRoute: typeof DemoTanstackQueryRoute + DemoFormAddressRoute: typeof DemoFormAddressRoute + DemoFormSimpleRoute: typeof DemoFormSimpleRoute +} + +declare module '@tanstack/react-router' { + interface FileRoutesByPath { + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } + '/demo/tanstack-query': { + id: '/demo/tanstack-query' + path: '/demo/tanstack-query' + fullPath: '/demo/tanstack-query' + preLoaderRoute: typeof DemoTanstackQueryRouteImport + parentRoute: typeof rootRouteImport + } + '/demo/form/simple': { + id: '/demo/form/simple' + path: '/demo/form/simple' + fullPath: '/demo/form/simple' + preLoaderRoute: typeof DemoFormSimpleRouteImport + parentRoute: typeof rootRouteImport + } + '/demo/form/address': { + id: '/demo/form/address' + path: '/demo/form/address' + fullPath: '/demo/form/address' + preLoaderRoute: typeof DemoFormAddressRouteImport + parentRoute: typeof rootRouteImport + } + } +} + +const rootRouteChildren: RootRouteChildren = { + IndexRoute: IndexRoute, + DemoTanstackQueryRoute: DemoTanstackQueryRoute, + DemoFormAddressRoute: DemoFormAddressRoute, + DemoFormSimpleRoute: DemoFormSimpleRoute, +} +export const routeTree = rootRouteImport + ._addFileChildren(rootRouteChildren) + ._addFileTypes() diff --git a/frontend/src/routes/demo.form.address.tsx b/frontend/src/routes/demo.form.address.tsx index 42f7618..4b1e8fc 100644 --- a/frontend/src/routes/demo.form.address.tsx +++ b/frontend/src/routes/demo.form.address.tsx @@ -2,7 +2,7 @@ import { createFileRoute } from '@tanstack/react-router' import { useAppForm } from '../hooks/demo.form' -export const Route = createFileRoute('/demo/form')({ +export const Route = createFileRoute('/demo/form/address')({ component: AddressForm, }) diff --git a/frontend/src/routes/demo.form.simple.tsx b/frontend/src/routes/demo.form.simple.tsx index 4a20008..551aadc 100644 --- a/frontend/src/routes/demo.form.simple.tsx +++ b/frontend/src/routes/demo.form.simple.tsx @@ -3,7 +3,7 @@ import { z } from 'zod' import { useAppForm } from '../hooks/demo.form' -export const Route = createFileRoute('/demo/form')({ +export const Route = createFileRoute('/demo/form/simple')({ component: SimpleForm, }) diff --git a/frontend/src/routes/index.tsx b/frontend/src/routes/index.tsx index b285335..44c9276 100644 --- a/frontend/src/routes/index.tsx +++ b/frontend/src/routes/index.tsx @@ -1,9 +1,9 @@ -import { createFileRoute } from '@tanstack/react-router' -import logo from '../logo.svg' +import { createFileRoute } from "@tanstack/react-router"; +import logo from "../logo.svg"; -export const Route = createFileRoute('/')({ +export const Route = createFileRoute("/")({ component: App, -}) +}); function App() { return ( @@ -35,5 +35,5 @@ function App() { - ) + ); } From 2ad7b27fd5b18fbea1749df986030e66b10002f7 Mon Sep 17 00:00:00 2001 From: Leons Aleksandrovs <58330666+Skrazzo@users.noreply.github.com> Date: Thu, 3 Jul 2025 21:58:49 +0300 Subject: [PATCH 3/4] Finished development Caddy Frontend And backend are now running --- backend/go.mod | 31 ++++++++- backend/go.sum | 91 ++++++++++++++++++++++++++- backend/main.go | 3 +- backend/routes/routes.go | 14 ++--- caddy/Caddyfile | 8 +++ docker-compose.yml => development.yml | 20 ++++-- 6 files changed, 150 insertions(+), 17 deletions(-) rename docker-compose.yml => development.yml (65%) diff --git a/backend/go.mod b/backend/go.mod index 7ea5871..36d69a2 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -2,4 +2,33 @@ module backend go 1.24.4 -require github.com/go-chi/chi/v5 v5.2.2 +require github.com/gin-gonic/gin v1.10.1 + +require ( + github.com/bytedance/sonic v1.11.6 // indirect + github.com/bytedance/sonic/loader v0.1.1 // indirect + github.com/cloudwego/base64x v0.1.4 // indirect + github.com/cloudwego/iasm v0.2.0 // indirect + github.com/gabriel-vasile/mimetype v1.4.3 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.20.0 // indirect + github.com/goccy/go-json v0.10.2 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/leodido/go-urn v1.4.0 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.2.12 // indirect + golang.org/x/arch v0.8.0 // indirect + golang.org/x/crypto v0.23.0 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/backend/go.sum b/backend/go.sum index ed9ec89..0397106 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -1,2 +1,89 @@ -github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618= -github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops= +github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= +github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= +github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= +github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= +github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= +github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= +github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= +github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ= +github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8= +github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= +github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= +github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= +github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= +golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= +golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/backend/main.go b/backend/main.go index 12a9138..44196d3 100644 --- a/backend/main.go +++ b/backend/main.go @@ -4,7 +4,6 @@ import ( "backend/config" "backend/routes" "log" - "net/http" ) func main() { @@ -16,5 +15,5 @@ func main() { // Listen on port smth log.Printf("Starting server on %s PORT\n", env["port"]) - log.Fatal(http.ListenAndServe(":"+env["port"], routes)) + log.Fatal(routes.Run(":8080")) } diff --git a/backend/routes/routes.go b/backend/routes/routes.go index 33bd9f0..3b786d2 100644 --- a/backend/routes/routes.go +++ b/backend/routes/routes.go @@ -3,16 +3,16 @@ package routes import ( "net/http" - "github.com/go-chi/chi/v5" - "github.com/go-chi/chi/v5/middleware" + "github.com/gin-gonic/gin" ) -func SetupRoutes() http.Handler { - r := chi.NewRouter() - r.Use(middleware.Logger) +func SetupRoutes() *gin.Engine { + r := gin.Default() - r.Get("/", func(w http.ResponseWriter, r *http.Request) { - w.Write([]byte("Hello World!")) + r.GET("/ping", func(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "message": "pong", + }) }) return r diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 2287bd6..643de04 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -2,3 +2,11 @@ admin off auto_https off } + +:8080 { + reverse_proxy frontend:3000 + + handle_path /api* { + reverse_proxy backend:8080 + } +} diff --git a/docker-compose.yml b/development.yml similarity index 65% rename from docker-compose.yml rename to development.yml index 9ad2221..5a6a9da 100644 --- a/docker-compose.yml +++ b/development.yml @@ -3,10 +3,12 @@ services: build: context: ./backend dockerfile: ../Dockerfile.backend - + restart: unless-stopped container_name: cover-letter-backend + environment: - - PORT=8080 # Internal container port + - GIN_MODE=debug + # - GIN_MODE=release # For production networks: - cover-letter-network frontend: @@ -14,16 +16,24 @@ services: context: ./frontend dockerfile: ../Dockerfile.frontend target: dev # Development stage + restart: unless-stopped container_name: cover-letter-frontend volumes: - "./frontend:/app" # Mount frontend - "/app/node_modules" # Ignore node_modules - - ports: - - 3000:3000 networks: - cover-letter-network + proxy: + image: caddy:alpine + restart: unless-stopped + + networks: + - cover-letter-network + volumes: + - ./caddy/Caddyfile:/etc/caddy/Caddyfile + ports: + - 8080:8080 networks: cover-letter-network: From 3c3036b9cae964d88ee3e78ac926d86e75fc0f34 Mon Sep 17 00:00:00 2001 From: Leons Aleksandrovs <58330666+Skrazzo@users.noreply.github.com> Date: Thu, 3 Jul 2025 22:01:38 +0300 Subject: [PATCH 4/4] Update README --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index da2eb68..d602693 100644 --- a/README.md +++ b/README.md @@ -52,4 +52,9 @@ TODO: ADD DEPLOYMENT INSTRUCTIONS ## Development -TODO: ADD DEV INSTRUCTIONS +If you want to run development version, you will need docker. Docker handles frontend, backend and proxies everything to single port. + +```sh +# Run development environment +docker compose -f development.yml up --build +```