My team

.github/workflows/deploy.yml

@@ -0,0 +1,26 @@
+jobs:
+    deploy:
+      name: Deploy Website
+      runs-on: ubuntu-latest
+      steps:
+        - name: Remote deploy
+          uses: appleboy/ssh-action@master
+          with:
+            host: ${{ secrets.SSH_HOST }}
+            key: ${{ secrets.SSH_KEY }}
+            port: ${{ secrets.SSH_PORT }}
+            username: ${{ secrets.SSH_USER }}
+            script: |
+              source ~/.bash_profile
+              cd ~/projects/codejam2024/
+              git reset --hard HEAD || true
+              git pull origin main
+              ./build.sh
+              sudo systemctl restart codejam-staging.service
+
+name: Deploy
+
+on:
+    push:
+        branches:
+            - main

.github/workflows/release.yml

@@ -0,0 +1,23 @@
+jobs:
+    deploy:
+      name: Deploy Prod Release
+      runs-on: ubuntu-latest
+      steps:
+        - name: Remote deploy
+          uses: appleboy/ssh-action@master
+          with:
+            host: ${{ secrets.SSH_HOST }}
+            key: ${{ secrets.SSH_KEY }}
+            port: ${{ secrets.SSH_PORT }}
+            username: ${{ secrets.SSH_USER }}
+            script: |
+              source ~/.bash_profile
+              sudo systemctl stop codejam-prod.service
+              sudo cp /opt/codejam/staging/codejam.io /opt/codejam/prod/
+              sudo systemctl start codejam-prod.service
+
+name: Release
+
+on:
+    release:
+        types: [published]

.gitignore

@@ -1,8 +1,18 @@
 .idea/
 *.iml
 
+node_modules
+
 # VSCODE
 .vscode/
 
 # Config files...
 config.toml
+
+# extra files to ignore
+codejam.io.exe
+brainstorm.txt
+gradientchange.svelte
+
+# docker related files
+docker-compose.override.yaml

Dockerfile

@@ -0,0 +1,29 @@
+FROM library/node:20-alpine3.20 as frontend_builder
+
+WORKDIR /app
+
+COPY ./html/package.json /app
+COPY ./html/package-lock.json /app
+
+RUN npm install
+
+COPY ./html /app
+
+RUN npm run build
+
+RUN mkdir /app/dist/static/
+RUN cp --recursive /app/static/. /app/dist/static/
+
+FROM library/golang:1.22.3-alpine3.20
+
+WORKDIR /app
+
+COPY ./backend/app/go.mod /app
+COPY ./backend/app/go.sum /app
+
+RUN go mod download
+
+COPY ./backend/app/ /app
+COPY --from=frontend_builder /app/dist/ /app/server/static_files/
+
+ENTRYPOINT [ "go", "run", "./main.go" ]

README.md

