Massive cleanup, was needed pretty badly (#31)

* cp -r app/ .

* Improve eslint & prettierrc

* Split up types

* cli scripts are modules :D

* Modernize migrate tool

* fix error catching

* Move to awaited-surrealdb driver

* Refactored away custom auth hooks

* Fix cannot convert undefined to object

Author: kearfy

Diff for: .eslintrc.json

@@ -0,0 +1,31 @@
+{
+    "extends": [
+        "eslint:recommended",
+        "next/core-web-vitals",
+        "prettier",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:react/recommended",
+        "plugin:react-hooks/recommended",
+        "plugin:json/recommended"
+    ],
+    "plugins": ["only-error", "prettier", "unused-imports"],
+    "rules": {
+        "prettier/prettier": [
+            "error",
+            {
+                "extends": [".prettierrc"]
+            }
+        ],
+        "unused-imports/no-unused-imports": "error",
+        "unused-imports/no-unused-vars": [
+            "error",
+            {
+                "vars": "all",
+                "varsIgnorePattern": "^_",
+                "args": "after-used",
+                "argsIgnorePattern": "^_"
+            }
+        ],
+        "@typescript-eslint/no-unused-vars": "off"
+    }
+}

Diff for: .gitignore

@@ -1,6 +1,45 @@
-node_modules/
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
+
+wrangler.toml
+
 dev.db/
 config.json
 .devbox
 .direnv
-.vscode
+.vscode
+webpack

Diff for: .prettierrc

@@ -2,5 +2,8 @@
     "trailingComma": "es5",
     "tabWidth": 4,
     "semi": true,
-    "singleQuote": true
+    "singleQuote": true,
+    "plugins": ["prettier-plugin-organize-imports"],
+    "endOfLine": "auto",
+    "organizeImportsSkipDestructiveCodeActions": true
 }

Diff for: app/.storybook/main.js renamed to .storybook/main.js

@@ -1,7 +1,7 @@
 <br><br>
 
 <p align="center">
-    <img src="app/public/Logo.svg" width="250">
+    <img src="public/Logo.svg" width="250">
 </p>
 
 <br><br>

Diff for: app/.storybook/preview.js renamed to .storybook/preview.js

@@ -1,12 +1,12 @@
 import * as React from 'react';
-import Fetcher from './Fetcher';
 import { Admin } from 'react-admin';
-import { UserResource } from './resources/User';
 import authProvider from './Auth';
-import { WaitlistResource } from './resources/Waitlist';
+import Fetcher from './Fetcher';
 import { AdminResource } from './resources/Admin';
-import { EventResource } from './resources/Event';
 import { EnvironmentResource } from './resources/Environment';
