updating master from homepage

66ee34c0 · Christopher Jorge Chan · 5cc7bdd3 · 8b595c15 · 66ee34c0 · 66ee34c0
Commit 66ee34c0 authored May 18, 2022 by Christopher Jorge Chan
67 changed files
--- a/widget_group_18/announcements/__pycache__/__init__.cpython-38.pyc
+++ b/widget_group_18/announcements/__pycache__/__init__.cpython-38.pyc
--- a/widget_group_18/announcements/__pycache__/admin.cpython-38.pyc
+++ b/widget_group_18/announcements/__pycache__/admin.cpython-38.pyc
--- a/widget_group_18/announcements/__pycache__/apps.cpython-38.pyc
+++ b/widget_group_18/announcements/__pycache__/apps.cpython-38.pyc
--- a/widget_group_18/announcements/__pycache__/models.cpython-38.pyc
+++ b/widget_group_18/announcements/__pycache__/models.cpython-38.pyc
--- a/widget_group_18/announcements/__pycache__/urls.cpython-38.pyc
+++ b/widget_group_18/announcements/__pycache__/urls.cpython-38.pyc
--- a/widget_group_18/announcements/__pycache__/views.cpython-38.pyc
+++ b/widget_group_18/announcements/__pycache__/views.cpython-38.pyc
--- a/widget_group_18/announcements/migrations/__pycache__/0001_initial.cpython-38.pyc
+++ b/widget_group_18/announcements/migrations/__pycache__/0001_initial.cpython-38.pyc
--- a/widget_group_18/announcements/migrations/__pycache__/0002_auto_20220405_1917.cpython-38.pyc
+++ b/widget_group_18/announcements/migrations/__pycache__/0002_auto_20220405_1917.cpython-38.pyc
--- a/widget_group_18/announcements/migrations/__pycache__/0003_rename_article_reaction_announcement.cpython-38.pyc
+++ b/widget_group_18/announcements/migrations/__pycache__/0003_rename_article_reaction_announcement.cpython-38.pyc
--- a/widget_group_18/announcements/migrations/__pycache__/__init__.cpython-38.pyc
+++ b/widget_group_18/announcements/migrations/__pycache__/__init__.cpython-38.pyc
--- a/widget_group_18/assignments/__pycache__/__init__.cpython-38.pyc
+++ b/widget_group_18/assignments/__pycache__/__init__.cpython-38.pyc
--- a/widget_group_18/assignments/__pycache__/admin.cpython-38.pyc
+++ b/widget_group_18/assignments/__pycache__/admin.cpython-38.pyc
--- a/widget_group_18/assignments/__pycache__/apps.cpython-38.pyc
+++ b/widget_group_18/assignments/__pycache__/apps.cpython-38.pyc
--- a/widget_group_18/assignments/__pycache__/models.cpython-38.pyc
+++ b/widget_group_18/assignments/__pycache__/models.cpython-38.pyc
--- a/widget_group_18/assignments/__pycache__/urls.cpython-38.pyc
+++ b/widget_group_18/assignments/__pycache__/urls.cpython-38.pyc
--- a/widget_group_18/assignments/__pycache__/views.cpython-38.pyc
+++ b/widget_group_18/assignments/__pycache__/views.cpython-38.pyc
--- a/widget_group_18/assignments/migrations/__pycache__/0001_initial.cpython-38.pyc
+++ b/widget_group_18/assignments/migrations/__pycache__/0001_initial.cpython-38.pyc
--- a/widget_group_18/assignments/migrations/__pycache__/0002_alter_assignments_max_points.cpython-38.pyc
+++ b/widget_group_18/assignments/migrations/__pycache__/0002_alter_assignments_max_points.cpython-38.pyc
--- a/widget_group_18/assignments/migrations/__pycache__/0003_rename_assignments_assignment.cpython-38.pyc
+++ b/widget_group_18/assignments/migrations/__pycache__/0003_rename_assignments_assignment.cpython-38.pyc
--- a/widget_group_18/assignments/migrations/__pycache__/0004_course.cpython-38.pyc
+++ b/widget_group_18/assignments/migrations/__pycache__/0004_course.cpython-38.pyc
--- a/widget_group_18/assignments/migrations/__pycache__/0005_assignment_course.cpython-38.pyc
+++ b/widget_group_18/assignments/migrations/__pycache__/0005_assignment_course.cpython-38.pyc
--- a/widget_group_18/assignments/migrations/__pycache__/0006_assignment_passing_score.cpython-38.pyc
+++ b/widget_group_18/assignments/migrations/__pycache__/0006_assignment_passing_score.cpython-38.pyc
--- a/widget_group_18/assignments/migrations/__pycache__/0007_auto_20220518_1124.cpython-38.pyc
+++ b/widget_group_18/assignments/migrations/__pycache__/0007_auto_20220518_1124.cpython-38.pyc
--- a/widget_group_18/assignments/migrations/__pycache__/__init__.cpython-38.pyc
+++ b/widget_group_18/assignments/migrations/__pycache__/__init__.cpython-38.pyc
--- a/widget_group_18/db.sqlite3
+++ b/widget_group_18/db.sqlite3
--- a/widget_group_18/forum/__pycache__/__init__.cpython-38.pyc
+++ b/widget_group_18/forum/__pycache__/__init__.cpython-38.pyc
--- a/widget_group_18/forum/__pycache__/admin.cpython-38.pyc
+++ b/widget_group_18/forum/__pycache__/admin.cpython-38.pyc
--- a/widget_group_18/forum/__pycache__/apps.cpython-38.pyc
+++ b/widget_group_18/forum/__pycache__/apps.cpython-38.pyc
--- a/widget_group_18/forum/__pycache__/models.cpython-38.pyc
+++ b/widget_group_18/forum/__pycache__/models.cpython-38.pyc
--- a/widget_group_18/forum/__pycache__/urls.cpython-38.pyc
+++ b/widget_group_18/forum/__pycache__/urls.cpython-38.pyc
--- a/widget_group_18/forum/__pycache__/views.cpython-38.pyc
+++ b/widget_group_18/forum/__pycache__/views.cpython-38.pyc
--- a/widget_group_18/forum/migrations/__pycache__/0001_initial.cpython-38.pyc
+++ b/widget_group_18/forum/migrations/__pycache__/0001_initial.cpython-38.pyc
--- a/widget_group_18/forum/migrations/__pycache__/0002_alter_post_pub_date.cpython-38.pyc
+++ b/widget_group_18/forum/migrations/__pycache__/0002_alter_post_pub_date.cpython-38.pyc
--- a/widget_group_18/forum/migrations/__pycache__/0003_alter_post_pub_date.cpython-38.pyc
+++ b/widget_group_18/forum/migrations/__pycache__/0003_alter_post_pub_date.cpython-38.pyc
--- a/widget_group_18/forum/migrations/__pycache__/0004_post_author_alter_post_post_body_alter_post_pub_date_and_more.cpython-38.pyc
+++ b/widget_group_18/forum/migrations/__pycache__/0004_post_author_alter_post_post_body_alter_post_pub_date_and_more.cpython-38.pyc
--- a/widget_group_18/forum/migrations/__pycache__/0005_alter_post_pub_date_alter_reply_pub_date.cpython-38.pyc
+++ b/widget_group_18/forum/migrations/__pycache__/0005_alter_post_pub_date_alter_reply_pub_date.cpython-38.pyc
--- a/widget_group_18/forum/migrations/__pycache__/0006_alter_post_pub_date_alter_reply_pub_date.cpython-38.pyc
+++ b/widget_group_18/forum/migrations/__pycache__/0006_alter_post_pub_date_alter_reply_pub_date.cpython-38.pyc
--- a/widget_group_18/forum/migrations/__pycache__/__init__.cpython-38.pyc
+++ b/widget_group_18/forum/migrations/__pycache__/__init__.cpython-38.pyc
--- a/widget_group_18/homepage/__pycache__/__init__.cpython-38.pyc
+++ b/widget_group_18/homepage/__pycache__/__init__.cpython-38.pyc
--- a/widget_group_18/homepage/__pycache__/admin.cpython-38.pyc
+++ b/widget_group_18/homepage/__pycache__/admin.cpython-38.pyc
--- a/widget_group_18/homepage/__pycache__/apps.cpython-38.pyc
+++ b/widget_group_18/homepage/__pycache__/apps.cpython-38.pyc
--- a/widget_group_18/homepage/__pycache__/models.cpython-38.pyc
+++ b/widget_group_18/homepage/__pycache__/models.cpython-38.pyc
--- a/widget_group_18/homepage/__pycache__/urls.cpython-38.pyc
+++ b/widget_group_18/homepage/__pycache__/urls.cpython-38.pyc
--- a/widget_group_18/homepage/__pycache__/views.cpython-38.pyc
+++ b/widget_group_18/homepage/__pycache__/views.cpython-38.pyc
--- a/widget_group_18/homepage/migrations/__pycache__/0001_initial.cpython-38.pyc
+++ b/widget_group_18/homepage/migrations/__pycache__/0001_initial.cpython-38.pyc
--- a/widget_group_18/homepage/migrations/__pycache__/0002_widgetuser_email_widgetuser_id_num.cpython-38.pyc
+++ b/widget_group_18/homepage/migrations/__pycache__/0002_widgetuser_email_widgetuser_id_num.cpython-38.pyc
--- a/widget_group_18/homepage/migrations/__pycache__/0003_department.cpython-38.pyc
+++ b/widget_group_18/homepage/migrations/__pycache__/0003_department.cpython-38.pyc
--- a/widget_group_18/homepage/migrations/__pycache__/0004_widgetuser_department.cpython-38.pyc
+++ b/widget_group_18/homepage/migrations/__pycache__/0004_widgetuser_department.cpython-38.pyc
--- a/widget_group_18/homepage/migrations/__pycache__/__init__.cpython-38.pyc
+++ b/widget_group_18/homepage/migrations/__pycache__/__init__.cpython-38.pyc
--- a/widget_group_18/homepage/static/homepage/css/base.css
+++ b/widget_group_18/homepage/static/homepage/css/base.css
+body{
+	font-family: Arial;
+	background-color: orange;
+	color: green;
+}
\ No newline at end of file
--- a/widget_group_18/homepage/static/homepage/css/details.css
+++ b/widget_group_18/homepage/static/homepage/css/details.css
+#profilepic{
+	width: 20%;
+	height: 20%;
+	border-radius: 40px;
+}
\ No newline at end of file
--- a/widget_group_18/homepage/static/homepage/images/2010354.png
+++ b/widget_group_18/homepage/static/homepage/images/2010354.png
--- a/widget_group_18/homepage/static/homepage/images/2010511.png
+++ b/widget_group_18/homepage/static/homepage/images/2010511.png
--- a/widget_group_18/homepage/static/homepage/images/2010783.png
+++ b/widget_group_18/homepage/static/homepage/images/2010783.png
--- a/widget_group_18/homepage/static/homepage/images/2013423.png
+++ b/widget_group_18/homepage/static/homepage/images/2013423.png
--- a/widget_group_18/homepage/static/homepage/images/2020131.png
+++ b/widget_group_18/homepage/static/homepage/images/2020131.png
--- a/widget_group_18/homepage/static/homepage/images/2022107.png
+++ b/widget_group_18/homepage/static/homepage/images/2022107.png
--- a/widget_group_18/homepage/static/homepage/images/smile.jpg
+++ b/widget_group_18/homepage/static/homepage/images/smile.jpg
--- a/widget_group_18/homepage/templates/homepage/base.html
+++ b/widget_group_18/homepage/templates/homepage/base.html
+<!DOCTYPE html>
+<html lang="en">
+{%load static%}
+<head>
+	<title>Widget</title>
+	<link rel="stylesheet" type="text/css" href="{%static 'homepage/css/base.css'%}">
+</head>
+<body>
+	{%block body%}
+
+	{%endblock%}
+</body>
+</html>
\ No newline at end of file
--- a/widget_group_18/homepage/templates/homepage/details.html
+++ b/widget_group_18/homepage/templates/homepage/details.html
+{%extends "homepage/base.html" %}
+
+{%load static%}
+
+{%block body%}
+	<link rel="stylesheet" type="text/css" href="{%static 'homepage/css/details.css'%}">
+
+	<div class="container main">
+		<img id="profilepic" src="{%static imgurl%}"> <br><br>
+		<h1>{{widget_user.last_name}}, {{widget_user.first_name}} {{widget_user.middle_name}}</h1>
+		<h2>{{widget_user.id_num}}</h2>
+		<h3>{{widget_user.email}}</h3>
+		<h4>{{widget_user.department.dept_name}}</h4>
+		<h4>{{widget_user.department.home_unit}}</h4>
+	</div>
+{%endblock%}
\ No newline at end of file
--- a/widget_group_18/homepage/templates/homepage/home.html
+++ b/widget_group_18/homepage/templates/homepage/home.html
+{%extends "homepage/base.html" %}
+
+{%load static%}
+
+{%block body%}
+	<link rel="stylesheet" type="text/css" href="{%static 'homepage/css/home.css'%}">
+
+	<div class="container main">
+		<h1>Welcome to Widget!</h1><br>
+		<h2>Widget Users:</h2>
+		<ol class="widgetusers">
+			{%for w in widget_users%}
+				<li><a href="{%url 'details' w.id_num%}">{{w.last_name}}, {{w.first_name}} {{w.middle_name}}</a></li>
+			{%endfor%}
+		</ol>
+	</div>
+{%endblock%}
\ No newline at end of file
--- a/widget_group_18/homepage/urls.py
+++ b/widget_group_18/homepage/urls.py
@@ -2,5 +2,6 @@ from django.urls import path
 from . import views

 urlpatterns = [
-	path('', views.index, name='index')
+	path('', views.homepage_view, name='homepage'),
+	path('users/<user_id>/details', views.details, name='details')
 ]
