fix: Temporary homepage

Zenoo · Zenoo · commit d3e808460d66 · 2022-12-18T19:40:23.000+01:00
diff --git a/client/src/HomeView.tsx b/client/src/HomeView.tsx
@@ -0,0 +1,15 @@
+import { Card, CardContent } from '@mui/material';
+import React from 'react';
+import Page from './components/Page';
+
+const HomeView = () => (
+  <Page
+    title="User list"
+  >
+    <Card>
+      <CardContent>Hello !</CardContent>
+    </Card>
+  </Page>
+);
+
+export default HomeView;
diff --git a/client/src/api/RequestRoutes.ts b/client/src/api/RequestRoutes.ts
@@ -1,11 +1,6 @@
-import { Request as _Request } from '@fullstack-typescript-monorepo/prisma';
+import { Request } from '@fullstack-typescript-monorepo/prisma';
 import Super from './Super';
 
-// Typescript reference error hack
-export type Request = {
-  [key in keyof _Request]: Request[key];
-};
-
 const RequestRoutes = {
   ...Super<Request>('request'),
 };
diff --git a/client/src/api/Super.ts b/client/src/api/Super.ts
@@ -1,7 +1,7 @@
 import { TableState } from '../components/Datatable';
 import Fetch from '../utils/fetcher';
 