+import { EventResource } from './resources/Event';
+import { UserResource } from './resources/User';
+import { WaitlistResource } from './resources/Waitlist';
 
 const App = () => (
     <Admin dataProvider={Fetcher()} authProvider={authProvider}>

Diff for: README.md

@@ -1,10 +1,11 @@
 import { UserIdentity } from 'ra-core';
-import { TAdminUserDetails } from '../constants/Types';
+
+import { TAdminUserDetails } from '../constants/Types/Admin.types';
 import { SurrealDatabase, SurrealNamespace } from '../lib/Surreal';
-import { SurrealInstanceAdmin, SurrealQueryAdmin } from './Surreal';
+import { SurrealInstanceAdmin, SurrealQuery } from './Surreal';
 
 export const AdminUserDetails = async (): Promise<TAdminUserDetails | null> => {
-    const result = await SurrealQueryAdmin<TAdminUserDetails>(
+    const result = await SurrealQuery<TAdminUserDetails>(
         'SELECT * FROM admin WHERE id = $auth.id'
     );
     const preParse =

Diff for: app/admin/App.tsx renamed to admin/App.tsx

@@ -1,13 +1,13 @@
 import {
+    CreateResult,
     DataProvider,
-    UpdateResult,
+    DeleteManyResult,
+    DeleteResult,
     RaRecord,
     UpdateManyResult,
-    CreateResult,
-    DeleteResult,
-    DeleteManyResult,
+    UpdateResult,
 } from 'ra-core';
-import { SurrealQueryAdmin } from './Surreal';
+import { SurrealQuery } from './Surreal';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function SelectFilterBuilder(filters: any) {
@@ -54,7 +54,7 @@ export const Fetcher = (): DataProvider => ({
             LIMIT BY ${limit} 
             ${start > 0 ? `START AT ${start}` : ''}`;
 
-        return SurrealQueryAdmin(query).then((result) => {
+        return SurrealQuery(query).then((result) => {
             if (result[0]?.result) {
                 let total = 0;
                 const data =
@@ -79,7 +79,7 @@ export const Fetcher = (): DataProvider => ({
 
     getOne: (resource, params) => {
         const query = `SELECT * FROM ${resource} WHERE id="${params.id}"`;
-        return SurrealQueryAdmin(query).then((result) => {
+        return SurrealQuery(query).then((result) => {
             if (result[0]?.result) {
                 return {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -95,7 +95,7 @@ export const Fetcher = (): DataProvider => ({
         const query = `SELECT * FROM ${resource} WHERE ${JSON.stringify(
             params.ids
         )} CONTAINS id`;
-        return SurrealQueryAdmin(query).then((result) => {
+        return SurrealQuery(query).then((result) => {
             if (result[0]?.result) {
                 return {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -122,7 +122,7 @@ export const Fetcher = (): DataProvider => ({
             start > 0 ? `START AT ${start}` : ''
         }`;
 
-        return SurrealQueryAdmin(query).then((result) => {
+        return SurrealQuery(query).then((result) => {
             if (result[0]?.result) {
                 let total = 0;
                 const data =
@@ -150,7 +150,7 @@ export const Fetcher = (): DataProvider => ({
             params.data as RaRecord
         ).join(', ')}`;
 
-        return SurrealQueryAdmin(query).then((result) => {
+        return SurrealQuery(query).then((result) => {
             if (result[0]?.result) {
                 return Promise.resolve({
                     data: result[0]?.result[0],
@@ -167,7 +167,7 @@ export const Fetcher = (): DataProvider => ({
             params.data as RaRecord
         ).join(', ')} WHERE ${JSON.stringify(params.ids)} CONTAINS id`;
 
-        return SurrealQueryAdmin<{
+        return SurrealQuery<{
             id?: string;
         }>(query).then((result) => {
             if (result[0]?.result) {
@@ -188,7 +188,7 @@ export const Fetcher = (): DataProvider => ({
             params.data as RaRecord
         ).join(', ')}`;
 
-        return SurrealQueryAdmin(query).then((result) => {
+        return SurrealQuery(query).then((result) => {
             if (result[0]?.result) {
                 return Promise.resolve({
                     data: result[0]?.result[0],
@@ -203,7 +203,7 @@ export const Fetcher = (): DataProvider => ({
     delete: (_resource, params) => {
         const query = `DELETE ${params.id}`;
 
-        return SurrealQueryAdmin(query).then((result) => {
+        return SurrealQuery(query).then((result) => {
             if (result[0]?.result) {
                 return Promise.resolve({
                     data: result[0]?.result[0],
@@ -220,7 +220,7 @@ export const Fetcher = (): DataProvider => ({
             params.ids
         )} CONTAINS id`;
 
-        return SurrealQueryAdmin<{
+        return SurrealQuery<{
             id?: string;
         }>(query).then((result) => {
             if (result[0]?.result) {

Diff for: app/admin/Auth.tsx renamed to admin/Auth.tsx

@@ -1,9 +1,9 @@
 import React, { ReactNode, useEffect, useState } from 'react';
 import Surreal, { Result } from 'surrealdb.js';
 import {
+    SurrealDatabase,
     SurrealEndpoint,
     SurrealNamespace,
-    SurrealDatabase,
 } from '../lib/Surreal';
 
 export const SurrealInstanceAdmin = new Surreal(SurrealEndpoint);
@@ -24,7 +24,7 @@ export const SurrealInitAdmin = async () => {
     }
 };
 
-export const SurrealQueryAdmin = async <T = unknown,>(
+export const SurrealQuery = async <T = unknown,>(
     query: string,
     vars?: Record<string, unknown>
 ): Promise<Result<T[]>[]> =>

Diff for: app/admin/Fetcher.ts renamed to admin/Fetcher.ts

@@ -1,26 +1,26 @@
+import { TableCell, TableHead, TableRow } from '@mui/material';
 import React, { useState } from 'react';
 import {
-    List,
+    Create,
     Datagrid,
-    TextField,
-    EmailField,
-    Resource,
     DateField,
     Edit,
-    SimpleForm,
-    TextInput,
+    EmailField,
+    List,
+    ListContextProvider,
+    Pagination,
+    Resource,
     Show,
-    TabbedShowLayout,
-    Tab,
     ShowButton,
-    useRecordContext,
-    Create,
-    ListContextProvider,
+    SimpleForm,
+    Tab,
+    TabbedShowLayout,
+    TextField,
+    TextInput,
     useGetManyReference,
     useList,
-    Pagination,
+    useRecordContext,
 } from 'react-admin';
-import { TableHead, TableRow, TableCell } from '@mui/material';
 
 export const AdminList = () => (
     <List sort={{ field: 'created', order: 'DESC' }}>

Diff for: app/admin/Surreal.tsx renamed to admin/Surreal.tsx

@@ -1,14 +1,14 @@
 import React from 'react';
 import {
-    List,
     Datagrid,
-    TextField,
-    Resource,
     Edit,
+    EditButton,
+    List,
+    Resource,
     SimpleForm,
+    TextField,
     TextInput,
     useRecordContext,
-    EditButton,
 } from 'react-admin';
 
 export const EnvironmentList = () => (
@@ -26,7 +26,7 @@ const EnvironmentTitle = () => {
     return <>{ctx ? `Key: ${`${ctx.id}`.split(':')[1]}` : 'Loading'}</>;
 };
 
-export const EditEnvironment = () => (
+export const EdiTEnv = () => (
     <Edit title={<EnvironmentTitle />}>
         <SimpleForm>
             <TextInput disabled source="id" />
@@ -39,7 +39,7 @@ export const EnvironmentResource = (
     <Resource
         name="environment"
         list={EnvironmentList}
-        edit={EditEnvironment}
+        edit={EdiTEnv}
         options={{ label: 'Environment keys' }}
     />
 );

Diff for: app/admin/resources/Admin.tsx renamed to admin/resources/Admin.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { List, Datagrid, TextField, Resource, DateField } from 'react-admin';
+import { Datagrid, DateField, List, Resource, TextField } from 'react-admin';
 import { JsonField } from 'react-admin-json-view';
 
 export const EventList = () => (

Diff for: app/admin/resources/Environment.tsx renamed to admin/resources/Environment.tsx

@@ -1,30 +1,30 @@
+import { TableCell, TableHead, TableRow } from '@mui/material';
 import React, { useState } from 'react';
 import {
-    List,
+    Create,
     Datagrid,
-    TextField,
-    EmailField,
-    Resource,
     DateField,
     Edit,
-    SimpleForm,
-    TextInput,
+    EmailField,
+    FormTab,
+    List,
+    ListContextProvider,
+    NumberField,
+    NumberInput,
+    Pagination,
+    Resource,
     Show,
-    TabbedShowLayout,
-    Tab,
     ShowButton,
-    useRecordContext,
-    Create,
-    ListContextProvider,
+    SimpleForm,
+    Tab,
+    TabbedForm,
+    TabbedShowLayout,
+    TextField,
+    TextInput,
     useGetManyReference,
     useList,
-    Pagination,
-    NumberInput,
-    NumberField,
-    TabbedForm,
-    FormTab,
+    useRecordContext,
 } from 'react-admin';
-import { TableHead, TableRow, TableCell } from '@mui/material';
 
 export const UserList = () => (
     <List sort={{ field: 'created', order: 'DESC' }}>