Описание изменений

darisha666 · darisha666 · commit cc90ffaeb502 · 2024-10-02T09:26:01.000-04:00
diff --git a/server/djangoapp/urls.py b/server/djangoapp/urls.py
@@ -1,12 +1,16 @@
 # Uncomment the imports before you add the code
-# from django.urls import path
+from django.urls import path
 from django.conf.urls.static import static
 from django.conf import settings
-# from . import views
+from . import views
 
 app_name = 'djangoapp'
 urlpatterns = [
-    # # path for registration
+    path(route="register", view=views.registration, name="register"),
+    
+    path(route="login", view=views.login_user, name="login"),
+    path(route="logout", view=views.logout_request, name="logout"),
+    
 
     # path for login
     # path(route='login', view=views.login_user, name='login'),
diff --git a/server/djangoapp/views.py b/server/djangoapp/views.py
@@ -1,22 +1,23 @@
 # Uncomment the required imports before adding the code
 
-# from django.shortcuts import render
-# from django.http import HttpResponseRedirect, HttpResponse
-# from django.contrib.auth.models import User
-# from django.shortcuts import get_object_or_404, render, redirect
-# from django.contrib.auth import logout
-# from django.contrib import messages
-# from datetime import datetime
+from django.shortcuts import render
+from django.http import HttpResponseRedirect, HttpResponse
+from django.contrib.auth.models import User
+from django.shortcuts import get_object_or_404, render, redirect
+from django.contrib.auth import logout
+from django.contrib import messages
+from datetime import datetime
+
 
 from django.http import JsonResponse
 from django.contrib.auth import login, authenticate
 import logging
 import json
 from django.views.decorators.csrf import csrf_exempt
-# from .populate import initiate
+from .populate import initiate
 
 
-# Get an instance of a logger
+#Get an instance of a logger
 logger = logging.getLogger(__name__)
 
 
@@ -39,13 +40,43 @@ def login_user(request):
     return JsonResponse(data)
 
 # Create a `logout_request` view to handle sign out request
-# def logout_request(request):
-# ...
+def logout_request(request):
+    logout(request)
+    data = {"userName":""}
+    return JsonResponse(data)
 
 # Create a `registration` view to handle sign up request
-# @csrf_exempt
-# def registration(request):
-# ...
+@csrf_exempt
+def registration(request):
+    context = {}
+
+    data = json.loads(request.body)
+    username = data['userName']
+    password = data['password']
+    first_name = data['firstName']
+    last_name = data['lastName']
+    email = data['email']
+    username_exist = False
+    email_exist = False
+    try:
+        # Check if user already exists
+        User.objects.get(username=username)
+        username_exist = True
+    except:
+        # If not, simply log this is a new user
+        logger.debug("{} is new user".format(username))
+
+    # If it is a new user
+    if not username_exist:
+        # Create user in auth_user table
+        user = User.objects.create_user(username=username, first_name=first_name, last_name=last_name,password=password, email=email)
+        # Login the user and redirect to list page
+        login(request, user)
+        data = {"userName":username,"status":"Authenticated"}
+        return JsonResponse(data)
+    else :
+        data = {"userName":username,"error":"Already Registered"}
+        return JsonResponse(data)
 
 # # Update the `get_dealerships` view to render the index page with
 # a list of dealerships
diff --git a/server/djangoproj/settings.py b/server/djangoproj/settings.py
@@ -28,8 +28,8 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = [https://mikhailovska-8000.theianext-1-labs-prod-misc-tools-us-east-0.proxy.cognitiveclass.ai]
-CSRF_TRUSTED_ORIGINS = [https://mikhailovska-8000.theianext-1-labs-prod-misc-tools-us-east-0.proxy.cognitiveclass.ai]
+ALLOWED_HOSTS = ['localhost','https://mikhailovska-8000.theianext-1-labs-prod-misc-tools-us-east-0.proxy.cognitiveclass.ai']
+CSRF_TRUSTED_ORIGINS = ['https://mikhailovska-8000.theianext-1-labs-prod-misc-tools-us-east-0.proxy.cognitiveclass.ai']
 
 REST_FRAMEWORK = {
     'DEFAULT_AUTHENTICATION_CLASSES': [],
@@ -62,7 +62,9 @@
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [
-        os.path.join(BASE_DIR,'frontend/static')
+            os.path.join(BASE_DIR, 'frontend/static'),
+            os.path.join(BASE_DIR, 'frontend/build'),
+            os.path.join(BASE_DIR, 'frontend/build/static'), 
         ],
         'APP_DIRS': True,
         'OPTIONS': {
@@ -137,6 +139,8 @@
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 STATICFILES_DIRS = [
-    os.path.join(BASE_DIR,'frontend/static')
+    os.path.join(BASE_DIR, 'frontend/static'),
+    os.path.join(BASE_DIR, 'frontend/build'),
+    os.path.join(BASE_DIR, 'frontend/build/static'),
 ]
 
diff --git a/server/djangoproj/urls.py b/server/djangoproj/urls.py
@@ -19,7 +19,10 @@
 from django.conf.urls.static import static
 from django.conf import settings
 
-urlpatterns = [
+urlpatterns = [    
+    path('register/', TemplateView.as_view(template_name="index.html")),   
+    path('login/', TemplateView.as_view(template_name="index.html")),      
+    path('about/', TemplateView.as_view(template_name="About.html")),
     path('contact/', TemplateView.as_view(template_name="Contact.html")),
     path('admin/', admin.site.urls),
     path('djangoapp/', include('djangoapp.urls')),
diff --git a/server/frontend/package-lock.json b/server/frontend/package-lock.json
diff --git a/server/frontend/src/App.js b/server/frontend/src/App.js
@@ -1,10 +1,12 @@
 import LoginPanel from "./components/Login/Login"
+import RegisterPanel from "./components/Register/Register"
 import { Routes, Route } from "react-router-dom";
 
 function App() {
   return (
     <Routes>
       <Route path="/login" element={<LoginPanel />} />
+      <Route path="/register" element={<RegisterPanel />} />
     </Routes>
   );
 }
diff --git a/server/frontend/src/components/Register/Register.jsx b/server/frontend/src/components/Register/Register.jsx
@@ -0,0 +1,98 @@
+import React, { useState } from "react";
+import "./Register.css";
+import user_icon from "../assets/person.png"
+import email_icon from "../assets/email.png"
+import password_icon from "../assets/password.png"
+import close_icon from "../assets/close.png"
+
+const Register = () => {
+
+  const [userName, setUserName] = useState("");
+  const [password, setPassword] = useState("");
+  const [email, setEmail] = useState("");
+  const [firstName, setFirstName] = useState("");
+  const [lastName, setlastName] = useState("");
+
+
+  const gohome = ()=> {
+    window.location.href = window.location.origin;
+  }
+
+  const register = async (e) => {
+    e.preventDefault();
+
+    let register_url = window.location.origin+"/djangoapp/register";
+    
+    const res = await fetch(register_url, {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+            "userName": userName,
+            "password": password,
+            "firstName":firstName,
+            "lastName":lastName,
+            "email":email
+        }),
+    });
+
+    const json = await res.json();
+    if (json.status) {
+        sessionStorage.setItem('username', json.userName);
+        window.location.href = window.location.origin;
+    }
+    else if (json.error === "Already Registered") {
+      alert("The user with same username is already registered");
+      window.location.href = window.location.origin;
+    }
+};
+
+  return(
+    <div className="register_container" style={{width: "50%"}}>
+      <div className="header" style={{display: "flex",flexDirection: "row", justifyContent: "space-between"}}>
+          <span className="text" style={{flexGrow:"1"}}>SignUp</span> 
+          <div style={{display: "flex",flexDirection: "row", justifySelf: "end", alignSelf: "start" }}>
+          <a href="/" onClick={()=>{gohome()}} style={{justifyContent: "space-between", alignItems:"flex-end"}}>
+            <img style={{width:"1cm"}} src={close_icon} alt="X"/>
+          </a>
+          </div>
+          <hr/>
+        </div>
+
+        <form onSubmit={register}>
+        <div className="inputs">
+          <div className="input">
+            <img src={user_icon} className="img_icon" alt='Username'/>
+            <input type="text"  name="username" placeholder="Username" className="input_field" onChange={(e) => setUserName(e.target.value)}/>
+          </div>
+          <div>
+            <img src={user_icon} className="img_icon" alt='First Name'/>
+            <input type="text"  name="first_name" placeholder="First Name" className="input_field" onChange={(e) => setFirstName(e.target.value)}/>
+          </div>
+
+          <div>
+            <img src={user_icon} className="img_icon" alt='Last Name'/>
+            <input type="text"  name="last_name" placeholder="Last Name" className="input_field" onChange={(e) => setlastName(e.target.value)}/>
+          </div>
+
+          <div>
+            <img src={email_icon} className="img_icon" alt='Email'/>
+            <input type="email"  name="email" placeholder="email" className="input_field" onChange={(e) => setEmail(e.target.value)}/>
+          </div>
+
+          <div className="input">
+            <img src={password_icon} className="img_icon" alt='password'/>
+            <input name="psw" type="password"  placeholder="Password" className="input_field" onChange={(e) => setPassword(e.target.value)}/>
+          </div>
+
+        </div>
+        <div className="submit_panel">
+          <input className="submit" type="submit" value="Register"/>
+        </div>
+      </form>
+      </div>
+  )
+}
+
+export default Register;
diff --git a/server/frontend/static/Contact.html b/server/frontend/static/Contact.html
@@ -39,7 +39,7 @@ <h2 style="padding-right: 5%;">Dealerships</h2>
         </div>
         <div style="display: flex;flex-direction: row; margin:auto">
             <div class="card" style="width: 50%;">
-                <img class="card-img-top" src="/static/person3.png" alt="Card image">
+                <img class="card-img-top" src="/static/person3.jpeg" alt="Card image">
             </div>
 
             <div class="card" style="width: 50%; text-align: center; color:blue">
diff --git a/server/frontend/static/Home.html b/server/frontend/static/Home.html
@@ -7,7 +7,22 @@
 <script>
 
 const logout = async (e) => {
-//Include the code for logout here.
+  let logout_url = window.location.origin+"/djangoapp/logout";
+  const res = await fetch(logout_url, {
+    method: "GET",
+  });
+
+  const json = await res.json();
+  if (json) {
+    let username = sessionStorage.getItem('username');
+    sessionStorage.removeItem('username');
+    window.location.href = window.location.origin;
+    window.location.reload();
+    alert("Logging out "+username+"...")
+  }
+  else {
+    alert("The user could not be logged out.")
+  }
 };
 
 let checkSession = ()=>{
diff --git a/server/frontend/static/person3.jpeg b/server/frontend/static/person3.jpeg
