cleaning up unused files and imports

nitrotap · Jul 25, 2022 · eaf6a35 · eaf6a35
1 parent 231786f
commit eaf6a35
Show file tree

Hide file tree

Showing 8 changed files with 191 additions and 184 deletions.
diff --git a/README.md b/README.md
@@ -1 +1,37 @@
-# React with Apollo and JWT
+# react-apollo-jwt
+
+## Description
+
+Sample App using MERN stack and JWT Authentication
+
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+![badmath](https://img.shields.io/github/languages/top/nitrotap/react-apollo-jwt)
+![badmath](https://img.shields.io/github/languages/top/nitrotap/nitrotap/react-apollo-jwt)  
+![badmath](https://img.shields.io/github/issues/nitrotap/react-apollo-jwt)
+![badmath](https://img.shields.io/github/forks/nitrotap/react-apollo-jwt)  
+![badmath](https://img.shields.io/github/stars/nitrotap/react-apollo-jwt)
+
+## Table of Contents
+
+- [Installation](#Installation)
+- [Questions](#Questions)
+- [License](#License)
+
+## Installation
+
+npm i
+
+## Questions
+
+Please reach out to me on [GitHub](https://github.com/nitrotap) or by email at [email protected] for any additional questions.
+
+## License
+
+MIT
+
+Copyright 2022 nitrotap
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -14,7 +14,7 @@
     "@mui/material": "^5.8.1",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.2.0",
-    "@testing-library/user-event": "^13.5.0",
+    "@testing-library/user-event": "^14.3.0",
     "graphql": "^16.5.0",
     "jwt-decode": "^3.1.2",
     "react": "^18.2.0",

diff --git a/client/src/App.js b/client/src/App.js
@@ -2,9 +2,6 @@ import * as React from 'react';
 import Box from '@mui/material/Box';
 import CssBaseline from '@mui/material/CssBaseline';
 
-
-
-
 //apollo
 import {
   ApolloClient,
@@ -42,14 +39,8 @@ const client = new ApolloClient({
   cache: new InMemoryCache(),
 });
 
-
-
-
-
 export default function App() {
 
-
-
   return (
     <ApolloProvider client={client}>
       <Box sx={{ marginTop: '30px', marginBottom: '60px' }}>
@@ -58,7 +49,7 @@ export default function App() {
             <CssBaseline />
 
             <Routes>
-              {/* <Route path="/" element={<Home />} /> */}
+              <Route path="/" element={<Signup />} />
               <Route path="signup" element={<Signup />} />
               <Route path="login" element={<Login />} />
             </Routes>

diff --git a/client/src/assets/images/jumbo.jpg b/client/src/assets/images/jumbo.jpg
diff --git a/client/src/assets/images/jumbo2.jpg b/client/src/assets/images/jumbo2.jpg
diff --git a/client/src/pages/Login.js b/client/src/pages/Login.js
@@ -8,7 +8,6 @@ import Auth from '../utils/auth';
 import * as React from 'react';
 import Avatar from '@mui/material/Avatar';
 import Button from '@mui/material/Button';
-import CssBaseline from '@mui/material/CssBaseline';
 import TextField from '@mui/material/TextField';
 import FormControlLabel from '@mui/material/FormControlLabel';
 import Checkbox from '@mui/material/Checkbox';
@@ -18,14 +17,9 @@ import Box from '@mui/material/Box';
 import LockOutlinedIcon from '@mui/icons-material/LockOutlined';
 import Typography from '@mui/material/Typography';
 import Container from '@mui/material/Container';
-import { createTheme, ThemeProvider } from '@mui/material/styles';
 
 import Copyright from '../components/Elements/Copyright';
 
-
-
-const theme = createTheme();
-
 function Login(props) {
   const [formState, setFormState] = useState({ email: '', password: '' });
   const [login, { error }] = useMutation(LOGIN);
@@ -87,84 +81,79 @@ function Login(props) {
 
 
   return (
-    <Container>
-      <ThemeProvider theme={theme}>
-        <Container component="main" maxWidth="xs" sx={{
-          backgroundColor: 'white', marginTop: '100px', marginBottom: '250px',
-        }}>
-          <CssBaseline />
-          <Box
-            sx={{
-              marginTop: 8,
-              display: 'flex',
-              flexDirection: 'column',
-              alignItems: 'center',
-            }}
+    <Container component="main" maxWidth="xs" sx={{
+      backgroundColor: 'white', marginTop: '100px', marginBottom: '250px',
+    }}>
+      <Box
+        sx={{
+          marginTop: 8,
+          display: 'flex',
+          flexDirection: 'column',
+          alignItems: 'center',
+        }}
+      >
+        <Avatar sx={{ m: 1, bgcolor: 'secondary.main' }}>
+          <LockOutlinedIcon />
+        </Avatar>
+        <Typography component="h1" variant="h5">
+          Sign in
+        </Typography>
+        <Box component="form" onSubmit={handleFormSubmit} noValidate sx={{ mt: 1 }}>
+          <TextField
+            margin="normal"
+            required
+            fullWidth
+            id="email"
+            label="Email Address"
+            name="email"
+            autoComplete="email"
+            autoFocus
+            onChange={handleChangeEmail}
+            error={!emailState}
+            helperText={emailHelper}
+          />
+          <TextField
+            margin="normal"
+            required
+            fullWidth
+            name="password"
+            label="Password"
+            type="password"
+            id="password"
+            autoComplete="current-password"
+            onChange={handleChangePw}
+            error={!passwordState}
+            helperText={pwHelper}
+          />
+          <FormControlLabel
+            control={<Checkbox value="remember" color="primary" />}
+            label="Remember me"
+            checked={checked}
+            onChange={() => setChecked(!checked)}
+          />
+          <Button
+            type="submit"
+            fullWidth
+            variant="contained"
+            sx={{ mt: 3, mb: 2 }}
           >
-            <Avatar sx={{ m: 1, bgcolor: 'secondary.main' }}>
-              <LockOutlinedIcon />
-            </Avatar>
-            <Typography component="h1" variant="h5">
-              Sign in
-            </Typography>
-            <Box component="form" onSubmit={handleFormSubmit} noValidate sx={{ mt: 1 }}>
-              <TextField
-                margin="normal"
-                required
-                fullWidth
-                id="email"
-                label="Email Address"
-                name="email"
-                autoComplete="email"
-                autoFocus
-                onChange={handleChangeEmail}
-                error={!emailState}
-                helperText={emailHelper}
-              />
-              <TextField
-                margin="normal"
-                required
-                fullWidth
-                name="password"
-                label="Password"
-                type="password"
-                id="password"
-                autoComplete="current-password"
-                onChange={handleChangePw}
-                error={!passwordState}
-                helperText={pwHelper}
-              />
-              <FormControlLabel
-                control={<Checkbox value="remember" color="primary" />}
-                label="Remember me"
-                checked={checked}
-                onChange={() => setChecked(!checked)}
-              />
-              <Button
-                type="submit"
-                fullWidth
-                variant="contained"
-                sx={{ mt: 3, mb: 2 }}
-              >
-                Sign In
-              </Button>
-              <Grid container>
-                <Grid item xs>
-                  {/* <Link href="#" variant="body2">
+            Sign In
+          </Button>
+          <Grid container>
+            <Grid item xs>
+              {/* <Link href="#" variant="body2">
                     Forgot password?
                   </Link> */}
-                </Grid>
-                <Grid item>
-                  <Link to="/signup" variant="body2">
-                    {"Don't have an account? Sign Up"}
-                  </Link>
-                </Grid>
-              </Grid>
-            </Box>
-          </Box>
-          <Copyright sx={{ mt: 8, mb: 4 }} />
-        </Container>
-      </ThemeProvider>
+            </Grid>
+            <Grid item>
+              <Link to="/signup" variant="body2">
+                {"Don't have an account? Sign Up"}
+              </Link>
+            </Grid>
+          </Grid>
+        </Box>
+      </Box>
+      <Copyright sx={{ mt: 8, mb: 4 }} />
     </Container>
   );
 }