IT2002 · Aeromon · Mar 20, 2022 · Mar 20, 2022 · Mar 20, 2022 · Mar 20, 2022
diff --git a/.env b/.env
@@ -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-3-225-213-67.compute-1.amazonaws.com
+DB_NAME=dcafujsnfvh3vf
+DB_USER=gxhdxwiypuoagw
+DB_PORT=5432
+DB_PASSWORD=7ca86887b1a9c84830bc056af1655ef2d61c199484e0c7a5e6f227b126d74f1f
diff --git a/AppStore/settings.py b/AppStore/settings.py
@@ -150,3 +150,6 @@
 STATIC_URL = '/static/'
 
 django_heroku.settings(locals())
+import app.views
+LOGIN_REDIRECT_URL = '/'
+LOGOUT_REDIRECT_URL = "/"
diff --git a/AppStore/urls.py b/AppStore/urls.py
@@ -14,15 +14,44 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
+#from django.contrib.auth import views as auth_views
+#from django.urls import include
 from django.urls import path
 
 import app.views
 
+urlpatterns = [
+    path('admin/', admin.site.urls),
+    path('', app.views.home, name='home'),
+    path('register/', app.views.register, name='register'),
+    path('profile/<int:id>', app.views.profile, name='profile'),
+    path('login/', app.views.signin, name='login'),
+    path('view/<int:id>', app.views.view, name='view')
+]
 
+"""
+urlpatterns = [
+    path('admin/', admin.site.urls),
+    path('', app.views.index_products, name='products'),
+    #path("accounts/", include("django.contrib.auth.urls")),
+    #path("accounts/login/", auth_views.login().as_view, name='login'),
+    #path('login/', LoginView.as_view(template_name='app/login.html'), name='login'),
+    #path('', app.views.index, name='index'),
+    path('add/', app.views.add, name='add'),
+    #path('buy/', app.views.buy, name='buy'),
+    path('view/<str:id>', app.views.view, name='view'),
+    path('edit/<str:id>', app.views.edit, name='edit'),
+    path('login/', app.views.login, name='login'),
+    path('purchase/<int:productid>', app.views.purchase, name='purchase'),
+]
+"""
+
+"""
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('', app.views.index, name='index'),
     path('add', app.views.add, name='add'),
     path('view/<str:id>', app.views.view, name='view'),
     path('edit/<str:id>', app.views.edit, name='edit'),
 ]
+"""
diff --git a/add_sql.sh b/add_sql.sh
@@ -28,8 +28,9 @@ 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/clean.sql
+psql ${URI} -f sql/appschema.sql
+psql ${URI} -f sql/allusersdata.sql
+psql ${URI} -f sql/products.sql
+psql ${URI} -f sql/transdata.sql
+
diff --git a/app/admin.py b/app/admin.py
@@ -1,3 +1,7 @@
 from django.contrib import admin
+from django.contrib.auth.models import User
 
 # Register your models here.
+
+class PersonAdmin(admin.ModelAdmin):
+    list_display = ('username', 'phoneno', 'password1')
diff --git a/app/forms.py b/app/forms.py
@@ -0,0 +1,20 @@
+from django import forms
+from django.contrib.auth.forms import UserCreationForm
+from django.contrib.auth.models import User
+
+
+# Create your forms here.
+
+class NewUserForm(UserCreationForm):
+	phoneno = forms.IntegerField(required=True)
+
+	class Meta:
+		model = User
+		fields = ("username", "phoneno", "password1", "password2")
+
+	def save(self, commit=True):
+		user = super(NewUserForm, self).save(commit=False)
+		user.phoneno = self.cleaned_data['phoneno']
+		if commit:
+			user.save()
+		return user
diff --git a/app/models.py b/app/models.py
@@ -0,0 +1 @@
+
diff --git a/app/static/app/images/images.png b/app/static/app/images/images.png
diff --git a/app/templates/app/add.html b/app/templates/app/add.html
diff --git a/app/templates/app/edit.html → app/templates/app/edit_admin.html b/app/templates/app/edit.html → app/templates/app/edit_admin.html
diff --git a/app/templates/app/home.html b/app/templates/app/home.html
@@ -0,0 +1,35 @@
+{% load static %}
+<html>      
+<body>
+
+    <h2>Product Listing</h2>
+    <a href="register">Register</a>
+    <a href="login">Login</a>
+    <br/><br/>
+    <table border=1>    
+        <thead>
+            <th>Product ID</th>
+            <th>Name</th>
+            <th>Price</th>
+            <th>Minimum Order </th>
+            <th>Category </th>
+        </thead>
+        {% for product in products %}
+        <tr>
+            <td> {{ product.0 }} </td>
+            <td> {{ product.2 }} </td>
+            <td> {{ product.4 }} </td>
+            <td> {{ product.7 }} </td>
+            <td> {{ product.5 }} </td>
+
+            <td>
+                <a href="view/{{product.0}}"><button>View More</button></a>
+                <form method="POST" style="display: inline;">
+                {% csrf_token %}
+                <input type="hidden" name="id" value="{{product.0}}"/>
+              </form></td>
+        <tr>
+        {% endfor %}
+    </table>
+</body>
+</html>
diff --git a/app/templates/app/index_products.html b/app/templates/app/index_products.html
@@ -0,0 +1,37 @@
+{% load static %}
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Products Listing</title>
+</head>
+<body>
+    <img src="{% static 'app/images/images.png' %}" width="10%"   alt="App Logo"/><br/>
+    <h2>The Makan Network</h2>
+    <a href="add">Register</a>
+    <br/>
+    <a href="login">Login</a>
+    <br/><br/>
+    <table border=1>
+        <thead>
+            <th>ID</th>
+            <th>Product Name</th>
+            <th>Description</th>
+            <th>Price</th>
+            <th>Category</th>
+        </thead>
+        {% for product in products %}
+        <tr>
+            <td> {{ product.0 }} </td>
+            <td> {{ product.2 }} </td>
+            <td> {{ product.3 }} </td>
+            <td> {{ product.4 }} </td>
+            <td> {{ product.5 }} </td>
+
+            <td>
+                <a href="purchase/{{ product }}"><button>Purchase</button></a>
+            </td>
+        <tr>
+        {% endfor %}
+    </table>
+</body>
+</html>
diff --git a/app/templates/app/index.html → app/templates/app/index_user_admin.html b/app/templates/app/index.html → app/templates/app/index_user_admin.html
@@ -3,7 +3,7 @@
 <body>
     <h2>Customers in the App Store</h2>
     <img src="{% static 'app/images/nus.jpg' %}" width="10%"   alt="NUS logo"/><br/>
-    <a href="add">New customer</a>
+    <a href="add">New User</a>
     <br/><br/>
     <table border=1>
         <thead>