diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000..78e5623149 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,47 @@ +name: 'Lint Code' +on: + push: + branches: [master, main] + pull_request: + branches: [master, main] +jobs: + lint_python: + name: Lint Python Files + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: 3.12 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install flake8 + - name: Print working directory + run: pwd + - name: Run Linter + run: | + pwd + # This command finds all Python files recursively and runs flake8 on them + find . -name "*.py" -exec flake8 {} + + echo "Linted all the python files successfully" + lint_js: + name: Lint JavaScript Files + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + - name: Install Node.js + uses: actions/setup-node@v3 + with: + node-version: 14 + - name: Install JSHint + run: npm install jshint --global + - name: Run Linter + run: | + # This command finds all JavaScript files recursively and runs JSHint on them + find ./server/database -name "*.js" -exec jshint {} + + echo "Linted all the js files successfully" diff --git a/server/database/app.js b/server/database/app.js index 00f52b2008..7c8954e5bb 100644 --- a/server/database/app.js +++ b/server/database/app.js @@ -1,39 +1,37 @@ +/* eslint-env es6 */ + const express = require('express'); const mongoose = require('mongoose'); const fs = require('fs'); -const cors = require('cors') -const app = express() +const cors = require('cors'); +const app = express(); const port = 3030; -app.use(cors()) +app.use(cors()); app.use(require('body-parser').urlencoded({ extended: false })); const reviews_data = JSON.parse(fs.readFileSync("reviews.json", 'utf8')); const dealerships_data = JSON.parse(fs.readFileSync("dealerships.json", 'utf8')); -mongoose.connect("mongodb://mongo_db:27017/",{'dbName':'dealershipsDB'}); - +mongoose.connect("mongodb://mongo_db:27017/", { dbName: 'dealershipsDB' }); const Reviews = require('./review'); - const Dealerships = require('./dealership'); try { - Reviews.deleteMany({}).then(()=>{ - Reviews.insertMany(reviews_data['reviews']); + Reviews.deleteMany({}).then(() => { + Reviews.insertMany(reviews_data.reviews); }); - Dealerships.deleteMany({}).then(()=>{ - Dealerships.insertMany(dealerships_data['dealerships']); + Dealerships.deleteMany({}).then(() => { + Dealerships.insertMany(dealerships_data.dealerships); }); - } catch (error) { - res.status(500).json({ error: 'Error fetching documents' }); + console.error(error); // You can't use res here without a route context } - // Express route to home app.get('/', async (req, res) => { - res.send("Welcome to the Mongoose API") + res.send("Welcome to the Mongoose API"); }); // Express route to fetch all reviews @@ -49,7 +47,7 @@ app.get('/fetchReviews', async (req, res) => { // Express route to fetch reviews by a particular dealer app.get('/fetchReviews/dealer/:id', async (req, res) => { try { - const documents = await Reviews.find({dealership: req.params.id}); + const documents = await Reviews.find({ dealership: req.params.id }); res.json(documents); } catch (error) { res.status(500).json({ error: 'Error fetching documents' }); @@ -58,42 +56,57 @@ app.get('/fetchReviews/dealer/:id', async (req, res) => { // 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 documents' }); + } }); // 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 documents' }); + } }); // Express route to fetch dealer by a particular id app.get('/fetchDealer/:id', async (req, res) => { -//Write your code here + try { + const documents = await Dealerships.find({ id: req.params.id }); + res.json(documents); + } catch (error) { + res.status(500).json({ error: 'Error fetching documents' }); + } }); -//Express route to insert review +// Express route to insert review app.post('/insert_review', express.raw({ type: '*/*' }), async (req, res) => { - data = JSON.parse(req.body); - const documents = await Reviews.find().sort( { id: -1 } ) - let new_id = documents[0]['id']+1 + const data = JSON.parse(req.body); + const documents = await Reviews.find().sort({ id: -1 }); + let new_id = documents[0].id + 1; const review = new Reviews({ - "id": new_id, - "name": data['name'], - "dealership": data['dealership'], - "review": data['review'], - "purchase": data['purchase'], - "purchase_date": data['purchase_date'], - "car_make": data['car_make'], - "car_model": data['car_model'], - "car_year": data['car_year'], - }); + id: new_id, + name: data.name, + dealership: data.dealership, + review: data.review, + purchase: data.purchase, + purchase_date: data.purchase_date, + car_make: data.car_make, + car_model: data.car_model, + car_year: data.car_year, + }); try { const savedReview = await review.save(); res.json(savedReview); } catch (error) { - console.log(error); + console.error(error); res.status(500).json({ error: 'Error inserting review' }); } }); diff --git a/server/djangoapp/.env b/server/djangoapp/.env index 01822e542a..e02e4f7304 100644 --- a/server/djangoapp/.env +++ b/server/djangoapp/.env @@ -1,2 +1,2 @@ -backend_url =your backend url -sentiment_analyzer_url=your code engine deployment url +backend_url =https://eminyeni-3030.theiadockernext-0-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai +sentiment_analyzer_url=https://sentianalyzer.1ucbiy71o5ho.us-south.codeengine.appdomain.cloud/ diff --git a/server/djangoapp/__init__.py b/server/djangoapp/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/server/djangoapp/admin.py b/server/djangoapp/admin.py index 433657fc64..6218f25b0e 100644 --- a/server/djangoapp/admin.py +++ b/server/djangoapp/admin.py @@ -1,8 +1,9 @@ -# from django.contrib import admin -# from .models import related models +from django.contrib import admin +from .models import CarMake, CarModel - -# Register your models here. +# Registering models with their respective admins +admin.site.register(CarMake) +admin.site.register(CarModel) # CarModelInline class diff --git a/server/djangoapp/models.py b/server/djangoapp/models.py index eb101a68c8..59019a2bba 100644 --- a/server/djangoapp/models.py +++ b/server/djangoapp/models.py @@ -1,25 +1,36 @@ # Uncomment the following imports before adding the Model code -# from django.db import models -# from django.utils.timezone import now -# from django.core.validators import MaxValueValidator, MinValueValidator +from django.db import models +from django.core.validators import MaxValueValidator, MinValueValidator # Create your models here. -# Create a Car Make model `class CarMake(models.Model)`: -# - Name -# - Description -# - Any other fields you would like to include in car make model -# - __str__ method to print a car make object - - -# Create a Car Model model `class CarModel(models.Model):`: -# - Many-To-One relationship to Car Make model (One Car Make has many -# Car Models, using ForeignKey field) -# - Name -# - Type (CharField with a choices argument to provide limited choices -# such as Sedan, SUV, WAGON, etc.) -# - Year (IntegerField) with min value 2015 and max value 2023 -# - Any other fields you would like to include in car model -# - __str__ method to print a car make object +class CarMake(models.Model): + name = models.CharField(max_length=100) + description = models.TextField() + + def __str__(self): + return self.name + + +class CarModel(models.Model): + car_make = models.ForeignKey(CarMake, on_delete=models.CASCADE) + name = models.CharField(max_length=100) + CAR_TYPES = [ + ('SEDAN', 'Sedan'), + ('SUV', 'SUV'), + ('WAGON', 'Wagon'), + # Add more choices as required + ] + type = models.CharField(max_length=10, choices=CAR_TYPES, default='SUV') + year = models.IntegerField( + default=2023, + validators=[ + MaxValueValidator(2023), + MinValueValidator(2015) + ] + ) + + def __str__(self): + return self.name # Return the name as the string representation diff --git a/server/djangoapp/populate.py b/server/djangoapp/populate.py index 1927e09e18..2fffc18e42 100644 --- a/server/djangoapp/populate.py +++ b/server/djangoapp/populate.py @@ -1,2 +1,123 @@ +from .models import CarMake, CarModel + + def initiate(): - print("Populate not implemented. Add data manually") + car_make_data = [ + {"name": "NISSAN", "description": "Great cars. Japanese technology"}, + {"name": "Mercedes", "description": "Great cars. German technology"}, + {"name": "Audi", "description": "Great cars. German technology"}, + {"name": "Kia", "description": "Great cars. Korean technology"}, + {"name": "Toyota", "description": "Great cars. Japanese technology"}, + ] + + car_make_instances = [] + for data in car_make_data: + car_make_instances.append( + CarMake.objects.create( + name=data['name'], + description=data['description'] + ) + ) + + # Create CarModel instances with the corresponding CarMake instances + car_model_data = [ + { + "name": "Pathfinder", + "type": "SUV", + "year": 2023, + "car_make": car_make_instances[0] + }, + { + "name": "Qashqai", + "type": "SUV", + "year": 2023, + "car_make": car_make_instances[0] + }, + { + "name": "XTRAIL", + "type": "SUV", + "year": 2023, + "car_make": car_make_instances[0] + }, + { + "name": "A-Class", + "type": "SUV", + "year": 2023, + "car_make": car_make_instances[1] + }, + { + "name": "C-Class", + "type": "SUV", + "year": 2023, + "car_make": car_make_instances[1] + }, + { + "name": "E-Class", + "type": "SUV", + "year": 2023, + "car_make": car_make_instances[1] + }, + { + "name": "A4", + "type": "SUV", + "year": 2023, + "car_make": car_make_instances[2] + }, + { + "name": "A5", + "type": "SUV", + "year": 2023, + "car_make": car_make_instances[2] + }, + { + "name": "A6", + "type": "SUV", + "year": 2023, + "car_make": car_make_instances[2] + }, + { + "name": "Sorrento", + "type": "SUV", + "year": 2023, + "car_make": car_make_instances[3] + }, + { + "name": "Carnival", + "type": "SUV", + "year": 2023, + "car_make": car_make_instances[3] + }, + { + "name": "Cerato", + "type": "Sedan", + "year": 2023, + "car_make": car_make_instances[3] + }, + { + "name": "Corolla", + "type": "Sedan", + "year": 2023, + "car_make": car_make_instances[4] + }, + { + "name": "Camry", + "type": "Sedan", + "year": 2023, + "car_make": car_make_instances[4] + }, + { + "name": "Kluger", + "type": "SUV", + "year": 2023, + "car_make": car_make_instances[4] + }, + # Add more CarModel instances as needed + ] + + for data in car_model_data: + CarModel.objects.create( + name=data['name'], + car_make=data['car_make'], + type=data['type'], + year=data['year'] + ) diff --git a/server/djangoapp/restapis.py b/server/djangoapp/restapis.py index 90709d9e3b..5d3560e937 100644 --- a/server/djangoapp/restapis.py +++ b/server/djangoapp/restapis.py @@ -1,5 +1,5 @@ # Uncomment the imports below before you add the function code -# import requests +import requests import os from dotenv import load_dotenv @@ -11,12 +11,41 @@ 'sentiment_analyzer_url', default="http://localhost:5050/") -# def get_request(endpoint, **kwargs): -# Add code for get requests to back end -# def analyze_review_sentiments(text): -# request_url = sentiment_analyzer_url+"analyze/"+text -# Add code for retrieving sentiments +def get_request(endpoint, **kwargs): + params = "" + if kwargs: + for key, value in kwargs.items(): + params += f"{key}={value}&" -# def post_review(data_dict): -# Add code for posting review + request_url = f"{backend_url}{endpoint}?{params}" + + print(f"GET from {request_url}") + try: + # Call get method of requests library with URL and parameters + response = requests.get(request_url) + return response.json() + except Exception as e: + # If any error occurs + print(f"An error occurred: {e}") + + +def analyze_review_sentiments(text): + request_url = f"{sentiment_analyzer_url}analyze/{text}" + try: + # Call get method of requests library with URL and parameters + response = requests.get(request_url) + return response.json() + except Exception as err: + print(f"Unexpected {err=}, {type(err)=}") + print("Network exception occurred") + + +def post_review(data_dict): + request_url = f"{backend_url}/insert_review" + try: + response = requests.post(request_url, json=data_dict) + print(response.json()) + return response.json() + except Exception as e: + print(f"An error occurred: {e}") diff --git a/server/djangoapp/urls.py b/server/djangoapp/urls.py index 0edc274f90..02ce699f3e 100644 --- a/server/djangoapp/urls.py +++ b/server/djangoapp/urls.py @@ -1,18 +1,30 @@ -# Uncomment the imports before you add the code -# from django.urls import path -from django.conf.urls.static import static -from django.conf import settings -# from . import views +from django.urls import path +from . import views -app_name = 'djangoapp' urlpatterns = [ - # # path for registration - - # path for login - # path(route='login', view=views.login_user, name='login'), - - # path for dealer reviews view - - # path for add a review view - -] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + path('login/', views.login_user, name='login'), + path('logout/', views.logout_request, name='logout'), + path('register/', views.registration, name='register'), + path('cars/', views.get_cars, name='get_cars'), + path('get_dealers/', view=views.get_dealerships, name='get_dealers'), + path( + 'get_dealers//', + views.get_dealerships, + name='get_dealers_by_state' + ), + path( + 'dealer//', + views.get_dealer_details, + name='get_dealer_details' + ), + path( + 'dealer//reviews/', + views.get_dealer_reviews, + name='get_dealer_reviews' + ), + path( + 'dealer//postreview/', + views.add_review, + name='add_review' + ), +] diff --git a/server/djangoapp/views.py b/server/djangoapp/views.py index b16409f419..a1e11d25a5 100644 --- a/server/djangoapp/views.py +++ b/server/djangoapp/views.py @@ -1,27 +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.contrib.auth import login, authenticate, logout 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 +from django.contrib.auth.models import User # Import User model +from .models import CarMake, CarModel +from .restapis import get_request, analyze_review_sentiments, post_review # Get an instance of a logger logger = logging.getLogger(__name__) - # Create your views here. + # Create a `login_request` view to handle sign in request @csrf_exempt def login_user(request): @@ -29,37 +21,126 @@ def login_user(request): data = json.loads(request.body) username = data['userName'] password = data['password'] - # Try to check if provide credential can be authenticated + + # Try to check if provided credentials can be authenticated user = authenticate(username=username, password=password) data = {"userName": username} + if user is not None: # If user is valid, call login method to login current user login(request, user) data = {"userName": username, "status": "Authenticated"} + 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): -# ... - -# # Update the `get_dealerships` view to render the index page with -# a list of dealerships -# def get_dealerships(request): -# ... - -# Create a `get_dealer_reviews` view to render the reviews of a dealer -# def get_dealer_reviews(request,dealer_id): -# ... - -# Create a `get_dealer_details` view to render the dealer details -# def get_dealer_details(request, dealer_id): -# ... - -# Create a `add_review` view to submit a review -# def add_review(request): -# ... +@csrf_exempt +def registration(request): + 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 + try: + # Check if user already exists + User.objects.get(username=username) + username_exist = True + except User.DoesNotExist: + # If not, simply log this is a new user + logger.debug(f"{username} is a new user") + + # 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) + + +def get_cars(request): + count = CarMake.objects.count() + print(count) + if count == 0: + initiate() + + car_models = CarModel.objects.select_related('car_make') + cars = [] + for car_model in car_models: + cars.append( + {"CarModel": car_model.name, "CarMake": car_model.car_make.name} + ) + + return JsonResponse({"CarModels": cars}) + + +# Update the `get_dealerships` render list of dealerships +def get_dealerships(request, state="All"): + if state == "All": + endpoint = "/fetchDealers" + else: + endpoint = f"/fetchDealers/{state}" + + dealerships = get_request(endpoint) + return JsonResponse({"status": 200, "dealers": dealerships}) + + +def get_dealer_details(request, dealer_id): + if dealer_id: + endpoint = f"/fetchDealer/{dealer_id}" + dealership = get_request(endpoint) + return JsonResponse({"status": 200, "dealer": dealership}) + else: + return JsonResponse({"status": 400, "message": "Bad Request"}) + + +def get_dealer_reviews(request, dealer_id): + # If dealer ID has been provided + if dealer_id: + endpoint = f"/fetchReviews/dealer/{dealer_id}" + reviews = get_request(endpoint) + + for review_detail in reviews: + review_detail['sentiment'] = analyze_review_sentiments( + review_detail['review'] + )['sentiment'] + + return JsonResponse({"status": 200, "reviews": reviews}) + else: + return JsonResponse({"status": 400, "message": "Bad Request"}) + + +def add_review(request): + if not request.user.is_anonymous: + data = json.loads(request.body) + try: + post_review(data) + return JsonResponse({"status": 200}) + except Exception as e: + print(f"An error occurred: {e}") + return JsonResponse( + {"status": 401, "message": "Error in posting review"} + ) + else: + return JsonResponse({"status": 403, "message": "Unauthorized"}) diff --git a/server/djangoproj/settings.py b/server/djangoproj/settings.py index e0b1092a5c..e772eab6fc 100644 --- a/server/djangoproj/settings.py +++ b/server/djangoproj/settings.py @@ -13,23 +13,30 @@ import os from pathlib import Path - # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent - # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY =\ +SECRET_KEY = ( 'django-insecure-ccow$tz_=9%dxu4(0%^(z%nx32#s@(zt9$ih@)5l54yny)wm-0' +) # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] -CSRF_TRUSTED_ORIGINS = [] +ALLOWED_HOSTS = [ + 'localhost', + 'eminyeni-8000.theiadockernext-0-labs-prod-' + 'theiak8s-4-tor01.proxy.cognitiveclass.ai', +] + +CSRF_TRUSTED_ORIGINS = [ + 'https://eminyeni-8000.theiadockernext-0-labs-prod-' + 'theiak8s-4-tor01.proxy.cognitiveclass.ai', +] REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': [], @@ -61,7 +68,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': [ @@ -76,7 +87,6 @@ WSGI_APPLICATION = 'djangoproj.wsgi.application' - # Database # https://docs.djangoproject.com/en/3.2/ref/settings/#databases @@ -89,24 +99,23 @@ AUTH_PASSWORD_VALIDATORS = [ { - 'NAME': - 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + 'NAME': 'django.contrib.auth.password_validation.' + 'UserAttributeSimilarityValidator', }, { - 'NAME': - 'django.contrib.auth.password_validation.MinimumLengthValidator', + 'NAME': 'django.contrib.auth.password_validation.' + 'MinimumLengthValidator', }, { - 'NAME': - 'django.contrib.auth.password_validation.CommonPasswordValidator', + 'NAME': 'django.contrib.auth.password_validation.' + 'CommonPasswordValidator', }, { - 'NAME': - 'django.contrib.auth.password_validation.NumericPasswordValidator', + 'NAME': 'django.contrib.auth.password_validation.' + 'NumericPasswordValidator', }, ] - # Internationalization # https://docs.djangoproject.com/en/3.2/topics/i18n/ @@ -120,7 +129,6 @@ USE_TZ = True - # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.2/howto/static-files/ @@ -134,5 +142,8 @@ 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'), +] diff --git a/server/djangoproj/urls.py b/server/djangoproj/urls.py index 6808da9141..9672c5982b 100644 --- a/server/djangoproj/urls.py +++ b/server/djangoproj/urls.py @@ -23,4 +23,21 @@ 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('', TemplateView.as_view(template_name="index.html")), +] + +urlpatterns += [ + path('login/', TemplateView.as_view(template_name="index.html")), + path('register/', TemplateView.as_view(template_name="index.html")), + path('dealers/', TemplateView.as_view(template_name="index.html")), + path( + 'dealer/', + TemplateView.as_view(template_name="index.html") + ), + path( + 'postreview/', + TemplateView.as_view(template_name="index.html") + ), ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) diff --git a/server/entrypoint.sh b/server/entrypoint.sh new file mode 100644 index 0000000000..b24c7e80a4 --- /dev/null +++ b/server/entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# Make migrations and migrate the database. +echo "Making migrations and migrating the database. " +python manage.py makemigrations --noinput +python manage.py migrate --noinput +python manage.py collectstatic --noinput +exec "$@" \ No newline at end of file diff --git a/server/frontend/package-lock.json b/server/frontend/package-lock.json index 0797425307..bdb21fad35 100644 --- a/server/frontend/package-lock.json +++ b/server/frontend/package-lock.json @@ -16,6 +16,9 @@ "react-router-dom": "^6.19.0", "react-scripts": "5.0.1", "web-vitals": "^2.1.4" + }, + "devDependencies": { + "@babel/plugin-proposal-private-property-in-object": "^7.21.11" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -646,9 +649,18 @@ } }, "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.21.0-placeholder-for-preset-env.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", - "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", + "version": "7.21.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz", + "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-create-class-features-plugin": "^7.21.0", + "@babel/helper-plugin-utils": "^7.20.2", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + }, "engines": { "node": ">=6.9.0" }, @@ -1891,6 +1903,18 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/preset-env/node_modules/@babel/plugin-proposal-private-property-in-object": { + "version": "7.21.0-placeholder-for-preset-env.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", + "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/preset-env/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", diff --git a/server/frontend/src/App.js b/server/frontend/src/App.js index aceac6974d..0569c84790 100644 --- a/server/frontend/src/App.js +++ b/server/frontend/src/App.js @@ -1,10 +1,19 @@ import LoginPanel from "./components/Login/Login" -import { Routes, Route } from "react-router-dom"; +import RegisterContainer from "./components/Register/Register" +import { Routes, Route } from "react-router-dom" +import Dealers from "./components/Dealers/Dealers" +import Dealer from "./components/Dealers/Dealer" +import PostReview from "./components/Dealers/PostReview" function App() { return ( } /> + } /> + } /> + } /> + } /> + ); } diff --git a/server/frontend/src/components/Dealers/Dealers.jsx b/server/frontend/src/components/Dealers/Dealers.jsx index db3410680c..7845ded024 100644 --- a/server/frontend/src/components/Dealers/Dealers.jsx +++ b/server/frontend/src/components/Dealers/Dealers.jsx @@ -88,7 +88,7 @@ return( } ))} - ; + ) } diff --git a/server/frontend/src/components/Dealers/PostReview.jsx b/server/frontend/src/components/Dealers/PostReview.jsx index 5ef16de3df..17910192a0 100644 --- a/server/frontend/src/components/Dealers/PostReview.jsx +++ b/server/frontend/src/components/Dealers/PostReview.jsx @@ -4,120 +4,159 @@ import "./Dealers.css"; import "../assets/style.css"; import Header from '../Header/Header'; - const PostReview = () => { const [dealer, setDealer] = useState({}); const [review, setReview] = useState(""); - const [model, setModel] = useState(); + const [model, setModel] = useState(""); const [year, setYear] = useState(""); const [date, setDate] = useState(""); const [carmodels, setCarmodels] = useState([]); + const [loading, setLoading] = useState(false); + const [error, setError] = useState(null); + + const params = useParams(); + const id = params.id; let curr_url = window.location.href; - let root_url = curr_url.substring(0,curr_url.indexOf("postreview")); - let params = useParams(); - let id =params.id; - let dealer_url = root_url+`djangoapp/dealer/${id}`; - let review_url = root_url+`djangoapp/add_review`; - let carmodels_url = root_url+`djangoapp/get_cars`; - - const postreview = async ()=>{ - let name = sessionStorage.getItem("firstname")+" "+sessionStorage.getItem("lastname"); - //If the first and second name are stores as null, use the username - if(name.includes("null")) { + let root_url = curr_url.substring(0, curr_url.indexOf("postreview")); + let dealer_url = `${root_url}djangoapp/dealer/${id}`; + let review_url = `${root_url}djangoapp/add_review`; + let carmodels_url = `${root_url}djangoapp/get_cars`; + + const postReview = async () => { + setLoading(true); + setError(null); + + let name = sessionStorage.getItem("firstname") + " " + sessionStorage.getItem("lastname"); + if (name.includes("null")) { name = sessionStorage.getItem("username"); } - if(!model || review === "" || date === "" || year === "" || model === "") { - alert("All details are mandatory") + + if (!model || review === "" || date === "" || year === "") { + setError("All details are mandatory"); + setLoading(false); return; } - let model_split = model.split(" "); - let make_chosen = model_split[0]; - let model_chosen = model_split[1]; + let modelSplit = model.split(" "); + let makeChosen = modelSplit[0]; + let modelChosen = modelSplit.length > 1 ? modelSplit[1] : ""; - let jsoninput = JSON.stringify({ + let jsonInput = JSON.stringify({ "name": name, "dealership": id, "review": review, "purchase": true, "purchase_date": date, - "car_make": make_chosen, - "car_model": model_chosen, + "car_make": makeChosen, + "car_model": modelChosen, "car_year": year, }); - console.log(jsoninput); - const res = await fetch(review_url, { - method: "POST", - headers: { + try { + const response = await fetch(review_url, { + method: "POST", + headers: { "Content-Type": "application/json", - }, - body: jsoninput, - }); + }, + body: jsonInput, + }); - const json = await res.json(); - if (json.status === 200) { - window.location.href = window.location.origin+"/dealer/"+id; - } + if (!response.ok) { + throw new Error(`HTTP error! status: ${response.status}`); + } + const json = await response.json(); + if (json.status === 200) { + window.location.href = `${window.location.origin}/dealer/${id}`; + } else { + setError("Failed to post review"); + } + } catch (error) { + setError(error.message); + } finally { + setLoading(false); + } } - const get_dealer = async ()=>{ - const res = await fetch(dealer_url, { - method: "GET" - }); - const retobj = await res.json(); - - if(retobj.status === 200) { - let dealerobjs = Array.from(retobj.dealer) - if(dealerobjs.length > 0) - setDealer(dealerobjs[0]) + + const getDealer = async () => { + try { + const response = await fetch(dealer_url, { + method: "GET" + }); + + if (!response.ok) { + throw new Error(`HTTP error! status: ${response.status}`); + } + + const retObj = await response.json(); + + if (retObj.status === 200) { + let dealerObjs = Array.from(retObj.dealer) + if (dealerObjs.length > 0) { + setDealer(dealerObjs[0]) + } + } + } catch (error) { + setError(error.message); } } - const get_cars = async ()=>{ - const res = await fetch(carmodels_url, { - method: "GET" - }); - const retobj = await res.json(); - - let carmodelsarr = Array.from(retobj.CarModels) - setCarmodels(carmodelsarr) + const getCars = async () => { + try { + const response = await fetch(carmodels_url, { + method: "GET" + }); + + if (!response.ok) { + throw new Error(`HTTP error! status: ${response.status}`); + } + + const retObj = await response.json(); + + let carModelsArr = Array.from(retObj.CarModels) + setCarmodels(carModelsArr) + } catch (error) { + setError(error.message); + } } - useEffect(() => { - get_dealer(); - get_cars(); - },[]); + useEffect(() => { + getDealer(); + getCars(); + }, [id]); return (
-
-
-