@@ -1 +1,42 @@
-# CodeJam Site
+# CodeJam Site
+
+## docker compose
+### Deploying
+
+1. Pull all images
+
+```bash
+docker compose pull database redis
+```
+
+2. Build the docker image: `docker compose build server`
+
+```bash
+docker compose build server
+```
+
+3. Copy the example configuration file from `./backend/app/config.example.toml` to `./backend/app/config.toml`
+4. Edit the configuration file
+    1. The database user will be "postgres"
+    2. The database host will be "database" (as the name of the service in the `docker-compose.yaml` file)
+    3. The redis host will be "redis" (as the name of the service in the `docker-compose.yaml` file)
+5. Start the PostgreSQL and Redis containers
+
+```bash
+docker compose up -d database redis
+```
+
+6. Start the docker container through docker compose
+
+```bash
+docker compose up -d server
+```
+
+7. Visit website at [http://localhost:8080](http://localhost:8080)
+
+### Providing more overrides
+
+1. Unignore the `docker-compose.override.yaml` in the `.gitignore` file
+2. Make changes
+3. Stage the updated `docker-compose.override.yaml` file
+4. Ignore the `docker-compose.override.yaml` file in the `.gitignore` file

backend/app/database/events.go

@@ -1,33 +1,58 @@
 package database
 
-import "github.com/jackc/pgx/v5/pgtype"
+import (
+	"github.com/jackc/pgx/v5/pgtype"
+)
 
 type DBEvent struct {
 	Id              pgtype.UUID      `db:"id"`
 	StatusId        int              `db:"status_id"`
 	Title           string           `db:"title"`
 	Description     string           `db:"description"`
 	Rules           string           `db:"rules"`
-	OrganizerUserId pgtype.UUID      `db:"organizer_user_id"`
+	Timeline        string           `db:"timeline"`
+	OrganizerUserId pgtype.UUID      `db:"organizer_user_id" json:"-"`
 	MaxTeams        int              `db:"max_teams"`
 	StartsAt        pgtype.Timestamp `db:"starts_at"`
 	EndsAt          pgtype.Timestamp `db:"ends_at"`
-	CreatedOn       pgtype.Timestamp `db:"created_on"`
+	CreatedOn       pgtype.Timestamp `db:"created_on" json:"-"`
+}
+
+type DBEventStatus struct {
+	Id          int    `db:"id"`
+	Code        string `db:"code"`
+	Title       string `db:"title"`
+	Description string `db:"description"`
+	Sort        int    `db:"sort"`
+}
+
+type DBEventStatusCode struct {
+	Code string `db:"code"`
+}
+
+func GetEventStatusCode(eventId pgtype.UUID) (string, error) {
+	result, err := GetRow[DBEventStatusCode](
+		`SELECT code
+         FROM events 
+         INNER JOIN statuses ON (events.status_id = statuses.id)
+         WHERE events.id = $1`,
+		eventId)
+	return result.Code, err
 }
 
 func CreateEvent(organizerUserId pgtype.UUID) (DBEvent, error) {
 	var event DBEvent
 	event, err := GetRow[DBEvent](
 		`INSERT INTO events
-           (status_id, title, description, rules, organizer_user_id)
-         VALUES
-           ((SELECT id FROM statuses WHERE code = 'PLANNING'),
+            (status_id, title, description, rules, organizer_user_id)
+            VALUES
+            ((SELECT id FROM statuses WHERE code = 'PLANNING'),
             '',
             '',
             '',
             $1)
          RETURNING *
-         `,
+        `,
 		organizerUserId)
 	return event, err
 }
@@ -44,18 +69,35 @@ func GetEvents() ([]DBEvent, error) {
 	return result, err
 }
 
+// GetActiveEvent will return what is assumed to be a single active event.
+func GetActiveEvent() (DBEvent, error) {
+	result, err := GetRow[DBEvent](
+		`SELECT * FROM events
+         WHERE status_id IN (
+           SELECT id FROM statuses WHERE code NOT IN ('PLANNING', 'ENDED') 
+         )
+         LIMIT 1`)
+	return result, err
+}
+
 func UpdateEvent(event DBEvent) (DBEvent, error) {
 	event, err := GetRow[DBEvent](
 		`UPDATE events
          SET status_id=$2,
              title=$3,
-             description=$4,
-             rules=$5,
-             max_teams=$6,
-             starts_at=$7,
-             ends_at=$8
+             timeline=$4,
+             description=$5,
+             rules=$6,
+             max_teams=$7,
+             starts_at=$8,
+             ends_at=$9
          WHERE id=$1
          RETURNING *`,
-		event.Id, event.StatusId, event.Title, event.Description, event.Rules, event.MaxTeams, event.StartsAt, event.EndsAt)
+		event.Id, event.StatusId, event.Title, event.Timeline, event.Description, event.Rules, event.MaxTeams, event.StartsAt, event.EndsAt)
 	return event, err
 }
+
+func GetStatuses() ([]DBEventStatus, error) {
+	statuses, err := GetRows[DBEventStatus](`SELECT * FROM statuses ORDER BY sort`)
+	return statuses, err
+}

backend/app/database/migrations.go

@@ -0,0 +1,39 @@
+package database
+
+import (
+	"embed"
+	"github.com/golang-migrate/migrate/v4"
+	"github.com/golang-migrate/migrate/v4/database/pgx/v5"
+	"github.com/golang-migrate/migrate/v4/source/iofs"
+	"github.com/jackc/pgx/v5/stdlib"
+	"os"
+)
+
+//go:embed migrations/*
+var migrationsFS embed.FS
+
+func RunMigrations() {
+	logger.Info("Running DB Migrations...")
+	stdConn := stdlib.OpenDBFromPool(Pool)
+
+	migrationConfig := pgx.Config{}
+	sqlDriver, err := pgx.WithInstance(stdConn, &migrationConfig)
+	if err != nil {
+		logger.Critical("Error setting up migrations DB connection: %v", err)
+		os.Exit(1)
+	}
+
+	sourceDriver, err := iofs.New(migrationsFS, "migrations")
+	if err != nil {
+		logger.Critical("Error setting up migrations FS: %v", err)
+		os.Exit(1)
+	}
+
+	m, err := migrate.NewWithInstance("embeddedFS", sourceDriver, "postgres", sqlDriver)
+	err = m.Up()
+	if err != nil && err != migrate.ErrNoChange {
+		logger.Critical("Migrations failure: %v", err)
+		os.Exit(1)
+	}
+	logger.Info("Migrations completed")
+}

backend/app/database/migrations/00000000_Initial.up.sql

@@ -0,0 +1,49 @@
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
+
+CREATE TABLE IF NOT EXISTS users (
+    id UUID DEFAULT uuid_generate_v4() PRIMARY KEY,
+    service_name TEXT NOT NULL,
+    service_user_id TEXT NOT NULL,
+    display_name TEXT NOT NULL DEFAULT '',
+    created_on TIMESTAMP WITH TIME ZONE DEFAULT (now() AT TIME ZONE('utc'))
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS idx_service_user ON users (service_name, service_user_id);
+
+CREATE TABLE IF NOT EXISTS events (
+    id UUID DEFAULT uuid_generate_v4() PRIMARY KEY,
+    status_id integer,
+    title TEXT NOT NULL,
+    description TEXT NOT NULL,
+    rules TEXT NOT NULL,
+    organizer_user_id UUID NOT NULL,
+    max_teams integer default -1,
+    starts_at TIMESTAMP WITH TIME ZONE,
+    ends_at TIMESTAMP WITH TIME ZONE,
+    created_on TIMESTAMP WITH TIME ZONE DEFAULT (now() AT TIME ZONE('utc'))
+);
+
+CREATE TABLE IF NOT EXISTS statuses (
+    id SERIAL PRIMARY KEY,
+    code TEXT NOT NULL UNIQUE,
+    title TEXT NOT NULL,
+    description TEXT NOT NULL
+);
+
+INSERT INTO statuses (id, code, title, description) VALUES (1, 'PLANNING', 'Planning', 'Event is not yet live.  The organizer may edit and preview the site but normal users will just see a placeholder page')
+ON CONFLICT (id) DO UPDATE set code = EXCLUDED.code, title = EXCLUDED.title, description = EXCLUDED.description;
+
+INSERT INTO statuses (id, code, title, description) VALUES (2, 'PUBLISHED', 'Published', 'Event is publicly visible.')
+ON CONFLICT (id) DO UPDATE set code = EXCLUDED.code, title = EXCLUDED.title, description = EXCLUDED.description;
+
+INSERT INTO statuses (id, code, title, description) VALUES (3, 'STARTED', 'Started', 'The theme will be shown publicly and users can start coding. Submissions will be accepted during this time.')
+ON CONFLICT (id) DO UPDATE set code = EXCLUDED.code, title = EXCLUDED.title, description = EXCLUDED.description;
+
+INSERT INTO statuses (id, code, title, description) VALUES (4, 'VOTING', 'Voting Open', 'Submissions are closed and voting is underway')
+ON CONFLICT (id) DO UPDATE set code = EXCLUDED.code, title = EXCLUDED.title, description = EXCLUDED.description;
+
+INSERT INTO statuses (id, code, title, description) VALUES (5, 'ENDED', 'Ended', 'Competition is over.  Results may still be viewed, but no more voting is allowed')
+ON CONFLICT (id) DO UPDATE set code = EXCLUDED.code, title = EXCLUDED.title, description = EXCLUDED.description;
+
+
+

backend/app/database/migrations/00000001_event_adds.down.sql

@@ -0,0 +1 @@
+ALTER TABLE events DROP COLUMN timeline;

backend/app/database/migrations/00000001_event_adds.up.sql

@@ -0,0 +1 @@
+ALTER TABLE events ADD COLUMN timeline TEXT DEFAULT '';

backend/app/database/migrations/00000002_user_role.down.sql

@@ -0,0 +1 @@
+ALTER TABLE users DROP COLUMN IF EXISTS role;

backend/app/database/migrations/00000002_user_role.up.sql

@@ -0,0 +1 @@
+ALTER TABLE users ADD COLUMN role TEXT DEFAULT '';

backend/app/database/migrations/00000003_teams.up.sql

@@ -0,0 +1,12 @@
+CREATE TABLE IF NOT EXISTS teams (
+    id UUID DEFAULT uuid_generate_v4() PRIMARY KEY,
+    event_id UUID references events(id),
+    owner_user_id UUID references users(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
+    name TEXT NOT NULL,
+    visibility TEXT,
+    timezone TEXT,
+    technologies TEXT,
+    availability TEXT NOT NULL,
+    description TEXT NOT NULL,
+    created_on TIMESTAMP WITH TIME ZONE DEFAULT (now() AT TIME ZONE('utc'))
+);

backend/app/database/migrations/00000004_team_members.up.sql

@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS team_members (
+    team_id UUID NOT NULL references teams(id) ON DELETE CASCADE,
+    user_id UUID NOT NULL references users(id) ON DELETE CASCADE,
+    team_role TEXT NOT NULL,
+    created_on TIMESTAMP WITH TIME ZONE DEFAULT (now() AT TIME ZONE('utc')),
+    PRIMARY KEY (team_id, user_id)
+);
+
+ALTER TABLE teams DROP COLUMN IF EXISTS owner_user_id;
+

backend/app/database/migrations/00000005_team_role.down.sql

@@ -0,0 +1 @@
+ALTER TABLE team_members RENAME COLUMN role TO team_role;

backend/app/database/migrations/00000006_team_code.up.sql

@@ -0,0 +1 @@
+ALTER TABLE teams ADD COLUMN code TEXT;

backend/app/database/migrations/00000007_team_code.down.sql

@@ -0,0 +1 @@
+ALTER TABLE teams RENAME code TO invite_code;

backend/app/database/migrations/00000008_team_code.down.sql

@@ -0,0 +1 @@
+ALTER TABLE teams DROP COLUMN code;

backend/app/database/migrations/00000009_avatars.up.sql

@@ -0,0 +1 @@
+ALTER TABLE users ADD COLUMN IF NOT EXISTS avatar_url TEXT;

backend/app/database/migrations/00000010_signup_status.down.sql

@@ -0,0 +1,3 @@
+ALTER TABLE statuses DROP COLUMN sort;
+
+DELETE FROM statuses WHERE code in ('SIGNUP', 'COMPLETED');