Dat

.env

@@ -5,7 +5,7 @@
 ## Change to false on deployment
 DEBUG = True  
 ## For running local database
-RUN_LOCAL_DB = True 
+RUN_LOCAL_DB = false
 
 ##### Local database ######
 LOCAL_DB_NAME='appstore'
@@ -14,8 +14,8 @@ LOCAL_DB_USER='postgres'
 LOCAL_DB_PASSWORD='postgres'
 
 ##### Heroku database ######
-DB_HOST=
-DB_NAME=
-DB_USER=
-DB_PORT=
-DB_PASSWORD=
+DB_HOST=ec2-18-210-191-5.compute-1.amazonaws.com
+DB_NAME=dfrm6gaqmbacc5
+DB_USER=mgcpstosjeuepv
+DB_PORT=5432
+DB_PASSWORD=a3e79367a032178775f39ad9f641f3cd6ddf3ae490980bb75e3f2952efc6f3cf

AppStore/settings.py

@@ -56,8 +56,11 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
 ]
 
+# SESSION_ENGINE = ["django.contrib.sessions.backends.cache"]
+
 ROOT_URLCONF = 'AppStore.urls'
 
 TEMPLATES = [

AppStore/urls.py

@@ -14,15 +14,29 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path
+from django.urls import path, re_path
+
 
 import app.views
 
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path('', app.views.index, name='index'),
+    re_path(r'^appstore_admin/(?:(?P<id>\w+)/)?$', app.views.appstore_admin, name='appstore_admin'),
+    path('log_out', app.views.log_out, name='log_out'),
     path('add', app.views.add, name='add'),
+    path('signup', app.views.signup, name='signup'),
     path('view/<str:id>', app.views.view, name='view'),
     path('edit/<str:id>', app.views.edit, name='edit'),
+    path('', app.views.index, name='index'),
+    re_path(r'^listing/(?:(?P<id>\w+)/)?$', app.views.listing, name='listing'),
+    path('add_listing', app.views.add_listing, name='add_listing'),
+    path('del_listing', app.views.del_listing, name='del_listing'),
+    path('view_listing/<str:id>', app.views.view_listing, name='view_listing'),
+    path('rental/<str:Listingid>', app.views.rental, name = 'rental'),
+    path('personal/<str:id>', app.views.personal, name='personal'),
+    path('top_up', app.views.top_up, name='top_up'),
+    path('customer_details', app.views.customer_details, name='customer_details'),
+    re_path(r'^admin_listing/(?:(?P<id>\w+)/)?$', app.views.admin_listing, name='admin_listing'),
+    re_path(r'^admin_rental/(?:(?P<id>\w+)/)?$', app.views.admin_rental, name='admin_rental')
 ]

Github flow.txt