{dealer.full_name}

- -
- Purchase Date setDate(e.target.value)}/> -
-
- Car Make - -
- -
- Car Year setYear(e.target.value)} max={2023} min={2015}/> -
+
+
+

{dealer.full_name}

+ +
+ Purchase Date setDate(e.target.value)} /> +
+
+ Car Make + +
-
- +
+ Car Year setYear(e.target.value)} max={2023} min={2015} /> +
+ +
+ + {error &&
{error}
} +
-
) } -export default PostReview +export default PostReview; diff --git a/server/frontend/src/components/Login/Login.jsx b/server/frontend/src/components/Login/Login.jsx index b1790e7f90..35c8a4eeb5 100644 --- a/server/frontend/src/components/Login/Login.jsx +++ b/server/frontend/src/components/Login/Login.jsx @@ -9,7 +9,7 @@ const Login = ({ onClose }) => { const [password, setPassword] = useState(""); const [open,setOpen] = useState(true) - let login_url = window.location.origin+"/djangoapp/login"; + let login_url = window.location.origin+"/djangoapp/login/"; const login = async (e) => { e.preventDefault(); diff --git a/server/frontend/src/components/Register/Register.jsx b/server/frontend/src/components/Register/Register.jsx new file mode 100644 index 0000000000..9f1a290327 --- /dev/null +++ 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( +
+ + +
+
+
+ Username + setUserName(e.target.value)}/> +
+
+ First Name + setFirstName(e.target.value)}/> +
+ +
+ Last Name + setlastName(e.target.value)}/> +
+ +
+ Email + setEmail(e.target.value)}/> +
+ +
+ password + setPassword(e.target.value)}/> +
+ +
+
+ +
+
+
+ ) +} + +export default Register; \ No newline at end of file diff --git a/server/frontend/static/About.html b/server/frontend/static/About.html index 484efd960f..5d3ec02a2a 100644 --- a/server/frontend/static/About.html +++ b/server/frontend/static/About.html @@ -1,6 +1,7 @@ - + +