Merge pull request #1 from minenwerfer/master

Refactor style
SamCaliman · Jul 29, 2024 · 852d03e · 852d03e
2 parents 0dd58a5 + 1165250
commit 852d03e
Show file tree

Hide file tree

Showing 23 changed files with 82 additions and 424 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,5 @@
 production.env
 dist
 node_modules
-api/release
+**/.aeria/out
 
diff --git a/api/.aeria/aeria-sdk.d.ts b/api/.aeria/aeria-sdk.d.ts
@@ -87,84 +87,6 @@ declare type MirrorDescriptions = {
       }
     }
   },
-  "pet": {
-    "$id": "pet",
-    "properties": {
-      "name": {
-        "type": "string"
-      },
-      "type": {
-        "enum": [
-          "dog",
-          "cat"
-        ]
-      },
-      "picture": {
-        "$ref": "file",
-        "accept": [
-          "image/*"
-        ],
-        "indexes": [
-          "name",
-          "link",
-          "type"
-        ]
-      },
-      "created_at": {
-        "type": "string",
-        "format": "date-time",
-        "noForm": true,
-        "readOnly": true,
-        "isTimestamp": true
-      },
-      "updated_at": {
-        "type": "string",
-        "format": "date-time",
-        "noForm": true,
-        "readOnly": true,
-        "isTimestamp": true
-      }
-    },
-    "icon": "dog",
-    "presets": [
-      "crud"
-    ],
-    "indexes": [
-      "name"
-    ],
-    "actions": {
-      "spawnAdd": {
-        "label": "action.add",
-        "event": "spawnAdd",
-        "icon": "plus",
-        "button": true,
-        "translate": true
-      }
-    },
-    "individualActions": {
-      "spawnEdit": {
-        "label": "action.edit",
-        "event": "spawnEdit",
-        "icon": "pencil-simple",
-        "translate": true
-      },
-      "viewItem": {
-        "label": "action.view",
-        "icon": "eye",
-        "translate": true,
-        "route": {
-          "name": "/dashboard/:collection/:id",
-          "setItem": true
-        }
-      },
-      "remove": {
-        "label": "action.remove",
-        "icon": "trash",
-        "ask": true,
-        "translate": true
-      }
-    }
-  },
   "tempFile": {
     "$id": "tempFile",
     "icon": "file",
@@ -442,38 +364,6 @@ declare type MirrorRouter = {
       "builtin": true
     }
   },
-  "/pet/get": {
-    "POST": {
-      "roles": [
-        "root"
-      ],
-      "builtin": true
-    }
-  },
-  "/pet/getAll": {
-    "POST": {
-      "roles": [
-        "root"
-      ],
-      "builtin": true
-    }
-  },
-  "/pet/insert": {
-    "POST": {
-      "roles": [
-        "root"
-      ],
-      "builtin": true
-    }
-  },
-  "/pet/upload": {
-    "POST": {
-      "roles": [
-        "root"
-      ],
-      "builtin": true
-    }
-  },
   "/user/get": {
     "POST": {
       "roles": [

diff --git a/api/.aeria/out/collections/index.d.mts b/api/.aeria/out/collections/index.d.mts
diff --git a/api/.aeria/out/collections/index.mjs b/api/.aeria/out/collections/index.mjs
diff --git a/api/.aeria/out/collections/person.d.mts b/api/.aeria/out/collections/person.d.mts
diff --git a/api/.aeria/out/collections/person.mjs b/api/.aeria/out/collections/person.mjs
diff --git a/api/.aeria/out/collections/pet.d.mts b/api/.aeria/out/collections/pet.d.mts
diff --git a/api/.aeria/out/collections/pet.mjs b/api/.aeria/out/collections/pet.mjs
diff --git a/api/.aeria/out/index.d.mts b/api/.aeria/out/index.d.mts
diff --git a/api/.aeria/out/index.mjs b/api/.aeria/out/index.mjs
diff --git a/api/.aeria/out/package.json b/api/.aeria/out/package.json
diff --git a/api/schemas/main.aeria b/api/schemas/main.aeria
@@ -1,22 +1,16 @@
+collection File extends aeria.file {}
+collection TempFile extends aeria.tempFile {}
 
-collection Pet {
-  icon "dog"
-  indexes {
-    name
+collection User extends aeria.user {
+  form {
+    github_id
+    twitch_id
+    google_id
   }
   properties {
-    name str
-    type enum @values(["dog", "cat"])
-    picture File @accept(["image/*"])
-  }
-  functions {
-    get @expose
-    getAll @expose
-    insert @expose
-    upload @expose
-  }
-  presets {
-    crud
+    github_id str
+    twitch_id str
+    google_id str
   }
 }
 
diff --git a/api/src/collections.ts b/api/src/collections.ts
@@ -1,26 +1,3 @@
 export * from '../.aeria/out/collections/index.mjs'
-export {
-  file, tempFile,
-} from 'aeria'
-import { extendCollection, user as originalUser } from 'aeria'
 
-export const user = extendCollection(originalUser,{
-  description: {
-    form: [
-      'github_id',
-      'twitch_id',
-      'google_id'
-    ],
-    properties: {
-      github_id: {
-        type: 'string',
-      },
-      twitch_id: {
-        type: 'string',
-      },
-      google_id:{
-        type:'string'
-      }
-    },
-  },
-})
+
diff --git a/api/src/routes/implementations/github.ts b/api/src/routes/implementations/github.ts
@@ -2,7 +2,7 @@ import { ACError, type RouteContext, Result, successfulAuthentication } from 'ae
 import {OAuth} from '../../oauth.js'
 
 export const github = async(context: RouteContext)=>{
-  
+
   const {
     GITHUB_CLIENT_ID,
     GITHUB_CLIENT_SECRET,
@@ -11,18 +11,8 @@ export const github = async(context: RouteContext)=>{
     GITHUB_REDIRECT_URI,
   } = process.env
 
-  if(
-    !GITHUB_CLIENT_ID 
-    || 
-    !GITHUB_CLIENT_SECRET
-    ||
-    !GITHUB_USER_URL
-    ||
-    !GITHUB_TOKEN_URL
-    ||
-    !GITHUB_REDIRECT_URI
-  ){
-    throw new Error('INVALID ENV FILES')
+  if( !GITHUB_CLIENT_ID || !GITHUB_CLIENT_SECRET || !GITHUB_USER_URL || !GITHUB_TOKEN_URL || !GITHUB_REDIRECT_URI ) {
+    throw new Error('missing env variables')
   }
 
   const gitTempToken = await OAuth.exchangeCodeForAccessToken(
@@ -46,7 +36,7 @@ export const github = async(context: RouteContext)=>{
       github_id: gitTempUser.id.toString(),
     },
   })
-  
+
   if(userError){
     //Check what user error returns
     switch(userError.code){