nehalist · nehalist · Nov 7, 2023 · Nov 7, 2023 · Dec 3, 2023 · Dec 5, 2023
diff --git a/.babelrc b/.babelrc
diff --git a/.env b/.env
@@ -1,5 +1,7 @@
-# Password for /admin
-ADMIN_PASSWORD=h1ldeb3steV3r
+NEXT_PUBLIC_SITE_URL=http://localhost:3000
+
+EMAIL_SERVER=smtp://localhost:1025
+EMAIL_FROM=noreply@hilde.gg
 
 # Arbitrary string used to generate secure tokens
 NEXTAUTH_SECRET=+Zrk5zW6fgog5k0LbN4bxL1YXKIhvb65Yln5ZKf+g3o=
@@ -8,4 +10,8 @@ NEXTAUTH_SECRET=+Zrk5zW6fgog5k0LbN4bxL1YXKIhvb65Yln5ZKf+g3o=
 NEXTAUTH_URL=http://localhost:3000
 
 # Database connection string
-DATABASE_URL=mysql://root:hildepw@localhost:3309/hilde
+DATABASE_URL=postgresql://user:password@127.0.0.1:5432/app?search_path=public
+
+# OAuth
+GITHUB_CLIENT_ID=
+GITHUB_CLIENT_SECRET=
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,18 +5,17 @@ on:
     tags:
       - '*'
     branches:
-      - main
+      - '*'
   pull_request:
-    branches:
-      - main
+    types: [opened, reopened]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [ 14.x ]
+        node-version: [ 20.x ]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,13 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
+.react-email
+
 .idea
 db.sqlite
 db.sqlite-journal
 
+public/uploads
+
 # dependencies
 /node_modules
 /.pnp

diff --git a/.prettierrc.json b/.prettierrc.json
@@ -5,5 +5,6 @@
   "singleQuote": false,
   "bracketSpacing": true,
   "printWidth": 80,
-  "arrowParens": "avoid"
+  "arrowParens": "avoid",
+  "plugins": ["prettier-plugin-organize-imports"]
 }
diff --git a/README.md b/README.md
@@ -1,15 +1,18 @@
 # Hilde 🏆
 
