From 8cd43bbb158fda4471127c329cbd23a1c211a14f Mon Sep 17 00:00:00 2001 From: "hltiffany@csuchico.edu" Date: Tue, 18 Apr 2023 19:14:32 -0700 Subject: [PATCH 01/12] Add page to filter shoes --- data/ShoeExpert/templates/app1/blog.html | 2 +- data/ShoeExpert/templates/app1/filter.html | 12 ++++++++++++ data/ShoeExpert/templates/app1/navigation.html | 5 ++++- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 data/ShoeExpert/templates/app1/filter.html diff --git a/data/ShoeExpert/templates/app1/blog.html b/data/ShoeExpert/templates/app1/blog.html index 00b6967..50e55a2 100644 --- a/data/ShoeExpert/templates/app1/blog.html +++ b/data/ShoeExpert/templates/app1/blog.html @@ -4,7 +4,7 @@
-

Test about

+

Blog Page

diff --git a/data/ShoeExpert/templates/app1/filter.html b/data/ShoeExpert/templates/app1/filter.html new file mode 100644 index 0000000..f521ff6 --- /dev/null +++ b/data/ShoeExpert/templates/app1/filter.html @@ -0,0 +1,12 @@ + + + +{% include "app1/head.html" %} + + +
+

Filterig Page