@@ -0,0 +1,26 @@
+0.  I use git bash as terminal in VSCode, but if other terminals work then ok
+
+1. Clone the repo to work locally:
+git clone https://github.com/thaotran27/AppStore.git
+
+2. Check which branch you are on:
+git checkout 
+
+(should give sth like your branch is up to date with '...'
+
+3. (if needed) create other branch:
+git branch <new_branch_name> 
+(change the thing inside <>)
+
+4. (if needed) switch to other branch:
+git checkout <branch_name> 
+
+5. push code onto Github remote so everyone can see:
+git add .
+git commit -m "message_change_this"
+git push
+
+if they got error like this: The current branch new_branch has no upstream branch.
+git push --set-upstream origin new_branch
+
+then git add, commit and push again

add_sql.sh

@@ -28,8 +28,11 @@ done < ".env"
 URI="postgres://$DB_USER:$DB_PASSWORD@$DB_HOST:$DB_PORT/$DB_NAME"
 
 # Run the scripts to insert data.
-psql ${URI} -f sql/AppStoreClean.sql
-psql ${URI} -f sql/AppStoreSchema.sql
-psql ${URI} -f sql/AppStoreCustomers.sql
-psql ${URI} -f sql/AppStoreGames.sql
-psql ${URI} -f sql/AppStoreDownloads.sql
+psql ${URI} -f sql/Clear_Data.sql
+psql ${URI} -f sql/GPU_rentalSchema.sql
+psql ${URI} -f sql/Trigger_Functions.sql
+psql ${URI} -f sql/User.sql
+psql ${URI} -f sql/GPU.sql
+psql ${URI} -f sql/GPU_Listing.sql
+#psql ${URI} -f sql/GPU_Listing_Archive.sql
+psql ${URI} -f sql/Rental.sql

app/static/style.css

@@ -0,0 +1,8 @@
+body {
+    background-color: lightblue;
+  }
+
+  h1 {
+    color: red;
+    margin-left: 20px;
+  }

app/templates/app/add.html

@@ -1,7 +1,16 @@
 <html>
+<head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <!-- Bootstrap CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+    <title>Add</title>
+</head>
 <body>
-    <h2>Add New Customer</h2>
-    <a href="/">Back to home</a>
+    <div class="container-fluid">
+    <a href="/customer_details">Back to Main</a>
 
     <p style="color:red">{{ status|safe }}</p>
     <!-- Create a Form -->
@@ -12,15 +21,18 @@ <h2>Add New Customer</h2>
         <div id="div_id_first_name" class="control-group"> <label for="id_first_name" class="control-label requiredField">
         First name<span class="asteriskField">*</span> </label> <div class="controls"> <input type="text" name="first_name" maxlength="64" class="textinput textInput" required="" id="id_first_name"> </div> </div> <div id="div_id_last_name" class="control-group"> <label for="id_last_name" class="control-label requiredField">
         Last name<span class="asteriskField">*</span> </label> <div class="controls"> <input type="text" name="last_name" maxlength="64" class="textinput textInput" required="" id="id_last_name"> </div> </div> <div id="div_id_email" class="control-group"> <label for="id_email" class="control-label requiredField">
-        Email<span class="asteriskField">*</span> </label> <div class="controls"> <input type="text" name="email" maxlength="64" class="textinput textInput" required="" id="id_email"> </div> </div> <div id="div_id_dob" class="control-group"> <label for="id_dob" class="control-label requiredField">
-        Date of birth (yyyy-mm-dd)<span class="asteriskField">*</span> </label> <div class="controls"> <input type="text" name="dob" class="dateinput" required="" id="id_dob"> </div> </div> <div id="div_id_since" class="control-group"> <label for="id_since" class="control-label requiredField">
-        Since (yyyy-mm-dd)<span class="asteriskField">*</span> </label> <div class="controls"> <input type="text" name="since" class="dateinput" required="" id="id_since"> </div> </div> <div id="div_id_customerid" class="control-group"> <label for="id_customerid" class="control-label requiredField">
-        Customerid<span class="asteriskField">*</span> </label> <div class="controls"> <input type="text" name="customerid" maxlength="16" class="textinput textInput" required="" id="id_customerid"> </div> </div> <div id="div_id_country" class="control-group"> <label for="id_country" class="control-label requiredField">
-        Country<span class="asteriskField">*</span> </label> <div class="controls"> <input type="text" name="country" maxlength="16" class="textinput textInput" required="" id="id_country"> </div> </div>
-
+        Email<span class="asteriskField">*</span> </label> <div class="controls"> <input type="text" name="email" maxlength="64" class="textinput textInput" required="" id="id_email"> </div> </div> <div id="div_id_customerid" class="control-group"> <label for="id_customerid" class="control-label requiredField">
+        Customerid<span class="asteriskField">*</span> </label> <div class="controls"> <input type="text" name="customerid" class="textinput textInput" required="" id="id_customerid"> </div> </div> <div id="div_id_phonenumber" class="control-group"> <label for="id_phonenumber" class="control-label requiredField">
+        Phone Number<span class="asteriskField">*</span> </label> <div class="controls"> <input type="number" name="phonenumber" maxlength="16" class="textinput textInput" required="" id="id_phonenumber"> </div> </div> <div id="div_id_password" class="control-group"> <label for="id_password" class="control-label requiredField">
+        Password<span class="asteriskField">*</span> </label> <div class="controls"> <input type="text" name="password" maxlength="16" class="textinput textInput" required="" id="id_password"> </div> </div>
+        <div id="div_id_credit_card_nbr" class="control-group"> <label for="id_credit_card_nbr" class="control-label requiredField">
+        Credit card number<span class="asteriskField">*</span> </label> <div class="controls"> <input type="number" name="credit_card_nbr" maxlength="64" class="textinput textInput" required="" id="id_credit_card_nbr"> </div> </div>
+        <div id="div_id_credit_card_type" class="control-group"> <label for="id_credit_card_type" class="control-label requiredField">
+        Credit card type<span class="asteriskField">*</span> </label> <div class="controls"> <input type="text" name="credit_card_type" maxlength="64" class="textinput textInput" required="" id="id_credit_card_type"> </div> </div>
         <br>
-        <button type="submit" value="Add">Add</button>
+        <button type="submit" class="btn btn-primary" value="Add">Add</button>
     </form>
+    </div>
 </body>
 </html>
 

app/templates/app/add_listing.html

@@ -0,0 +1,37 @@
+<html>
+    <head>
+        <!-- Required meta tags -->
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <!-- Bootstrap CSS -->
+        <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+        <title>Add listing</title>
+      </head>
+<body>
+    <div class="container-lg">
+    <p style="color:red">{{ status|safe }}</p>
+    <!-- Create a Form -->
+    <form method="POST">
+        <!-- Security token by Django -->
+        {% csrf_token %}
+        <!-- form -->
+        <h2>Add New Listing</h2>
+        <div id="div_id_gpu_model" class="control-group"> <label for="id_gpu_model" class="control-label requiredField">
+        GPU Model<span class="asteriskField">*</span> </label> <div class="controls"> <input type="text" name="gpu_model" maxlength="64" class="textinput textInput" required="" id="id_gpu_model"> </div> </div> 
+        <div id="div_id_gpu_brand" class="control-group"> <label for="id_gpu_brand" class="control-label requiredField">
+        GPU Brand<span class="asteriskField">*</span> </label> <div class="controls"> <input type="text" name="gpu_brand" maxlength="64" class="textinput textInput" required="" id="id_gpu_brand"> </div> </div> 
+        <div id="div_id_start_date" class="control-group"> <label for="id_start_date" class="control-label requiredField">
+        Available Start Date<span class="asteriskField">*</span> </label> <div class="controls"> <input type="date" name="start_date" required="" id="id_start_date"> </div> </div> 
+        <div id="div_id_end_date" class="control-group"> <label for="id_end_date" class="control-label requiredField">
+        Available End Date<span class="asteriskField">*</span> </label> <div class="controls"> <input type="date" name="end_date" required="" id="id_end_date"> </div> </div> 
+        <div id="div_id_price" class="control-group"> <label for="id_price" class="control-label requiredField">
+        Price<span class="asteriskField">*</span> </label> <div class="controls"> <input type="number" name="price" required="" id="id_price"> </div> </div> 
+
+        <br>
+        <button class="btn btn-info" type="submit" value="Add">Add</button>
+    </form>
+</div>
+</body>
+</html>
+

app/templates/app/admin_listing.html

@@ -0,0 +1,74 @@
+{% load static %}
+<html>
+<head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <!-- Bootstrap CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+    <title>Customer Details</title>
+</head>
+<style>
+    .submitbtn {
+        width: auto;
+        padding: 5px 20px;
+        background-color: #03c61d;
+        color: rgb(255, 255, 255);
+        border-radius: 5px;
+    }
+    .resetbtn {
+        width: auto;
+        padding: 5px 20px;
+        background-color: #0464e2;
+        color: rgb(255, 255, 255);
+        border-radius: 5px;
+    }
+</style>
+<body>
+    <div class="container-fluid">
+    <h2>Listing by Customer Dashboard</h2>
+    <img src="{% static 'app/images/nus.jpg' %}" width="20%"   alt="NUS logo"/><br/>
+    <a href="{% url 'appstore_admin' %}">Back to Main</a>
+    <br/><br/>
+    <form action="/admin_listing/" method="get" id="cust">
+        <label for="cust">Select Customer ID:</label>
+            <select name="cust" id="cust">
+                <option value="Reset">--</option>
+                {% for customer in customers %}
+                    <option value={{customer.3}}>{{customer.3}}</option>
+                {% endfor %}
+            </select>
+        <input type="submit" class="submitbtn" value="Submit">
+    </form>
+    <form action="/admin_listing/" method="get" id="reset">
+        <input type="submit" class="resetbtn" value="Reset">
+    </form>
+
+    <table class='table' border=1>
+        <thead class="thead-dark">
+            <th>Customerid</th>
+            <th>First Name</th>
+            <th>Last Name</th>
+            <th>GPU Model</th>
+            <th>GPU Brand</th>
+            <th>Price</th>
+            <th>Available Start Day</th>
+            <th>Available End Day</th>
+        </thead>
+        {% for custinfo_index in custinfo %}
+        <tr>
+            <td> {{ custinfo_index.0 }} </td>
+            <td> {{ custinfo_index.1 }} </td>
+            <td> {{ custinfo_index.2 }} </td>
+            <td> {{ custinfo_index.3 }} </td>
+            <td> {{ custinfo_index.4 }} </td>
+            <td> {{ custinfo_index.5 }}</td>
+            <td> {{ custinfo_index.6 }}</td>
+            <td> {{ custinfo_index.7 }}</td>
+        </tr>
+        {% endfor %}
+    </table>
+    </div>
+</body>
+</html>

app/templates/app/admin_rental.html

@@ -0,0 +1,74 @@
+{% load static %}
+<html>
+<head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <!-- Bootstrap CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+    <title>Customer Details</title>
+</head>
+<style>
+    .submitbtn {
+        width: auto;
+        padding: 5px 20px;
+        background-color: #03c61d;
+        color: rgb(255, 255, 255);
+        border-radius: 5px;
+    }
+    .resetbtn {
+        width: auto;
+        padding: 5px 20px;
+        background-color: #0464e2;
+        color: rgb(255, 255, 255);
+        border-radius: 5px;
+    }
+</style>
+<body>
+    <div class="container-fluid">
+    <h2>Rental by Customer Dashboard</h2>
+    <img src="{% static 'app/images/nus.jpg' %}" width="20%"   alt="NUS logo"/><br/>
+    <a href="{% url 'appstore_admin' %}">Back to Main</a>
+    <br/><br/>
+    <form action="/admin_rental/" method="get" id="cust">
+        <label for="cust">Select Customer ID:</label>
+            <select name="cust" id="cust">
+                <option value="Reset">--</option>
+                {% for customer in customers %}
+                    <option value={{customer.3}}>{{customer.3}}</option>
+                {% endfor %}
+            </select>
+        <input type="submit" class="submitbtn"value="Submit">
+    </form>
+    <form action="/admin_rental/" method="get" id="reset">
+        <input type="submit" class="resetbtn" value="Reset">
+    </form>
+
+    <table class='table' border=1>
+        <thead class="thead-dark">
+            <th>Borrower ID</th>
+            <th>First Name</th>
+            <th>Last Name</th>
+            <th>GPU Model</th>
+            <th>GPU Brand</th>
+            <th>Price</th>
+            <th>Start Day</th>
+            <th>End Day</th>
+        </thead>
+        {% for custinfo_index in custinfo %}
+        <tr>
+            <td> {{ custinfo_index.0 }} </td>
+            <td> {{ custinfo_index.1 }} </td>
+            <td> {{ custinfo_index.2 }} </td>
+            <td> {{ custinfo_index.3 }} </td>
+            <td> {{ custinfo_index.4 }} </td>
+            <td> {{ custinfo_index.5 }}</td>
+            <td> {{ custinfo_index.6 }}</td>
+            <td> {{ custinfo_index.7 }}</td>
+        </tr>
+        {% endfor %}
+    </table>
+    </div>
+</body>
+</html>