Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
206 commits
Select commit Hold shift + click to select a range
6ce6d58
Create TheMakanNetworkSchema
Aeromon Mar 20, 2022
7be0e17
Update TheMakanNetworkSchema
Aeromon Mar 20, 2022
4c5885a
Merge pull request #2 from Aeromon/branch-schema
Aeromon Mar 20, 2022
30b4b74
Update TheMakanNetworkSchema
kohlongyang Mar 20, 2022
42b123f
Update .env
Aeromon Mar 22, 2022
59338ef
Merge pull request #7 from Aeromon/Aeromon-Front-end
Aeromon Mar 22, 2022
9d54ec2
Change names of HTML files
Aeromon Mar 22, 2022
03dc1c1
Merge pull request #8 from Aeromon/master
Aeromon Mar 22, 2022
4a6b770
Updated HTML and views
Aeromon Mar 22, 2022
734cd54
Add files via upload
Aeromon Mar 22, 2022
63a8245
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 22, 2022
001b149
Added index_products.html and purchase.html
Aeromon Mar 23, 2022
9d7906d
Merge remote-tracking branch 'origin/master'
Aeromon Mar 23, 2022
04a1873
testing purchase.html, urls and views
Aeromon Mar 23, 2022
ab810fc
Merge pull request #9 from Aeromon/master
Aeromon Mar 23, 2022
c67e4bc
testing purchase.html, urls and views
Aeromon Mar 23, 2022
bd47f88
Merge remote-tracking branch 'origin/master'
Aeromon Mar 23, 2022
5d48e25
testing purchase.html, urls and views
Aeromon Mar 23, 2022
10334e5
Merge pull request #10 from Aeromon/master
Aeromon Mar 23, 2022
ae04604
testing purchase.html, urls and views
Aeromon Mar 23, 2022
762658d
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 23, 2022
f749902
testing purchase.html, urls and views
Aeromon Mar 23, 2022
2152123
Merge remote-tracking branch 'origin/master'
Aeromon Mar 23, 2022
b5ced97
Merge pull request #11 from Aeromon/master
Aeromon Mar 23, 2022
b925f9c
Update TheMakanNetworkSchema
kohlongyang Mar 24, 2022
586249d
Merge branch 'The-Makan-Network:master' into longyangschema
kohlongyang Mar 24, 2022
ed276b2
Update new_user.html
kohlongyang Mar 24, 2022
d4daae9
testing purchase.html, urls and views
Aeromon Mar 24, 2022
758b9e3
Update urls.py
Aeromon Mar 24, 2022
1e85c58
Merge pull request #12 from Aeromon/master
Aeromon Mar 24, 2022
0c0588d
testing purchase.html, urls and views
Aeromon Mar 24, 2022
d5be16e
Merge remote-tracking branch 'origin/master'
Aeromon Mar 24, 2022
40f3979
testing purchase.html, urls and views
Aeromon Mar 24, 2022
90d6768
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 24, 2022
a5639e8
Merge pull request #13 from Aeromon/master
Aeromon Mar 24, 2022
33b3a48
Merge branch 'The-Makan-Network:master' into longyangschema
kohlongyang Mar 24, 2022
0cba915
Merge pull request #4 from kohlongyang/longyangschema
Aeromon Mar 24, 2022
e8379a5
Add files via upload
kohlongyang Mar 24, 2022
ce9c2e8
Update add_sql.sh
kohlongyang Mar 24, 2022
a735b63
Update models.py
Aeromon Mar 24, 2022
2ccd578
testing purchase.html, urls and views
Aeromon Mar 24, 2022
c546e53
Merge remote-tracking branch 'origin/master'
Aeromon Mar 24, 2022
73c848f
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 24, 2022
53ad477
Merge pull request #14 from Aeromon/master
Aeromon Mar 24, 2022
7dfc290
testing purchase.html, urls and views
Aeromon Mar 24, 2022
1e86da9
Merge remote-tracking branch 'origin/master'
Aeromon Mar 24, 2022
ce753cd
Merge pull request #15 from Aeromon/master
Aeromon Mar 24, 2022
e082022
testing purchase.html, urls and views
Aeromon Mar 24, 2022
cb858e0
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 24, 2022
1e7bc54
Merge pull request #16 from Aeromon/master
Aeromon Mar 24, 2022
62422d7
testing purchase.html, urls and views
Aeromon Mar 24, 2022
0383c1e
Merge remote-tracking branch 'origin/master'
Aeromon Mar 24, 2022
9fa5407
Merge pull request #17 from Aeromon/master
Aeromon Mar 24, 2022
f9cce2a
testing purchase.html, urls and views
Aeromon Mar 24, 2022
8e7a44b
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 24, 2022
1878b9e
Merge pull request #18 from Aeromon/master
Aeromon Mar 24, 2022
3ee1359
Rename TheMakanNetworkSchema to TheMakanNetworkSchema.sql
Aeromon Mar 24, 2022
fd169ec
Update add_sql.sh
Aeromon Mar 24, 2022
af36264
Add files via upload
kohlongyang Mar 24, 2022
dcbb4f4
Update add_sql.sh
Aeromon Mar 24, 2022
09a9c83
Add files via upload
wanfeijong Mar 24, 2022
1638801
Update appschema.sql
wanfeijong Mar 24, 2022
0d96cf8
Update add_sql.sh
wanfeijong Mar 24, 2022
0066616
Delete transdata.sql
wanfeijong Mar 24, 2022
f2b2ab3
Add files via upload
wanfeijong Mar 24, 2022
17475b6
Delete transdata.sql
wanfeijong Mar 24, 2022
e5eac1d
Add files via upload
wanfeijong Mar 24, 2022
6a134f1
Update index_products.html
kohlongyang Mar 24, 2022
e72c830
Update index_products.html
kohlongyang Mar 24, 2022
2e2fa9a
Update index_products.html
kohlongyang Mar 24, 2022
a81e26b
Update index_products.html
kohlongyang Mar 24, 2022
cfdc5cf
Update purchase.html
kohlongyang Mar 24, 2022
f996ad3
Update index_products.html
kohlongyang Mar 24, 2022
e894654
Update views.py
kohlongyang Mar 25, 2022
51fd4d1
Update views.py
kohlongyang Mar 25, 2022
8995417
Update views.py
kohlongyang Mar 25, 2022
487a68d
Update views.py
kohlongyang Mar 25, 2022
1d6eb33
Update views.py
kohlongyang Mar 25, 2022
d052df5
Update new_user.html
kohlongyang Mar 25, 2022
66f560d
Update new_user.html
kohlongyang Mar 25, 2022
ac8723e
Update new_user.html
kohlongyang Mar 25, 2022
78d3302
Create styleforregister.css
kohlongyang Mar 25, 2022
0905f19
Update new_user.html
kohlongyang Mar 25, 2022
20b256b
Update styleforregister.css
kohlongyang Mar 25, 2022
e931880
Update new_user.html
kohlongyang Mar 25, 2022
65138ac
Add files via upload
wanfeijong Mar 25, 2022
035d607
Update add_sql.sh
wanfeijong Mar 25, 2022
000a72d
Update appschema.sql
kohlongyang Mar 25, 2022
936b43f
Update appschema.sql
kohlongyang Mar 25, 2022
d115a28
testing purchase pathing
wanfeijong Mar 25, 2022
272e02d
testing purchase path
wanfeijong Mar 25, 2022
e180c2d
Update styleforregister.css
kohlongyang Mar 25, 2022
13b1729
Update new_user.html
kohlongyang Mar 25, 2022
2558b54
Update new_user.html
kohlongyang Mar 25, 2022
4fb46d3
Update new_user.html
kohlongyang Mar 25, 2022
60830c0
Update new_user.html
kohlongyang Mar 25, 2022
bac63ed
Update styleforregister.css
kohlongyang Mar 25, 2022
ac5b62b
Update new_user.html
kohlongyang Mar 25, 2022
1ab4655
Update new_user.html
kohlongyang Mar 25, 2022
b5c11d3
Update new_user.html
kohlongyang Mar 25, 2022
d0ea077
Update login.html
wanfeijong Mar 25, 2022
43c1547
Update views.py
wanfeijong Mar 25, 2022
0ed1464
Delete images.png
Aeromon Mar 25, 2022
8c4e624
Delete images.png
Aeromon Mar 25, 2022
515902f
Add files via upload
Aeromon Mar 25, 2022
d435cff
Update login.html
kohlongyang Mar 25, 2022
3bd53f9
Update styleforregister.css
kohlongyang Mar 25, 2022
55fd0aa
Update styleforregister.css
kohlongyang Mar 25, 2022
d9fd5e4
Update login.html
kohlongyang Mar 25, 2022
a4ab618
Rename styleforregister.css to styleforlogin.css
kohlongyang Mar 25, 2022
2808207
Update login.html
kohlongyang Mar 25, 2022
f135c32
Update login.html
kohlongyang Mar 25, 2022
1820d7f
Update login.html
kohlongyang Mar 25, 2022
411b060
Update login.html
kohlongyang Mar 25, 2022
a7ebd44
Update login.html
kohlongyang Mar 25, 2022
428090b
Update login.html
kohlongyang Mar 25, 2022
74326bb
Update login.html
kohlongyang Mar 25, 2022
56c67c9
Update login.html
kohlongyang Mar 25, 2022
d48fd45
Update login.html
kohlongyang Mar 25, 2022
38a9027
Update login.html
kohlongyang Mar 25, 2022
726cca9
Update login.html
kohlongyang Mar 25, 2022
1ed8fd4
Update login.html
kohlongyang Mar 25, 2022
42aa874
Update login.html
kohlongyang Mar 25, 2022
c5067af
Update login.html
wanfeijong Mar 25, 2022
18c90d0
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 28, 2022
696d0c9
testing purchase.html, urls and views
Aeromon Mar 28, 2022
15f90d0
testing purchase.html, urls and views
Aeromon Mar 28, 2022
72b1d8d
Merge remote-tracking branch 'origin/master'
Aeromon Mar 28, 2022
5f3e938
testing purchase.html, urls and views
Aeromon Mar 28, 2022
093fc0f
Merge pull request #21 from Aeromon/master
Aeromon Mar 28, 2022
87533c2
testing purchase.html, urls and views
Aeromon Mar 28, 2022
4bf8197
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 28, 2022
51436d0
Merge pull request #22 from Aeromon/master
Aeromon Mar 28, 2022
98f60d5
Update views.py
Aeromon Mar 28, 2022
76df5fb
Update views.py
Aeromon Mar 28, 2022
2fd946b
testing purchase.html, urls and views
Aeromon Mar 28, 2022
50a4244
Merge branch 'master' into master
Aeromon Mar 28, 2022
86bc575
Update views.py
Aeromon Mar 28, 2022
24526a9
testing purchase.html, urls and views
Aeromon Mar 28, 2022
30d81c0
Merge remote-tracking branch 'origin/master'
Aeromon Mar 28, 2022
15628b4
testing purchase.html, urls and views
Aeromon Mar 28, 2022
5ddc5e4
Revert "Changed the settings.py "
Aeromon Mar 28, 2022
ab4d3fe
Merge pull request #23 from The-Makan-Network/revert-22-master
Aeromon Mar 28, 2022
5d4934b
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 28, 2022
82682c8
testing purchase.html, urls and views
Aeromon Mar 28, 2022
04d2c43
Merge remote-tracking branch 'origin/master'
Aeromon Mar 28, 2022
6395653
Merge pull request #24 from Aeromon/master
Aeromon Mar 28, 2022
a19738c
testing purchase.html, urls and views
Aeromon Mar 28, 2022
469e01c
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 28, 2022
3a09759
Merge pull request #25 from Aeromon/master
Aeromon Mar 28, 2022
60db773
testing purchase.html, urls and views
Aeromon Mar 28, 2022
4fad3a2
Merge remote-tracking branch 'origin/master'
Aeromon Mar 28, 2022
268b16b
Merge pull request #26 from Aeromon/master
Aeromon Mar 28, 2022
b3dd644
testing purchase.html, urls and views
Aeromon Mar 28, 2022
31cf60c
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 28, 2022
075b55e
Merge pull request #27 from Aeromon/master
Aeromon Mar 28, 2022
f363696
testing purchase.html, urls and views
Aeromon Mar 28, 2022
bf58ac2
Merge remote-tracking branch 'origin/master'
Aeromon Mar 28, 2022
bee6fe1
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 28, 2022
26952d0
Merge pull request #28 from Aeromon/master
Aeromon Mar 28, 2022
b638f8b
testing purchase.html, urls and views
Aeromon Mar 28, 2022
be91ab4
Merge remote-tracking branch 'origin/master'
Aeromon Mar 28, 2022
1101837
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 28, 2022
033789c
Merge pull request #29 from Aeromon/master
Aeromon Mar 28, 2022
12441ef
testing purchase.html, urls and views
Aeromon Mar 28, 2022
fa75c68
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 28, 2022
2f650da
Merge pull request #30 from Aeromon/master
Aeromon Mar 28, 2022
99700ff
testing purchase.html, urls and views
Aeromon Mar 28, 2022
3fdf441
Merge remote-tracking branch 'origin/master'
Aeromon Mar 28, 2022
f15a1d4
Merge branch 'The-Makan-Network:master' into master
Aeromon Mar 28, 2022
be840fb
Merge pull request #31 from Aeromon/master
Aeromon Mar 28, 2022
12f0fdc
testing purchase.html, urls and views
Aeromon Mar 28, 2022
e66ef0d
Merge remote-tracking branch 'origin/master'
Aeromon Mar 28, 2022
d0a424a
Merge pull request #32 from Aeromon/master
Aeromon Mar 28, 2022
c8ca567
Update login.html
kohlongyang Mar 29, 2022
2ae7e5b
Update login.html
kohlongyang Mar 29, 2022
d287ab9
Update urls.py
kohlongyang Mar 29, 2022
5dede1c
Update urls.py
kohlongyang Mar 29, 2022
932861d
Update urls.py
kohlongyang Mar 29, 2022
2e22a2b
Update urls.py
kohlongyang Mar 29, 2022
4620239
Update urls.py
Aeromon Mar 29, 2022
63bd135
Update views.py
Aeromon Mar 29, 2022
5bd4d07
Update views.py
kohlongyang Mar 29, 2022
b75f958
Update views.py
kohlongyang Mar 29, 2022
5b13eba
Update views.py
kohlongyang Mar 29, 2022
fb5cb80
Update views.py
kohlongyang Mar 29, 2022
88bcae6
Update views.py
kohlongyang Mar 29, 2022
96f0e40
Update views.py
kohlongyang Mar 29, 2022
02d3217
Update views.py
kohlongyang Mar 29, 2022
6c8f064
Update views.py
kohlongyang Mar 29, 2022
fe49168
Update views.py
kohlongyang Mar 29, 2022
602f2d4
Update views.py
kohlongyang Mar 29, 2022
44e45e1
Update views.py
kohlongyang Mar 29, 2022
8cc6320
Update views.py
kohlongyang Mar 29, 2022
b106ad7
Update views.py
wanfeijong Mar 31, 2022
9409a56
Create forms.py
wanfeijong Mar 31, 2022
ec20722
Update admin.py
wanfeijong Mar 31, 2022
bb136f9
Create view.html
wanfeijong Mar 31, 2022
9915759
Update register.html
wanfeijong Mar 31, 2022
3087a68
Update login.html
wanfeijong Mar 31, 2022
218381e
Create home.html
wanfeijong Mar 31, 2022
00bd50a
Update urls.py
wanfeijong Mar 31, 2022
463aa13
Update views.py
wanfeijong Mar 31, 2022
0be5efa
Update views.py
wanfeijong Mar 31, 2022
1221b50
Update views.py
wanfeijong Mar 31, 2022
2518c0a
Update views.py
wanfeijong Mar 31, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions AppStore/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,6 @@
STATIC_URL = '/static/'

django_heroku.settings(locals())
import app.views
LOGIN_REDIRECT_URL = '/'
LOGOUT_REDIRECT_URL = "/"
29 changes: 29 additions & 0 deletions AppStore/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
]
"""
11 changes: 6 additions & 5 deletions add_sql.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

4 changes: 4 additions & 0 deletions app/admin.py
Original file line number Diff line number Diff line change
@@ -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')
20 changes: 20 additions & 0 deletions app/forms.py
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions app/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Binary file added app/static/app/images/images.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 0 additions & 26 deletions app/templates/app/add.html

This file was deleted.

File renamed without changes.
35 changes: 35 additions & 0 deletions app/templates/app/home.html
Original file line number Diff line number Diff line change
@@ -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>
37 changes: 37 additions & 0 deletions app/templates/app/index_products.html
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading