diff --git a/.flake8 b/.flake8 new file mode 100644 index 0000000000..227e2fe706 --- /dev/null +++ b/.flake8 @@ -0,0 +1,3 @@ +[flake8] +exclude = djangoenv, node_modules, migrations +max-line-length = 88 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000..7e20100b72 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,50 @@ +name: 'Lint Code' + +on: + push: + branches: [main, master] + pull_request: + branches: [main, master] + +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: Run Linter + run: | + find . -name "*.py" -exec flake8 {} + + echo "✅ Python linting completed" + + 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 -g jshint + + - name: Run Linter + run: | + find ./server/database -name "*.js" -exec jshint {} + + echo "✅ JavaScript linting completed" diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 0000000000..6bc8f189e8 --- /dev/null +++ b/.jshintrc @@ -0,0 +1,3 @@ +{ + "esversion": 8 +} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000..c62538b98a --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,10 @@ +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.4.0 + hooks: + - id: end-of-file-fixer + - id: trailing-whitespace + - repo: https://github.com/pycqa/flake8 + rev: 6.1.0 + hooks: + - id: flake8 diff --git a/README.md b/README.md index 5884e26a5b..8e0a57cf3c 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# coding-project-template \ No newline at end of file +# This is my Full Stack Developer Capstone Project uzing React and Node.JS w/python and html/css & DJANGO, Express-MongoDB, and a Sentiment Analyzer etc... It's a car dealership with user access / inventory and bare bones functionality that will be improved on, this will serve as a future template for app/web dev. 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..99892e1859 100644 --- a/server/database/app.js +++ b/server/database/app.js @@ -1,11 +1,11 @@ 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')); @@ -20,10 +20,10 @@ const Dealerships = require('./dealership'); try { Reviews.deleteMany({}).then(()=>{ - Reviews.insertMany(reviews_data['reviews']); + Reviews.insertMany(reviews_data.reviews); }); Dealerships.deleteMany({}).then(()=>{ - Dealerships.insertMany(dealerships_data['dealerships']); + Dealerships.insertMany(dealerships_data.dealerships); }); } catch (error) { @@ -33,7 +33,7 @@ try { // 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 @@ -56,38 +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 dealers = await Dealerships.find(); + res.json(dealers); + } 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 dealers = await Dealerships.find({ state: req.params.state }); + res.json(dealers); + } 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 -}); + const id = parseInt(req.params.id, 10); // Parse the ID as an integer + try { + const dealership = await Dealerships.findOne({ id }); + if (!dealership) { + res.status(404).json({ error: 'No dealership found with ID: ${id}'}); + } else { + res.json(dealership); + } + } catch (error) { + res.status(500).json({ error: 'Error fetching dealership by ID'}); + } + }); //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 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(); @@ -101,4 +120,4 @@ app.post('/insert_review', express.raw({ type: '*/*' }), async (req, res) => { // Start the Express server app.listen(port, () => { console.log(`Server is running on http://localhost:${port}`); -}); +}); \ No newline at end of file diff --git a/server/deployment.yaml b/server/deployment.yaml new file mode 100644 index 0000000000..d12f39e1bb --- /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-ryanwdear/dealership:latest + imagePullPolicy: Always + name: dealership + ports: + - containerPort: 8000 + protocol: TCP + restartPolicy: Always \ No newline at end of file diff --git a/server/djangoapp/.env b/server/djangoapp/.env index 01822e542a..f09e94c15c 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://ryanwdear-3030.theiadockernext-0-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai +sentiment_analyzer_url=https://sentianalyzer.1ux214w5ffje.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..6697b152f8 100644 --- a/server/djangoapp/admin.py +++ b/server/djangoapp/admin.py @@ -1,9 +1,9 @@ -# from django.contrib import admin -# from .models import related models - - -# Register your models here. +from django.contrib import admin +from .models import CarMake, CarModel +# Registering models with their respective admins +admin.site.register(CarMake) +admin.site.register(CarModel) # CarModelInline class # CarModelAdmin class diff --git a/server/djangoapp/models.py b/server/djangoapp/models.py index eb101a68c8..8b91911973 100644 --- a/server/djangoapp/models.py +++ b/server/djangoapp/models.py @@ -1,25 +1,40 @@ # 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() + # Other fields as needed + + def __str__(self): + return self.name # Return the name as the string representation + + +class CarModel(models.Model): + car_make = models.ForeignKey( + CarMake, on_delete=models.CASCADE + ) # Many-to-One relationship + 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), + ], + ) + # Other fields as needed + + 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..556601c3d8 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..0191d73ddb 100644 --- a/server/djangoapp/restapis.py +++ b/server/djangoapp/restapis.py @@ -1,22 +1,52 @@ # Uncomment the imports below before you add the function code -# import requests +import requests import os from dotenv import load_dotenv 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 +def get_request(endpoint, **kwargs): + params = "" + if kwargs: + for key, value in kwargs.items(): + params = params + key + "=" + value + "&" -# def post_review(data_dict): -# Add code for posting review + request_url = ( + f"{backend_url.rstrip('/')}/" + f"{endpoint.lstrip('/')}?{params}" + ) + + print("GET from {} ".format(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: + print(f"Error: {e}") + + +def analyze_review_sentiments(text): + request_url = 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 = 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"Error: {e}") diff --git a/server/djangoapp/urls.py b/server/djangoapp/urls.py index 0edc274f90..8c5472a703 100644 --- a/server/djangoapp/urls.py +++ b/server/djangoapp/urls.py @@ -1,18 +1,34 @@ # 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' +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(route="logout", view=views.logout_request, name="logout"), # path for dealer reviews view - + path(route="get_cars", view=views.get_cars, name="getcars"), + 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( + route="dealer/", + view=views.get_dealer_details, + name="dealer_details", + ), + path( + route="reviews/dealer/", + view=views.get_dealer_reviews, + name="dealer_details", + ), # path for add a review view - + path(route="add_review", view=views.add_review, name="add_review"), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/server/djangoapp/views.py b/server/djangoapp/views.py index b16409f419..fa28854570 100644 --- a/server/djangoapp/views.py +++ b/server/djangoapp/views.py @@ -1,19 +1,16 @@ # 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 +from .models import CarMake, CarModel 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 .restapis import get_request, analyze_review_sentiments, post_review # Get an instance of a logger @@ -22,13 +19,14 @@ # Create your views here. + # Create a `login_request` view to handle sign in request @csrf_exempt def login_user(request): # Get username and password from request.POST dictionary data = json.loads(request.body) - username = data['userName'] - password = data['password'] + username = data["userName"] + password = data["password"] # Try to check if provide credential can be authenticated user = authenticate(username=username, password=password) data = {"userName": username} @@ -38,28 +36,117 @@ def login_user(request): 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 Exception as e: + # If an exception occurs, log it with a message about the new user + logger.debug(f"Error occurred: {e}. {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.filter().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}) + + +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}) + + +def get_dealer_reviews(request, dealer_id): + # if dealer id has been provided + if dealer_id: + endpoint = "/fetchReviews/dealer/" + str(dealer_id) + reviews = get_request(endpoint) + for review_detail in reviews: + response = analyze_review_sentiments(review_detail["review"]) + print(response) + review_detail["sentiment"] = response["sentiment"] + return JsonResponse({"status": 200, "reviews": reviews}) + else: + return JsonResponse({"status": 400, "message": "Bad Request"}) + + +def get_dealer_details(request, dealer_id): + if dealer_id: + endpoint = "fetchDealer/" + str(dealer_id) + dealership = get_request(endpoint) + + # If it's a list, get the first item + if isinstance(dealership, list) and len(dealership) > 0: + return JsonResponse(dealership[0], safe=False) + elif isinstance(dealership, dict): + return JsonResponse(dealership, safe=False) + else: + return JsonResponse({}, status=404) + else: + return JsonResponse({"message": "Bad Request"}, status=400) + + +def add_review(request): + if not request.user.is_anonymous: + data = json.loads(request.body) + try: + response = post_review(data) + return JsonResponse({"status": 200, "data": response}) + except Exception as e: + return JsonResponse({ + "status": 401, + "message": f"Error in posting review: {str(e)}" + }) + else: + return JsonResponse({ + "status": 403, + "message": "User must be logged in to post a review." + }) diff --git a/server/djangoproj/settings.py b/server/djangoproj/settings.py index e0b1092a5c..aa286ca347 100644 --- a/server/djangoproj/settings.py +++ b/server/djangoproj/settings.py @@ -22,97 +22,115 @@ # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY =\ - 'django-insecure-ccow$tz_=9%dxu4(0%^(z%nx32#s@(zt9$ih@)5l54yny)wm-0' +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://teyahc-8000.theiadockernext-0-labs-prod-theiak8s-4-tor01.proxy." + "cognitiveclass.ai/", +] +CSRF_TRUSTED_ORIGINS = [ + "https://teyahc-8000.theiadockernext-0-labs-prod-theiak8s-4-tor01.proxy." + "cognitiveclass.ai" +] REST_FRAMEWORK = { - 'DEFAULT_AUTHENTICATION_CLASSES': [], + "DEFAULT_AUTHENTICATION_CLASSES": [], } # Application definition INSTALLED_APPS = [ - 'djangoapp.apps.DjangoappConfig', - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', + "djangoapp.apps.DjangoappConfig", + "django.contrib.admin", + "django.contrib.auth", + "django.contrib.contenttypes", + "django.contrib.sessions", + "django.contrib.messages", + "django.contrib.staticfiles", ] MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', + "django.middleware.security.SecurityMiddleware", + "django.contrib.sessions.middleware.SessionMiddleware", + "django.middleware.common.CommonMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "django.contrib.messages.middleware.MessageMiddleware", + "django.middleware.clickjacking.XFrameOptionsMiddleware", ] -ROOT_URLCONF = 'djangoproj.urls' +ROOT_URLCONF = "djangoproj.urls" TEMPLATES = [ { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', + "BACKEND": "django.template.backends.django.DjangoTemplates", + "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": [ + "django.template.context_processors.debug", + "django.template.context_processors.request", + "django.contrib.auth.context_processors.auth", + "django.contrib.messages.context_processors.messages", ], }, }, ] -WSGI_APPLICATION = 'djangoproj.wsgi.application' +WSGI_APPLICATION = "djangoproj.wsgi.application" # Database # https://docs.djangoproject.com/en/3.2/ref/settings/#databases DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', + "default": { + "ENGINE": "django.db.backends.sqlite3", + "NAME": BASE_DIR / "db.sqlite3", } } 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' +LANGUAGE_CODE = "en-us" -TIME_ZONE = 'UTC' +TIME_ZONE = "UTC" USE_I18N = True @@ -124,15 +142,18 @@ # 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/' +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 = [] +DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" +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..02a2fa5de4 100644 --- a/server/djangoproj/urls.py +++ b/server/djangoproj/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.urls import path, include from django.views.generic import TemplateView @@ -20,7 +21,20 @@ from django.conf import settings urlpatterns = [ - path('admin/', admin.site.urls), - path('djangoapp/', include('djangoapp.urls')), - path('', TemplateView.as_view(template_name="Home.html")), + 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/", + 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..5fa6306d3a 100644 --- a/server/frontend/src/App.js +++ b/server/frontend/src/App.js @@ -1,11 +1,19 @@ import LoginPanel from "./components/Login/Login" import { Routes, Route } from "react-router-dom"; +import Register from "./components/Register/Register"; +import Dealers from './components/Dealers/Dealers'; +import Dealer from "./components/Dealers/Dealer"; +import PostReview from "./components/Dealers/PostReview"; function App() { return ( } /> + } /> + } /> + } /> + } /> ); } -export default App; +export default App; \ No newline at end of file diff --git a/server/frontend/src/components/Dealers/Dealers.jsx b/server/frontend/src/components/Dealers/Dealers.jsx index db3410680c..f71dd330f2 100644 --- a/server/frontend/src/components/Dealers/Dealers.jsx +++ b/server/frontend/src/components/Dealers/Dealers.jsx @@ -8,11 +8,27 @@ const Dealers = () => { const [dealersList, setDealersList] = useState([]); // let [state, setState] = useState("") let [states, setStates] = useState([]) - + const [searchQuery, setSearchQuery] = useState(''); + const [originalDealers, setOriginalDealers] = useState([]); // let root_url = window.location.origin let dealer_url ="/djangoapp/get_dealers"; let dealer_url_by_state = "/djangoapp/get_dealers/"; + + const handleInputChange = (event) => { + const query = event.target.value; + setSearchQuery(query); + const filtered = originalDealers.filter(dealer => + dealer.state.toLowerCase().includes(query.toLowerCase()) + ); + setDealersList(filtered); + }; + + const handleLostFocus = () => { + if (!searchQuery) { + setDealersList(originalDealers); + } + } const filterDealers = async (state) => { dealer_url_by_state = dealer_url_by_state+state; @@ -40,6 +56,7 @@ const Dealers = () => { setStates(Array.from(new Set(states))) setDealersList(all_dealers) + setOriginalDealers(all_dealers); } } useEffect(() => { @@ -60,13 +77,9 @@ return( Address Zip - + + + {isLoggedIn ? ( @@ -93,4 +106,4 @@ return( ) } -export default Dealers +export default Dealers \ No newline at end of file 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..755c34beb1 100644 --- a/server/frontend/static/About.html +++ b/server/frontend/static/About.html @@ -1,6 +1,7 @@ - + +
- -
- -
-
- Card image + +
+ +
+ +
+ Card image
-

