From 17f67ccebf389a422acdeb0a5ce96a540d0af83e Mon Sep 17 00:00:00 2001 From: Ruidy Nemausat Date: Tue, 5 May 2020 19:19:12 +0200 Subject: [PATCH] home page layout --- app.db | Bin 106496 -> 106496 bytes client/src/images/real_time_collaboration.svg | 1 + client/src/pages/HomePage.tsx | 15 ++++++++++++++- client/src/routes/AppRouter.tsx | 4 ++-- 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 client/src/images/real_time_collaboration.svg diff --git a/app.db b/app.db index 6fa35e26736f50d719eca8142e9a4f725f9461cf..d7221104f2a3a87ea75c54aca5c4e07037fc6efd 100644 GIT binary patch delta 181 zcmZoTz}9epZNvY3M%hgTEDFpr3^9}0Cs;7XOmvh9$&lq`5H@x+=49k#G-qT82zM+> zP0uVYNi9-HEGSS&ELH#t85tNE=o**;k%FOxm5I5Pp`o6ssez@LA(D)NffX1rGffV( z7iHwwd~AZC#lr5WT(f@XIu;bjngZY delta 76 zcmZoTz}9epZNvY3Mwv|oEDFrh496z3Pq3IQB+$P3*aW-x%+ma&)7cvs%{L1QnDb9B g=x1b^UfIvs4HS=^&OU+Be7leWqdfog*!hf$0R!3?-2eap diff --git a/client/src/images/real_time_collaboration.svg b/client/src/images/real_time_collaboration.svg new file mode 100644 index 0000000..93bd4d8 --- /dev/null +++ b/client/src/images/real_time_collaboration.svg @@ -0,0 +1 @@ +real_time_collaboration \ No newline at end of file diff --git a/client/src/pages/HomePage.tsx b/client/src/pages/HomePage.tsx index 57f3804..bd556ed 100644 --- a/client/src/pages/HomePage.tsx +++ b/client/src/pages/HomePage.tsx @@ -1,7 +1,20 @@ import React, { FC } from "react"; +import { Redirect } from "react-router-dom"; +import SignInSide from "../components/SignInSide"; +import { useAuth0 } from "../authentication/auth0"; +import { getUID } from "../authentication/helpers"; +import * as ROUTES from "../constants/routes"; const HomePage: FC = () => { - return
HomePage
; + const { isAuthenticated, user } = useAuth0(); + + if (isAuthenticated) { + // retrieve userId + const uid = getUID(user); + return ; + } else { + return ; + } }; export default HomePage; diff --git a/client/src/routes/AppRouter.tsx b/client/src/routes/AppRouter.tsx index d2d529a..daccd25 100644 --- a/client/src/routes/AppRouter.tsx +++ b/client/src/routes/AppRouter.tsx @@ -7,7 +7,7 @@ import UserController from "../controllers/UserController"; import TicketController from "../controllers/TicketController"; import NotFoundPage from "../pages/NotFoundPage"; import TestPage from "../pages/TestPage"; -import SigninPage from "../pages/SigninPage"; +// import SigninPage from "../pages/SigninPage"; import * as ROUTES from "../constants/routes"; const AppRouter = () => { @@ -15,7 +15,7 @@ const AppRouter = () => { - + {/* */}