Merge branch 'development' into events-with-activitystream

bounswe · Dec 10, 2021 · b2b63bb · b2b63bb
2 parents 9d1aefa + b70a41e
commit b2b63bb
Show file tree

Hide file tree

Showing 24 changed files with 274 additions and 21 deletions.
diff --git a/backend/app/settings.py b/backend/app/settings.py
@@ -43,7 +43,7 @@
     'eventposts',
     'profiles',
     'corsheaders',
-    'actstream',
+    'frontend',
 ]
 
 SITE_ID = 1

diff --git a/backend/app/urls.py b/backend/app/urls.py
@@ -21,4 +21,5 @@
     path('api/', include('authentication.urls')),
     path('api/', include('eventposts.urls')),
     path('api/', include('profiles.urls')),
+    path('', include('frontend.urls'))
 ]
diff --git a/backend/frontend/.babelrc b/backend/frontend/.babelrc
@@ -0,0 +1,10 @@
+{
+  "presets": ["@babel/preset-env", "@babel/preset-react"],
+  "plugins": [
+    ["@babel/plugin-transform-runtime",
+      {
+        "regenerator": true
+      }
+    ]
+  ]
+}
diff --git a/backend/frontend/__init__.py b/backend/frontend/__init__.py
diff --git a/backend/frontend/admin.py b/backend/frontend/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/backend/frontend/apps.py b/backend/frontend/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class FrontendConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'frontend'
diff --git a/backend/frontend/migrations/__init__.py b/backend/frontend/migrations/__init__.py
diff --git a/backend/frontend/models.py b/backend/frontend/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/backend/frontend/static/frontend/52f70eebdc5cc704875c.png b/backend/frontend/static/frontend/52f70eebdc5cc704875c.png
diff --git a/backend/frontend/static/frontend/bundle.js b/backend/frontend/static/frontend/bundle.js
diff --git a/backend/frontend/static/frontend/bundle.js.LICENSE.txt b/backend/frontend/static/frontend/bundle.js.LICENSE.txt
@@ -0,0 +1,86 @@
+/*
+object-assign
+(c) Sindre Sorhus
+@license MIT
+*/
+
+/**
+ * A better abstraction over CSS.
+ *
+ * @copyright Oleg Isonen (Slobodskoi) / Isonen 2014-present
+ * @website https://github.com/cssinjs/jss
+ * @license MIT
+ */
+
+/**
+ * React Router DOM v6.0.1
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+
+/**
+ * React Router v6.0.1
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+
+/** @license MUI v5.1.0
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v0.20.2
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.13.1
+ * react-is.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v17.0.2
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v17.0.2
+ * react-jsx-runtime.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v17.0.2
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
diff --git a/backend/frontend/static/frontend/index.html b/backend/frontend/static/frontend/index.html
@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><title></title><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="viewport" content="initial-scale=1,width=device-width"/><script defer="defer" src="bundle.js"></script></head><body><div id="app" class=""></div></body></html>
diff --git a/backend/frontend/templates/frontend/index.html b/backend/frontend/templates/frontend/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Django REST with React</title>
+<link rel="stylesheet" href="https://rsms.me/inter/inter.css">
+
+</head>
+<body>
+<div id="app">
+    <!-- React will load here -->
+</div>
+</body>
+{% load static %}
+<script src="{% static "frontend/bundle.js" %}"></script>
+</html>
diff --git a/backend/frontend/tests.py b/backend/frontend/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/backend/frontend/urls.py b/backend/frontend/urls.py
@@ -0,0 +1,7 @@
+from django.urls import path
+from . import views
+
+
+urlpatterns = [
+    path('', views.index ),
+]
diff --git a/backend/frontend/views.py b/backend/frontend/views.py
@@ -0,0 +1,5 @@
+from django.shortcuts import render
+
+
+def index(request):
+    return render(request, 'frontend/index.html')
diff --git a/frontend/package.json b/frontend/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "scripts": {
     "dev": "webpack --mode development --entry ./src/index.js --output-path ./static/frontend",
-    "build": "webpack --mode production --entry ./src/index.js --output-path ./static/frontend",
+    "build": "webpack --mode production --entry ./src/index.js --output-path ../backend/frontend/static/frontend",
     "start": "webpack serve --config ./webpack.config.js --mode development --open"
   },
   "keywords": [],
@@ -35,6 +35,7 @@
     "date-fns": "^2.25.0",
     "joi": "^17.4.2",
     "lodash": "^4.17.21",
+    "notistack": "^2.0.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-router-dom": "^6.0.1",

diff --git a/frontend/src/Controllers/AuthInfo.js b/frontend/src/Controllers/AuthInfo.js
@@ -0,0 +1,21 @@
+const headers = {}
+
+export const setHeaders = (accessToken, refreshToken) =>{
+    headers.access = accessToken
+    headers.refresh = refreshToken
+    headers.accessTimeStamp = new Date().getTime()
+}
+
+export const getToken = async _=>{
+    if(headers.accessTimeStamp === null) return false
+    if(new Date().getTime()-headers.accessTimeStamp < 1000*60*5) return headers.access
+    const options = {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({refresh:headers.refresh})
+    }
+    return fetch("http://34.68.66.109/api/token/refresh/",options)
+        .then(response=>response.json())
+        .then(r=>{console.log(r); return r})
+        .then(r=>r.access)
+}
diff --git a/frontend/src/Controllers/LoginController.js b/frontend/src/Controllers/LoginController.js
@@ -4,7 +4,7 @@ export function obtainToken(username_in, password_in){
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ username:username_in,password:password_in})
     }
-    return fetch("http://34.122.205.8/api/token/obtain/",options)
+    return fetch("http://34.68.66.109/api/token/obtain/",options)
         .then(response=>response.json())
         .then(r=>{console.log(r); return r})
 }
@@ -14,7 +14,7 @@ export function refreshToken(refresh_token){
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({refresh:refresh_token})
     }
-    return fetch("http://34.122.205.8/api/token/refresh/",options)
+    return fetch("http://34.68.66.109/api/token/refresh/",options)
         .then(response=>response.json())
         .then(r=>{console.log(r); return r})
 }
@@ -25,7 +25,7 @@ export function postResetPassword(email){
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ email: email})
     }
-    return fetch("http://34.122.205.8/api/password/reset/",options)
+    return fetch("http://34.68.66.109/api/password/reset/",options)
         .then(response=>response.json())
         .then(r=>{console.log(r); return r})
 }
@@ -35,7 +35,7 @@ export function postResetPasswordConfirmation(newPassword,token){
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ password: newPassword, token: token})
     }
-    return fetch("http://34.122.205.8/api/password/reset/confirm/",options)
+    return fetch("http://34.68.66.109/api/password/reset/confirm/",options)
         .then(response=>response.json())
         .then(r=>{console.log(r); return r})
 }
diff --git a/frontend/src/Controllers/SignUpController.js b/frontend/src/Controllers/SignUpController.js
@@ -7,9 +7,15 @@ const SignUpFunction = values =>{
         headers: { 'Accept': 'application/json','Content-Type': 'application/json'},
         body: JSON.stringify(values)
     }
-    return fetch("http://34.122.205.8/api/user/create/",options)
+    return fetch("http://34.68.66.109/api/user/create/",options)
         .then(response=>response.json())
-            .then(r=>{console.log(r); return r})
+            .then(r=>{
+                if(Array.isArray(r.username))
+                    throw new Error('Something went wrong');
+                    console.log(r);
+                    return r
+            })
+
 }
 
 export default  SignUpFunction
diff --git a/frontend/src/Views/Home/Home.js b/frontend/src/Views/Home/Home.js
@@ -10,6 +10,7 @@ import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos';
 import ArrowBackIosIcon from '@mui/icons-material/ArrowBackIos';
 import {getSampleEvents} from "../../Controllers/SampleEventController";
 import EventInfoCard from "./EventCard";
+import {getToken} from "../../Controllers/AuthInfo";
 function Homepage() {
     const [sports, setSports] = useState([{}])
     const [events, setEvents] = useState([{}])

diff --git a/frontend/src/Views/Login/Login.js b/frontend/src/Views/Login/Login.js
@@ -1,12 +1,11 @@
 import * as React from "react";
 import Button from "@mui/material/Button";
-import {Grid, Paper, TextField, Typography, Box, SvgIcon} from "@mui/material";
+import {Grid, Paper, TextField, Typography, Box} from "@mui/material";
 import {Link, useNavigate} from 'react-router-dom'
-import {Icon} from '@mui/material';
-import Joi from 'joi'
 import {obtainToken} from "../../Controllers/LoginController";
 import {useState} from "react";
 import {Alert} from "@mui/lab";
+import {setHeaders, getToken} from "../../Controllers/AuthInfo";
 
 const initialState = {
     username: {
@@ -51,6 +50,7 @@ export default function LoginPage(props){
                      setState(newState)
                  }
                  else{
+                     setHeaders(r.refresh, r.access)
                      navigate("/")
                  }
              })

diff --git a/frontend/src/Views/Shared/Layout.js b/frontend/src/Views/Shared/Layout.js
@@ -2,6 +2,7 @@ import React from 'react';
 import {Outlet} from 'react-router-dom'
 import Header from './Header'
 import {createTheme, ThemeProvider} from "@mui/material/styles";
+import { SnackbarProvider} from 'notistack';
 
 
 
@@ -11,11 +12,12 @@ const Layout = () => {
     return (
         <React.Fragment>
             <ThemeProvider theme={theme}>
-
-                <div>
-                    <Header loggedIn={false}/>
-                    <Outlet />
-                </div>
+                <SnackbarProvider maxSnack={3}>
+                    <div>
+                        <Header loggedIn={false}/>
+                        <Outlet />
+                    </div>
+                </SnackbarProvider>
             </ThemeProvider>
         </React.Fragment>
     )

diff --git a/frontend/src/Views/Signup/Index.js b/frontend/src/Views/Signup/Index.js
@@ -11,6 +11,7 @@ import Joi from 'joi'
 import {useNavigate} from 'react-router-dom'
 import image from '../../logos/reb und(400 x 100 px).png'
 import SignUpFunction from "../../Controllers/SignUpController";
+import {useSnackbar} from "notistack";
 
 
 const useStyles = makeStyles(theme => createStyles({
@@ -128,6 +129,8 @@ export default function SignUp() {
     const classes = useStyles()
     const navigate = useNavigate()
     const [state, setState] = useState(initialState)
+    const { enqueueSnackbar } = useSnackbar();
+
 
     const getValue = state => ({
         username: state.username.value,
@@ -168,11 +171,13 @@ export default function SignUp() {
         const result = schema.validate(value, {abortEarly: false})
         if(result.error)return
         SignUpFunction(value).then(_=>{
-            navigate("/profile/"+value.username)
-            }
-        )
-
-
+                navigate("/profile/"+value.username)
+                enqueueSnackbar("Your account is successfully created.", {variant: "success"})
+            })
+            .catch(e=>{
+                enqueueSnackbar("An error occured in the server.", {variant: "error"})
+                console.log(e)
+            })
     }
 
     return (