Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion data/ShoeExpert/ShoeExpert/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
path('join/', app1_views.join),
path('login/', app1_views.user_login),
path('logout/', app1_views.user_logout),
#path('blog/', app1_views.blog)
path('shoe_pref/', app1_views.shoe_pref),
]

for url_path in Url_Paths:
Expand Down
20 changes: 20 additions & 0 deletions data/ShoeExpert/app1/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,23 @@ class Meta():
class LoginForm(forms.Form):
username = forms.CharField()
password = forms.CharField(widget=forms.PasswordInput())

class ShoePreferenceForm(forms.Form):
CHOICES = [
('Approach', 'Approach'),
('Basketball', 'Basketball'),
('Climbing', 'Climbing'),
('Cross Fit', 'Cross Fit'),
('Football', 'Football'),
('Golf', 'Golf'),
('Hiking', 'Hiking'),
('Running', 'Running'),
('Sneaker', 'Sneaker'),
('Soccer', 'Soccer'),
('Tennis', 'Tennis'),
('Track', 'Track'),
('Trail', 'Trail'),
('Training', 'Training'),
('Walking', 'Walking'),
]
preference = forms.MultipleChoiceField(choices=CHOICES, widget=forms.CheckboxSelectMultiple)
6 changes: 6 additions & 0 deletions data/ShoeExpert/app1/models.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from aggregate import Url_Paths
from django.db import models
from django.contrib.auth.models import User, AbstractUser

# Create your models here.

Expand All @@ -15,3 +16,8 @@ def create_shoe_model(url_path: Url_Paths):

for url_path in Url_Paths:
create_shoe_model(url_path)

class UserPreference(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE)
shoe_type = models.CharField(max_length=50)
has_logged_in_before = models.BooleanField(default=False)
43 changes: 40 additions & 3 deletions data/ShoeExpert/app1/views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from aggregate import Url_Paths
from app1.forms import JoinForm, LoginForm
from django.contrib.auth import authenticate, login, logout
from app1.forms import JoinForm, LoginForm, ShoePreferenceForm
from django.contrib.auth import authenticate, login, logout, get_user_model
from django.contrib.auth.decorators import login_required
from django.core.paginator import Paginator
from django.http import HttpResponse
Expand Down Expand Up @@ -59,9 +59,23 @@ def join(request):
return render(request, 'app1/join.html', page_data)



@login_required(login_url='/login/')
def home(request):
context_list = []
user = request.user
if user.is_authenticated and not user.has_logged_in_before:
user.has_logged_in_before = True
user.save()
form = ShoePreferenceForm(request.POST or None)
if request.method == 'POST':
if form.is_valid():
request.session['user_preference'] = form.cleaned_data.get('preference')
# Redirect to the home page to display the updated preferences
return redirect('home')
return render(request, 'app1/shoe_pref.html', { 'form': form })

user_preference = request.session.get('user_preference', None)
for url_path in Url_Paths:
tmp_dict = {}
tmp_dict['shoes'] = globals()[url_path.name.capitalize()].objects.all().order_by('?')[:3]
Expand All @@ -71,10 +85,22 @@ def home(request):
tmp_dict['fields'] = []
for column in url_path.get_django_available_columns():
tmp_dict['headers'].append(url_path.get_column_name(column))
tmp_dict['fields'].append(url_path.get_column_name(column, attribute = True))
tmp_dict['fields'].append(url_path.get_column_name(column, attribute=True))

# Reorder the shoes based on user preference
if user_preference and user_preference in tmp_dict['fields']:
field_index = tmp_dict['fields'].index(user_preference)
shoes_with_pref = tmp_dict['shoes'].order_by('-' + user_preference)
shoes_without_pref = tmp_dict['shoes'].exclude(**{user_preference + '__isnull': True})
tmp_dict['shoes'] = list(shoes_with_pref) + list(shoes_without_pref)
del tmp_dict['fields'][field_index]
tmp_dict['fields'] = [user_preference] + tmp_dict['fields']

context_list.append(tmp_dict)

return render(request, 'app1/home.html', { 'context_list': context_list })


@login_required(login_url='/login/')
def generic_shoe(request, url_path):
page_sizes = [5, 10, 15, 20, 30, 40, 50]
Expand Down Expand Up @@ -111,3 +137,14 @@ def about(request):
@login_required(login_url='/login/')
def blog(request):
return render(request, 'app1/blog.html')

def shoe_pref(request):
if request.method == 'POST':
form = ShoePreferenceForm(request.POST)
if form.is_valid():
user_preference = form.cleaned_data.get('preference')
request.session['user_preference'] = user_preference
return redirect('home')
else:
form = ShoePreferenceForm()
return render(request, 'app1/shoe_pref.html', { 'form': form })
4 changes: 3 additions & 1 deletion data/ShoeExpert/templates/app1/navigation.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link" href="/about"> About </a>

</li>
<li class="nav-item">
<a class="nav-link" href="/shoe_pref"> Shoe Prefrence </a>
</li>
{%if user.is_authenticated%}
<li class="nav-item">
Expand Down