Skip to content
Open

login #252

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# coding-project-template
# fullstack_developer_capstone
25 changes: 22 additions & 3 deletions server/database/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,38 @@ app.get('/fetchReviews/dealer/:id', async (req, res) => {
}
});

// Express route to fetch all dealerships
// Express route to fetch all dealerships
app.get('/fetchDealers', async (req, res) => {
//Write your code here
try {
const documents = await Dealerships.find();
res.json(documents);
} catch (error) {
res.status(500).json({ error: 'Error fetching dealerships' });
}
});


// Express route to fetch Dealers by a particular state

app.get('/fetchDealers/:state', async (req, res) => {
//Write your code here
try {
const documents = await Dealerships.find({ state: req.params.state });
res.json(documents);
} catch (error) {
res.status(500).json({ error: 'Error fetching dealerships by state' });
}
});


// Express route to fetch dealer by a particular id
app.get('/fetchDealer/:id', async (req, res) => {
//Write your code here
try {
const document = await Dealerships.findOne({ id: req.params.id });
res.json(document);
} catch (error) {
res.status(500).json({ error: 'Error fetching dealership by id' });
}
});

//Express route to insert review
Expand Down
12 changes: 5 additions & 7 deletions server/djangoapp/urls.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
# 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 for login
# path(route='login', view=views.login_user, name='login'),

path(route='login', view=views.login_user, name='login'),
path('logout/', views.logout_request, name='logout'),
path('registration/', views.registration, name='registration'),
# path for dealer reviews view

# path for add a review view
Expand Down
55 changes: 44 additions & 11 deletions server/djangoapp/views.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# 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
Expand All @@ -39,12 +39,45 @@ 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) # Terminate user session
data = {"userName":""} # Return empty username
return JsonResponse(data)
# ...

# Create a `registration` view to handle sign up request
# @csrf_exempt
# def registration(request):
@csrf_exempt
def registration(request):
context = {}

# Load JSON data from the request body
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
Expand Down
16 changes: 12 additions & 4 deletions server/djangoproj/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True

ALLOWED_HOSTS = []
CSRF_TRUSTED_ORIGINS = []
ALLOWED_HOSTS=['localhost','https://omerisler031-8000.theianext-0-labs-prod-misc-tools-us-east-0.proxy.cognitiveclass.ai']
CSRF_TRUSTED_ORIGINS=['https://omerisler031-8000.theianext-0-labs-prod-misc-tools-us-east-0.proxy.cognitiveclass.ai']

REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': [],
Expand Down Expand Up @@ -61,7 +61,11 @@
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'DIRS': [
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': {
'context_processors': [
Expand Down Expand Up @@ -134,5 +138,9 @@

DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

STATICFILES_DIRS = []
STATICFILES_DIRS = [
os.path.join(BASE_DIR, 'frontend/static'),
os.path.join(BASE_DIR, 'frontend/build'),
os.path.join(BASE_DIR, 'frontend/build/static'),
]

4 changes: 4 additions & 0 deletions server/djangoproj/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,8 @@
path('admin/', admin.site.urls),
path('djangoapp/', include('djangoapp.urls')),
path('', TemplateView.as_view(template_name="Home.html")),
path('about/', TemplateView.as_view(template_name="About.html")),
path('contact/', TemplateView.as_view(template_name="Contact.html")),
path('login/', TemplateView.as_view(template_name="index.html")),
path('register/', TemplateView.as_view(template_name="index.html")),
] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
30 changes: 27 additions & 3 deletions server/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions server/frontend/src/App.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import LoginPanel from "./components/Login/Login"
import { Routes, Route } from "react-router-dom";
import Register from "./components/Register/Register";

function App() {
return (
<Routes>
<Route path="/login" element={<LoginPanel />} />
<Route path="/register" element={<Register />} />
</Routes>
);
}
Expand Down
101 changes: 101 additions & 0 deletions server/frontend/src/components/Register/Register.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
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 = () => {
// State variables for form inputs
const [userName, setUserName] = useState("");
const [password, setPassword] = useState("");
const [email, setEmail] = useState("");
const [firstName, setFirstName] = useState("");
const [lastName, setlastName] = useState("");

// Redirect to home
const gohome = ()=> {
window.location.href = window.location.origin;
}

// Handle form submission
const register = async (e) => {
e.preventDefault();

let register_url = window.location.origin+"/djangoapp/register";

// Send POST request to register endpoint
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) {
// Save username in session and reload home
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;
6 changes: 4 additions & 2 deletions server/frontend/static/About.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<html>
<head>
<!-- Link the style sheet here -->
<link rel="stylesheet" href="/static/style.css">
<link rel="stylesheet" href="/static/bootstrap.min.css">
</head>
<div>
<nav class="navbar navbar-expand-lg navbar-light" style="background-color:darkturquoise; height: 1in;">
Expand All @@ -27,7 +28,8 @@ <h2 style="padding-right: 5%;">Dealerships</h2>

<div class="card" style="width: 80%;margin: auto; margin-top:5%;">
<div class="banner" name="about-header">
<!-- Insert header information here -->
<h1>About Us</h1>
Welcome to Best Cars dealership, home to the best cars in North America. We deal in selling domestic and imported cars at reasonable prices.
</div>
<div style="display: flex;flex-direction: row; margin:auto">
<div class="card" style="width: 30%;">
Expand Down
Loading