alt/zot-wo-auth
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more signin work for auth enabled/disabled logic

Browse Source 
Signed-off-by: Raul Cristian Kele <raulkeleblk@gmail.com>
Signed-off-by: Raul Kele <raulkeleblk@gmail.com>
This commit is contained in:
Raul Cristian Kele 2022-07-05 22:50:08 +03:00 committed by Ramkumar Chinchani
parent cde4b9a9a1
commit ba6951f6ef
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/App.js
View File

@ -1,4 +1,4 @@
import React, { useState, useEffect } from 'react'
import React, { useState } from 'react'
import HomePage from './pages/HomePage.jsx'
import LoginPage from './pages/LoginPage.jsx'
import ImageDetails from './components/ImageDetails.jsx'
@ -23,7 +23,7 @@ function App() {
const [password, setPassword] = useState(null);
const [searchKeywords, setSearchKeywords] = useState(null);
const [data, setData] = useState(null);
const [isAuthEnabled, setIsAuthEnabled] = useState(false)
const [isAuthEnabled, setIsAuthEnabled] = useState(true)
const [isLoggedIn, setIsLoggedIn] = useState(isUsername())
const classes = useStyles();
@ -33,13 +33,13 @@ function App() {
<div className="App">
<Router>
<Routes>
<Route element={<AuthWrapper isAuthEnabled={isAuthEnabled} isLoggedIn={isLoggedIn} redirect="/login" />}>
<Route path="/" element={<Navigate to="/login" />} />
<Route path="/login" element={<LoginPage isLoggedIn={isLoggedIn} username={username} password={password} updateUsername={setUsername} updatePassword={setPassword} isAuthEnabled={isAuthEnabled} setIsAuthEnabled={setIsAuthEnabled} setIsLoggedIn={setIsLoggedIn} />} />
<Route element={<AuthWrapper isLoggedIn={isLoggedIn} redirect="/login" />}>
<Route path="/" element={<Navigate to="/home" />} />
<Route path="/home" element={<HomePage keywords={searchKeywords} updateKeywords={setSearchKeywords} data={data} updateData={setData} />} />
<Route path="/image/:name" element={<ImageDetails username={username} password={password} />} />
</Route>
<Route element={<AuthWrapper isAuthEnabled={isAuthEnabled} isLoggedIn={!isLoggedIn} redirect="/"/>}>
<Route element={<AuthWrapper isLoggedIn={!isLoggedIn} redirect="/"/>}>
<Route path="/login" element={<LoginPage username={username} password={password} updateUsername={setUsername} updatePassword={setPassword} isAuthEnabled={isAuthEnabled} setIsAuthEnabled={setIsAuthEnabled} isLoggedIn={isLoggedIn} setIsLoggedIn={setIsLoggedIn} />} />
<Route path="*" element={<Navigate to="/login" />} />
</Route>
</Routes>

3
src/components/SignIn.jsx
View File

@ -16,8 +16,7 @@ import CircularProgress from '@mui/material/CircularProgress';
import TermsOfService from './TermsOfService';
// styling
import { makeStyles, propsToClassKey } from '@mui/styles';
import { usePushingGutterStyles } from '@mui-treasury/styles/gutter/pushing';
import { makeStyles } from '@mui/styles';
import { Card, CardContent } from '@mui/material';
const useStyles = makeStyles((theme) => ({

5
src/utilities/AuthWrapper.jsx
View File

@ -1,10 +1,7 @@
import React from 'react';
import { Navigate, Outlet } from 'react-router-dom';
const AuthWrapper = ({isAuthEnabled,isLoggedIn, redirect}) => {
if(!isAuthEnabled) {
return <Outlet/>
}
const AuthWrapper = ({isLoggedIn, redirect}) => {
return isLoggedIn ? <Outlet />: <Navigate to={redirect} replace={true} />;
};