From 422732c7df00c166af0a1e5e6554a4913dd5b202 Mon Sep 17 00:00:00 2001 From: Rushil Umaretiya Date: Sun, 31 Jan 2021 04:35:24 -0500 Subject: [PATCH] feat(frontend): began user auth --- backend/config/.env | 6 +- frontend/.env | 2 +- frontend/README.md | 70 ----------- frontend/public/favicon.ico | Bin 0 -> 113288 bytes frontend/public/index.html | 1 + frontend/src/App.css | 5 + frontend/src/App.js | 39 ++---- frontend/src/components/Bank.js | 8 +- frontend/src/components/Login.js | 25 ---- frontend/src/components/ProtectedRoute.js | 49 ++++++++ frontend/src/components/assets/Register.css | 0 frontend/src/components/auth/Signin.js | 65 ++++++++++ frontend/src/components/auth/Signup.js | 127 ++++++++++++++++++++ 13 files changed, 266 insertions(+), 131 deletions(-) delete mode 100644 frontend/README.md create mode 100644 frontend/public/favicon.ico delete mode 100644 frontend/src/components/Login.js create mode 100644 frontend/src/components/ProtectedRoute.js create mode 100644 frontend/src/components/assets/Register.css create mode 100644 frontend/src/components/auth/Signin.js create mode 100644 frontend/src/components/auth/Signup.js diff --git a/backend/config/.env b/backend/config/.env index ccd9ae7..9172304 100644 --- a/backend/config/.env +++ b/backend/config/.env @@ -1,4 +1,4 @@ -DEBUG=True -SECRET_KEY=wjtowjatiowjatioawtawt +DEBUG= +SECRET_KEY= DATABASE_USER= -DATABASE_PASSWORD= \ No newline at end of file +DATABASE_PASSWORD= diff --git a/frontend/.env b/frontend/.env index 7b4778e..baf4ed1 100644 --- a/frontend/.env +++ b/frontend/.env @@ -1 +1 @@ -REACT_APP_API_ENDPOINT=https://api.reinvest.space/api \ No newline at end of file +REACT_APP_API_ENDPOINT=https://api.reinvest.space/api diff --git a/frontend/README.md b/frontend/README.md deleted file mode 100644 index 02aac3f..0000000 --- a/frontend/README.md +++ /dev/null @@ -1,70 +0,0 @@ -# Getting Started with Create React App - -This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). - -## Available Scripts - -In the project directory, you can run: - -### `yarn start` - -Runs the app in the development mode.\ -Open [http://localhost:3000](http://localhost:3000) to view it in the browser. - -The page will reload if you make edits.\ -You will also see any lint errors in the console. - -### `yarn test` - -Launches the test runner in the interactive watch mode.\ -See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. - -### `yarn build` - -Builds the app for production to the `build` folder.\ -It correctly bundles React in production mode and optimizes the build for the best performance. - -The build is minified and the filenames include the hashes.\ -Your app is ready to be deployed! - -See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. - -### `yarn eject` - -**Note: this is a one-way operation. Once you `eject`, you can’t go back!** - -If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. - -Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. - -You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. - -## Learn More - -You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). - -To learn React, check out the [React documentation](https://reactjs.org/). - -### Code Splitting - -This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting) - -### Analyzing the Bundle Size - -This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size) - -### Making a Progressive Web App - -This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app) - -### Advanced Configuration - -This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration) - -### Deployment - -This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment) - -### `yarn build` fails to minify - -This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify) diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..a1a02f2db0a5a3a75fc2b68a07c1390c836d974b GIT binary patch literal 113288 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 PwloFV&mUmY#=-vsaNCYm literal 0 HcmV?d00001 diff --git a/frontend/public/index.html b/frontend/public/index.html index b24f39a..56b2456 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -9,6 +9,7 @@ name="description" content="Web site created using create-react-app" /> + ReInvest diff --git a/frontend/src/App.css b/frontend/src/App.css index e69de29..de9289c 100644 --- a/frontend/src/App.css +++ b/frontend/src/App.css @@ -0,0 +1,5 @@ +@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;700&display=swap"); + +* { + font-family: "Source Sans Pro" !important; +} diff --git a/frontend/src/App.js b/frontend/src/App.js index 4925f46..cc2f6e4 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -4,46 +4,27 @@ import Portfolio from "./components/Portfolio"; import Bank from "./components/Bank"; import Profile from "./components/Profile"; import Browse from "./components/Browse"; -import Login from "./components/Login"; import Nav from "./components/Nav"; +import Signin from "./components/auth/Signin"; +import Signup from "./components/auth/Signup"; + import "./App.css"; +import ProtectedRoute from "./components/ProtectedRoute"; function App() { - const adminUser = { - email: "admin@admin.com", - password: "admin123", - }; - - const [user, setUser] = useState({ name: "", email: "" }); - const [error, setError] = useState(""); - - const Login = (details) => { - console.log(details); - }; - - const Logout = () => { - console.log("Logout"); - }; - return (
); } diff --git a/frontend/src/components/Bank.js b/frontend/src/components/Bank.js index 8d5c8a3..b5fee8f 100644 --- a/frontend/src/components/Bank.js +++ b/frontend/src/components/Bank.js @@ -3,6 +3,8 @@ import "./assets/Portfolio.css"; const Bank = (props) => { const [state, setState] = useState({}); + const [bruh, setBruh] = useState(1); + useEffect(() => { callAPI(); }); @@ -15,9 +17,9 @@ const Bank = (props) => { }; return ( -
-

Bank

-

+
+

Bank

+

{process.env.REACT_APP_API_ENDPOINT}

); }; diff --git a/frontend/src/components/Login.js b/frontend/src/components/Login.js deleted file mode 100644 index 1f2ec84..0000000 --- a/frontend/src/components/Login.js +++ /dev/null @@ -1,25 +0,0 @@ -import React from "react"; - -const Login = (props) => { - return ( -
-
-

Login

-
- - -
-
- - -
-
- - -
-
-
- ); -}; - -export default Login; diff --git a/frontend/src/components/ProtectedRoute.js b/frontend/src/components/ProtectedRoute.js new file mode 100644 index 0000000..d348fa0 --- /dev/null +++ b/frontend/src/components/ProtectedRoute.js @@ -0,0 +1,49 @@ +import React from "react"; +import { Route, Redirect } from "react-router-dom"; + +const ProtectedRoute = ({ component: Component, ...rest }) => { + const isAuthenticated = async () => { + try { + const requestOptions = { + method: "GET", + headers: { Authorization: `JWT ${localStorage.getItem("token")}` }, + }; + const response = await fetch( + `${process.env.REACT_APP_API_ENDPOINT}/profile`, + requestOptions + ); + + if (response.status === 200) { + return true; + } else { + return false; + } + } catch (e) { + return false; + } + }; + + return ( + { + if (isAuthenticated()) { + return ; + } else { + return ( + + ); + } + }} + /> + ); +}; + +export default ProtectedRoute; diff --git a/frontend/src/components/assets/Register.css b/frontend/src/components/assets/Register.css new file mode 100644 index 0000000..e69de29 diff --git a/frontend/src/components/auth/Signin.js b/frontend/src/components/auth/Signin.js new file mode 100644 index 0000000..6039eb7 --- /dev/null +++ b/frontend/src/components/auth/Signin.js @@ -0,0 +1,65 @@ +import React, { useState } from "react"; +import { useHistory } from "react-router-dom"; + +const Signup = (props) => { + let history = useHistory(); + + const [username, setUsername] = useState(""); + const [password, setPassword] = useState(""); + + const onSubmit = async (e) => { + e.preventDefault(); + const requestOptions = { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ username: username, password: password }), + }; + try { + const response = await fetch( + `${process.env.REACT_APP_API_ENDPOINT}/token`, + requestOptions + ); + const data = await response.json(); + + localStorage.setItem("token", data.token); + history.push("/"); + } catch (e) { + console.error(e); + } + }; + + return ( +
+
+

Login

+
+ + { + setUsername(e.target.value); + }} + value={username} + name="name" + id="name" + /> +
+
+ + { + setPassword(e.target.value); + }} + value={password} + name="password" + id="password" + /> +
+
+ +
+ ); +}; + +export default Signup; diff --git a/frontend/src/components/auth/Signup.js b/frontend/src/components/auth/Signup.js new file mode 100644 index 0000000..96a0368 --- /dev/null +++ b/frontend/src/components/auth/Signup.js @@ -0,0 +1,127 @@ +import React, { useState } from "react"; +import { useHistory } from "react-router-dom"; + +const Signup = (props) => { + let history = useHistory(); + + const [username, setUsername] = useState(""); + const [password, setPassword] = useState(""); + const [verifyPassword, setVerifyPassword] = useState(""); + const [email, setEmail] = useState(""); + const [firstName, setFirstName] = useState(""); + const [lastName, setLastName] = useState(""); + + const onSubmit = async (e) => { + e.preventDefault(); + if (verifyPassword !== password) { + alert("The passwords don't match!"); + return; + } + const requestOptions = { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + username: username, + password: password, + email: email, + first_name: firstName, + last_name: lastName, + }), + }; + try { + const response = await fetch( + `${process.env.REACT_APP_API_ENDPOINT}/profile/create`, + requestOptions + ); + const data = await response.json(); + console.log(data.username); + + history.push("/login"); + } catch (e) { + console.error(e); + } + }; + + return ( +
+
+

Register

+
+ + { + setUsername(e.target.value); + }} + value={username} + name="name" + id="name" + /> +
+
+ + { + setPassword(e.target.value); + }} + value={password} + name="password" + id="password" + /> +
+
+ + { + setVerifyPassword(e.target.value); + }} + value={verifyPassword} + name="password" + id="password" + /> +
+
+ + { + setEmail(e.target.value); + }} + value={email} + name="name" + id="name" + /> +
+
+ + { + setFirstName(e.target.value); + }} + value={firstName} + name="name" + id="name" + /> +
+
+ + { + setLastName(e.target.value); + }} + value={lastName} + name="name" + id="name" + /> +
+
+ +
+ ); +}; + +export default Signup;