diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000..841a3456a2 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,51 @@ +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 {} + + jshint ./server/database --esversion 8 || true + echo "Linted all the js files successfully" diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000..5c5973974e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,25 @@ + FROM python:3.12.0-slim-bookworm + + ENV PYTHONBUFFERED 1 + ENV PYTHONWRITEBYTECODE 1 + + ENV APP=/app + + # Change the workdir. + WORKDIR $APP + + # Install the requirements + COPY requirements.txt $APP + + RUN pip3 install -r requirements.txt + + # Copy the rest of the files + COPY . $APP + + EXPOSE 8000 + + RUN chmod +x /app/entrypoint.sh + + ENTRYPOINT ["/bin/bash","/app/entrypoint.sh"] + + CMD ["gunicorn", "--bind", ":8000", "--workers", "3", "djangoproj.wsgi"] diff --git a/deployment.yaml b/deployment.yaml new file mode 100644 index 0000000000..50d18cd50a --- /dev/null +++ b/deployment.yaml @@ -0,0 +1,29 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + run: dealership + name: dealership +spec: + replicas: 1 + selector: + matchLabels: + run: dealership + strategy: + rollingUpdate: + maxSurge: 25% + maxUnavailable: 25% + type: RollingUpdate + template: + metadata: + labels: + run: dealership + spec: + containers: + - image: us.icr.io/sn-labs-cmaisy010822/dealership:latest + imagePullPolicy: Always + name: dealership + ports: + - containerPort: 8000 + protocol: TCP + restartPolicy: Always diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000000..863742d778 --- /dev/null +++ b/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 "$@" diff --git a/server/Dockerfile b/server/Dockerfile new file mode 100644 index 0000000000..6795963570 --- /dev/null +++ b/server/Dockerfile @@ -0,0 +1,25 @@ + FROM python:3.12.0-slim-bookworm + + ENV PYTHONBUFFERED 1 + ENV PYTHONWRITEBYTECODE 1 + + ENV APP=/app + + # Change the workdir. + WORKDIR $APP + + # Install the requirements + COPY requirements.txt $APP + + RUN pip3 install -r requirements.txt + + # Copy the rest of the files + COPY . $APP + + EXPOSE 8000 + + RUN chmod +x /app/entrypoint.sh + + ENTRYPOINT ["/bin/bash","/app/entrypoint.sh"] + + CMD ["gunicorn", "--bind", ":8000", "--workers", "3", "djangoproj.wsgi"] \ No newline at end of file diff --git a/server/database/app.js b/server/database/app.js index 00f52b2008..af98a3e9ff 100644 --- a/server/database/app.js +++ b/server/database/app.js @@ -1,3 +1,4 @@ +/* jshint esversion: 8 */ const express = require('express'); const mongoose = require('mongoose'); const fs = require('fs'); @@ -58,17 +59,32 @@ 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 dealers by ID' }); + } }); //Express route to insert review diff --git a/server/database/review.js b/server/database/review.js index 4759725a3a..7aea95053f 100644 --- a/server/database/review.js +++ b/server/database/review.js @@ -1,3 +1,4 @@ +/* jshint esversion: 8 */ const mongoose = require('mongoose'); const Schema = mongoose.Schema; diff --git a/server/deployment.yaml b/server/deployment.yaml new file mode 100644 index 0000000000..50d18cd50a --- /dev/null +++ b/server/deployment.yaml @@ -0,0 +1,29 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + run: dealership + name: dealership +spec: + replicas: 1 + selector: + matchLabels: + run: dealership + strategy: + rollingUpdate: + maxSurge: 25% + maxUnavailable: 25% + type: RollingUpdate + template: + metadata: + labels: + run: dealership + spec: + containers: + - image: us.icr.io/sn-labs-cmaisy010822/dealership:latest + imagePullPolicy: Always + name: dealership + ports: + - containerPort: 8000 + protocol: TCP + restartPolicy: Always diff --git a/server/djangoapp/.env b/server/djangoapp/.env index 01822e542a..7546363701 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://cmaisy010822-3030.theiadockernext-0-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai" +sentiment_analyzer_url="https://sentianalyzer.21n1woj7t5ov.us-south.codeengine.appdomain.cloud/" diff --git a/server/djangoapp/admin.py b/server/djangoapp/admin.py index 433657fc64..8b53fb60b4 100644 --- a/server/djangoapp/admin.py +++ b/server/djangoapp/admin.py @@ -1,8 +1,10 @@ -# from django.contrib import admin -# from .models import related models +from django.contrib import admin +from .models import CarMake, CarModel # Register your models here. +admin.site.register(CarMake) +admin.site.register(CarModel) # CarModelInline class diff --git a/server/djangoapp/models.py b/server/djangoapp/models.py index eb101a68c8..fe2ff6affa 100644 --- a/server/djangoapp/models.py +++ b/server/djangoapp/models.py @@ -1,25 +1,48 @@ -# 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 +# Car Make model +class CarMake(models.Model): + name = models.CharField(max_length=100) + description = models.TextField() + # created_at = models.DateTimeField(auto_now_add=True) + + def __str__(self): + return self.name + + +# Car Model model +class CarModel(models.Model): + # Many-to-One relationship (one CarMake has many CarModels) + 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 diff --git a/server/djangoapp/populate.py b/server/djangoapp/populate.py index 1927e09e18..2a50e57a11 100644 --- a/server/djangoapp/populate.py +++ b/server/djangoapp/populate.py @@ -1,2 +1,122 @@ +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], + }, + ] + + 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..63774d7658 100644 --- a/server/djangoapp/restapis.py +++ b/server/djangoapp/restapis.py @@ -1,22 +1,53 @@ # Uncomment the imports below before you add the function code -# import requests +import requests import os from dotenv import load_dotenv +# Load environment variables load_dotenv() -backend_url = os.getenv( - 'backend_url', default="http://localhost:3030") +backend_url = os.getenv('backend_url', default="http://localhost:3030") sentiment_analyzer_url = os.getenv( - 'sentiment_analyzer_url', - default="http://localhost:5050/") + '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 +# Add code for GET requests to backend +def get_request(endpoint, **kwargs): + params = "" + if kwargs: + for key, value in kwargs.items(): + params = params + key + "=" + value + "&" + + request_url = 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 err: + # Handle network or JSON errors gracefully + print(f"Network exception occurred: {err}") + + +def analyze_review_sentiments(text): + request_url = sentiment_analyzer_url + "analyze/" + text + try: + response = requests.get(request_url) + print(response) + return response.json() + except Exception as err: + print(f"Unexpected error: {err} ({type(err)})") + print("Network exception occurred") + -# def post_review(data_dict): # Add code for posting review +def post_review(data_dict): + request_url = backend_url + "/insert_review" + try: + response = requests.post(request_url, json=data_dict) + print(response.json()) + return response.json() + except Exception as err: + print(f"Network exception occurred: {err}") diff --git a/server/djangoapp/urls.py b/server/djangoapp/urls.py index 0edc274f90..eb0bd065c9 100644 --- a/server/djangoapp/urls.py +++ b/server/djangoapp/urls.py @@ -1,18 +1,50 @@ # 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 registration + path(route='register', view=views.registration, name='register'), # path for login - # path(route='login', view=views.login_user, name='login'), + path(route='login', view=views.login_user, name='login'), + + # path for logout + path(route='logout', view=views.logout_request, name='logout'), # path for dealer reviews view + path( + route='get_dealers/', + view=views.get_dealerships, + name='get_dealers', + ), + path( + route='get_dealers/', + view=views.get_dealerships, + name='get_dealers_by_state', + ), + + # path for get a detailed dealer + path( + route='dealer/', + view=views.get_dealer_details, + name='dealer_details', + ), + + # path for get a review of dealer + path( + route='reviews/dealer/', + view=views.get_dealer_reviews, + name='dealer_reviews', + ), # path for add a review view + path(route='add_review', view=views.add_review, name='add_review'), + # path for get car model list + path(route='get_cars', view=views.get_cars, name='get_cars'), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/server/djangoapp/views.py b/server/djangoapp/views.py index b16409f419..26879694ca 100644 --- a/server/djangoapp/views.py +++ b/server/djangoapp/views.py @@ -1,20 +1,13 @@ -# 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.models import User +from django.contrib.auth import logout, login, authenticate from django.http import JsonResponse -from django.contrib.auth import login, authenticate +from django.views.decorators.csrf import csrf_exempt import logging import json -from django.views.decorators.csrf import csrf_exempt -# from .populate import initiate +from .populate import initiate +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__) @@ -29,37 +22,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 + # If user is valid, log in the 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) # 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): + # 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 + + try: + # Check if user already exists + User.objects.get(username=username) + username_exist = True + except Exception: + # If not, simply log that this is a new user + logger.debug("%s is a new user", 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 return status + login(request, user) + data = {"userName": username, "status": "Authenticated"} + return JsonResponse(data) + + data = {"userName": username, "error": "Already Registered"} + return JsonResponse(data) + + +# Create `get_cars` view to render the car model list +def get_cars(request): + count = CarMake.objects.filter().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` to render list of dealerships: +# all by default, or a particular state if state is passed +def get_dealerships(request, state="All"): + if state == "All": + endpoint = "/fetchDealers" + else: + endpoint = "/fetchDealers/" + state + dealerships = get_request(endpoint) + return JsonResponse({"status": 200, "dealers": dealerships}) -# # 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): -# ... +def get_dealer_reviews(request, dealer_id): + # If dealer id has been provided + if dealer_id: + try: + endpoint = "/fetchReviews/dealer/" + str(dealer_id) + reviews = get_request(endpoint) + for review_detail in reviews: + response = analyze_review_sentiments(review_detail['review']) + review_detail['sentiment'] = response.get( + 'sentiment', + 'neutral', + ) + return JsonResponse({"status": 200, "reviews": reviews}) + except Exception: + return JsonResponse( + {"status": 500, "message": "Internal server error"} + ) + return JsonResponse({"status": 400, "message": "Bad Request"}) + # Create a `get_dealer_details` view to render the dealer details -# def get_dealer_details(request, dealer_id): -# ... +def get_dealer_details(request, dealer_id): + if dealer_id: + endpoint = "/fetchDealer/" + str(dealer_id) + dealership = get_request(endpoint) + return JsonResponse({"status": 200, "dealer": dealership}) + return JsonResponse({"status": 400, "message": "Bad Request"}) + -# Create a `add_review` view to submit a review -# def add_review(request): -# ... +# Create an `add_review` view to submit a review +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: + return JsonResponse( + {"status": 401, "message": "Error in posting review"} + ) + return JsonResponse({"status": 403, "message": "Unauthorized"}) diff --git a/server/djangoproj/settings.py b/server/djangoproj/settings.py index e0b1092a5c..2e04f5c34b 100644 --- a/server/djangoproj/settings.py +++ b/server/djangoproj/settings.py @@ -1,42 +1,36 @@ """ Django settings for djangoproj project. - Generated by 'django-admin startproject' using Django 3.2.5. - -For more information on this file, see -https://docs.djangoproject.com/en/3.2/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/3.2/ref/settings/ """ 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', + 'https://cmaisy010822-8000.theiadockernext-0-labs-prod-theiak8s-4-tor01.' + 'proxy.cognitiveclass.ai', +] + +CSRF_TRUSTED_ORIGINS = [ + 'https://cmaisy010822-8000.theiadockernext-0-labs-prod-theiak8s-4-tor01.' + 'proxy.cognitiveclass.ai', +] REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': [], } -# Application definition - INSTALLED_APPS = [ 'djangoapp.apps.DjangoappConfig', 'django.contrib.admin', @@ -61,7 +55,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,10 +74,6 @@ WSGI_APPLICATION = 'djangoproj.wsgi.application' - -# Database -# https://docs.djangoproject.com/en/3.2/ref/settings/#databases - DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', @@ -89,50 +83,43 @@ 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/ - LANGUAGE_CODE = 'en-us' - TIME_ZONE = 'UTC' - USE_I18N = True - USE_L10N = True - USE_TZ = True - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/3.2/howto/static-files/ - STATIC_URL = '/static/' STATIC_ROOT = os.path.join(BASE_DIR, 'static') MEDIA_ROOT = os.path.join(STATIC_ROOT, 'media') MEDIA_URL = '/media/' -# Default primary key field type -# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field - 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..fa6916e153 100644 --- a/server/djangoproj/urls.py +++ b/server/djangoproj/urls.py @@ -23,4 +23,17 @@ 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")), + path('dealers/', TemplateView.as_view(template_name="index.html")), + path( + 'dealer/int:dealer_id', + TemplateView.as_view(template_name="index.html") + ), + path( + 'postreview/int:dealer_id', + 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..6d89a82b3a 100644 --- a/server/frontend/src/App.js +++ b/server/frontend/src/App.js @@ -1,10 +1,19 @@ import LoginPanel from "./components/Login/Login" +import Register from "./components/Register/Register"; +import Dealers from './components/Dealers/Dealers'; +import Dealer from "./components/Dealers/Dealer"; +import PostReview from "./components/Dealers/PostReview"; import { Routes, Route } from "react-router-dom"; function App() { return ( } /> + } /> + } /> + } /> + } /> + ); } diff --git a/server/frontend/src/components/Register/Register.jsx b/server/frontend/src/components/Register/Register.jsx new file mode 100644 index 0000000000..d7981a606e --- /dev/null +++ b/server/frontend/src/components/Register/Register.jsx @@ -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( +
+ + +
+
+
+ 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..ba4096c09a 100644 --- a/server/frontend/static/About.html +++ b/server/frontend/static/About.html @@ -1,6 +1,7 @@ - + +