-type RecursivePartial<T> = {
+export type RecursivePartial<T> = {
   [P in keyof T]?: RecursivePartial<T[P]>;
 };
 
diff --git a/client/src/layouts/AdminLayout.tsx b/client/src/layouts/AdminLayout.tsx
@@ -6,7 +6,7 @@ import { useAuth } from '../hooks/useAuth';
 const AdminLayout = () => {
   const auth = useAuth();
 
-  return auth.user.admin ? <Outlet /> : <Navigate to="/app/data/table/lptp/sites" />;
+  return auth.user.admin ? <Outlet /> : <Navigate to="/app/home" />;
 };
 
 export default AdminLayout;
diff --git a/client/src/layouts/DashboardLayout/DashboardLayout.tsx b/client/src/layouts/DashboardLayout/DashboardLayout.tsx
@@ -24,6 +24,7 @@ const DashboardLayout = () => {
     if (!auth.authed) {
       const user = localStorage.getItem('user');
       const token = localStorage.getItem('token') || '';
+
       if (user) {
         auth.signin(user, token).catch((error: ErrorType) => {
           localStorage.removeItem('user');
diff --git a/client/src/layouts/DashboardLayout/TopBar.tsx b/client/src/layouts/DashboardLayout/TopBar.tsx
@@ -29,7 +29,7 @@ const TopBar = ({
       {...rest}
     >
       <Toolbar>
-        <RouterLink to="/app/data/table/lptp/sites">
+        <RouterLink to="/app/home">
           <Logo sx={{ height: 50 }} />
         </RouterLink>
         <Box flexGrow={1} />
diff --git a/client/src/layouts/MainLayout/TopBar.tsx b/client/src/layouts/MainLayout/TopBar.tsx
@@ -9,7 +9,7 @@ const TopBar = ({ ...rest }) => (
     {...rest}
   >
     <Toolbar sx={{ height: 64 }}>
-      <RouterLink to="/app/data/table/lptp/sites">
+      <RouterLink to="/app/home">
         <Logo sx={{ height: 50 }} />
       </RouterLink>
     </Toolbar>
diff --git a/client/src/routes.tsx b/client/src/routes.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { Navigate } from 'react-router-dom';
+import HomeView from './HomeView';
 import AdminLayout from './layouts/AdminLayout';
 import DashboardLayout from './layouts/DashboardLayout/DashboardLayout';
 import MainLayout from './layouts/MainLayout/MainLayout';
@@ -15,6 +16,7 @@ const routes = [
     path: 'app',
     element: <DashboardLayout />,
     children: [
+      { path: 'home', element: <HomeView /> },
       { path: 'account', element: <AccountView /> },
       {
         path: 'admin',
diff --git a/client/src/views/auth/LoginView.tsx b/client/src/views/auth/LoginView.tsx
@@ -41,7 +41,7 @@ const LoginView = () => {
     Loader.open();
     auth.signin(formData.login, formData.password).then(() => {
       Loader.close();
-      navigate('/app/data/table/lptp/sites', { replace: true });
+      navigate('/app/home', { replace: true });
     }).catch((response: string) => {
       catchError(Alert, t)(response);
       Loader.close();
@@ -64,7 +64,7 @@ const LoginView = () => {
       });
     }
     if (auth.authed) {
-      navigate('/app/data/table/lptp/sites', { replace: true });
+      navigate('/app/home', { replace: true });
     }
   }, [Alert, Loader, auth, navigate, t]);
 
diff --git a/client/tsconfig.json b/client/tsconfig.json
@@ -25,6 +25,9 @@
     "noEmit": true,
     "jsx": "react"
   },
+  "include": [
+    "src"
+  ],
   "references": [
     { "path": "../core" },
     { "path": "../prisma" }
diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
     "dev": "concurrently --prefix \"[{name}]\" --names \"SERVER,CLIENT\" -c \"bgBlue.bold,bgGreen.bold\" \"npm run back\" \"npm run front\"",
     "db:sync:dev": "npm run db:sync:dev --workspace=server",
     "db:sync:prod": "npm run db:sync:prod --workspace=server",
+    "db:seed": "npm run db:seed --workspace=server",
     "postinstall": "bash ./postInstall.sh && npm run compile"
   },
   "devDependencies": {
diff --git a/server/package.json b/server/package.json
@@ -11,7 +11,11 @@
     "start": "node ./lib/server.js",
     "start:watch": "tsc-watch --build ./tsconfig.json --onSuccess \"node ./lib/server.js\"",
     "db:sync:dev": "prisma migrate dev",
-    "db:sync:prod": "prisma generate && prisma migrate deploy"
+    "db:sync:prod": "prisma generate && prisma migrate deploy",
+    "db:seed": "prisma db seed"
+  },
+  "prisma": {
+    "seed" : "ts-node prisma/seed.ts"
   },
   "dependencies": {
     "@fullstack-typescript-monorepo/core": "*",
diff --git a/server/prisma/migrations/20221218173150_person_address_optional/migration.sql b/server/prisma/migrations/20221218173150_person_address_optional/migration.sql
@@ -0,0 +1,8 @@
+-- DropForeignKey
+ALTER TABLE "Person" DROP CONSTRAINT "Person_addressId_fkey";
+
+-- AlterTable
+ALTER TABLE "Person" ALTER COLUMN "addressId" DROP NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "Person" ADD CONSTRAINT "Person_addressId_fkey" FOREIGN KEY ("addressId") REFERENCES "Address"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
@@ -30,7 +30,7 @@ model Person {
   phone     String?  @db.VarChar(255)
   phone2    String?  @db.VarChar(255)
   address   Address? @relation(fields: [addressId], references: [id])
-  addressId Int      @unique
+  addressId Int?     @unique
   user      User?
 }
 
diff --git a/server/prisma/seed.ts b/server/prisma/seed.ts
@@ -0,0 +1,54 @@
+import { PrismaClient } from '@fullstack-typescript-monorepo/prisma';
+import bcrypt from 'bcrypt';
+
+const prisma = new PrismaClient();
+async function main() {
+  // Check if DB is empty
+  const count = await prisma.user.count();
+
+  if (count > 0) {
+    console.warn('DB is not empty, skipping seeding');
+    return;
+  }
+
+  await prisma.user.create({
+    data: {
+      login: 'admin',
+      admin: true,
+      password: await bcrypt.hash('admin', 10),
+      active: true,
+      person: {
+        create: {
+          firstName: 'Foo',
+          lastName: 'Bar',
+          email: 'foo@b.ar',
+        },
+      },
+    },
+  });
+
+  await prisma.user.create({
+    data: {
+      login: 'test',
+      password: await bcrypt.hash('test', 10),
+      active: true,
+      person: {
+        create: {
+          firstName: 'Test',
+          lastName: 'Test',
+          email: 'test@test.te',
+        },
+      },
+    },
+  });
+}
+main()
+  .then(async () => {
+    await prisma.$disconnect();
+  })
+  .catch(async (e) => {
+    console.error(e);
+    await prisma.$disconnect();
+    // eslint-disable-next-line no-process-exit
+    process.exit(1);
+  });
diff --git a/server/src/controllers/Users.ts b/server/src/controllers/Users.ts
@@ -39,7 +39,7 @@ const authenticate = (prisma: PrismaClient) => async (
     });
 
     // Check password against connexion token
-    const passwordIsToken = await bcrypt.compare(password, user.connexionToken);
+    const passwordIsToken = password === user.connexionToken;
 
     // User is aleady logged in with the token
     if (passwordIsToken) {
@@ -80,6 +80,8 @@ const authenticate = (prisma: PrismaClient) => async (
       // Return user
       res.json(user);
     }
+
+    throw new Error('Invalid password');
   } catch (error) {
     sendError(res, error);
   }
diff --git a/server/src/routes.ts b/server/src/routes.ts
@@ -15,18 +15,18 @@ const initRoutes = (app: Express, prisma: PrismaClient) => {
   }));
 
   // User
+  app.post('/api/user/authenticate', Users.authenticate(prisma));
+  app.post('/api/user/reset-password', Users.resetPassword(prisma));
   app.get('/api/user/all', Users.getAll(prisma));
   app.get('/api/user/all/csv', Users.getAllAsCsv(prisma));
   app.put('/api/user', Users.insert(prisma));
   app.get('/api/user/:id', Users.get(prisma));
   app.post('/api/user/table', Users.table(prisma));
   app.post('/api/user/:id', Users.update(prisma));
   app.delete('/api/user/:id', Users.delete(prisma));
-  app.post('/api/user/authenticate', Users.authenticate(prisma));
   app.post('/api/user/:id/change-password', Users.changePassword(prisma));
   app.get('/api/user/:login/send-password-reset-mail', Users.sendPasswordResetEmail(prisma));
   app.get('/api/user/:login/reset-code-check', Users.checkResetCodeValidity(prisma));
-  app.post('/api/user/reset-password', Users.resetPassword(prisma));
 
   // Record
   app.get('/api/record/list', Records.list(prisma));
diff --git a/server/src/server.ts b/server/src/server.ts
@@ -21,7 +21,7 @@ const CLIENT_BUILD = path.join(__dirname, '..', '..', 'client', 'build');
 app.use(express.static(CLIENT_BUILD));
 
 app.listen(port, () => {
-  console.log(`App running: http://localhost:${port}/`);
+  console.warn(`App running: http://localhost:${port}/`);
 });
 
 initRoutes(app, prisma);
diff --git a/server/src/utils/UserUtils.ts b/server/src/utils/UserUtils.ts
@@ -22,8 +22,6 @@ const getTokenExpiration = (user: User) => {
     return expired;
   }
 
-  console.log(decodedToken.split('|')[1]);
-
   return moment(decodedToken.split('|')[1]);
 };
 
diff --git a/server/tsconfig.json b/server/tsconfig.json
@@ -2,8 +2,9 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "lib"
+    "outDir": "lib",
   },
+  "exclude": ["prisma/seed.ts", "lib/**/*"],
   "references": [
     { "path": "../core" },
     { "path": "../prisma" }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ const TopBar = ({`
`29`	`29`	`{...rest}`
`30`	`30`	`>`
`31`	`31`	`<Toolbar>`
`32`		`- <RouterLink to="/app/data/table/lptp/sites">`
	`32`	`+ <RouterLink to="/app/home">`
`33`	`33`	`<Logo sx={{ height: 50 }} />`
`34`	`34`	`</RouterLink>`
`35`	`35`	`<Box flexGrow={1} />`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ const TopBar = ({ ...rest }) => (`
`9`	`9`	`{...rest}`
`10`	`10`	`>`
`11`	`11`	`<Toolbar sx={{ height: 64 }}>`
`12`		`- <RouterLink to="/app/data/table/lptp/sites">`
	`12`	`+ <RouterLink to="/app/home">`
`13`	`13`	`<Logo sx={{ height: 50 }} />`
`14`	`14`	`</RouterLink>`
`15`	`15`	`</Toolbar>`