+
+ + + diff --git a/data/ShoeExpert/templates/app1/navigation.html b/data/ShoeExpert/templates/app1/navigation.html index 16a7f9e..d1bfefb 100644 --- a/data/ShoeExpert/templates/app1/navigation.html +++ b/data/ShoeExpert/templates/app1/navigation.html @@ -10,10 +10,13 @@ About + {%if user.is_authenticated%}
  • Blog
    • - {%if user.is_authenticated%} +
  • + Filter +
  • Logout ({{user.username}})
    • From d08df5906e3a69cf35fdc27b60ba432d1d6a0359 Mon Sep 17 00:00:00 2001 From: "hltiffany@csuchico.edu" Date: Wed, 3 May 2023 12:13:34 -0700 Subject: [PATCH 02/12] Fix filtering page --- data/ShoeExpert/ShoeExpert/urls.py | 1 + data/ShoeExpert/app1/views.py | 4 ++++ data/ShoeExpert/templates/app1/filter.html | 2 +- data/ShoeExpert/templates/app1/navigation.html | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/data/ShoeExpert/ShoeExpert/urls.py b/data/ShoeExpert/ShoeExpert/urls.py index 8e27703..1430df5 100644 --- a/data/ShoeExpert/ShoeExpert/urls.py +++ b/data/ShoeExpert/ShoeExpert/urls.py @@ -26,6 +26,7 @@ path('login/', app1_views.user_login), path('logout/', app1_views.user_logout), path('blog/', app1_views.blog) + path('filter/', app1_views.filter) ] for url_path in Url_Paths: diff --git a/data/ShoeExpert/app1/views.py b/data/ShoeExpert/app1/views.py index 0980f64..c8b95f7 100644 --- a/data/ShoeExpert/app1/views.py +++ b/data/ShoeExpert/app1/views.py @@ -111,3 +111,7 @@ def about(request): @login_required(login_url='/login/') def blog(request): return render(request, 'app1/blog.html') + +@login_required(login_url='/login/') +def filter(request): + return render(request, 'app1/filter.html') diff --git a/data/ShoeExpert/templates/app1/filter.html b/data/ShoeExpert/templates/app1/filter.html index f521ff6..641bd7b 100644 --- a/data/ShoeExpert/templates/app1/filter.html +++ b/data/ShoeExpert/templates/app1/filter.html @@ -5,7 +5,7 @@
    -

    Filterig Page

    +

    Filtering Page

    diff --git a/data/ShoeExpert/templates/app1/navigation.html b/data/ShoeExpert/templates/app1/navigation.html index d1bfefb..d8ce1c3 100644 --- a/data/ShoeExpert/templates/app1/navigation.html +++ b/data/ShoeExpert/templates/app1/navigation.html @@ -15,7 +15,7 @@ Blog
  • - Filter + Filter
  • Logout ({{user.username}}) From 2017847408509235d65c2031ba7d31956a2c864c Mon Sep 17 00:00:00 2001 From: "hltiffany@csuchico.edu" Date: Thu, 4 May 2023 14:14:26 -0700 Subject: [PATCH 03/12] Working Filter page --- data/ShoeExpert/ShoeExpert/urls.py | 2 +- data/ShoeExpert/app1/forms.py | 4 ++++ data/ShoeExpert/app1/tests.py | 23 +++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/data/ShoeExpert/ShoeExpert/urls.py b/data/ShoeExpert/ShoeExpert/urls.py index 1430df5..4c57f32 100644 --- a/data/ShoeExpert/ShoeExpert/urls.py +++ b/data/ShoeExpert/ShoeExpert/urls.py @@ -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('blog/', app1_views.blog), path('filter/', app1_views.filter) ] diff --git a/data/ShoeExpert/app1/forms.py b/data/ShoeExpert/app1/forms.py index 5830ced..acdfcea 100644 --- a/data/ShoeExpert/app1/forms.py +++ b/data/ShoeExpert/app1/forms.py @@ -15,3 +15,7 @@ class Meta(): class LoginForm(forms.Form): username = forms.CharField() password = forms.CharField(widget=forms.PasswordInput()) + +class FilterForm(forms.Form): + username = forms.CharField() + password = forms.CharField(widget=forms.PasswordInput()) diff --git a/data/ShoeExpert/app1/tests.py b/data/ShoeExpert/app1/tests.py index 7ce503c..22cb66a 100644 --- a/data/ShoeExpert/app1/tests.py +++ b/data/ShoeExpert/app1/tests.py @@ -1,3 +1,26 @@ from django.test import TestCase +from selenium import webdriver +from selenium.webdriver.common.keys import Keys + +service = ChromeService(executable_path=ChromeDriverManager().install()) + +driver = webdriver.Chrome(service=service) # Create your tests here. + +class LoginFormTest(testCase): + def testform(self): + selenium.get('http://127.0.0.1:8000/') + username=selenium.find_element_by_id('username') + password=selenium.find_element_by_id('password') + + submit = selenium.find_element_by_id('submit_button') + + username.send_keys('docker') + password.send_keys('docker') + + submit.send_keys(Keys.RETURN) + + assert 'docker' in selenium.page_source + +driver.quit(); From 77075281fbd0ee9b298b5697b9500566e7ed7d91 Mon Sep 17 00:00:00 2001 From: "hltiffany@csuchico.edu" Date: Thu, 4 May 2023 14:18:39 -0700 Subject: [PATCH 04/12] Add form on filter page --- data/ShoeExpert/app1/forms.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/data/ShoeExpert/app1/forms.py b/data/ShoeExpert/app1/forms.py index acdfcea..1c432a4 100644 --- a/data/ShoeExpert/app1/forms.py +++ b/data/ShoeExpert/app1/forms.py @@ -16,6 +16,23 @@ class LoginForm(forms.Form): username = forms.CharField() password = forms.CharField(widget=forms.PasswordInput()) +SHOE_CHOICES= [ + ('Running', 'Running'), + ('Basketball', 'Basketball'), + ('Approach', 'Approach'), + ('Climbing', 'Climbing'), + ('Crossfit', 'Crossfit'), + ('Cycling', 'Cycling'), + ('Football', 'Football'), + ] + +#CUSHIONING_CHOICES= [ +# ('All', 'All'), +# ('Plush', 'Plush'), +# ('Firm', 'Firm'), +# ('Balanced', 'Balanced'), +# ] + class FilterForm(forms.Form): - username = forms.CharField() - password = forms.CharField(widget=forms.PasswordInput()) + Shoe = forms.CharField(widget=forms.Select(choices=SHOE_CHOICES)) +# Cushioning = forms.CharField(widget=forms.Select(choices=CUSHIONING_CHOICES)) From ed22915abdf03de6aa347c6dd1af3fd34377db44 Mon Sep 17 00:00:00 2001 From: "hltiffany@csuchico.edu" Date: Thu, 4 May 2023 14:24:34 -0700 Subject: [PATCH 05/12] Fixing filter pages --- data/ShoeExpert/ShoeExpert/urls.py | 1 + data/ShoeExpert/app1/views.py | 4 ++-- data/ShoeExpert/templates/app1/filter2.html | 24 +++++++++++++++++++ .../ShoeExpert/templates/app1/navigation.html | 2 +- 4 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 data/ShoeExpert/templates/app1/filter2.html diff --git a/data/ShoeExpert/ShoeExpert/urls.py b/data/ShoeExpert/ShoeExpert/urls.py index 4c57f32..a894bfb 100644 --- a/data/ShoeExpert/ShoeExpert/urls.py +++ b/data/ShoeExpert/ShoeExpert/urls.py @@ -26,6 +26,7 @@ path('login/', app1_views.user_login), path('logout/', app1_views.user_logout), path('blog/', app1_views.blog), + path('filter2/', app1_views.filter2), path('filter/', app1_views.filter) ] diff --git a/data/ShoeExpert/app1/views.py b/data/ShoeExpert/app1/views.py index c8b95f7..c2f6166 100644 --- a/data/ShoeExpert/app1/views.py +++ b/data/ShoeExpert/app1/views.py @@ -113,5 +113,5 @@ def blog(request): return render(request, 'app1/blog.html') @login_required(login_url='/login/') -def filter(request): - return render(request, 'app1/filter.html') +def filter2(request): + return render(request, 'app1/filter2.html') diff --git a/data/ShoeExpert/templates/app1/filter2.html b/data/ShoeExpert/templates/app1/filter2.html new file mode 100644 index 0000000..17f12c2 --- /dev/null +++ b/data/ShoeExpert/templates/app1/filter2.html @@ -0,0 +1,24 @@ + + + +{% include "app1/head.html" %} + + +
    +

    Filter

    +
    + {% csrf_token %} + + {{ filter_form.as_table }} + + + +
    + +
    +
    +
    + + + + diff --git a/data/ShoeExpert/templates/app1/navigation.html b/data/ShoeExpert/templates/app1/navigation.html index d8ce1c3..e992f1e 100644 --- a/data/ShoeExpert/templates/app1/navigation.html +++ b/data/ShoeExpert/templates/app1/navigation.html @@ -15,7 +15,7 @@ Blog
  • - Filter + Filter
  • Logout ({{user.username}}) From b3c6e4ca04c3bf27f2b083f481e51832be6d14e1 Mon Sep 17 00:00:00 2001 From: "hltiffany@csuchico.edu" Date: Thu, 4 May 2023 14:27:42 -0700 Subject: [PATCH 06/12] Fixing filter pages --- data/ShoeExpert/app1/views.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/data/ShoeExpert/app1/views.py b/data/ShoeExpert/app1/views.py index c2f6166..983a1f5 100644 --- a/data/ShoeExpert/app1/views.py +++ b/data/ShoeExpert/app1/views.py @@ -112,6 +112,17 @@ def about(request): def blog(request): return render(request, 'app1/blog.html') +@login_required(login_url='/login/') +def filter(request): + return(request, 'app1/filer.html') + @login_required(login_url='/login/') def filter2(request): - return render(request, 'app1/filter2.html') + if (request.method == "POST"): + filter_form = FilterForm(request.POST) + if filter_form.is_valid(): + userBrand = filter_form.cleaned_data["Brand"] + userCushion = filter_form.cleaned_data["Cushioning"] + return redirect(filter, userBrand, userCushion) + return render(request, 'app1/filter2.html', {'filter_form': FilterForm}) + From 3c686f1b31d5acd4c98c15bf65e8e18d21e7e13c Mon Sep 17 00:00:00 2001 From: "hltiffany@csuchico.edu" Date: Thu, 4 May 2023 14:29:34 -0700 Subject: [PATCH 07/12] Add user input --- data/ShoeExpert/ShoeExpert/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/ShoeExpert/ShoeExpert/urls.py b/data/ShoeExpert/ShoeExpert/urls.py index a894bfb..6c2d1e0 100644 --- a/data/ShoeExpert/ShoeExpert/urls.py +++ b/data/ShoeExpert/ShoeExpert/urls.py @@ -27,7 +27,7 @@ path('logout/', app1_views.user_logout), path('blog/', app1_views.blog), path('filter2/', app1_views.filter2), - path('filter/', app1_views.filter) + path('filter//', app1_views.filter) ] for url_path in Url_Paths: From 34a04288403115dfc44744691a55efe4b0c188e7 Mon Sep 17 00:00:00 2001 From: "hltiffany@csuchico.edu" Date: Thu, 4 May 2023 14:32:33 -0700 Subject: [PATCH 08/12] Fix filter page --- data/ShoeExpert/app1/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/ShoeExpert/app1/views.py b/data/ShoeExpert/app1/views.py index 983a1f5..b28d3c6 100644 --- a/data/ShoeExpert/app1/views.py +++ b/data/ShoeExpert/app1/views.py @@ -1,5 +1,5 @@ from aggregate import Url_Paths -from app1.forms import JoinForm, LoginForm +from app1.forms import JoinForm, LoginForm, FilterForm from django.contrib.auth import authenticate, login, logout from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator From e8210055e891ca607e88d723edb4f229f679d54b Mon Sep 17 00:00:00 2001 From: "hltiffany@csuchico.edu" Date: Fri, 5 May 2023 09:26:06 -0700 Subject: [PATCH 09/12] Working on filter page --- data/ShoeExpert/ShoeExpert/urls.py | 2 +- data/ShoeExpert/app1/views.py | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/data/ShoeExpert/ShoeExpert/urls.py b/data/ShoeExpert/ShoeExpert/urls.py index 6c2d1e0..c9acbc4 100644 --- a/data/ShoeExpert/ShoeExpert/urls.py +++ b/data/ShoeExpert/ShoeExpert/urls.py @@ -27,7 +27,7 @@ path('logout/', app1_views.user_logout), path('blog/', app1_views.blog), path('filter2/', app1_views.filter2), - path('filter//', app1_views.filter) + path('filter/', app1_views.filter) ] for url_path in Url_Paths: diff --git a/data/ShoeExpert/app1/views.py b/data/ShoeExpert/app1/views.py index b28d3c6..681449e 100644 --- a/data/ShoeExpert/app1/views.py +++ b/data/ShoeExpert/app1/views.py @@ -113,16 +113,20 @@ def blog(request): return render(request, 'app1/blog.html') @login_required(login_url='/login/') -def filter(request): - return(request, 'app1/filer.html') +def filter(request, userShoe, userCushion): + shoes_per_page = 5 + queryset = RunningShoe.objects.filter(shoe=userShoe) + paginator = Paginator(queryset, shoes_per_page) + page = request.GET.get('page') + shoes = paginator.get_page(page) + return render(request, 'app1/filter.html', {'shoes': shoes}) @login_required(login_url='/login/') def filter2(request): if (request.method == "POST"): filter_form = FilterForm(request.POST) if filter_form.is_valid(): - userBrand = filter_form.cleaned_data["Brand"] - userCushion = filter_form.cleaned_data["Cushioning"] - return redirect(filter, userBrand, userCushion) + userShoe = filter_form.cleaned_data["Brand"] + return redirect(filter, userShoe) return render(request, 'app1/filter2.html', {'filter_form': FilterForm}) From e7f6c24a9340fdc89806dd18840b2c0cb77bcb40 Mon Sep 17 00:00:00 2001 From: "hltiffany@csuchico.edu" Date: Fri, 5 May 2023 13:21:08 -0700 Subject: [PATCH 10/12] Adding filter to home page --- data/ShoeExpert/app1/views.py | 56 ++++++-- data/ShoeExpert/templates/app1/filter.html | 39 +++++- data/ShoeExpert/templates/app1/filter3.html | 129 ++++++++++++++++++ .../templates/app1/generic_shoe.html | 14 ++ 4 files changed, 228 insertions(+), 10 deletions(-) create mode 100644 data/ShoeExpert/templates/app1/filter3.html diff --git a/data/ShoeExpert/app1/views.py b/data/ShoeExpert/app1/views.py index 681449e..2fe56e4 100644 --- a/data/ShoeExpert/app1/views.py +++ b/data/ShoeExpert/app1/views.py @@ -78,6 +78,8 @@ def home(request): @login_required(login_url='/login/') def generic_shoe(request, url_path): page_sizes = [5, 10, 15, 20, 30, 40, 50] + brands = ['All', 'Adidas', 'Nike', 'Aky'] + brands_per_page = request.GET.get('brands_per_page', brands[0]) shoes_per_page = int(request.GET.get('shoes_per_page', page_sizes[0])) queryset = globals()[url_path.name.capitalize()].objects.all().order_by('shoe_name') paginator = Paginator(queryset, shoes_per_page) @@ -112,21 +114,59 @@ def about(request): def blog(request): return render(request, 'app1/blog.html') + @login_required(login_url='/login/') -def filter(request, userShoe, userCushion): - shoes_per_page = 5 - queryset = RunningShoe.objects.filter(shoe=userShoe) - paginator = Paginator(queryset, shoes_per_page) - page = request.GET.get('page') - shoes = paginator.get_page(page) - return render(request, 'app1/filter.html', {'shoes': shoes}) +def filter3(request, url_path): + page_sizes = [5, 10, 15, 20, 30, 40, 50] + brands = [All, Adidas, Nike, Aky] + brands_per_page = request.GET.get('brands_per_page', brands[0]) + shoes_per_page = int(request.GET.get('shoes_per_page', page_sizes[10])) + queryset = globals()[url_path.name.capitalize()].objects.all().order_by('shoe_name') + paginator = Paginator(queryset, shoes_per_page, brands_per_page) + page = request.GET.get('page') + shoes = paginator.get_page(page) + headers = [] + fields = [] + for column in url_path.get_django_available_columns(): + headers.append({ + 'has_modal': column.has_modal(), + 'modal_body': column.get_modal_body(), + 'modal_title': url_path.get_column_name(column, display_units = False), + 'modal_id': url_path.get_column_name(column, attribute = True), + 'column_title': url_path.get_column_name(column) + }) + fields.append(url_path.get_column_name(column, attribute = True)) + return render(request, 'app1/filter3.html', { + 'shoes': shoes, + 'headers': headers, + 'fields': fields, + 'shoes_per_page': shoes_per_page, + 'page_sizes': page_sizes, + 'title': url_path.name.replace('_', ' ').title() + }) + +#@login_required(login_url='/login/') +def filter(request, userShoe): + context_list = [] + for url_path in Url_Paths: + tmp_dict = {} + tmp_dict['shoes'] = globals()[url_path.name.capitalize()].objects.all().order_by('?')[:3] + tmp_dict['title'] = url_path.name.replace('_', ' ').title() + tmp_dict['redirect'] = url_path.name.lower() + tmp_dict['headers'] = [] + 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)) + context_list.append(tmp_dict) + return render(request, 'app1/filter.html', { 'context_list': context_list }) @login_required(login_url='/login/') def filter2(request): if (request.method == "POST"): filter_form = FilterForm(request.POST) if filter_form.is_valid(): - userShoe = filter_form.cleaned_data["Brand"] + userShoe = filter_form.cleaned_data["Shoe"] return redirect(filter, userShoe) return render(request, 'app1/filter2.html', {'filter_form': FilterForm}) diff --git a/data/ShoeExpert/templates/app1/filter.html b/data/ShoeExpert/templates/app1/filter.html index 641bd7b..79b399c 100644 --- a/data/ShoeExpert/templates/app1/filter.html +++ b/data/ShoeExpert/templates/app1/filter.html @@ -1,12 +1,47 @@ +{% load getattribute %} {% include "app1/head.html" %} -
    -

    Filtering Page

    +
    + + {% for shoe_dict in context_list %} +
    +
    +
    + {{ shoe_dict.title }} +
    +
    + + + + + {% for header in shoe_dict.headers %} + + {% endfor %} + + + + {% for value in shoe_dict.shoes %} + + + {% for field in shoe_dict.fields %} + + {% endfor %} + + {% endfor %} + +
    Shoe Name{{header}}
    {{value.shoe_name}}{{ value|getattribute:field }}
    +
    +
    +
    + {% endfor %} +
    + + diff --git a/data/ShoeExpert/templates/app1/filter3.html b/data/ShoeExpert/templates/app1/filter3.html new file mode 100644 index 0000000..0d2d68e --- /dev/null +++ b/data/ShoeExpert/templates/app1/filter3.html @@ -0,0 +1,129 @@ +{% load getattribute %} + + +{% include "app1/head.html" %} + + +
    +
    +
    + +
    + + +
    + +
    + + +
    + +

    {{title}}

    +
    + + + + + {% for header in headers %} + + {% endfor %} + + + + {% for value in shoes %} + + + {% for field in fields %} + + {% endfor %} + + {% endfor %} + +
    Shoe Name + {% if header.has_modal %} + {% include "app1/modal.html" with data=header %} + {% else %} + {{ header.column_title }} + {% endif %} +
    {{value.shoe_name}}{{ value|getattribute:field }}
    +
    + + +
    + +
    + +
    +
    +
    + + + diff --git a/data/ShoeExpert/templates/app1/generic_shoe.html b/data/ShoeExpert/templates/app1/generic_shoe.html index fe2e4b3..593245d 100644 --- a/data/ShoeExpert/templates/app1/generic_shoe.html +++ b/data/ShoeExpert/templates/app1/generic_shoe.html @@ -22,6 +22,20 @@ +
    + + +
    +

    {{title}}

    From e49aa53a77987d2c717733646442fdf36294a919 Mon Sep 17 00:00:00 2001 From: "hltiffany@csuchico.edu" Date: Mon, 8 May 2023 10:02:00 -0700 Subject: [PATCH 11/12] Trying to fix dropdown menu --- data/ShoeExpert/app1/views.py | 8 +++++--- data/ShoeExpert/templates/app1/generic_shoe.html | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/data/ShoeExpert/app1/views.py b/data/ShoeExpert/app1/views.py index 2fe56e4..2a85105 100644 --- a/data/ShoeExpert/app1/views.py +++ b/data/ShoeExpert/app1/views.py @@ -1,5 +1,5 @@ from aggregate import Url_Paths -from app1.forms import JoinForm, LoginForm, FilterForm + from django.contrib.auth import authenticate, login, logout from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator @@ -78,12 +78,14 @@ def home(request): @login_required(login_url='/login/') def generic_shoe(request, url_path): page_sizes = [5, 10, 15, 20, 30, 40, 50] - brands = ['All', 'Adidas', 'Nike', 'Aky'] - brands_per_page = request.GET.get('brands_per_page', brands[0]) + #brands = ['All', 'Adidas', 'Nike', 'Aky'] + brands = [5, 10, 15, 20] + brands_per_page = int(request.GET.get('brands_per_page', brands[0])) shoes_per_page = int(request.GET.get('shoes_per_page', page_sizes[0])) queryset = globals()[url_path.name.capitalize()].objects.all().order_by('shoe_name') paginator = Paginator(queryset, shoes_per_page) page = request.GET.get('page') + brand = request.GET.get('brand') shoes = paginator.get_page(page) headers = [] fields = [] diff --git a/data/ShoeExpert/templates/app1/generic_shoe.html b/data/ShoeExpert/templates/app1/generic_shoe.html index 593245d..4e14663 100644 --- a/data/ShoeExpert/templates/app1/generic_shoe.html +++ b/data/ShoeExpert/templates/app1/generic_shoe.html @@ -24,7 +24,7 @@
    - - + +

    {{title}}