\ No newline at end of file
--- a/widget_group_18/homepage/views.py
+++ b/widget_group_18/homepage/views.py
@@ -3,6 +3,7 @@ from django.http import HttpResponse
 from .models import Department, WidgetUser

 # Create your views here.
+"""
 def index(request):

 	message = 'WIDGET USERS:<br/>'
@@ -13,4 +14,22 @@ def index(request):
 		for w in widget_users:
 			message += f"{w.last_name}, {w.first_name} {w.middle_name}: {w.id_num}, {w.email}, {d.dept_name}, {d.home_unit}<br/>"

-	return HttpResponse(message)
\ No newline at end of file
+	return HttpResponse(message)
+"""
+
+def homepage_view(request):
+	widget_users = WidgetUser.objects.all().order_by('last_name')
+	homepage_dict = {
+		"widget_users" : widget_users
+	}
+	return render(request, "homepage/home.html", homepage_dict)
+
+
+def details(request, user_id):
+	widget_user = WidgetUser.objects.get(id_num=user_id)
+	imgurl = f"homepage/images/{user_id}.png"
+	details_dict = {
+		"widget_user" : widget_user,
+		"imgurl" : imgurl
+	}
+	return render(request, "homepage/details.html", details_dict)
\ No newline at end of file
--- a/widget_group_18/widget_group_18/__pycache__/__init__.cpython-38.pyc
+++ b/widget_group_18/widget_group_18/__pycache__/__init__.cpython-38.pyc
--- a/widget_group_18/widget_group_18/__pycache__/settings.cpython-38.pyc
+++ b/widget_group_18/widget_group_18/__pycache__/settings.cpython-38.pyc
--- a/widget_group_18/widget_group_18/__pycache__/urls.cpython-38.pyc
+++ b/widget_group_18/widget_group_18/__pycache__/urls.cpython-38.pyc
--- a/widget_group_18/widget_group_18/__pycache__/wsgi.cpython-38.pyc
+++ b/widget_group_18/widget_group_18/__pycache__/wsgi.cpython-38.pyc