+> [!CAUTION]
+> WIP 1.0.0
+
 ![Build](https://img.shields.io/github/actions/workflow/status/nehalist/hilde/build.yml?branch=main)
 ![License](https://img.shields.io/github/license/nehalist/hilde)
 ![Docker Pulls](https://img.shields.io/docker/pulls/nehalist/hilde)
 
-You've got a foosball table or similar in your office and want to track your matches, player progress and compare yourself to your
-colleagues and see who's the best? You've come to the right place.
-**Hilde** is a match tracking app for games like foosball, table tennis, air hockey, etc. with achievements, elo ratings, statistics and
-more. **Hilde** is easy to setup and can be used by everyone.
-
-A public **demo** is available at [demo.hilde.gg](https://demo.hilde.gg).
+[//]: # (You've got a foosball table or similar in your office and want to track your matches, player progress and compare yourself to your)
+[//]: # (colleagues and see who's the best? You've come to the right place.)
+[//]: # (**Hilde** is a match tracking app for games like foosball, table tennis, air hockey, etc. with achievements, elo ratings, statistics and)
+[//]: # (more. **Hilde** is easy to setup and can be used by everyone.)
+[//]: # ()
+[//]: # (A public **demo** is available at [demo.hilde.gg]&#40;https://demo.hilde.gg&#41;.)
 
 ![Hilde](hilde.png)
 
@@ -23,36 +26,27 @@ A public **demo** is available at [demo.hilde.gg](https://demo.hilde.gg).
 
 ## ⚡️ Features
 
-- Simple, intuitive interface
-- **Elo rating** for each team
-- **Seasons** (managable via admin interface)
-- Detailed team statistics (winstreaks, winrate, elo history chart, ...)
-- **Achievements** (e.g. "Win 100 Matches", "Win 10 Matches in a row", ...)
-- Compare teams against each other
-- Teams of any size, simply separated by a comma in the team name
-- **Light/Dark theme**
-- Match comments
-- **Leaderboards**
-- *Optional*: Deployable for free with Vercel & Planetscale
-- *Optional*: Fully dockerized
+[//]: # (- Simple, intuitive interface)
+[//]: # (- **Elo rating** for each team)
+[//]: # (- **Seasons** &#40;managable via admin interface&#41;)
+[//]: # (- Detailed team statistics &#40;winstreaks, winrate, elo history chart, ...&#41;)
+[//]: # (- **Achievements** &#40;e.g. "Win 100 Matches", "Win 10 Matches in a row", ...&#41;)
+[//]: # (- Compare teams against each other)
+[//]: # (- Teams of any size, simply separated by a comma in the team name)
+[//]: # (- **Light/Dark theme**)
+[//]: # (- Match comments)
+[//]: # (- **Leaderboards**)
+[//]: # (- *Optional*: Deployable for free with Vercel & Planetscale)
+[//]: # (- *Optional*: Fully dockerized)
 
 ## ⭐ Getting Started
 
-Hilde can be installed in a few minutes, either by deploying it to Vercel, using Docker or setting it up manually.
+[//]: # (Hilde can be installed in a few minutes, either by deploying it to Vercel, using Docker or setting it up manually.)
 
 Requirements:
 
-- Node 14
-- MySQL (5.7+)
-
-Keep in mind that after installing you need to add a season via the admin ui (`/admin`) using the password from the environment variable (`ADMIN_PASSWORD`).
-
-### Free hosting with Vercel & Planetscale
-
-Hilde is designed in a way that it could easily be hosted for free, using [Vercel](https://vercel.com) for hosting
-and [Planetscale](https://planetscale.com) for the database.
-
-[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fnehalist%2Fhilde)
+- Node 20
+- PostgreSQL 13+
 
 ### Docker Compose
 
@@ -72,17 +66,17 @@ services:
       - '127.0.0.1:3000:3000'
     environment:
       - DATABASE_URL=mysql://root:hildepw@database:3306/hilde
-      - ADMIN_PASSWORD=v3rys3cr3tp4ssw0rd
 
-  database:
-    networks:
-      - internal
-    image: mysql:8.0
-    environment:
-      - MYSQL_DATABASE=hilde
-      - MYSQL_ROOT_PASSWORD=hildepw
+  db:
+    image: postgres:13.3
+    ports:
+      - "5432:5432"
     volumes:
-      - db:/var/lib/mysql
+      - db_data:/var/lib/postgresql/data/
+    environment:
+      POSTGRES_DB: app
+      POSTGRES_USER: user
+      POSTGRES_PASSWORD: password
 
 volumes:
   db:
@@ -98,8 +92,9 @@ After running `docker-compose up -d` Hilde is running on `localhost:3000`.
 1. Clone/fork the repository
 2. Run `npm ci` to install dependencies
 3. Run `docker-compose up -d` in order to start the database container (or adjust the `.env` file to use a different db)
-4. Run `npm run dev` to start the development server
-5. Add awesome features.
+4. Run `npm run db:migrations:make` to execute all migrations
+5. Run `npm run dev` to start the development server (at `localhost:3000`)
+6. Add **awesome** features.
 
 ### Docker
 
@@ -112,44 +107,43 @@ via:
 
 ## ⚙️ Usage
 
-### Administration
-
-Hilde provides an admin ui at `/admin` which can be used to manage seasons.
-
 ### Commands
 
 Hilde provides a set of utility terminal commands:
 
-| Command           | Description                   |
-|-------------------|-------------------------------|
-| `npm run dev`     | Starts the development server |
-| `npm run build`   | Builds the app                |
-| `npm run start`   | Starts the production server  |
-| `npm run lint`    | Lints files                   |
-| `npm run migrate` | Executes Prisma migrations    |
+| Command                         | Description                                                          |
+|---------------------------------|----------------------------------------------------------------------|
+| `npm run dev`                   | Starts the development server                                        |
+| `npm run build`                 | Builds the app                                                       |
+| `npm run start`                 | Starts the production server                                         |
+| `npm run lint`                  | Lints files                                                          |
+| `npm run db:migrations:make`    | Create migrations                                                    |
+| `npm run db:migrations:execute` | Execute migrations                                                   |
+| `npm run email:dev`             | Run [react-email dev server](https://react.email/docs/cli#email-dev) |
 
 ### Configuration
 
 Hilde can be configured via environment variables in the `.env` file.
 
-| Variable          | Description                | Default                                        |
-|-------------------|----------------------------|------------------------------------------------|
-| `ADMIN_PASSWORD`  | Administration password    | `h1ldeb3steV3r`                                |
-| `NEXTAUTH_SECRET` | Token secret               | `+Zrk5zW6fgog5k0LbN4bxL1YXKIhvb65Yln5ZKf+g3o=` |
-| `NEXTAUTH_URL`    | Deployed URL of Hilde      | `http://localhost:3000`                        |
-| `DATABASE_URL`    | Database connection string | `mysql://root:hildepw@localhost:3309/hilde`    |
+| Variable               | Description                | Default                                                            |
+|------------------------|----------------------------|--------------------------------------------------------------------|
+| `NEXT_PUBLIC_SITE_URL` | Site URL                   | `http://localhost:3000`                                            |
+| `EMAIL_SERVER`         | Email server config        | `smtp://localhost:1025`                                            |
+| `EMAIL_FROM`           | Default sender email       | `noreply@hilde.gg`                                                 |
+| `NEXTAUTH_SECRET`      | Token secret               | `+Zrk5zW6fgog5k0LbN4bxL1YXKIhvb65Yln5ZKf+g3o=`                     |
+| `NEXTAUTH_URL`         | Deployed URL of Hilde      | `http://localhost:3000`                                            |
+| `DATABASE_URL`         | Database connection string | `postgresql://user:password@127.0.0.1:5432/app?search_path=public` |
 
 ## 👐 Contributing
 
 Hilde was created for fun and to play around with technologies I don't use on a daily basis in my office job, hence can be improved by many ways.
 
 It's built on:
 
-- [Next.js 13](https://nextjs.org/)
-- [tRPC](https://trpc.io/)
+- [Next.js 14](https://nextjs.org/)
 - [Tailwind CSS](https://tailwindcss.com/)
 - [TypeScript](https://www.typescriptlang.org/)
-- [Prisma](https://www.prisma.io/)
+- [Drizzle](https://orm.drizzle.team/)
 - [NextAuth.js](https://next-auth.js.org/)
 - and many more (see [package.json](package.json))
 

diff --git a/content/de/changelog/test.mdx b/content/de/changelog/test.mdx
@@ -0,0 +1,40 @@
+---
+title: Test DE
+date: 2024-04-01
+---
+
+## Nec ad molliter navita sustinet
+
+Lorem markdownum aeque non sit nescimus patuit regis fas. Spes dum socerum
+concedimus isto matrum, violentior adspexi exhibuit.
+
+> Herbis tot dedit *fiducia laniataque* ferro populique quid parantem etiam
+> *Fame* seraque nunc rarus nescia est terrae! Quae fuit coniugis auctor?
+> Clymene munere clamavit adversas neque ipsi quereretur nostrae tamen flexere
+> longe. Troiana nec moveri, ver onerata patiar, *sum erit* amissam tanta bubo
+> huc sic.
+
+Radiantis pariter, vidit aquis ab nymphae Cinyrae, si esse dantibus coercet
+fecit; Actoridaeque viros. Sparsi notae terga forsitan. Sequens vindicet parva
+imagine, in tum nunc illo dixisse nec pectore, et.
+
+## Dracones latet
+
+Mea de **admota praesaga**, usus venerat et dives [murmure
+undis](http://carbasa-in.com/dictis-infirmis.php) de. Iunguntur tergum,
+inplicuit usus; cum ramis usus ultima, ut nullo. Prospicit parmam fallitur
+partior, esse, capillis *suis*, tua nec inmergitque et puto rigido grege in
+derigere iuvencae. Nil factoque amor est tantum sibi recusem omen ignare? Est
+nec magis tactuque sustulit legeret *vulnere* loqui muneris claudit, concubitus
+[aequoris crevit quamvis](http://phrygum-iuravimus.org/crede-animalia) at ora!
+
+Abstulit inde luce et utque: ituras quodque petens aquae. Erat qua argentea, cur
+ardor haud vincta harena tertius quicquam huius!
+
+Favore artus fatum ab nitenti longius e regis quaeris contingere fontis, est.
+Doluere infesto fecit infelix beati mox natae consorti laudare licet: hunc.
+Oscula aliquis lauro. Praecordia arescere, glans aptos caelum novissima femina
+tantum loca conata Sisyphon: lacerto veri! Superare stimulis senserat deducit
+gradus; inque Morpheus respicit manant quattuor quoscumque putares per, in.
+
+Editus volucris refero. Praeside anus arcton, nec ab idem.
diff --git a/content/de/faq.mdx b/content/de/faq.mdx
diff --git a/content/en/changelog/0-4-0.mdx b/content/en/changelog/0-4-0.mdx
@@ -0,0 +1,24 @@
+---
+title: 1.0.0-beta1 - Hilde as a Platform
+date: 2024-04-01
+---
+
+Hilde is now a platform! 🎉
+
+## Added
+
+- Added landing page
+- Added user system
+- Added league system
+- Added customizable rating parameters
+- Added social login
+- Added achievement rewards
+- Added more achievements
+- Added i18n support
+- Added match detail view
+- Added league statistics
+
+## Changed
+
+- Changed styling
+- Leaderboards have been replaced with statistics and are shown after a league has been finished
diff --git a/content/en/faq.mdx b/content/en/faq.mdx
@@ -0,0 +1,13 @@
+<Faq>
+  <Accordion variant="bordered">
+    <AccordionItem key="1" aria-label="Accordion 1" title="Accordion 1">
+      this is content
+    </AccordionItem>
+    <AccordionItem key="2" aria-label="Accordion 2" title="Accordion 2">
+      this is more content
+    </AccordionItem>
+    <AccordionItem key="3" aria-label="Accordion 3" title="Accordion 3">
+      this is very little content
+    </AccordionItem>
+  </Accordion>
+</Faq>
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,16 +1,22 @@
-version: '3'
+version: '3.4'
 
 services:
-  database:
-    container_name: hilde_db
-    image: mysql:8.0
-    environment:
-      - MYSQL_DATABASE=hilde
-      - MYSQL_ROOT_PASSWORD=hildepw
+  db:
+    image: postgres:13.3
     ports:
-      - "127.0.0.1:3309:3306"
+      - "5432:5432"
     volumes:
-      - db:/var/lib/mysql
+      - db_data:/var/lib/postgresql/data/
+    environment:
+      POSTGRES_DB: app
+      POSTGRES_USER: user
+      POSTGRES_PASSWORD: password
+
+  mail:
+    image: axllent/mailpit
+    ports:
+      - "1025:1025"
+      - "8025:8025"
 
 volumes:
-  db:
+  db_data:
diff --git a/drizzle.config.ts b/drizzle.config.ts
@@ -0,0 +1,11 @@
+import "dotenv/config";
+import type { Config } from "drizzle-kit";
+
+export default {
+  schema: "./src/db/schema.ts",
+  out: "./drizzle",
+  driver: "pg",
+  dbCredentials: {
+    connectionString: `${process.env.DATABASE_URL}`,
+  },
+} satisfies Config;