Fixed navibar issue and Added headers for all pages

Navibar used to append urls thereby stacking and creating errors, progress is being made

Fixed navibar issue and Added headers for all pages
Navibar used to append urls thereby stacking and creating errors, progress is being made
7b860f35 · Jose Luis Bautista · 207468fb · 7b860f35 · 7b860f35 · 7b860f35
Commit 7b860f35 authored Mar 23, 2021 by Jose Luis Bautista
15 changed files
--- a/BauJo/BauJo/__pycache__/forms.cpython-39.pyc
+++ b/BauJo/BauJo/__pycache__/forms.cpython-39.pyc
--- a/BauJo/BauJo/__pycache__/settings.cpython-39.pyc
+++ b/BauJo/BauJo/__pycache__/settings.cpython-39.pyc
--- a/BauJo/BauJo/__pycache__/urls.cpython-39.pyc
+++ b/BauJo/BauJo/__pycache__/urls.cpython-39.pyc
--- a/BauJo/BauJo/__pycache__/views.cpython-39.pyc
+++ b/BauJo/BauJo/__pycache__/views.cpython-39.pyc
--- a/BauJo/BauJo/forms.py
+++ b/BauJo/BauJo/forms.py
 from django import forms

 class home(forms.Form):
+	name = forms.CharField(label='Name: ', max_length = 25)
+
+class profile(forms.Form):
+	name = forms.CharField(label='', max_length = 25)
+
+class key(forms.Form):
+	name = forms.CharField(label='', max_length = 25)
+
+class this_week(forms.Form):
+	name = forms.CharField(label='', max_length = 25)
+
+class today(forms.Form):
 	name = forms.CharField(label='', max_length = 25)
\ No newline at end of file
--- a/BauJo/BauJo/settings.py
+++ b/BauJo/BauJo/settings.py
@@ -16,7 +16,7 @@ import os
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent

-
+APPEND_SLASH = False
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/


--- a/BauJo/BauJo/templates/base.html
+++ b/BauJo/BauJo/templates/base.html
@@ -8,14 +8,24 @@

 <html>
 <head>
+	<meta charest = "utf-8">
+	<meta name= "viewport" content = "width=device-width">
+
 	<title>{% block title %}{% endblock %}</title>
 	<nav>
        <ul>
-            <li><a href="home/">Home</a></li>
-            <li><a href="profile/">Profile</a></li>
+            <li><a href = "{% url 'home' %}">Home</a></li>
+            <li><a href = "{% url 'profile' %}">Profile</a></li>
+            <li><a href = "{% url 'key' %}">Key</a></li>
+            <li><a href = "{% url 'this_week' %}">This Week</a></li>
+            <li><a href = "{% url 'today' %}">Today</a></li>
        </ul>
    </nav>
+
+    <h2> {% block header %} {% endblock %} </h2>
 </head>
 <body>
+{% block body %}
+{% endblock %}
 </body>
 </html>
\ No newline at end of file
--- a/BauJo/BauJo/templates/home.html
+++ b/BauJo/BauJo/templates/home.html
 {% extends 'base.html' %}

+{% block title %}Your Bujo{% endblock %}
+
+{% block header %}Your Bullet Journal{% endblock %}
+
+{% block body %}
+
+{% if name %}
+
+<h1> Hello {{name}}! Today is going to be a great day! </h1>
+
+{% else %}
+
+<h1> Hello! What is your name? </h1>
+
+<form action = "home/" method = "POST"> 
+{% csrf_token %}
+{{ form }}
+<input type="submit" name="submit" id = "submit" value = "Submit Name">
+</form>
+{% endif %}
+
+{% endblock %}

-{% block title %}Key{% endblock %}
\ No newline at end of file
--- a/BauJo/BauJo/templates/key.html
+++ b/BauJo/BauJo/templates/key.html
 {% extends 'base.html' %}

 {% block title %}Key{% endblock %}
+
+{% block header %}Key{% endblock %}
\ No newline at end of file
--- a/BauJo/BauJo/templates/profile.html
+++ b/BauJo/BauJo/templates/profile.html
 {% extends 'base.html' %}

 {% block title %}Profile{% endblock %}
+
+{% block header %}Profile{% endblock %}
\ No newline at end of file
--- a/BauJo/BauJo/templates/this_week.html
+++ b/BauJo/BauJo/templates/this_week.html
 {% extends 'base.html' %}

 {% block title %}This Week{% endblock %}
+
+{% block header %}This Week{% endblock %}
\ No newline at end of file
--- a/BauJo/BauJo/templates/today.html
+++ b/BauJo/BauJo/templates/today.html
 {% extends 'base.html' %}

 {% block title %}Today{% endblock %}
+
+{% block header %}Today{% endblock %}
\ No newline at end of file
--- a/BauJo/BauJo/urls.py
+++ b/BauJo/BauJo/urls.py
@@ -16,13 +16,14 @@ Including another URLconf
 from django.contrib import admin
 from django.urls import path

-from .views import index
+from .views import page_home, page_profile, page_key, page_today, page_this_week, page_today

 urlpatterns = [
    #path('admin/', admin.site.urls),
-    path('', index, name = 'index'),
-    path('home/', index, name = 'index'),
-    path('profile/', index, name = 'profile'),
-
-
+    path('', page_home, name = 'home'),
+    path('home/', page_home, name = 'home'),
+    path('profile/', page_profile, name = 'profile'),
+    path('key/', page_key, name = 'key'),
+    path('this_week/', page_this_week, name = 'this_week'),
+    path('today/', page_today, name = 'today'),
 ]
--- a/BauJo/BauJo/views.py
+++ b/BauJo/BauJo/views.py
 from django.shortcuts import render
 from django.http import HttpResponse
-from .forms import home
+from django.views import View
+from .forms import home, profile, key, this_week, today

-def index(request): 
+def page_home(request): 
 	form = home()
-	return render(request,'profile.html',{'home' : home})
+	# if request.method == 'POST':
+	# 	form = home(request.POST)
+	# else:
+	# 	form = home()
+	return render(request, 'home.html', {'form' : form})

+def page_profile(request):
+	return render(request, 'profile.html',{'profile': profile})
+
+def page_key(request):
+	return render(request, 'key.html',{'profile': profile})
+
+def page_this_week(request):
+	return render(request, 'this_week.html',{'profile': profile})
+
+def page_today(request):
+	return render(request, 'today.html',{'profile': profile})
--- a/BauJo/db.sqlite3
+++ b/BauJo/db.sqlite3