From 92947c702c8c61e4a64ab6ccd91de7d6f4db7916 Mon Sep 17 00:00:00 2001 From: Fritz Ortiz Date: Wed, 27 Dec 2023 18:35:12 -0500 Subject: [PATCH 01/27] Adding temporary changes to Github --- server/db.sqlite3 | Bin 0 -> 131072 bytes .../djangoapp/templates/djangoapp/about.html | 14 ++++++++++++++ .../templates/djangoapp/contact_us.html | 17 +++++++++++++++++ .../djangoapp/templates/djangoapp/index.html | 9 ++++++++- server/djangoapp/urls.py | 2 ++ server/djangoapp/views.py | 12 +++++++++--- server/requirements.txt | 2 +- 7 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 server/db.sqlite3 create mode 100644 server/djangoapp/templates/djangoapp/about.html create mode 100644 server/djangoapp/templates/djangoapp/contact_us.html diff --git a/server/db.sqlite3 b/server/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..0d4986de7021a1a62acd20b91e9df65706faf686 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_us.html b/server/djangoapp/templates/djangoapp/contact_us.html new file mode 100644 index 0000000000..3b9b574f41 --- /dev/null +++ b/server/djangoapp/templates/djangoapp/contact_us.html @@ -0,0 +1,17 @@ + + + + + + + +

Contact Us

+

+ Phone number: 000-111-2222
+ Address: 1600 Pennsylvania Ave, Washington DC, DC 20500 + +

+ + + + \ No newline at end of file diff --git a/server/djangoapp/templates/djangoapp/index.html b/server/djangoapp/templates/djangoapp/index.html index 1a9ee6e39a..655fcf8a43 100644 --- a/server/djangoapp/templates/djangoapp/index.html +++ b/server/djangoapp/templates/djangoapp/index.html @@ -15,8 +15,15 @@ - This is the index page of your Django app! + + diff --git a/server/djangoapp/urls.py b/server/djangoapp/urls.py index 37b1c89d01..74ec8bac82 100644 --- a/server/djangoapp/urls.py +++ b/server/djangoapp/urls.py @@ -10,8 +10,10 @@ # 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..1a010d428d 100644 --- a/server/djangoapp/views.py +++ b/server/djangoapp/views.py @@ -17,13 +17,19 @@ # Create your views here. -# Create an `about` view to render a static about page -# def about(request): -# ... +# Create an `about` view to render a static about page +def about(request): + context = {} + if request.method == "GET": + return render(request, 'djangoapp/about.html',context) # Create a `contact` view to return a static contact page #def contact(request): +def contact(request): + context = {} + if request.method == "GET": + return render(request, 'djangoapp/contact_us.html',context) # Create a `login_request` view to handle sign in request # def login_request(request): diff --git a/server/requirements.txt b/server/requirements.txt index 2851cca128..a3e766f47a 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -1,6 +1,6 @@ requests Django==3.1.3 -Pillow==8.0.1 +Pillow==10.1.0 gunicorn==20.1.0 ibm-cloud-sdk-core==3.10.0 ibm-watson==5.2.2 From b00e5e5aaaefd1141f9a5790a77d6efdfa164d39 Mon Sep 17 00:00:00 2001 From: Fritz Ortiz Date: Wed, 27 Dec 2023 23:03:49 -0500 Subject: [PATCH 02/27] Added authentication and registration features --- server/db.sqlite3 | Bin 131072 -> 131072 bytes .../djangoapp/templates/djangoapp/index.html | 44 +++++++++++-- .../templates/djangoapp/registration.html | 19 +++++- server/djangoapp/urls.py | 3 + server/djangoapp/views.py | 61 ++++++++++++++++-- 5 files changed, 114 insertions(+), 13 deletions(-) diff --git a/server/db.sqlite3 b/server/db.sqlite3 index 0d4986de7021a1a62acd20b91e9df65706faf686..8080ad09b74c765736645e94a1d0ecc91a0d89eb 100644 GIT binary patch delta 516 zcmZo@;Am*zm>|vQI#I@%(RE|OB6*Qn3~c;m4E!(ouki2YFXQj#U&CLqu`z*va+$u0 z8Uq7^5D+5)UOr}d#>CQ+jQG;x)FLKvR%T53VQ!kaJa8yavh@ttGf&*VF|vGEXJ zeWL^uFGHiIBZsgsF9)Zia6wXbN}5r8aYmw%shNtAp_ze!fr_(PQAkikU{XhU zg@S>xm5Hg9k%69tp{2RGX+eHLPG*TwJ*ol|D^m+SGjmfD3xk6E)J73Tu-iDrd3iZG z9eJ_3EwaQgI3?M{y}-paRV5|gJ+ZtPCvlOw3FTP0bQhax?Rg-EL@QXl`X>p=W4lVPR~^1q^E@ z{`U<0-}&Ef7EE}|FT~C)%n0-m69=<6Cs;G@X2t?`0VclN8yhe4F)^xcY*b{NRKUT+ pe+Q`HDnFyj#72cp4J-=HEEl%3Twr8TVB&uSl)25%C^ykj3IMRrie3N! 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 -