From a2e93d99a865f02d8681e4e50c2216d108a49895 Mon Sep 17 00:00:00 2001 From: sanket17 Date: Tue, 6 Feb 2024 04:29:42 -0500 Subject: [PATCH 1/2] Capstone week 1 changes --- server/db.sqlite3 | Bin 0 -> 131072 bytes .../djangoapp/templates/djangoapp/about.html | 5 +++ .../templates/djangoapp/contact.html | 9 +++++ .../djangoapp/templates/djangoapp/index.html | 34 +++++++++++++++--- server/djangoapp/urls.py | 4 +-- server/djangoapp/views.py | 5 ++- 6 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 server/db.sqlite3 create mode 100644 server/djangoapp/templates/djangoapp/about.html create mode 100644 server/djangoapp/templates/djangoapp/contact.html diff --git a/server/db.sqlite3 b/server/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..81402a9614297ce50a9b942b9f9eac23213b82ff GIT binary patch literal 131072 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 +

+Welcome to Best Cars dealership, home to the best cars in North America. We sell domestic and imported cars at reasonable prices. +

+ \ No newline at end of file diff --git a/server/djangoapp/templates/djangoapp/contact.html b/server/djangoapp/templates/djangoapp/contact.html new file mode 100644 index 0000000000..683cbf61a4 --- /dev/null +++ b/server/djangoapp/templates/djangoapp/contact.html @@ -0,0 +1,9 @@ + +

+Contact Us +

+
+

Address: IBM, final exam, congnitiveclass ai, North America

+

Contact: +01-12345689

