From b523f5ff1d9ab2306d131e0f611f1678663ddff0 Mon Sep 17 00:00:00 2001 From: MarekAtGitHub Date: Mon, 16 Oct 2023 11:28:39 -0400 Subject: [PATCH 01/14] first test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cdd50e544e..974ea42dc6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Final Project Template -The final project for this course has several steps that you must complete. +Thhe final project for this course has several steps that you must complete. To give you an overview of the whole project, all the high-level steps are listed below. The project is then divided into several smaller labs that give the detailed instructions for each step. You must complete all the labs to successfully complete the project. From 5ab3a9291c7a2209fa97563cc03925d66298ed58 Mon Sep 17 00:00:00 2001 From: MarekAtGitHub Date: Mon, 16 Oct 2023 12:51:48 -0400 Subject: [PATCH 02/14] First LAbss --- server/db.sqlite3 | Bin 0 -> 131072 bytes .../djangoapp/templates/djangoapp/about.html | 12 +++++++++ .../templates/djangoapp/contact.html | 12 +++++++++ .../djangoapp/templates/djangoapp/index.html | 24 +++++++++++++++--- server/djangoapp/urls.py | 7 ++++- server/djangoapp/views.py | 9 ++++--- 6 files changed, 57 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..f3fd6c711d48891096efa15f6a437f013369ef0a GIT binary patch literal 131072 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 + + + + About Us - Dealership Review + + +

Welcome to Best Cars dealership

+

Home to the best cars in North America. We sell domestic and imported cars at reasonable prices.

+ + + diff --git a/server/djangoapp/templates/djangoapp/contact.html b/server/djangoapp/templates/djangoapp/contact.html new file mode 100644 index 0000000000..36c92577d8 --- /dev/null +++ b/server/djangoapp/templates/djangoapp/contact.html @@ -0,0 +1,12 @@ + + + + + Contact Us - Dealership Review + + +

Contact Us

+

Address: 123 Street, City, Country

+

Telephone: +1-123-456-7890

