add forum sql files

djsisson · Aug 26, 2024 · e65cfc4 · e65cfc4
1 parent e966400
commit e65cfc4
Show file tree

Hide file tree

Showing 21 changed files with 2,083 additions and 136 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -31,4 +31,4 @@ jobs:
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
       - name: Deploy to Coolify
         run: |
-          curl --request GET '${{ secrets.COOLIFY_WEBHOOK }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}'
+          curl --request GET '${{ secrets.COOLIFY_WEBHOOK }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}' --header 'CF-Access-Client-Id: ${{ secrets.CF_ID }}' --header 'CF-Access-Client-Secret: ${{ secrets.CF_SECRET }}'
diff --git a/drizzle.config.ts b/drizzle.config.ts
@@ -9,6 +9,7 @@ export default defineConfig({
     "./src/db/genshin/schema.ts",
     "./src/db/todos/schema.ts",
     "./src/db/tilez/schema.ts",
+    "./src/db/forum/schema.ts",
   ],
   out: "./src/db/migrations",
   dialect: "postgresql",

diff --git a/next.config.mjs b/next.config.mjs
@@ -40,7 +40,7 @@ const nextConfig = {
         source: "/assets/:slug*",
         headers: [
           {
-            key: "Cache-Control,",
+            key: "Cache-Control",
             value: "public, max-age=31536000, immutable",
           },
         ],

diff --git a/src/app/asteroidz/components/Button.tsx b/src/app/asteroidz/components/Button.tsx
@@ -1,21 +1,15 @@
 "use client";
 import Tooltip from "./Tooltip";
-import {
-  useGameState,
-  useGameStateDispatch,
-  useGameObject,
-  gameStateActionType,
-} from "./Context";
+import { useGameState, useGameStateDispatch, useGameObject } from "./Context";
 import { useEffect, useState, useId } from "react";
 
-enum containerType {
-  Inventory = "Inventory",
-  Research = "Research",
-  Upgrades = "Upgrades",
-  Shop = "Shop",
-}
-
-const Button = ({ type, name }: { type: containerType; name: string }) => {
+const Button = ({
+  type,
+  name,
+}: {
+  type: "Inventory" | "Research" | "Upgrades" | "Shop";
+  name: string;
+}) => {
   const dispatch = useGameStateDispatch();
   const score = useGameState().currentScore;
   const research = useGameState().researched;
@@ -178,21 +172,21 @@ const Button = ({ type, name }: { type: containerType; name: string }) => {
     switch (type) {
       case "Research": {
         dispatch({
-          type: gameStateActionType.BUYRESEARCH,
+          type: "buyResearch",
           value: name,
         });
         return;
       }
       case "Upgrades": {
         dispatch({
-          type: gameStateActionType.BUYUPGRADE,
+          type: "buyUpgrade",
           value: name,
         });
         return;
       }
       case "Shop": {
         dispatch({
-          type: gameStateActionType.BUYITEM,
+          type: "buyItem",
           value: name,
         });
         return;

diff --git a/src/app/asteroidz/components/Container.tsx b/src/app/asteroidz/components/Container.tsx
@@ -9,14 +9,7 @@ type requiredResearch = {
   description: string;
 };
 
-enum containerType {
-  Inventory = "Inventory",
-  Research = "Research",
-  Upgrades = "Upgrades",
-  Shop = "Shop",
-}
-
-const Container = ({ type }: { type: containerType }) => {
+const Container = ({ type }: { type: "Inventory" | "Research" | "Upgrades" | "Shop" }) => {
   const [buttonList, setButtonList] = useState([] as ButtonList | typeof inven);
   const inven = useGameState().items;
   const research = useGameState().researched;

diff --git a/src/app/asteroidz/components/Context.tsx b/src/app/asteroidz/components/Context.tsx
@@ -10,54 +10,41 @@ import React, {
 } from "react";
 import { gameObject, gameState } from "../data";
 
-export enum gameStateActionType {
-  CLICK = "click",
-  ADDCPS = "addCps",
-  BUYRESEARCH = "buyResearch",
-  BUYUPGRADE = "buyUpgrade",
-  BUYITEM = "buyItem",
-  UPDATEAVERAGE = "updateAverage",
-  CHANGETHEME = "changeTheme",
-  CHANGENAME = "changeName",
-  LOAD_GAME = "loadGame",
-  NEW_GAME = "newGame",
-}
-
 type gameAction =
   | {
-      type: gameStateActionType.CLICK;
+      type: "click";
       value: number;
     }
   | {
-      type: gameStateActionType.ADDCPS;
+      type: "addCps";
       value: number;
     }
   | {
-      type: gameStateActionType.BUYRESEARCH;
+      type: "buyResearch";
       value: string;
     }
   | {
-      type: gameStateActionType.BUYUPGRADE;
+      type: "buyUpgrade";
       value: string;
     }
   | {
-      type: gameStateActionType.BUYITEM;
+      type: "buyItem";
       value: string;
     }
   | {
-      type: gameStateActionType.CHANGETHEME;
+      type: "changeTheme";
       value: string;
     }
   | {
-      type: gameStateActionType.CHANGENAME;
+      type: "changeName";
       value: string;
     }
   | {
-      type: gameStateActionType.LOAD_GAME;
+      type: "loadGame";
       payload: typeof gameState;
     }
   | {
-      type: gameStateActionType.NEW_GAME;
+      type: "newGame";
       payload: typeof gameState;
     };
 
@@ -92,12 +79,12 @@ export const GameStateProvider = ({
 
     if (!localState) {
       const getGameState = async () => {
-        dispatch({ type: gameStateActionType.LOAD_GAME, payload: _gameState });
+        dispatch({ type: "loadGame", payload: _gameState });
       };
       getGameState();
     } else {
       dispatch({
-        type: gameStateActionType.LOAD_GAME,
+        type: "loadGame",
         payload: JSON.parse(localState) as typeof gameState,
       });
     }
@@ -344,7 +331,7 @@ const gameStateReducer = (
     }
 
     default: {
-      throw new Error(`Unknown action: ${action.type}`);
+      throw new Error(`Unknown action`);
     }
   }
 };
diff --git a/src/app/asteroidz/components/Theme.tsx b/src/app/asteroidz/components/Theme.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { gameStateActionType, useGameStateDispatch } from "./Context";
+import { useGameStateDispatch } from "./Context";
 
 const Theme = () => {
   const dispatch = useGameStateDispatch();
@@ -17,7 +17,7 @@ const Theme = () => {
 
   const onClick = ({ colour }: { colour: string }) => {
     dispatch({
-      type: gameStateActionType.CHANGETHEME,
+      type: "changeTheme",
       value: colour,
     });
   };

diff --git a/src/app/asteroidz/components/UserName.tsx b/src/app/asteroidz/components/UserName.tsx
@@ -1,9 +1,5 @@
 "use client";
-import {
-  useGameState,
-  useGameStateDispatch,
-  gameStateActionType,
-} from "./Context";
+import { useGameState, useGameStateDispatch } from "./Context";
 import { useState, useRef, useEffect } from "react";
 
 const UserName = () => {
@@ -47,7 +43,7 @@ const UserName = () => {
 
   const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     dispatch({
-      type: gameStateActionType.CHANGENAME,
+      type: "changeName",
       value: e.target.value,
     });
   };

diff --git a/src/app/asteroidz/components/ViewPort.tsx b/src/app/asteroidz/components/ViewPort.tsx
@@ -5,7 +5,6 @@ import {
   useGameState,
   calcdamage,
   useGameStateDispatch,
-  gameStateActionType,
   stats,
 } from "./Context";
 import VisualScore from "./VisualScore";
@@ -80,7 +79,7 @@ const ViewPort = () => {
     }));
     setCpsValues((x) => [...x, ...cpsToAdd]);
     dispatch({
-      type: gameStateActionType.ADDCPS,
+      type: "addCps",
       value: updatedAverageDmg.reduce((i, x) => i + x.totaldamage, 0),
     });
   };
@@ -107,7 +106,7 @@ const ViewPort = () => {
       } as Score,
     ]);
     dispatch({
-      type: gameStateActionType.CLICK,
+      type: "click",
       value: getCalcDamage.totaldamage,
     });
   };

diff --git a/src/app/asteroidz/page.tsx b/src/app/asteroidz/page.tsx
@@ -8,24 +8,17 @@ import { ThemeProvider } from "./components/ThemeProvider";
 import Total from "./components/Total";
 import ViewPort from "./components/ViewPort";
 
-enum containerType {
-  Inventory = "Inventory",
-  Research = "Research",
-  Upgrades = "Upgrades",
-  Shop = "Shop",
-}
-
 export default async function Asteroidz() {
 
   return (
     <Suspense fallback={<div>Loading...</div>}>
       <GameStateProvider _gameState={gameState} _gameObject={gameObject}>
         <ThemeProvider>
           <Header />
-          <Container type={containerType.Inventory} />
-          <Container type={containerType.Research} />
-          <Container type={containerType.Upgrades} />
-          <Container type={containerType.Shop} />
+          <Container type={"Inventory"} />
+          <Container type={"Research"} />
+          <Container type={"Upgrades"} />
+          <Container type={"Shop"} />
           <ViewPort />
           <Total />
           <Footer />

diff --git a/src/app/tilez/components/CurrentWord.tsx b/src/app/tilez/components/CurrentWord.tsx
@@ -3,7 +3,6 @@
 import { useGameState, useGameStateDispatch } from "./GameContext";
 import { useEffect, useState, useRef } from "react";
 import { uploadScore, getWordDefinition } from "../lib/GameLogic";
-import { GameActionType } from "../lib/GameTypes";
 import { Badge } from "@/components/ui/badge";
 import Help from "./Help";
 import {
@@ -35,7 +34,7 @@ export default function CurrentWord() {
       async function upload() {
         const uploaded = await uploadScore(gameState);
         if (uploaded) {
-          dispatch({ type: GameActionType.UPLOADED });
+          dispatch({ type: "UPLOADED" });
           setUploading(false);
         }
       }
@@ -62,7 +61,7 @@ export default function CurrentWord() {
     if (allWords.includes(currentWord)) {
       if (!gameState.found.includes(currentWord)) {
         dispatch({
-          type: GameActionType.FOUND,
+          type: "FOUND",
         });
       }
       if (!definitions.has(currentWord)) {

diff --git a/src/app/tilez/components/GameContext.tsx b/src/app/tilez/components/GameContext.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import React, { createContext, useContext, useReducer, useEffect } from "react";
-import { GameAction, GameState, GameActionType } from "../lib/GameTypes";
+import { GameAction, GameState } from "../lib/GameTypes";
 import { getWordsOnLoad, NewGame } from "../lib/GameLogic";
 
 export const useGameState = () => {
@@ -28,19 +28,19 @@ const gameStateReducer = (
   action: GameAction,
 ): GameState => {
   switch (action.type) {
-    case GameActionType.LOAD_GAME: {
+    case "LOAD_GAME": {
       return { ...(action.payload as GameState) };
     }
-    case GameActionType.RESET: {
+    case "RESET": {
       const words = Buffer.from(action.payload.words[0], "base64")
         .toString("utf-8")
         .split(",");
       return { ...(action.payload as GameState), words: words };
     }
-    case GameActionType.UPLOADED: {
+    case "UPLOADED": {
       return { ...gameState, uploaded: true };
     }
-    case GameActionType.FOUND: {
+    case "FOUND": {
       const currentWord = gameState.rows
         .map((x) => x.tiles[x.position + 1].letter)
         .join("");
@@ -68,13 +68,13 @@ const gameStateReducer = (
       }
       return newState;
     }
-    case GameActionType.GETSCORE: {
+    case "GETSCORE": {
       return {
         ...gameState,
         score: action.payload,
       };
     }
-    case GameActionType.MOVEROW: {
+    case "MOVEROW": {
       return {
         ...gameState,
         moves: gameState.completed ? gameState.moves : gameState.moves + 1,
@@ -112,7 +112,7 @@ export const GameStateProvider = ({
 
     if (!localState) {
       const getGameState = async () => {
-        dispatch({ type: GameActionType.LOAD_GAME, payload: await NewGame() });
+        dispatch({ type: "LOAD_GAME", payload: await NewGame() });
       };
       getGameState();
     } else {
@@ -127,13 +127,13 @@ export const GameStateProvider = ({
             .split(",");
           loadGame.score = words.score;
           dispatch({
-            type: GameActionType.LOAD_GAME,
+            type: "LOAD_GAME",
             payload: loadGame,
           });
         } catch (e) {
           localStorage.removeItem("Tilez");
           dispatch({
-            type: GameActionType.LOAD_GAME,
+            type: "LOAD_GAME",
             payload: await NewGame(),
           });
         }