+
+ \ No newline at end of file diff --git a/server/djangoapp/templates/djangoapp/index.html b/server/djangoapp/templates/djangoapp/index.html index 1a9ee6e39a..2abba1c1a3 100644 --- a/server/djangoapp/templates/djangoapp/index.html +++ b/server/djangoapp/templates/djangoapp/index.html @@ -14,10 +14,36 @@ - - This is the index page of your Django app! - - + diff --git a/server/djangoapp/urls.py b/server/djangoapp/urls.py index 37b1c89d01..ddcdf1487c 100644 --- a/server/djangoapp/urls.py +++ b/server/djangoapp/urls.py @@ -9,9 +9,9 @@ # view refers to the view function # name the URL - # path for about view + path(route='about', view=views.about, name='about'), - # path for contact us view + path(route='contact', view=views.contact, name='contact'), # path for registration diff --git a/server/djangoapp/views.py b/server/djangoapp/views.py index 61cc664da0..927b036a4e 100644 --- a/server/djangoapp/views.py +++ b/server/djangoapp/views.py @@ -20,10 +20,13 @@ # Create an `about` view to render a static about page # def about(request): # ... +def about(request): + return render(request, 'djangoapp/about.html') # Create a `contact` view to return a static contact page -#def contact(request): +def contact(request): + return render(request,'djangoapp/contact.html') # Create a `login_request` view to handle sign in request # def login_request(request): From c5e392322916696efc85dfc20a5f07f6ee266563 Mon Sep 17 00:00:00 2001 From: sanket17 Date: Tue, 6 Feb 2024 05:15:18 -0500 Subject: [PATCH 2/2] Capstone - Authentication and authorization added --- server/db.sqlite3 | Bin 131072 -> 131072 bytes .../djangoapp/templates/djangoapp/index.html | 3 - .../djangoapp/templates/djangoapp/login.html | 18 ++++ .../templates/djangoapp/registration.html | 24 ++++- server/djangoapp/urls.py | 7 +- server/djangoapp/views.py | 92 +++++++++++++++--- 6 files changed, 121 insertions(+), 23 deletions(-) create mode 100644 server/djangoapp/templates/djangoapp/login.html diff --git a/server/db.sqlite3 b/server/db.sqlite3 index 81402a9614297ce50a9b942b9f9eac23213b82ff..e7a0a781625f6d3d4effeab42b82f27f45e7fd84 100644 GIT binary patch delta 300 zcmZo@;Am*zm>|ulGEv5vQDtL-ojxPy=K1=m25gM{K@9vs8yh|N>l?Khc^Mit9XZ8$ ztvNXzc?*)VQ__s$i!&09OwCk`49yG-3{-LgGu$jJy#fr}ebZIEwIg#X(jz=G0|N8I zi~_;}jXer8g3J=bipoP${lY4%it-JMl2d#G^Yd+u42(>44UBXR%oGd_tPBmU49xXR z%#96Aj1p6FGxLfQE%UNdOG+}c6LSsC9ny0XGjsHk^K+538CY7GnpzoH=ouKBnV1@J zF)%PN@_%RG|Grr;;VnNG2eUXQ*eKr3j0NlhOnkRDHeTjqVpQGOsK_{}fP;zu4p8A$ jeqbOpDr{2pQun>aK Nw$K3xAhQU7_zx5Y6yN{= diff --git a/server/djangoapp/templates/djangoapp/index.html b/server/djangoapp/templates/djangoapp/index.html index 2abba1c1a3..c593e85468 100644 --- a/server/djangoapp/templates/djangoapp/index.html +++ b/server/djangoapp/templates/djangoapp/index.html @@ -20,9 +20,6 @@ Dealership Review
    -
  • - About us -
    • {% if user.is_authenticated %}
  • {{ user.first_name }}({{ user.username }}) diff --git a/server/djangoapp/templates/djangoapp/login.html b/server/djangoapp/templates/djangoapp/login.html new file mode 100644 index 0000000000..79275ef33f --- /dev/null +++ b/server/djangoapp/templates/djangoapp/login.html @@ -0,0 +1,18 @@ +
    + {% csrf_token %} +
    +

    Login

    +
    + + + + +
    + {% if message %} +
    + {{ message }} +
    + {% endif %} + +
    +
    \ No newline at end of file diff --git a/server/djangoapp/templates/djangoapp/registration.html b/server/djangoapp/templates/djangoapp/registration.html index ae11ea4b71..933bcd07ce 100644 --- a/server/djangoapp/templates/djangoapp/registration.html +++ b/server/djangoapp/templates/djangoapp/registration.html @@ -6,6 +6,28 @@ - +
    +
    + {% csrf_token %} +

    Sign Up

    +
    +
    + + + + + + + + + {% if message %} +
    + {{ message }} +
    + {% endif %} + +
    +
    +
    \ No newline at end of file diff --git a/server/djangoapp/urls.py b/server/djangoapp/urls.py index ddcdf1487c..7abdd35d67 100644 --- a/server/djangoapp/urls.py +++ b/server/djangoapp/urls.py @@ -13,11 +13,10 @@ path(route='contact', view=views.contact, name='contact'), - # path for registration + path('registration/', views.registration_request, name='registration'), - # path for login - - # path for logout + path('login/', views.login_request, name='login'), + path('logout/', views.logout_request, name='logout'), path(route='', view=views.get_dealerships, name='index'), diff --git a/server/djangoapp/views.py b/server/djangoapp/views.py index 927b036a4e..ad6399a76e 100644 --- a/server/djangoapp/views.py +++ b/server/djangoapp/views.py @@ -29,29 +29,91 @@ def contact(request): return render(request,'djangoapp/contact.html') # Create a `login_request` view to handle sign in request -# def login_request(request): -# ... +def login_request(request): + context = {} + if request.method == "POST": + username = request.POST['username'] + password = request.POST['psw'] + user = authenticate(username=username, password=password) + if user is not None: + login(request, user) + return redirect('djangoapp:index') + else: + context['message'] = "Invalid username or password." + return render(request, 'djangoapp/login.html', context) + else: + return render(request, 'djangoapp/login.html', context) -# Create a `logout_request` view to handle sign out request -# def logout_request(request): -# ... +def logout_request(request): + logout(request) + return redirect('djangoapp:index') -# Create a `registration_request` view to handle sign up request -# def registration_request(request): -# ... +def registration_request(request): + context = {} + if request.method == 'GET': + return render(request, 'djangoapp/registration.html', context) + elif request.method == 'POST': + # Check if user exists + username = request.POST['username'] + password = request.POST['psw'] + first_name = request.POST['firstname'] + last_name = request.POST['lastname'] + user_exist = False + try: + User.objects.get(username=username) + user_exist = True + except: + logger.error("New user") + if not user_exist: + user = User.objects.create_user(username=username, first_name=first_name, last_name=last_name, + password=password) + login(request, user) + return redirect("djangoapp:index") + else: + context['message'] = "User already exists." + return render(request, 'djangoapp/registration.html', context) # Update the `get_dealerships` view to render the index page with a list of dealerships def get_dealerships(request): - context = {} if request.method == "GET": + context = {} + # url = "https://sankettikam1-8000.theiadockernext-1-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai/dealerships/get" + # dealerships = get_dealers_from_cf(url) + # context['dealerships'] = dealerships return render(request, 'djangoapp/index.html', context) +# Create a `get_dealer_details` view to render tdealershipshe reviews of a dealer +def get_dealer_details(request, dealer_id): + if request.method == "GET": + context = {} + # Get dealers from the URL + url = "https://sankettikam1-8000.theiadockernext-1-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai/dealerships/get" + dealer = get_dealer_by_id_from_cf(url, dealer_id) -# Create a `get_dealer_details` view to render the reviews of a dealer -# def get_dealer_details(request, dealer_id): -# ... + url = "https://sankettikam1-8000.theiadockernext-1-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai/reviews/get" + reviews = get_dealer_reviews_from_cf(url, dealer_id) + context['reviews'] = reviews + context['dealer'] = dealer + return render(request, 'djangoapp/dealer_details.html', context) + # Create a `add_review` view to submit a review -# def add_review(request, dealer_id): -# ... - +def add_review(request, dealer_id): + if request.method == "POST": + review = dict() + review["time"] = datetime.utcnow().isoformat() + review["dealership"] = dealer_id + review["review"] = request.POST.get('review', '') + review["purchase"] = request.POST.get('purchase', '') + review["purchase_date"] = request.POST.get('purchase_date') + review["name"] = request.POST.get('name', '') + review["car_make"] = request.POST.get('car_make') + review["car_model"] = request.POST.get('car_model') + review["car_year"] = request.POST.get('car_year') + url = "https://sankettikam1-8000.theiadockernext-1-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai/reviews/post" + res = post_request(url, review) + return redirect("djangoapp:dealer_details", dealer_id=dealer_id) + url = "https://sankettikam1-8000.theiadockernext-1-labs-prod-theiak8s-4-tor01.proxy.cognitiveclass.ai/dealerships/get" + dealer = get_dealer_by_id_from_cf(url, dealer_id) + cars = CarModel.objects.all() + return render(request, 'djangoapp/add_review.html', {"dealer": dealer, "cars": cars}) \ No newline at end of file