diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index aacb559fd..14d705198 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -19,20 +19,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Set up Go
- uses: actions/setup-go@v3
+ uses: actions/setup-go@v4
with:
go-version: "1.22"
- name: Cache Go Modules
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
- ${{ runner.os }}-go-
+ ${{ runner.os }}-go
- name: Install gofumpt
run: go install mvdan.cc/gofumpt@latest
+ - name: templ
+ run: go install github.com/a-h/templ/cmd/templ@latest && templ generate
- name: Check code formatting
run: |
unformatted_files=$(gofumpt -l ./backend/)
@@ -49,13 +51,21 @@ jobs:
pull-requests: read
checks: write
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: "1.22"
- cache: false
+ - name: Cache Go Modules
+ uses: actions/cache@v4
+ with:
+ path: ~/go/pkg/mod
+ key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+ restore-keys: |
+ ${{ runner.os }}-go
+ - name: templ
+ run: go install github.com/a-h/templ/cmd/templ@latest && templ generate
- name: golangci-lint
- uses: golangci/golangci-lint-action@v3
+ uses: golangci/golangci-lint-action@v4
with:
version: latest
working-directory: ./backend/
@@ -74,20 +84,20 @@ jobs:
- 5432:5432
steps:
- name: Checkout Repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Set up Go
- uses: actions/setup-go@v3
+ uses: actions/setup-go@v4
with:
go-version: "1.22"
- name: Cache Go Modules
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go
- name: Install Dependencies
- run: cd ./backend/ && go get ./...
+ run: cd ./backend/ && go install github.com/a-h/templ/cmd/templ@latest && templ generate && go get ./...
- name: Increase max_connections in PostgreSQL
run: |
CONTAINER_ID=$(docker ps --filter "publish=5432" --format "{{.ID}}")
diff --git a/.github/workflows/backend_codeql.yml b/.github/workflows/backend_codeql.yml
index a40539efb..3570080bf 100644
--- a/.github/workflows/backend_codeql.yml
+++ b/.github/workflows/backend_codeql.yml
@@ -22,7 +22,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up Go
- uses: actions/setup-go@v3
+ uses: actions/setup-go@v4
with:
go-version: "1.22"
- name: Initialize CodeQL
@@ -32,7 +32,7 @@ jobs:
queries: security-and-quality
- name: Build
run: |
- cd ./backend/ && go build -o backend main.go
+ go install github.com/a-h/templ/cmd/templ@latest && templ generate && cd ./backend/ && go build -o backend main.go
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index fa584ba5d..4cd59de1e 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -19,13 +19,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Set up Go
- uses: actions/setup-go@v3
+ uses: actions/setup-go@v4
with:
go-version: "1.22"
- name: Cache Go Modules
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -49,13 +49,13 @@ jobs:
pull-requests: read
checks: write
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: "1.22"
cache: false
- name: golangci-lint
- uses: golangci/golangci-lint-action@v3
+ uses: golangci/golangci-lint-action@v4
with:
version: latest
working-directory: ./cli/
diff --git a/.github/workflows/cli_codeql.yml b/.github/workflows/cli_codeql.yml
index cb09497e5..7eb08c2ab 100644
--- a/.github/workflows/cli_codeql.yml
+++ b/.github/workflows/cli_codeql.yml
@@ -22,7 +22,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up Go
- uses: actions/setup-go@v3
+ uses: actions/setup-go@v4
with:
go-version: "1.22"
- name: Initialize CodeQL
diff --git a/.github/workflows/dashboard.yml b/.github/workflows/dashboard.yml
index 2c13b7a0d..0c5f56c9c 100644
--- a/.github/workflows/dashboard.yml
+++ b/.github/workflows/dashboard.yml
@@ -14,9 +14,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
@@ -34,9 +34,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
@@ -54,9 +54,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
diff --git a/.github/workflows/frontend_lib.yml b/.github/workflows/frontend_lib.yml
index 029ea34ae..f62be6185 100644
--- a/.github/workflows/frontend_lib.yml
+++ b/.github/workflows/frontend_lib.yml
@@ -14,9 +14,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
@@ -34,9 +34,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
@@ -54,9 +54,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
@@ -74,7 +74,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout current branch
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Get new version of package.json
id: get_new_version
@@ -82,7 +82,7 @@ jobs:
echo "new_version=$(jq -r '.version' frontend/lib/package.json)" >> $GITHUB_OUTPUT
- name: Checkout main
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
ref: main
diff --git a/.github/workflows/mobile.yml b/.github/workflows/mobile.yml
index 39304c8e7..eb5dde6d9 100644
--- a/.github/workflows/mobile.yml
+++ b/.github/workflows/mobile.yml
@@ -14,9 +14,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
@@ -34,9 +34,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
@@ -54,9 +54,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index 81b216117..72b30a0b3 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -14,9 +14,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
@@ -34,9 +34,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
@@ -54,9 +54,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
diff --git a/.gitignore b/.gitignore
index af7dd576d..87f35bef7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,17 @@
-# MacOS
.DS_Store
-# Cli
sac
-# VSCode
.vscode
.trunk
-# Node modules
node_modules
-# Environment files
.env
.env.dev
+.env.prod
-# Debug files
backend/tests/api/__debug_*
-.env.prod
frontend/mobile/ios/
frontend/mobile/android/
@@ -25,3 +19,5 @@ tmp/
ios
android
.idea/modules.xml
+
+*_templ.go
\ No newline at end of file
diff --git a/backend/.dockerignore b/backend/.dockerignore
index 59a45cc78..9ffcea7db 100644
--- a/backend/.dockerignore
+++ b/backend/.dockerignore
@@ -1,2 +1,4 @@
tests/
-docs/
\ No newline at end of file
+docs/
+*.md
+*.templ
\ No newline at end of file
diff --git a/backend/Dockerfile.server b/backend/Dockerfile.server
index 8fa18c7b8..57044ccc8 100644
--- a/backend/Dockerfile.server
+++ b/backend/Dockerfile.server
@@ -1,15 +1,18 @@
-# syntax=docker/dockerfile:1
-
-FROM golang:1.22.2
+FROM golang:1.22-alpine as builder
WORKDIR /app
+RUN apk add --no-cache git
-COPY go.mod go.sum ./
-
-COPY *.go ./
+COPY . ./
+RUN go install github.com/a-h/templ/cmd/templ@latest
+RUN templ generate
+RUN go get ./...
+RUN go mod tidy
+RUN go mod download
+RUN go build -tags prod -o bin/sac main.go
-RUN CGO_ENABLED=0 GOOS=linux go build -v -o ./sac
+FROM scratch
+COPY --from=builder /app/bin/sac /sac
EXPOSE 8080
-
-CMD ["/sac"]
\ No newline at end of file
+ENTRYPOINT [ "./sac" ]
\ No newline at end of file
diff --git a/backend/templates/emails/layouts/base_templ.go b/backend/templates/emails/layouts/base_templ.go
deleted file mode 100644
index 3689f140b..000000000
--- a/backend/templates/emails/layouts/base_templ.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.639
-package layouts
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import "context"
-import "io"
-import "bytes"
-
-func Base(title string, styles templ.Component) templ.Component {
- return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
- if !templ_7745c5c3_IsBuffer {
- templ_7745c5c3_Buffer = templ.GetBuffer()
- defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
- }
- ctx = templ.InitializeContext(ctx)
- templ_7745c5c3_Var1 := templ.GetChildren(ctx)
- if templ_7745c5c3_Var1 == nil {
- templ_7745c5c3_Var1 = templ.NopComponent
- }
- ctx = templ.ClearChildren(ctx)
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- var templ_7745c5c3_Var2 string
- templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(title)
- if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/emails/layouts/base.templ`, Line: 7, Col: 17}
- }
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- templ_7745c5c3_Err = styles.Render(ctx, templ_7745c5c3_Buffer)
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- templ_7745c5c3_Err = templ_7745c5c3_Var1.Render(ctx, templ_7745c5c3_Buffer)
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- if !templ_7745c5c3_IsBuffer {
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
- }
- return templ_7745c5c3_Err
- })
-}
diff --git a/backend/templates/emails/verification.templ b/backend/templates/emails/verification.templ
deleted file mode 100644
index fad4cff02..000000000
--- a/backend/templates/emails/verification.templ
+++ /dev/null
@@ -1,76 +0,0 @@
-package emails
-
-import (
- "github.com/GenerateNU/sac/backend/templates/emails/layouts"
-)
-
-templ Verification(otp string) {
- @layouts.Base("Welcome to Hippo! Verify your Email", verificationStyles()) {
-
-
Welcome to Hippo
-
- Thank you for signing up! To unlock the full potential of your account
- and start enjoying our services, please verify your email address by
- typing the following code in the verification page:
-
-
{ otp }
-
- If you didn't create an account with Hippo, please disregard this email.
-
-
We look forward to having you on board!
-
Sincerely,
-
The Hippo Team
-
Welcome to Hippo
Thank you for signing up! To unlock the full potential of your account and start enjoying our services, please verify your email address by typing the following code in the verification page:
")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- var templ_7745c5c3_Var3 string
- templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(otp)
- if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/emails/verification.templ`, Line: 16, Col: 19}
- }
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
If you didn't create an account with Hippo, please disregard this email.
We look forward to having you on board!
Sincerely,
The Hippo Team
Welcome to Hippo ")
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- var templ_7745c5c3_Var3 string
- templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(name)
- if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/emails/welcome.templ`, Line: 8, Col: 30}
- }
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
- if templ_7745c5c3_Err != nil {
- return templ_7745c5c3_Err
- }
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("!
Thank you for creating an account with us. We're excited to have you on board!
Your account is now active, and you can log in using your email address and password.
If you haven't already, we recommend that you complete your profile to get the most out of your Hippo experience.
To get started, you can visit our website at hipponeu.com.
If you have any questions or need assistance, please don't hesitate to contact us at generatesac@gmail.com.
We look forward to seeing you around!
Sincerely,
The Hippo Team