chore: v2 🎉

.env.example

@@ -1,11 +1,24 @@
-DISCORD_BOT_TOKEN="DISCORD BOT TOKEN HERE"
-PORT="3000"
-API_BASE_URL="YOUR BASE API URL CONNECTED TO THIS APPLICATION"
-DATABASE_URL="postgresql://username:password@localhost:5432/database?schema=public"
-# Replace username, password, localhost and database with the appropiate values
-
-DEV_SMEE_URL="your https://smee.io url"
-DEV_WEBHOOK_URL="Testing webhook"
-DEV_GUILD_ID="Testing guild"
-DEV_CHANNEL_ID="Testing channel"
-GITHUB_WEBHOOK_SECRET="Testing webhook secret"
+# .env.development.local, .env.test.local
+DATABASE_URL="postgres://USERNAME:PASSWORD@HOST:5432/DATABASE"
+NODE_ENV="development"
+
+WEBHOOK_SECRET="SECRET"
+ENCRYPTION_KEY="" # 32 character long key
+
+DISCORD_BOT_TOKEN="" # Discord bot token
+
+DEVELOPMENT_GUILD_ID="" # Discord guild Id for testing
+DEVELOPMENT_WEBHOOK_ID="" # Discord webhook Id for testing
+DEVELOPMENT_WEBHOOK_URL="" # Discord webhook URL for testing
+
+SMEE_URL="" # Smee.io url
+
+# .env.local
+DATABASE_URL="postgres://USERNAME:PASSWORD@HOST:5432/DATABASE"
+NODE_ENV="production"
+
+ENCRYPTION_KEY="" # 32 character long key
+DISCORD_BOT_TOKEN="" # Discord bot token
+
+
+

.eslintignore

@@ -39,4 +39,5 @@ yarn-error.log*
 .vercel
 
 # Config
-tsup.config.ts
+tsup.config.ts
+.eslintrc.js

.eslintrc.json

@@ -1,6 +1,3 @@
 {
-	"extends": ["@sapphire"],
-	"rules": {
-		"@typescript-eslint/no-base-to-string": "off"
-	}
+	"extends": ["@snowcrystals/eslint-config"]
 }

.github/CONTRIBUTING.md

@@ -18,7 +18,7 @@ To work on the project you must do the following:
 
 **1**. Fork and clone the repository, make sure you are in the correct branch in this case the **main** branch.
 
-**2**. Install Yarn (you can use npm as well but this project uses yarn), after that run `yarn install`.
+**2**. Install pnpm (you can use npm as well but this project uses pnpm), after that run `pnpm install`.
 
 **3**. Do whatever you want to do (add things, change things, fixed things, etc)
 

.github/readme.ijsblokje.toml

@@ -11,4 +11,9 @@ version = "1.1.1"
 
 [variables]
 information = "A Discord bot which makes your GitHub Discord embeds prettier ✨"
-installation = [ "Want to add the bot to your server? [Click here](https://discord.com/api/oauth2/authorize?client_id=1018461517408120842&permissions=536870928&scope=bot%20applications.commands)", "You can also install your own instance, check the .env.example for all the required environment variables.", "### Installation Via Docker", "```bash\ndocker run --name=gitcord -v .env:/gitcord/.env -p 3000:3000 ghcr.io/ijskoud/gitcord\n```" ]
+installation = [
+  "Want to add the bot to your server? [Click here](https://discord.com/api/oauth2/authorize?client_id=1018461517408120842&permissions=536870928&scope=bot%20applications.commands)", 
+  "You can also install your own instance, check the .env.example for all the required environment variables.", 
+  "### Installation Via Docker", 
+  "Copy the `docker/docker-compose.yml` file to your server and run `docker-compose up -d`"
+]

.github/workflows/codeql-analysis.yml

@@ -39,11 +39,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3

.github/workflows/continuous-integration.yml

@@ -13,14 +13,19 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v3
+        with:
+          version: 8
+
       - name: Install Node v18
         uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: yarn
+          cache: pnpm
 
       - name: Install Dependencies
-        run: yarn install --immutable
+        run: pnpm install --frozen-lockfile
 
   Building:
     runs-on: ubuntu-latest
@@ -29,17 +34,22 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v3
+        with:
+          version: 8
+
       - name: Install Node v18
         uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: yarn
+          cache: pnpm
 
       - name: Install Dependencies
-        run: yarn install --immutable
+        run: pnpm install --frozen-lockfile
 
       - name: Run Compiler
-        run: yarn run build
+        run: pnpm run build
 
   Linting:
     runs-on: ubuntu-latest
@@ -48,33 +58,43 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v3
+        with:
+          version: 8
+
       - name: Install Node v18
         uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: yarn
+          cache: pnpm
 
       - name: Install Dependencies
-        run: yarn install --immutable
+        run: pnpm install --frozen-lockfile
 
       - name: Run Eslint
-        run: yarn run lint
-
-  # Testing:
-  #   runs-on: ubuntu-latest
-  #   needs: Dependencies
-  #   steps:
-  #     - name: Checkout repository
-  #       uses: actions/checkout@v3
-
-  #     - name: Install Node v18
-  #       uses: actions/setup-node@v3
-  #       with:
-  #         node-version: 18
-  #         cache: yarn
-
-  #     - name: Install Dependencies
-  #       run: yarn install --immutable
-
-  #     - name: Run Vitest
-  #       run: yarn run test
+        run: pnpm run lint
+
+  Testing:
+    runs-on: ubuntu-latest
+    needs: Dependencies
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v3
+        with:
+          version: 8
+
+      - name: Install Node v18
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: pnpm
+
+      - name: Install Dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Run tests
+        run: pnpm run test

.github/workflows/docker.yml

@@ -1,4 +1,4 @@
-name: "cd(Docker): Publish stable image"
+name: "CD(Docker): Publish stable image"
 
 on:
   workflow_dispatch:
@@ -9,6 +9,18 @@ jobs:
   ghcr:
     name: Push Image to GitHub Packages
     runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        include:
+          # GitHub bot
+          - dockerfile: docker/bot.dockerfile
+            tags: ghcr.io/ijskoud/ijsblokje:bot
+
+          # Discord bot
+          - dockerfile: docker/api.dockerfile
+            tags: ghcr.io/ijskoud/ijsblokje:api
+
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
@@ -31,6 +43,6 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: true
-          tags: |
-            ghcr.io/ijskoud/gitcord:v1
-            ghcr.io/ijskoud/gitcord:latest
+          context: .
+          file: ${{ matrix.dockerfile }}
+          tags: ${{ matrix.tags }}

.gitignore

@@ -1,7 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
+node_modules
 /.pnp
 .pnp.js
 
@@ -14,9 +14,10 @@
 /coverage
 
 # next.js
-/.next/
-/out/
-/dist/
+.next/
+out/
+dist/
+.turbo
 
 # production
 /build

.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn lint-staged
+pnpm lint-staged

.lintstagedrc.cjs

@@ -0,0 +1,3 @@
+module.exports = {
+	"**/*.{js,jsx,ts,tsx}": [() => "pnpm lint -- --fix", "prettier --write"]
+};

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+	"npm.packageManager": "pnpm",
+	"editor.defaultFormatter": "esbenp.prettier-vscode",
+	"editor.formatOnSave": true,
+	"editor.codeActionsOnSave": {
+		"source.fixAll.eslint": "explicit"
+	},
+	"eslint.workingDirectories": [{ "pattern": "./packages/*/" }, { "pattern": "./apps/*/" }]
+}