+ + diff --git a/server/djangoapp/templates/djangoapp/index.html b/server/djangoapp/templates/djangoapp/index.html index 1a9ee6e39a..348b5bcb7b 100644 --- a/server/djangoapp/templates/djangoapp/index.html +++ b/server/djangoapp/templates/djangoapp/index.html @@ -14,10 +14,28 @@ - - This is the index page of your Django app! + - + diff --git a/server/djangoapp/urls.py b/server/djangoapp/urls.py index 37b1c89d01..772c2b913e 100644 --- a/server/djangoapp/urls.py +++ b/server/djangoapp/urls.py @@ -9,9 +9,14 @@ # view refers to the view function # name the URL + # path for index + path(route='', view=views.index, name='index'), + # 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 @@ -19,7 +24,7 @@ # path for logout - path(route='', view=views.get_dealerships, name='index'), + path(route='', view=views.get_dealerships, name='get_dealership'), # path for dealer reviews view diff --git a/server/djangoapp/views.py b/server/djangoapp/views.py index 61cc664da0..0d025be2c4 100644 --- a/server/djangoapp/views.py +++ b/server/djangoapp/views.py @@ -16,14 +16,17 @@ # Create your views here. +def index(request): + return render(request, 'djangoapp/index.html') # 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 be61e42335d31d0994a4ad8039cd31eb1032aad5 Mon Sep 17 00:00:00 2001 From: MarekAtGitHub Date: Mon, 16 Oct 2023 18:11:15 -0400 Subject: [PATCH 03/14] week number 2 --- server/db.sqlite3 | Bin 131072 -> 131072 bytes .../djangoapp/templates/djangoapp/index.html | 26 +++++++++++ .../djangoapp/templates/djangoapp/login.html | 15 ++++++ .../djangoapp/templates/djangoapp/logout.html | 11 +++++ .../templates/djangoapp/registration.html | 33 +++++++++++-- server/djangoapp/urls.py | 4 ++ server/djangoapp/views.py | 44 ++++++++++++++++-- 7 files changed, 124 insertions(+), 9 deletions(-) create mode 100644 server/djangoapp/templates/djangoapp/login.html create mode 100644 server/djangoapp/templates/djangoapp/logout.html diff --git a/server/db.sqlite3 b/server/db.sqlite3 index f3fd6c711d48891096efa15f6a437f013369ef0a..ce3dc00181d552e23ee76481a9f8abe2e7bf8a0a 100644 GIT binary patch delta 2523 zcmc(hON`r86o%t*gJyMM_JnQUv14zP|E3vVVQ&KgYg) zee?SD&37*%ADujVfP8d%?c>W&eHeNSb3@oK*mu}hn2WuQeTvOa7uT>G?v?1vp-||F z<+(N@JLqMk>r96o$L>wg-7rcZAG|O`p1k?(6&!4%J5Pr&Y3H+@r%xB#JHcWXjf57j z#5XTRBAZ+Bh$ZW4A9n0v7gBT-;xqsts>PLhHYXj$QxhU8q}!k^aN~+KoFx;QPtV_oJln&1gKMi2m};o>Fa zw#?ngl?TeKNLIc$&S~>9X+?>KBC%E1gEc4U1EN|h9k$2KBZ?J)QIjUAM6>kjGz|s6 zko4|Ci1Q@N<4lajwdJ{f*1i<0GaKjNl@&k5cV7P>+-T1H+Qdn zgS~hjy@cFJh=y*X&mgy-w6TfqZmpJ)n}~&8xDejH5!(4a^7;999v^Ps*rHDt(Jf@- zgA)b0a`J9;1Nre}VQwJi$>RNBQ3;0&$3$Glhl--8hIMo_F@1{B$DpnsEj!4<| zdVa1iHyd*Wrp>lg&`MfPZsMLM;oMk(oFhTpP>ABN4I4^U^SpdAi|5mxR?Bea@}8c} zaJYJqn5)g=VOuKB+h)U-1wC-2gPbZ=a~zM4?S?_}dA4nJ#4NSnA(GBCZcOdN18>TZ z1=^y^#k@N85}dCM%A8#I6CnXsu3aK$V+0FW$Q|#U3m4w3$A`Y+o2)%NRA}3BjCq&z z38)x-;Eui= z`WdHsyT`XiE~C;teLimWGM!n;(zTAuTHRs1BlR-gQ9dV>L91L&<&9#pA@z{UFDfqjf{u!rMk)Ml11J4>Q zVKVH`1QklK(Xg4BYZb@)B{IOf?X=SLGKqRE4ekMj^MHv_fTjU^ytlF9#MqoO0bL*Z z<3n@Q^;o^zl?|v)l%73=)cjF71^>389+6XU$57=dZ_E>%Baoz7rwprVw6ld~Dxov` z)uce-+*xPQfD~$Rcmrq$DNd> z!@C+3;7OdPmOUQFah5yl@nK8|oyWe!1Z;%;fW3#kce;22LvkmJ7lJ5SKpxhS!)HMc zYjEezf*w}f=vmOZv-$g3dt(nRY&|TmXCI*7FCX9f;udo5`3qsJAHsgdzQ#Vm-opA= z=5#@0$m=KZi@|ef99gfn8KsOKAM!*80ouPR$<+ CfcNJB delta 126 zcmZo@;Am*zm>|t4JyFJ)QF>#-B6*P&3~c;m4E!(ouki2YFXQj#pT%FXu`z*va+$u0 z8V?_{JV#<_Nk)8WacU6*1A{OSBLi_(W@E Contact Us + +
  • +
    + {% csrf_token %} +
    + + +
    + +
    +
    • + + + +
      +
    • + {% if user.is_authenticated %} + Welcome, {{ user.first_name }} +
      • +
    • + Logout + {% else %} + Guest +
      • + {% endif %} +
    diff --git a/server/djangoapp/templates/djangoapp/login.html b/server/djangoapp/templates/djangoapp/login.html new file mode 100644 index 0000000000..e79cf2681c --- /dev/null +++ b/server/djangoapp/templates/djangoapp/login.html @@ -0,0 +1,15 @@ + + + + + Login + + +

    Login

    +
    + {% csrf_token %} + {{ form.as_p }} + +
    + + diff --git a/server/djangoapp/templates/djangoapp/logout.html b/server/djangoapp/templates/djangoapp/logout.html new file mode 100644 index 0000000000..7db12df29c --- /dev/null +++ b/server/djangoapp/templates/djangoapp/logout.html @@ -0,0 +1,11 @@ + + + + + Logout + + +

    Logout

    +

    You have been successfully logged out. Thank you for visiting.

    + + diff --git a/server/djangoapp/templates/djangoapp/registration.html b/server/djangoapp/templates/djangoapp/registration.html index ae11ea4b71..d6cadba3b4 100644 --- a/server/djangoapp/templates/djangoapp/registration.html +++ b/server/djangoapp/templates/djangoapp/registration.html @@ -5,7 +5,32 @@ {% load static %} - - - - \ No newline at end of file + + +

    Sign Up :)

    +
    + {% csrf_token %} +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    + +
    + + diff --git a/server/djangoapp/urls.py b/server/djangoapp/urls.py index 772c2b913e..afea77f5b7 100644 --- a/server/djangoapp/urls.py +++ b/server/djangoapp/urls.py @@ -19,11 +19,15 @@ path(route='contact/', view=views.contact, name='contact'), # path for registration + path(route='registration/', view=views.signup, name='registration'), # path for login + path(route='login/', view=views.login_request, name='login_view'), # path for logout + path(route='logout/', view=views.logout_request, name='logout'), + path(route='', view=views.get_dealerships, name='get_dealership'), # path for dealer reviews view diff --git a/server/djangoapp/views.py b/server/djangoapp/views.py index 0d025be2c4..22d49e493f 100644 --- a/server/djangoapp/views.py +++ b/server/djangoapp/views.py @@ -1,10 +1,12 @@ -from django.shortcuts import render +from django.shortcuts import render, redirect from django.http import HttpResponseRedirect, HttpResponse from django.contrib.auth.models import User from django.shortcuts import get_object_or_404, render, redirect # from .models import related models # from .restapis import related methods from django.contrib.auth import login, logout, authenticate +from django.contrib.auth.forms import AuthenticationForm, UserCreationForm +from django.contrib.auth.decorators import login_required # For authentication checks from django.contrib import messages from datetime import datetime import logging @@ -31,14 +33,46 @@ def contact(request): # Create a `login_request` view to handle sign in request # def login_request(request): # ... +def login_request(request): + if request.method == 'POST': + form = AuthenticationForm(data=request.POST) + if form.is_valid(): + username = form.cleaned_data.get('username') + password = form.cleaned_data.get('password') + user = authenticate(request, username=username, password=password) + if user is not None: + login(request, user) + messages.success(request, "Logged in successfully.") + return redirect('djangoapp:index') # Redirect to the home page after successful login + else: + messages.error(request, "Invalid login credentials. Please try again.") + else: + form = AuthenticationForm() + + return render(request, 'djangoapp/login.html', {'form': form}) # Create a `logout_request` view to handle sign out request -# def logout_request(request): -# ... - +def logout_request(request): + logout(request) + messages.success(request, "Logged out successfully.") + return render(request, 'djangoapp/logout.html') # Create a `registration_request` view to handle sign up request # def registration_request(request): -# ... + +def signup(request): + if request.method == 'POST': + form = UserCreationForm(request.POST) + if form.is_valid(): + form.save() + username = form.cleaned_data.get('username') + messages.success(request, f"Account created for {username}. You can now log in.") + return redirect('djangoapp:login_view') + else: + # Debugging output + print(form.errors) # You can also log this information + else: + form = UserCreationForm() + return render(request, 'djangoapp/registration.html', {'form': form}) # Update the `get_dealerships` view to render the index page with a list of dealerships def get_dealerships(request): From ed58c86108c87403bf30a22f5746cfd5852648e3 Mon Sep 17 00:00:00 2001 From: MarekAtGitHub Date: Mon, 16 Oct 2023 18:18:25 -0400 Subject: [PATCH 04/14] week number 2a --- server/db.sqlite3 | Bin 131072 -> 131072 bytes .../djangoapp/templates/djangoapp/index.html | 7 +++++++ 2 files changed, 7 insertions(+) diff --git a/server/db.sqlite3 b/server/db.sqlite3 index ce3dc00181d552e23ee76481a9f8abe2e7bf8a0a..cbc26640c1fad4ca0afbffe8a74269f23fb2d298 100644 GIT binary patch delta 272 zcmZo@;Am*zm>|u#WTK2S0*U&)M*g(O^$O`Bn6Ei(?V+$h-vnFL0R^R4O$H|536*fYV2{FBwzt0@q2P;<`u?K$fic>+LQg_}IR|tKZ=#Gd$vAdX|=^hDK(aC*(CNGMa5{RN&9e)0Q%$n7D~-)k^G%Y9%O~%i zl^T#^V&!8IRS+NOX{sA<>{43dm{U@mB3ZsKcJU>4x#lTuRdWLcS+9$=Z|Yh++# ztZQhXYiyukWMpMvVP$BcXKZ0$VPx5)%);v19O^i^aJ|Cj3A3wNI6e4t`S0*g;-9p! hQHX!C+IlqwLJn%qS-(AJJtI#553 Contact Us + + + +
  • + Register +
  • @@ -45,6 +51,7 @@
    • +
      From eace94718c1f2132e0c7e7db022c666d9cfd1092 Mon Sep 17 00:00:00 2001 From: MarekAtGitHub <86894411+MarekAtGitHub@users.noreply.github.com> Date: Tue, 17 Oct 2023 11:41:28 +0200 Subject: [PATCH 05/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 974ea42dc6..cdd50e544e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Final Project Template -Thhe final project for this course has several steps that you must complete. +The final project for this course has several steps that you must complete. To give you an overview of the whole project, all the high-level steps are listed below. The project is then divided into several smaller labs that give the detailed instructions for each step. You must complete all the labs to successfully complete the project. From d0ca57099242168fa0c83a23e0875a4b8879df59 Mon Sep 17 00:00:00 2001 From: MarekAtGitHub <86894411+MarekAtGitHub@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:01:24 +0200 Subject: [PATCH 06/14] Update linter.yml --- .github/workflows/linter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 05ca50d23b..b8431f1bf6 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -5,6 +5,7 @@ on: branches: [master, main] pull_request: branches: [master, main] + workflow_dispatch: jobs: # list of things to do lint_function_js: From 0ff975ebcd1c47eaacc8b2500c2f01516375c9e5 Mon Sep 17 00:00:00 2001 From: MarekAtGitHub Date: Tue, 17 Oct 2023 17:40:32 -0400 Subject: [PATCH 07/14] CarModel labs --- server/db.sqlite3 | Bin 131072 -> 131072 bytes server/djangoapp/admin.py | 15 ++++++++++++--- server/djangoapp/models.py | 28 ++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/server/db.sqlite3 b/server/db.sqlite3 index cbc26640c1fad4ca0afbffe8a74269f23fb2d298..aa03cb64f07519d241aff1dbd7b6faab5d569fc0 100644 GIT binary patch delta 3094 zcmai0ZD=FM8Q!s0-j%K0@rQJ}vn)%ptTU?7X?L}|lAM+xf85!=ob8iyc6{W{r&zKi ze@T|)PYAMF`YTEAl7%V+k~9s0{%E1frGcg;N&l2U3r*V)3Q>HJKtt0X4gFPU6FNIu z*}Dg&!i;&IdFPpDW_F(4<74{xn7-!(-sk(rfwz9g=IoAm1b$TDM#Ird5mDx)nDTvR z%*b*gA65R~@YaxsY$l~?;CdRC4_C7Dyc=>N8XjY?5D zs)#PZz(ypF=aqd|*vN7c^7|{7!I><@1VK{1b{U+>VnmPxWo*E(HaRQ{vZy@!5Q{1~ zN%?qS)G!+-sk`HK3ohNBp~<+Yz?sa1!yiwkwsPCbYi_%KoD_+v-hb%!bm_;*vJh2% z>kbU-NiimiF$VsGXop1t{tbQvi|{@8415V5)T>WIv%_o(gPJ!BdIxESF?s3aZaKS> zDdu+zR@UUUV7OaK7YTxJJRk2>_Chw`Q9cTBHX7b0;BVk7@MrKIEWy7c?c4S0WvD#! zs14A{j~?x>Pz-6e164znXlF^g10$?&?j`MB3=8SvR<2aa<+sTm(%}Ml)tmWDdb?aa zG@T>eE|6MJZfEkzLSZ#o+{&lYn{77I?X(!^GvD#A{CNCdqqJagJ@A_<4f;MCqm z5^k5llIqk35bZS3$Y}?1>S3NH;8(B#KY+2f;p^}@xDQw1JRF5Xu#5dS`#JkN_806M z>0Sy{Eom0;ULci`DV89qnvz+69p8t#eBZ}P%k$s374Xx zjNS+8Ed%gh1o}h2`}X56Ax)X=7IoB{$7EMKU_T+)PwLe_vX$=+0`s-+EyQ=^GGE%+ zDDNMw?WYbl^4wmza2S(>>~1Q1m@n*HO3xfDu1`+RW!B@@6X}(O^3sNUoi9yo21O|@ zZ3<%>muD9ia;5dD)Dx50q`Z<2##WA|V^0P5mY?F6o>%)o7>~}ax1grhw;ef z(e7%66OM$%RADO-K1j%%uq7_7EsFE8U@Rj|6oN@HHGMdji>Bm>=|p@(OwKMWC*ot{ zf}G7{H!|t5&BV^m>c;F$a^dJk`LWE+$0znCqVbtoK^*0GO2r%dqmM7&*pa!K>&6)ZFkekKg9nhRYF|Yi?SsKiCi0*VzM@xF|OQ0iLcs z+W=l_Km%{7z=eQsgswFjz=>=TAQ+))-!#BQ%83B~2vr;T6nu;7)4-D|xPZWjMAe@A z6bx0)Bj6rB%f9jCwnx2t9yQfG4%F)#(I=tW-@J*_z?lpdm$d4w^MR&6?WL3EHY|1l+^s+AAl(L3JT8 z5+-ZEJ^?-oA`ps@wZEQ#VT#p&?Ex4LF$e_shtjg;^DIC8R#Z34n`*fSz)c4_5gL(9 zwYv|1j}CNb=$8mpd=`ZKAwyKQ^iXtq@OOlt#&X8+JY7DDIS>A>2vAtLO&5RaOI)`L zXQl1U(uyt?TeaGWoYwlx*rFkMTNY1?21zqv@rU$TY&3`>_9FT)v;@LBd&xT+>4)v9 zg>AS{=M9l+o!%OvJOI`Cf~^?WiquC2`$D+mK6u}Rq7r^az|YX7{|g*&nc|lJ9TEQp DIw$e2MMx z{l)RZN)?MrQ%ki}0WDIWN*|itN_}X#2m}vQTplU}-Ag52DkPwNf~QK1C(g!RS}jE& zMv2GYcg}qN=9~W<|2{hEK04}tZUnq?d~pH1a&m28q>me;SS!O@DayjoJk6r|jS;bv zrFb6Ie>*~Tu!y2Xy54t@>0l|u@Iu{pQRrYvia})krHgz!OA8|6#QFypzudv{g2=FS z#*8{xPT)kYUNqC4EW-*+{Vj8cGn%DYhOd8Y?r=sk6i-q0`AZ%5M$;7H`TDmXViC#k zO#SzltR0_5QY4A$9O^QoB{FVm(75)+a3cd|rQow`bT}iF?Gai8qPw6E}zy@ioFuAY$~S_JOI|kAo?oFG!K% zUd!sJ{(Cza*;D~=#&h_0;%W&^6@?#OaOf#96p;i_&5$`flifcyXApl98f^l zl588eP(2-K>9&pZ58_}3=$hJXY#+qID8N;WPIiPK6o%3C% zd`s}0ujB9ZnMeMZLpcr!FYHd?a8qKV!25~aU@AjO199}iqn5+ zTguXtj^$l)*CA#$(y`Lw{NgfNi@U-JfeytJJ5kx44J6m*^U`M0W7~QPk%*q9$XSXT zL&!?;R$8=(98GazDH+H{Lh-89Ifdk`B(f-56Uzv-39V|)@PujF@M+f8m)NVkBe~!x zF9au-9jiQIGdbi4EqSueEjwHEc=7=+pAs`6BvvUl zQ$9K9h*$Ie1!vg5=@hM0M)u{Gtm%d5UNT(Sh%E*d`CTqll;XRo6?a;UWmsQ8wiP`q zl-I>n0xLUbG16qKav9FT(*hE>>l3(c?HgORSUFTq33BWp#L4M=q7q=rGzum5$wDS0 zgyT6&HR3G!4%U{|i;~T=;htTV%l1TcdBIH=NV_Z-@|!uoC%x)PG5lW8c|afTZ1NRa zE(M)F$sf-J?V(cI>EGShNQ=Vyig%Xf4{edH^;vHv;R>@c2bIlBi>?$3O3Qox;vUIg zbuC`a#dkJP#j&&+W~v)@uecM61?Thea->pWJS*}1R&teA7H*N_I1laFkd{;S@Mfwk zxLu3!cr&N1-H3H3S>VH5BwoqvMC^N|^>kd?D+uX8%(mx`*o%j&PKTS^al4nCq4u0e zD~qg%vv7zP8SZ*@0#k!3vwR_$tfUk1L@X|a<%3j2B=@62u@sk6(G+F*ALUg2cZ2%R za@uiOD<0ZMtt56F+1P%`5k`LG^T~XvkalHe*O@96*j)~77wz*~-evNkpeQTJTbdmf zDO{h>syXqpn9q`dGAd^dQprG3hzA0}1PW(E5jlp~%4f}~`rj_7&zMuSRZ#AnHBp%t z^A3hdZLx{;W@2|`ZF^}x&d<6_E26znkb@CVvLMsRyzilcVw8fSEG#D|-SPDapypKI zgHb7(%tecwTuc|qL`+Tw#Zowv%L?UEhCIuu`u|#Zt(>Z#apAewtp!b}|PUV-RI9lthCx)`J%05p~lpr?uc^!0UjPOmR6}$_d zhYtAsNv$6O=W%VkI*F};NA1YE=A=h$aJZ`Uh{cUHC$(3$_(`R$oxs)%k9w}RUdP9< zVVJLX{f;`RJq2&)-~Y}>%&_sAM!Csb@EI6{R%j&d6K@bN5Lv=SScrbpN2cGHUN_w^ zc})|>zZ>5*zGnQU@!Co4in062VVwp{&FULpyaUW#LkgIt^bPkNFy8fe3zV8*PyrJ& z`o_z5z)07C0%mz#<7aok=esT_fclcI@!=itg|7Y<7`v;0J_XFMx`yX2n4IcW!06@k z#&sc(8f*4}zFxEAR>okVTRKs!~jCNg7eo`7{*v8gE4g3@QIebO=*|HDqCp8X&r;lwT)k~NSw3oQrJwEsj j);&Dj`PGAe!f@M$i~Z|x`#z&JW3~}P`-hX(_Vx8oOPaXs diff --git a/server/djangoapp/admin.py b/server/djangoapp/admin.py index b1039e16b8..9764fe7f61 100644 --- a/server/djangoapp/admin.py +++ b/server/djangoapp/admin.py @@ -1,13 +1,22 @@ from django.contrib import admin # from .models import related models +from .models import CarMake, CarModel -# Register your models here. - # CarModelInline class +class CarModelInline(admin.StackedInline): + model = CarModel + extra = 1 -# CarModelAdmin class +# Register your models here. +@admin.register(CarMake) +class CarMakeAdmin(admin.ModelAdmin): + inlines = [CarModelInline] +# CarModelAdmin class +@admin.register(CarModel) +class CarModelAdmin(admin.ModelAdmin): + pass # CarMakeAdmin class with CarModelInline # Register models here diff --git a/server/djangoapp/models.py b/server/djangoapp/models.py index 27d96f4eff..fa009006ed 100644 --- a/server/djangoapp/models.py +++ b/server/djangoapp/models.py @@ -1,6 +1,34 @@ from django.db import models from django.utils.timezone import now +class CarMake(models.Model): + name = models.CharField(max_length=100) + description = models.TextField() + # Place for another CarMake model + # For example: field = models.TypeOfField() + + def __str__(self): + return self.name + +class CarModel(models.Model): + make = models.ForeignKey(CarMake, on_delete=models.CASCADE) + dealer_id = models.IntegerField() + name = models.CharField(max_length=100) + TYPE_CHOICES = ( + ('Sedan', 'Sedan'), + ('SUV', 'SUV'), + ('WAGON', 'WAGON'), + # place for more + ) + type = models.CharField(max_length=10, choices=TYPE_CHOICES) + year = models.DateField() + # Other fields in CarModel model + # For example: field = models.TypeOfField() + + def __str__(self): + return self.name + + # Create your models here. From fba274f7f530d4b6c2a44bf1a03f6f3f8b2bccd5 Mon Sep 17 00:00:00 2001 From: MarekAtGitHub Date: Wed, 18 Oct 2023 09:09:46 -0400 Subject: [PATCH 08/14] Beggining last lab week 3 --- server/db.sqlite3 | Bin 131072 -> 131072 bytes server/djangoapp/models.py | 24 ++++++++++++++++++++++++ server/djangoapp/restapis.py | 34 +++++++++++++++++++++++++++++++++- server/djangoapp/urls.py | 2 +- server/djangoapp/views.py | 9 +++++++-- 5 files changed, 65 insertions(+), 4 deletions(-) diff --git a/server/db.sqlite3 b/server/db.sqlite3 index aa03cb64f07519d241aff1dbd7b6faab5d569fc0..d195d0888dd7d383497113470fac86f7696ef834 100644 GIT binary patch delta 219 zcmZo@;Am*zm>|ulI#I@%QFUWNVZNY+f}ydMfr*u&k)DZ>fr){|=12LA`U*)UX_-Y; z>E=bnsildjB_=s(r8z~JM!CsJ>1i2RrWKQ!=Wq5ZF>^__@<~liGRhB$H!uhebvFoi z&QB|?GWIS_E;RMZu{6ny_YX^o$Z!rwbjrv!GB7gMH8j*UFhsW0)WpPm(}D;51nq3v Oux$h58-EdO1^@sv=|(UB delta 219 zcmZo@;Am*zm>|ulI8nx#QE_8JVZNZbf{~#W5E+>18JHLunVD>Ul+UQIP-s?SSX`K0 zQeKr-o>GyWZ%|fJP-$sulu??JQJG&*IGK6=X0PI+&~mGg$k0+VXI;mv@&JpVAmj8f zlcMDC;<8BHfBV%1d16^Z7WJ}G=%?vgzc)(B4&ZZ69 MHZZ>N7r|x#09KJkf&c&j diff --git a/server/djangoapp/models.py b/server/djangoapp/models.py index fa009006ed..ccddc1b21a 100644 --- a/server/djangoapp/models.py +++ b/server/djangoapp/models.py @@ -28,6 +28,30 @@ class CarModel(models.Model): def __str__(self): return self.name +class CarDealer: + def __init__(self, address, city, full_name, id, lat, long, short_name, st, zip): + # Dealer address + self.address = address + # Dealer city + self.city = city + # Dealer Full Name + self.full_name = full_name + # Dealer id + self.id = id + # Location lat + self.lat = lat + # Location long + self.long = long + # Dealer short name + self.short_name = short_name + # Dealer state + self.st = st + # Dealer zip + self.zip = zip + + def __str__(self): + return "Dealer name: " + self.full_name + # Create your models here. diff --git a/server/djangoapp/restapis.py b/server/djangoapp/restapis.py index b4d13f596a..918046a5bc 100644 --- a/server/djangoapp/restapis.py +++ b/server/djangoapp/restapis.py @@ -1,13 +1,26 @@ import requests import json # import related models here +from .models import CarDealer from requests.auth import HTTPBasicAuth # Create a `get_request` to make HTTP GET requests # e.g., response = requests.get(url, params=params, headers={'Content-Type': 'application/json'}, # auth=HTTPBasicAuth('apikey', api_key)) - +def get_request(url, **kwargs): + print(kwargs) + print("GET from {} ".format(url)) + try: + # Call get method of requests library with URL and parameters + response = requests.get(url, headers={'Content-Type': 'application/json'}, params=kwargs) + except: + # If any error occurs + print("Network exception occurred") + status_code = response.status_code + print("With status {} ".format(status_code)) + json_data = json.loads(response.text) + return json_data # Create a `post_request` to make HTTP POST requests # e.g., response = requests.post(url, params=kwargs, json=payload) @@ -18,6 +31,25 @@ # - Call get_request() with specified arguments # - Parse JSON results into a CarDealer object list +def get_dealers_from_cf(url, **kwargs): + results = [] + # Call get_request with a URL parameter + json_result = get_request(url) + if json_result: + # Get the row list in JSON as dealers + dealers = json_result["rows"] + # For each dealer object + for dealer in dealers: + # Get its content in `doc` object + dealer_doc = dealer["doc"] + # Create a CarDealer object with values in `doc` object + dealer_obj = CarDealer(address=dealer_doc["address"], city=dealer_doc["city"], full_name=dealer_doc["full_name"], + id=dealer_doc["id"], lat=dealer_doc["lat"], long=dealer_doc["long"], + short_name=dealer_doc["short_name"], + st=dealer_doc["st"], zip=dealer_doc["zip"]) + results.append(dealer_obj) + return results + # Create a get_dealer_reviews_from_cf method to get reviews by dealer id from a cloud function # def get_dealer_by_id_from_cf(url, dealerId): diff --git a/server/djangoapp/urls.py b/server/djangoapp/urls.py index afea77f5b7..52df43e0f5 100644 --- a/server/djangoapp/urls.py +++ b/server/djangoapp/urls.py @@ -28,7 +28,7 @@ path(route='logout/', view=views.logout_request, name='logout'), - path(route='', view=views.get_dealerships, name='get_dealership'), + path(route='', view=views.get_dealerships, name='index') # path for dealer reviews view diff --git a/server/djangoapp/views.py b/server/djangoapp/views.py index 22d49e493f..ced7631141 100644 --- a/server/djangoapp/views.py +++ b/server/djangoapp/views.py @@ -76,9 +76,14 @@ def signup(request): # Update the `get_dealerships` view to render the index page with a list of dealerships def get_dealerships(request): - context = {} if request.method == "GET": - return render(request, 'djangoapp/index.html', context) + url = "your-cloud-function-domain/dealerships/dealer-get" + # Get dealers from the URL + dealerships = get_dealers_from_cf(url) + # Concat all dealer's short name + dealer_names = ' '.join([dealer.short_name for dealer in dealerships]) + # Return a list of dealer short name + return HttpResponse(dealer_names) # Create a `get_dealer_details` view to render the reviews of a dealer From 97b74334da5a9fd2196e3ef51f7cbd0a4ced2af8 Mon Sep 17 00:00:00 2001 From: MarekAtGitHub Date: Wed, 18 Oct 2023 09:27:36 -0400 Subject: [PATCH 09/14] Continuation lab week 3 --- server/db.sqlite3 | Bin 131072 -> 131072 bytes .../djangoapp/templates/djangoapp/index.html | 9 ++++++++- server/djangoapp/urls.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/server/db.sqlite3 b/server/db.sqlite3 index d195d0888dd7d383497113470fac86f7696ef834..65e252092b1653d3f9315a63df80cf1947b8eb90 100644 GIT binary patch delta 98 zcmZo@;Am*zm>|ulGf~EwQDR z-CO?lew$pVJ!rfYyTKsyii4q(m`;o%H;D!T>e!a&`fX;k@5rM@yHcrpZT?(!3@z3} z_8bn6BN{V26CoiyR5UFZwvSuQif^)pLvuz}wA9aIYOlN z`*x_vrj}jCr{492lu9LDR?ts#KV~JneCjwB>RuQCXqQJo7rSnf6;2Yn&&UynVPMo7 zR?`>HOu-KkKm{5?8o(`BDF1$AFfJ|=1VK_?1oic@+Iy#Vcjjuj|CZf9zdn=m2a6;% RBdFOA_d#uL%<;LuE#KHIix~g_ diff --git a/server/djangoapp/templates/djangoapp/index.html b/server/djangoapp/templates/djangoapp/index.html index a214ce4bbb..7108a23cb6 100644 --- a/server/djangoapp/templates/djangoapp/index.html +++ b/server/djangoapp/templates/djangoapp/index.html @@ -70,7 +70,14 @@ - +
      +

      List of Dealerships

      +
        + {% for dealer in dealerships %} +
      • {{ dealer.full_name }}
        • + {% endfor %} +
      +
      diff --git a/server/djangoapp/urls.py b/server/djangoapp/urls.py index 52df43e0f5..97f78aa6a0 100644 --- a/server/djangoapp/urls.py +++ b/server/djangoapp/urls.py @@ -28,7 +28,7 @@ path(route='logout/', view=views.logout_request, name='logout'), - path(route='', view=views.get_dealerships, name='index') + path(route='dealerships/', view=views.get_dealerships, name='dealerships') # path for dealer reviews view From 8a7165b5ce872c0493fb305c4ed8b9908b576db6 Mon Sep 17 00:00:00 2001 From: MarekAtGitHub Date: Wed, 18 Oct 2023 09:47:16 -0400 Subject: [PATCH 10/14] Continuation number 2 lab week 3 --- server/djangoapp/models.py | 15 +++++++++++++++ server/djangoapp/restapis.py | 25 ++++++++++++++++++++++++- server/djangoapp/urls.py | 2 ++ server/djangoapp/views.py | 9 +++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/server/djangoapp/models.py b/server/djangoapp/models.py index ccddc1b21a..601d05bfa9 100644 --- a/server/djangoapp/models.py +++ b/server/djangoapp/models.py @@ -52,6 +52,21 @@ def __init__(self, address, city, full_name, id, lat, long, short_name, st, zip) def __str__(self): return "Dealer name: " + self.full_name +class DealerReview(models.Model): + dealership = models.CharField(max_length=100) + name = models.CharField(max_length=100) + purchase = models.BooleanField() + review = models.TextField() + purchase_date = models.DateField() + car_make = models.CharField(max_length=100) + car_model = models.CharField(max_length=100) + car_year = models.IntegerField() + sentiment = models.CharField(max_length=10) + id = models.IntegerField(primary_key=True) + + def __str__(self): + return self.name + # Create your models here. diff --git a/server/djangoapp/restapis.py b/server/djangoapp/restapis.py index 918046a5bc..4681a1798c 100644 --- a/server/djangoapp/restapis.py +++ b/server/djangoapp/restapis.py @@ -1,10 +1,11 @@ import requests import json # import related models here -from .models import CarDealer +from .models import CarDealer, DealerReview from requests.auth import HTTPBasicAuth + # Create a `get_request` to make HTTP GET requests # e.g., response = requests.get(url, params=params, headers={'Content-Type': 'application/json'}, # auth=HTTPBasicAuth('apikey', api_key)) @@ -56,6 +57,28 @@ def get_dealers_from_cf(url, **kwargs): # - Call get_request() with specified arguments # - Parse JSON results into a DealerView object list +def get_dealer_reviews_from_cf(url, dealer_id): + results = [] + # Call get_request with a URL parameter + json_result = get_request(url, dealerId=dealer_id) + if json_result: + # Get the reviews from the JSON + reviews = json_result.get("reviews", []) + for review in reviews: + review_obj = DealerReview( + dealership=review["dealership"], + name=review["name"], + purchase=review["purchase"], + review=review["review"], + purchase_date=review["purchase_date"], + car_make=review["car_make"], + car_model=review["car_model"], + car_year=review["car_year"], + sentiment=review.get("sentiment", "N/A"), + id=review["id"] + ) + results.append(review_obj) + return results # Create an `analyze_review_sentiments` method to call Watson NLU and analyze text # def analyze_review_sentiments(text): diff --git a/server/djangoapp/urls.py b/server/djangoapp/urls.py index 97f78aa6a0..2ef29258be 100644 --- a/server/djangoapp/urls.py +++ b/server/djangoapp/urls.py @@ -32,6 +32,8 @@ # path for dealer reviews view + path('dealer//', views.get_dealer_details, name='dealer_details'), + # path for add a review view ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file diff --git a/server/djangoapp/views.py b/server/djangoapp/views.py index ced7631141..b6941a8181 100644 --- a/server/djangoapp/views.py +++ b/server/djangoapp/views.py @@ -4,6 +4,8 @@ from django.shortcuts import get_object_or_404, render, redirect # from .models import related models # from .restapis import related methods +from .restapis import get_dealer_reviews_from_cf, get_dealers_from_cf + from django.contrib.auth import login, logout, authenticate from django.contrib.auth.forms import AuthenticationForm, UserCreationForm from django.contrib.auth.decorators import login_required # For authentication checks @@ -90,6 +92,13 @@ def get_dealerships(request): # def get_dealer_details(request, dealer_id): # ... +def get_dealer_details(request, dealer_id): + if request.method == "GET": + url = "your-cloud-function-domain/reviews/review-get" # Replace with your actual URL + reviews = get_dealer_reviews_from_cf(url, dealer_id) + return render(request, 'djangoapp/dealer_details.html', {'reviews': reviews}) + + # Create a `add_review` view to submit a review # def add_review(request, dealer_id): # ... From 2a47d6561336ea8ab7f4bcb7f44c022e569e8c48 Mon Sep 17 00:00:00 2001 From: MarekAtGitHub Date: Wed, 18 Oct 2023 10:38:16 -0400 Subject: [PATCH 11/14] Continuation number 2- last lab week 3 --- server/djangoapp/restapis.py | 49 +++++++++++++++---- .../templates/djangoapp/dealer_details.html | 46 +++++++++++++++++ server/djangoapp/urls.py | 4 +- server/djangoapp/views.py | 16 ++++-- 4 files changed, 101 insertions(+), 14 deletions(-) diff --git a/server/djangoapp/restapis.py b/server/djangoapp/restapis.py index 4681a1798c..3bb4518ab9 100644 --- a/server/djangoapp/restapis.py +++ b/server/djangoapp/restapis.py @@ -4,17 +4,21 @@ from .models import CarDealer, DealerReview from requests.auth import HTTPBasicAuth - +WATSON_NLU_API_KEY = 'NgRnMOGD9aZZbFEGJI9B_6EoOc4lYsHbjHXRPEOcKAyx' # Create a `get_request` to make HTTP GET requests # e.g., response = requests.get(url, params=params, headers={'Content-Type': 'application/json'}, # auth=HTTPBasicAuth('apikey', api_key)) -def get_request(url, **kwargs): +def get_request(url, api_key=None, **kwargs): print(kwargs) print("GET from {} ".format(url)) try: - # Call get method of requests library with URL and parameters - response = requests.get(url, headers={'Content-Type': 'application/json'}, params=kwargs) + if api_key: + # Call GET method with basic authentication + response = requests.get(url, headers={'Content-Type': 'application/json'}, params=kwargs, auth=HTTPBasicAuth('apikey', api_key)) + else: + # Call GET method without authentication + response = requests.get(url, headers={'Content-Type': 'application/json'}, params=kwargs) except: # If any error occurs print("Network exception occurred") @@ -57,13 +61,16 @@ def get_dealers_from_cf(url, **kwargs): # - Call get_request() with specified arguments # - Parse JSON results into a DealerView object list -def get_dealer_reviews_from_cf(url, dealer_id): +def get_dealer_reviews_from_cf(url, dealer_id, api_key): results = [] + # Call get_request with a URL parameter - json_result = get_request(url, dealerId=dealer_id) + json_result = get_request(url, dealerId=dealer_id, api_key=api_key) + if json_result: - # Get the reviews from the JSON - reviews = json_result.get("reviews", []) + # Get the list of reviews + reviews = json_result + for review in reviews: review_obj = DealerReview( dealership=review["dealership"], @@ -74,10 +81,11 @@ def get_dealer_reviews_from_cf(url, dealer_id): car_make=review["car_make"], car_model=review["car_model"], car_year=review["car_year"], - sentiment=review.get("sentiment", "N/A"), + sentiment=analyze_review_sentiments(review["review"]), # Analyze sentiment id=review["id"] ) results.append(review_obj) + return results # Create an `analyze_review_sentiments` method to call Watson NLU and analyze text @@ -86,4 +94,27 @@ def get_dealer_reviews_from_cf(url, dealer_id): # - Get the returned sentiment label such as Positive or Negative +def analyze_review_sentiments(text): + url = "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/instances/b47940d0-c41e-43b6-8430-b92ee938ce46/v1/analyze?version=2020-08-01" + + params = { + "text": text, + "version": "2020-08-01", + "features": "sentiment", + "return_analyzed_text": True + } + + response = requests.get(url, params=params, headers={'Content-Type': 'application/json'}, auth=HTTPBasicAuth('apikey', WATSON_NLU_API_KEY)) + + if response.status_code == 200: + json_response = response.json() + if "sentiment" in json_response: + return json_response["sentiment"]["document"]["label"] + else: + return "Unknown" + else: + return "API request failed with status code: " + str(response.status_code) + + + diff --git a/server/djangoapp/templates/djangoapp/dealer_details.html b/server/djangoapp/templates/djangoapp/dealer_details.html index 25bd9a223d..f303bac282 100644 --- a/server/djangoapp/templates/djangoapp/dealer_details.html +++ b/server/djangoapp/templates/djangoapp/dealer_details.html @@ -13,6 +13,52 @@ + + + + + Dealership Review + {% load static %} + + + + + + + +
      +

      Dealer Details

      + + +
      +
      +
      {{ dealer.full_name }}
      +

      Address: {{ dealer.address }}, {{ dealer.city }}, {{ dealer.st }} {{ dealer.zip }}

      + +
      +
      + +

      Dealer Reviews

      + + +
      + {% for review in reviews %} +
      +
      +
      +

      {{ review.review }}

      +
      +
      + +
      +
      +
      +
      +
      + {% endfor %} +
      +
      + \ No newline at end of file diff --git a/server/djangoapp/urls.py b/server/djangoapp/urls.py index 2ef29258be..b9e0d6df07 100644 --- a/server/djangoapp/urls.py +++ b/server/djangoapp/urls.py @@ -28,11 +28,11 @@ path(route='logout/', view=views.logout_request, name='logout'), - path(route='dealerships/', view=views.get_dealerships, name='dealerships') + path(route='dealerships/', view=views.get_dealerships, name='dealerships'), # path for dealer reviews view - path('dealer//', views.get_dealer_details, name='dealer_details'), + path(route='dealer//', view=views.get_dealer_details, name='dealer_details') # path for add a review view diff --git a/server/djangoapp/views.py b/server/djangoapp/views.py index b6941a8181..d83a301474 100644 --- a/server/djangoapp/views.py +++ b/server/djangoapp/views.py @@ -92,11 +92,21 @@ def get_dealerships(request): # def get_dealer_details(request, dealer_id): # ... + + def get_dealer_details(request, dealer_id): + api_key = 'NgRnMOGD9aZZbFEGJI9B_6EoOc4lYsHbjHXRPEOcKAyx' + url = "https://us-south.functions.appdomain.cloud/api/v1/web/b81143fb-ebf7-455a-b7a0-fe558100017e/default/getReviewsForDealership?dealerId=13" + if request.method == "GET": - url = "your-cloud-function-domain/reviews/review-get" # Replace with your actual URL - reviews = get_dealer_reviews_from_cf(url, dealer_id) - return render(request, 'djangoapp/dealer_details.html', {'reviews': reviews}) + # Get reviews for the dealer with the specified ID + reviews = get_dealer_reviews_from_cf(url, dealer_id, api_key) + + context = { + "reviews": reviews + } + + return render(request, 'djangoapp/dealer_details.html', context) # Create a `add_review` view to submit a review From 737efc4d0fe5baa02654b56553331f8a12d967be Mon Sep 17 00:00:00 2001 From: MarekAtGitHub Date: Wed, 18 Oct 2023 16:23:49 -0400 Subject: [PATCH 12/14] Lab week 4 final project first --- server/db.sqlite3 | Bin 131072 -> 131072 bytes server/djangoapp/models.py | 53 ++++++++---------- .../templates/djangoapp/dealer_details.html | 19 ++++++- .../djangoapp/templates/djangoapp/index.html | 35 ++++++++++-- server/djangoapp/views.py | 13 +++-- 5 files changed, 79 insertions(+), 41 deletions(-) diff --git a/server/db.sqlite3 b/server/db.sqlite3 index 65e252092b1653d3f9315a63df80cf1947b8eb90..3b1ddaa9206c86a826642e37ef370aea97f60e13 100644 GIT binary patch delta 2697 zcmZuyOKclO7~Ub{$F6sG@^YNSc5KIX?8J4m58G=ON=ZXRTOl;qc_oizU^sOB1bhahEVrpAV*d`^nDxwlg$?8dGs+pB!A))@{ z6q{HKg1Zn@P^Zz2{`MD^lbsj{5Jvj4ebO{tQYlGKsDZB448D8?l9wZ5i)6M`TLf_l9< zH=Y#4L{jy6B)6f0cp{NZ#Do?T=Fq`t7Dv>$ z&<`fF3x&)=p|HG|$s7LD9JJd(`dDG+SU!`p^3d)eXgZfYwrJ^qb{~O@ncUIYe10~& zU~Y#FHz3W-XQ#1ZZrRieJwY%vmtL68rWY5dGU@qDE|+;}HnRjB(C+axVw34yHLPCU zA>z`9DD)?~ioQf=(d%d#&7u8h2O3%_^QhRtK+5gRXUM8~{ntrDD(E-VZ|sG&LdtHh z^}<;&a%hP3(r(7kr@=-qZ6-)L+)cgoKuCFlxR;@Oo9Sx7F;BfuLoa*9ePQ-8g>IvD zbOn8m-o@Q4p-HqCC6N!Y{6G8}|1JL^e}*sdbNmE9!VmIo+`rsS?gsZg_Zjy-r*dWP zMeaFnCpXBoa};}%z0O`0w;Q>c>z zZ4meYlb)KYr3Jenhyt3(8MZOd4S@(~UD6Qn7poCn*AVHqLl6P9rfpz-2m%kV5`FDP zc}WFUU07p0RYn)om_8l?H?V3-8g#cp-~$#SF`X;od*~v2V9`a$aXPD%u0p6@vb05$ zA-IPWXeK(1Gw*glFbvGPR)cp`d0nu<7rV&Dnl;%5Ywv&{1WZJ`W`j<$o=I1(u^m-b z*R8Sbqeay+nSJ~p4!%B{IH~ujG`!nE$Kw|mGW1-U}^z?36n8I#sM-0wUG{x(ND&HGWu4>e*Nb5 zzA$}(LYvsW^3}Z?9wdJ{?@bVAPF)J6N}>HVt0{GON#pW4^(fZ?SFb zqQs89>yTpgMla1aBfYO%nNtpXhb$wN*lm$abPg4m@6M`fRLq2 z2RAfe$6!!2SInDugE}z?iKfcdP2jb3U=WF$Do<~MfTdjrB@MJ;5F9pDKHdcGVzd>b z;nY12T&nj`wUW2`X%i7nm$%=~m)eA?o$!zLF|1ADt5fb{*wJ)x!CU2<=R`O>C#u|I z<=P%KEf8XH@}PW|!Rz&7zv|)<8&NfyzDO!Hly1mos@Zox1zNIRb0axO=;#-}Y=YsoRcq-E`XAwd>ze=o delta 1975 zcmZ9MU2NM_6vus=o7ih&-=s~Ju8A9mHtRyx#&&GS>42_kyR{%_*~Ab?`-s}CYt{npwGrY4w$aYgjF9-+v^PM?HbB}7^UfrQ$hloUZuX>SHn%_=Vms`hbD`Nh}U^4K%qX6j711lU+^!R}p2Am$h4uOQ8b<`Wk(JK1D02h<-;m(Sb^N7t&&bUYxjdFgQZe(B}i`W2Ga< zikX6gfj+-UGlkr-yuBUz!Y1Z3g`=~@;%qJp+n}EXX20HVFNdc zdu)*KvyT;@5Jouq1c4r)D!PWgK%N%5$ zXLc|##z+54-=n{yuh19h75YS_EYnME5JUj=`fO(5pw%hog&+#3>CAkll&OoMnmBbN zot=3kc6lJ^22^@_x}L^vhM*6SrrlI7Tf(bVTFhsH9S{hBv@9C}fu&l+@@DjH*8Gym<>YHXJfzIehA_KT3#DEs_B;DhQ7p@3kwa~4V7+(pcmLo z@A}NS%z8GHbd-=J;yT^N8n|$Gwy^|&BupmtrhsPH4#rR9RW9njRE}h9g zyH}ammEW^xWMMv@8+}^j#YCUL_X#Q|BnCuzKv4Uogdi$%A(tyXiq`K2S?pIO1z&Nk z1VI4w7lB{=Tw?Nnhgz8RO8ExU0wR@i7@YZtYC+XYp8O98^sJV-b1UwPE6{D@(5OaU zAF7leGM7ew{OZ97=jHp~K^f~%C{VJ`{ZLU9E zw_KN9XIv%MxU0i?-+9IPt~2i(bM{oq)mG{W&Q5?xAEjTt4OlXSAu3S%&$mIC?6SbM z2EtJmLwBt4Bn+ps9A1CUI#jVB&ge^$`o1-=l?-4Ic98lTYv4(;(}K$eY{3wdN&S~K z&_i}$2=zL2_d4*Cehl3)hu*&q0_0{3CNXsTFtCwF175Fe411Rs$HGy&etI2jA=@!T z`t15=>wq0^t3l(48(-F#GekRnEL$qfVR_lWqF1RlE$X7I^Pq*n}Yxx9Nj- Y0Q=>&yI`lM1^t9aVjY35)uGP+0at$%+5i9m diff --git a/server/djangoapp/models.py b/server/djangoapp/models.py index 601d05bfa9..6299df7623 100644 --- a/server/djangoapp/models.py +++ b/server/djangoapp/models.py @@ -1,11 +1,9 @@ -from django.db import models from django.utils.timezone import now +from django.db import models class CarMake(models.Model): name = models.CharField(max_length=100) description = models.TextField() - # Place for another CarMake model - # For example: field = models.TypeOfField() def __str__(self): return self.name @@ -14,40 +12,30 @@ class CarModel(models.Model): make = models.ForeignKey(CarMake, on_delete=models.CASCADE) dealer_id = models.IntegerField() name = models.CharField(max_length=100) + TYPE_CHOICES = ( ('Sedan', 'Sedan'), ('SUV', 'SUV'), ('WAGON', 'WAGON'), - # place for more + # Add more choices here ) + type = models.CharField(max_length=10, choices=TYPE_CHOICES) year = models.DateField() - # Other fields in CarModel model - # For example: field = models.TypeOfField() def __str__(self): return self.name -class CarDealer: - def __init__(self, address, city, full_name, id, lat, long, short_name, st, zip): - # Dealer address - self.address = address - # Dealer city - self.city = city - # Dealer Full Name - self.full_name = full_name - # Dealer id - self.id = id - # Location lat - self.lat = lat - # Location long - self.long = long - # Dealer short name - self.short_name = short_name - # Dealer state - self.st = st - # Dealer zip - self.zip = zip +class CarDealer(models.Model): + address = models.CharField(max_length=200) + city = models.CharField(max_length=100) + full_name = models.CharField(max_length=100) + id = models.IntegerField(primary_key=True) + lat = models.DecimalField(max_digits=9, decimal_places=6) + long = models.DecimalField(max_digits=9, decimal_places=6) + short_name = models.CharField(max_length=50) + st = models.CharField(max_length=2) + zip = models.CharField(max_length=10) def __str__(self): return "Dealer name: " + self.full_name @@ -61,14 +49,19 @@ class DealerReview(models.Model): car_make = models.CharField(max_length=100) car_model = models.CharField(max_length=100) car_year = models.IntegerField() - sentiment = models.CharField(max_length=10) - id = models.IntegerField(primary_key=True) + + SENTIMENT_CHOICES = ( + ('Positive', 'Positive'), + ('Negative', 'Negative'), + ('Neutral', 'Neutral'), + ) + + sentiment = models.CharField(max_length=10, choices=SENTIMENT_CHOICES) + id = models.AutoField(primary_key=True) def __str__(self): return self.name - - # Create your models here. # Create a Car Make model `class CarMake(models.Model)`: diff --git a/server/djangoapp/templates/djangoapp/dealer_details.html b/server/djangoapp/templates/djangoapp/dealer_details.html index f303bac282..a5946b03bd 100644 --- a/server/djangoapp/templates/djangoapp/dealer_details.html +++ b/server/djangoapp/templates/djangoapp/dealer_details.html @@ -10,7 +10,10 @@ - + @@ -57,6 +60,20 @@

      Dealer Reviews

      {% endfor %} + + +
      + {% for review in reviews %} +
      + Sentiment Emoji +
      +
      {{ review.car_make }} - {{ review.car_model }}
      +

      Purchase Year: {{ review.car_year }}

      +

      {{ review.review }}

      +
      +
      + {% endfor %} +
      diff --git a/server/djangoapp/templates/djangoapp/index.html b/server/djangoapp/templates/djangoapp/index.html index 7108a23cb6..3b9c51db0e 100644 --- a/server/djangoapp/templates/djangoapp/index.html +++ b/server/djangoapp/templates/djangoapp/index.html @@ -70,14 +70,39 @@ +

      List of Dealerships

      -
        - {% for dealer in dealerships %} -
      • {{ dealer.full_name }}
        • - {% endfor %} -
      + + + + + + + + + + + + + {% for dealer in dealerships %} + + + + + + + + + {% endfor %} + +
      IDDealer NameCityAddressZipState
      {{ dealer.id }}{{ dealer.full_name }}{{ dealer.city }}{{ dealer.address }}{{ dealer.zip }}{{ dealer.st }}
      + diff --git a/server/djangoapp/views.py b/server/djangoapp/views.py index d83a301474..37ec30b393 100644 --- a/server/djangoapp/views.py +++ b/server/djangoapp/views.py @@ -3,6 +3,7 @@ from django.contrib.auth.models import User from django.shortcuts import get_object_or_404, render, redirect # from .models import related models +from .models import CarDealer # from .restapis import related methods from .restapis import get_dealer_reviews_from_cf, get_dealers_from_cf @@ -79,13 +80,15 @@ def signup(request): # Update the `get_dealerships` view to render the index page with a list of dealerships def get_dealerships(request): if request.method == "GET": - url = "your-cloud-function-domain/dealerships/dealer-get" + url = "https://us-south.functions.appdomain.cloud/api/v1/web/b81143fb-ebf7-455a-b7a0-fe558100017e/default/getDealerships" # Get dealers from the URL - dealerships = get_dealers_from_cf(url) + dealerships = CarDealer.objects.all() # Concat all dealer's short name - dealer_names = ' '.join([dealer.short_name for dealer in dealerships]) - # Return a list of dealer short name - return HttpResponse(dealer_names) + context = { + "dealerships": dealerships # Updated context variable name + } + + return render(request, 'djangoapp/index.html', context) # Create a `get_dealer_details` view to render the reviews of a dealer From 92e41a512a4635bc2210e77beeeeed0c47f0a83f Mon Sep 17 00:00:00 2001 From: MarekAtGitHub Date: Wed, 18 Oct 2023 16:48:12 -0400 Subject: [PATCH 13/14] Lab week 4 final project everything done :) --- .../templates/djangoapp/add_review.html | 32 +++++++++++++ server/djangoapp/urls.py | 4 +- server/djangoapp/views.py | 46 ++++++++++++++++++- 3 files changed, 80 insertions(+), 2 deletions(-) diff --git a/server/djangoapp/templates/djangoapp/add_review.html b/server/djangoapp/templates/djangoapp/add_review.html index 768ddf508c..d4ddbc215a 100644 --- a/server/djangoapp/templates/djangoapp/add_review.html +++ b/server/djangoapp/templates/djangoapp/add_review.html @@ -12,5 +12,37 @@ +
      +

      Submit a Review

      +
      + {% csrf_token %} +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      + + +
      +
      \ No newline at end of file diff --git a/server/djangoapp/urls.py b/server/djangoapp/urls.py index b9e0d6df07..92daa24e36 100644 --- a/server/djangoapp/urls.py +++ b/server/djangoapp/urls.py @@ -32,8 +32,10 @@ # path for dealer reviews view - path(route='dealer//', view=views.get_dealer_details, name='dealer_details') + path(route='dealer//', view=views.get_dealer_details, name='dealer_details'), # path for add a review view + path('add_review//', views.add_review, name='add_review'), + ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file diff --git a/server/djangoapp/views.py b/server/djangoapp/views.py index 37ec30b393..0a781458f9 100644 --- a/server/djangoapp/views.py +++ b/server/djangoapp/views.py @@ -3,7 +3,7 @@ from django.contrib.auth.models import User from django.shortcuts import get_object_or_404, render, redirect # from .models import related models -from .models import CarDealer +from .models import CarDealer, CarModel, DealerReview # from .restapis import related methods from .restapis import get_dealer_reviews_from_cf, get_dealers_from_cf @@ -116,3 +116,47 @@ def get_dealer_details(request, dealer_id): # def add_review(request, dealer_id): # ... +def add_review(request, dealer_id): + if request.method == 'GET': + # Query cars with the dealer id to be reviewed + cars = CarModel.objects.filter(dealer_id=dealer_id) + + # Append the queried cars into context + context = { + 'cars': cars, + 'dealer_id': dealer_id, + } + return render(request, 'djangoapp/add_review.html', context) + + elif request.method == 'POST': + dealer_id = request.POST.get('dealer_id') # You may need to retrieve dealer_id from the form or URL + review_content = request.POST.get('content') + purchased = request.POST.get('purchasecheck') + car_id = request.POST.get('car') + purchasedate = request.POST.get('purchasedate') + + # Use datetime.utcnow().isoformat() to format the review time + review_time = datetime.utcnow().isoformat() + + # Use car.year.strftime("%Y") to get the year from the date field + car = CarModel.objects.get(id=car_id) + purchase_year = car.year.strftime("%Y") + + # Create a DealerReview object and save it to the database + review = DealerReview( + dealership=dealer_id, + name="Your User Name", # Replace with user authentication if available + purchase=(purchased == 'on'), # Convert checkbox input to a boolean + review=review_content, + purchase_date=purchasedate, + car_make=car.make.name, + car_model=car.name, + car_year=purchase_year, + sentiment="Unknown", + ) + review.save() + + # Redirect to the dealer details page for the dealer_id + return redirect('djangoapp:dealer_details', dealer_id=dealer_id) + + return HttpResponse("Invalid request method") \ No newline at end of file From e26c4e07600b75a33d970a2adebd2a05acc2008b Mon Sep 17 00:00:00 2001 From: MarekAtGitHub Date: Thu, 19 Oct 2023 08:46:11 -0400 Subject: [PATCH 14/14] Week 5 lab docker file and kubernetees deployment --- server/Dockerfile | 28 ++++++++++++++++++++++++++++ server/deployment.yaml | 29 +++++++++++++++++++++++++++++ server/entrypoint.sh | 17 +++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 server/Dockerfile create mode 100644 server/deployment.yaml create mode 100755 server/entrypoint.sh diff --git a/server/Dockerfile b/server/Dockerfile new file mode 100644 index 0000000000..f79740cfdf --- /dev/null +++ b/server/Dockerfile @@ -0,0 +1,28 @@ +FROM python:3.8.2 + +ENV PYTHONBUFFERED 1 +ENV PYTHONWRITEBYTECODE 1 + +RUN apt-get update \ + && apt-get install -y netcat + +# Set the working directory to /app +ENV APP=/app +WORKDIR $APP + +# Copy the requirements file into the container +COPY requirements.txt $APP + +# Install the requirements +RUN pip3 install -r requirements.txt + +# Copy the rest of the project files into the container +COPY . $APP + +EXPOSE 8000 + +RUN chmod +x /app/entrypoint.sh + +ENTRYPOINT ["/bin/bash", "/app/entrypoint.sh"] + +CMD ["gunicorn", "--bind", ":8000", "--workers", "3", "djangobackend.wsgi"] diff --git a/server/deployment.yaml b/server/deployment.yaml new file mode 100644 index 0000000000..953e6d1eb9 --- /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-marekmarkiew/dealership:latest + imagePullPolicy: Always + name: dealership + ports: + - containerPort: 8000 + protocol: TCP + restartPolicy: Always \ No newline at end of file diff --git a/server/entrypoint.sh b/server/entrypoint.sh new file mode 100755 index 0000000000..1a48bf8972 --- /dev/null +++ b/server/entrypoint.sh @@ -0,0 +1,17 @@ + #!/bin/sh + + if [ "$DATABASE" = "postgres" ]; then + echo "Waiting for postgres..." + + while ! nc -z $DATABASE_HOST $DATABASE_PORT; do + sleep 0.1 + done + + echo "PostgreSQL started" + fi + + # Make migrations and migrate the database. + echo "Making migrations and migrating the database. " + python manage.py makemigrations main --noinput + python manage.py migrate --noinput + exec "$@" \ No newline at end of file