Person1

-

Person1 Title

-

Some text that explains the person1 in about 2 short sentences

-

person1@example.com

+

Jackson Reed

+

Chief Performance Officer

+

With a background in motorsports engineering, Jackson brings speed, precision, and a love for turbochargers to the team.

+

jackson.reed@bestcars.com

-
- Card image +
+ Card image
-

Person2

-

Person2 Title

-

Some text that explains the person2 in about 2 short sentences

-

person2@example.com

+

Camila Torres

+

VP of Customer Experience

+

Camila's passion is matching people with the perfect ride. She makes "stress-free" feel like standard equipment.

+

camila.torres@bestcars.com

-
- Card image +
+ Card image
-

Person3

-

Person3 Title

-

Some text that explains the person3 in about 2 short sentences

-

person3@example.com

+

Marcus Grant

+

Head of Global Imports

+

Marcus tracks trends and treasures from Tokyo to Turin. If it’s rare and roadworthy, it’s on his radar.

+

marcus.grant@bestcars.com

+
-
-
- +
- diff --git a/server/frontend/static/Contact.html b/server/frontend/static/Contact.html new file mode 100644 index 0000000000..3d71345d9f --- /dev/null +++ b/server/frontend/static/Contact.html @@ -0,0 +1,82 @@ + + + + Contact Us + + + + + + + + + + + +
+

Contact Us

+

Need help choosing your next ride? Have questions? We’re here to put you in the driver's seat.

+ +
+

🏢 Best Cars Dealership HQ

+

Address icon123 Turbo Lane, Driveville, ON K1X 2B3

+

Phone icon+1 (800) 555-FAST

+

Email iconcontact@bestcars.com

+

Hours: Mon–Sat: 9am–7pm | Sun: Closed

+
+ +
+
🧑‍🔧 Contact Our Team
+

Need to talk to a specific department? Email us directly at support@bestcars.com and we'll get back to you within one business day.

+
+ + +
+
📍 Find Us
+ +
+ +
+ + + diff --git a/server/frontend/static/Home.html b/server/frontend/static/Home.html index fb0c3fb617..a4070803ea 100644 --- a/server/frontend/static/Home.html +++ b/server/frontend/static/Home.html @@ -7,7 +7,22 @@