Fix ci

.github/workflows/deploy-website-other.yaml

@@ -1,4 +1,4 @@
-name: Deploy prod
+name: Deploy branch
 
 on:
   workflow_dispatch:
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Extract branch name
         shell: bash
-        run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
         id: extract_branch
       - uses: actions/setup-node@v3
         with:
@@ -26,6 +26,7 @@ jobs:
         run: |
           cd website
           netlify build
+          ls /home/runner/work/fsc-core/fsc-core/public
           netlify deploy --alias ${{ steps.extract_branch.outputs.branch }}
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}

walter/src/db/schema.ts

@@ -6,6 +6,13 @@ export const users = mysqlTable('users', {
   username: varchar('username', { length: 120 }),
   tagline: varchar('tagline', { length: 250 }),
   img_url: varchar('img_url', { length: 500 }),
+  website_url: varchar('website_url', { length: 500 }),
+  twitter_url: varchar('twitter_url', { length: 500 }),
+  facebook_url: varchar('facebook_url', { length: 500 }),
+  instagram_url: varchar('instagram_url', { length: 500 }),
+  twitch_url: varchar('twitch_url', { length: 500 }),
+  threads_url: varchar('threads_url', { length: 500 }),
+  is_public: boolean('is_public'),
 })
 
 export const userLinks = mysqlTable('user_links', {

website/drizzle.config.ts

@@ -0,0 +1,13 @@
+import type { Config } from "drizzle-kit";
+import * as dotenv from 'dotenv'
+
+dotenv.config()
+
+export default {
+  schema: "./functions/db/schema.ts",
+  out: "./drizzle/generated",
+  driver: "mysql2",
+  dbCredentials: {
+    connectionString: process.env["DATABASE_URL"] as string
+  },
+} satisfies Config;

website/drizzle/generated/0000_nervous_warbird.sql

@@ -0,0 +1,37 @@
+CREATE TABLE `spaces` (
+	`id` serial AUTO_INCREMENT NOT NULL,
+	`space_url` varchar(300),
+	CONSTRAINT `spaces_id` PRIMARY KEY(`id`)
+);
+--> statement-breakpoint
+CREATE TABLE `user_links` (
+	`id` serial AUTO_INCREMENT NOT NULL,
+	`type` int,
+	`is_public` boolean,
+	`tagline` varchar(250),
+	CONSTRAINT `user_links_id` PRIMARY KEY(`id`)
+);
+--> statement-breakpoint
+CREATE TABLE `user_role_pings` (
+	`id` serial AUTO_INCREMENT NOT NULL,
+	`role_id` varchar(20),
+	`user_id` int,
+	CONSTRAINT `user_role_pings_id` PRIMARY KEY(`id`)
+);
+--> statement-breakpoint
+CREATE TABLE `user_xp` (
+	`user_id` bigint NOT NULL,
+	`last_applied_time` bigint,
+	`current_xp` bigint,
+	`multiplier` int,
+	`pentalty_count` int,
+	CONSTRAINT `user_xp_user_id` PRIMARY KEY(`user_id`)
+);
+--> statement-breakpoint
+CREATE TABLE `users` (
+	`id` bigint NOT NULL,
+	`username` varchar(120),
+	`tagline` varchar(250),
+	`img_url` varchar(500),
+	CONSTRAINT `users_id` PRIMARY KEY(`id`)
+);

website/drizzle/generated/0001_needy_mattie_franklin.sql

@@ -0,0 +1,6 @@
+ALTER TABLE `users` ADD `website_url` varchar(500);--> statement-breakpoint
+ALTER TABLE `users` ADD `twitter_url` varchar(500);--> statement-breakpoint
+ALTER TABLE `users` ADD `facebook_url` varchar(500);--> statement-breakpoint
+ALTER TABLE `users` ADD `instagram_url` varchar(500);--> statement-breakpoint
+ALTER TABLE `users` ADD `twitch_url` varchar(500);--> statement-breakpoint
+ALTER TABLE `users` ADD `threads_url` varchar(500);

website/drizzle/generated/meta/0000_snapshot.json

@@ -0,0 +1,220 @@
+{
+  "version": "5",
+  "dialect": "mysql",
+  "id": "d20ff113-3ba9-4c19-8db9-36225ede32be",
+  "prevId": "00000000-0000-0000-0000-000000000000",
+  "tables": {
+    "spaces": {
+      "name": "spaces",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "space_url": {
+          "name": "space_url",
+          "type": "varchar(300)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "spaces_id": {
+          "name": "spaces_id",
+          "columns": [
+            "id"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "user_links": {
+      "name": "user_links",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "type": {
+          "name": "type",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_public": {
+          "name": "is_public",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "tagline": {
+          "name": "tagline",
+          "type": "varchar(250)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "user_links_id": {
+          "name": "user_links_id",
+          "columns": [
+            "id"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "user_role_pings": {
+      "name": "user_role_pings",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "role_id": {
+          "name": "role_id",
+          "type": "varchar(20)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "user_role_pings_id": {
+          "name": "user_role_pings_id",
+          "columns": [
+            "id"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "user_xp": {
+      "name": "user_xp",
+      "columns": {
+        "user_id": {
+          "name": "user_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_applied_time": {
+          "name": "last_applied_time",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "current_xp": {
+          "name": "current_xp",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "multiplier": {
+          "name": "multiplier",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pentalty_count": {
+          "name": "pentalty_count",
+          "type": "int",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "user_xp_user_id": {
+          "name": "user_xp_user_id",
+          "columns": [
+            "user_id"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "varchar(120)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "tagline": {
+          "name": "tagline",
+          "type": "varchar(250)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "img_url": {
+          "name": "img_url",
+          "type": "varchar(500)",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "users_id": {
+          "name": "users_id",
+          "columns": [
+            "id"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    }
+  },
+  "schemas": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  }
+}