adding navbar

cqoverly-uw · cqoverly-uw · commit e242e4c7c5e6 · 2022-03-22T18:52:13.000-07:00
diff --git a/templates/courses/course_history.html b/templates/courses/course_history.html
@@ -1,9 +1,6 @@
-<html>
-<head>
-    <title>Course_History</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
-</head>
-<body>
+{% extends "shared/base.html" %}
+{% block title %}Course Info{% endblock %}
+{% block body %}
     <div class="container-fluid">
         <div>
             <p><a href="/">Menu</a></p>
@@ -62,5 +59,6 @@ <h3>Course History</h3>
             </table>
         </div>
     </div>
+{% endblock %}
 </body>
 </html>
diff --git a/templates/courses/course_info.html b/templates/courses/course_info.html
@@ -56,5 +56,4 @@ <h4>More Information</h4>
             </div>
         </div>     
     </div>
-</body>
 {% endblock %}
diff --git a/templates/courses/joint_courses.html b/templates/courses/joint_courses.html
@@ -1,9 +1,6 @@
-<html>
-<head>
-    <title>Joint Courses</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
-</head>
-<body>
+{% extends "shared/base.html" %}
+{% block title %}Course Info{% endblock %}
+{% block body %}
     <div class="container-fluid">
         <div>
             <p><a href="/">Menu</a></p>
@@ -32,5 +29,5 @@ <h5>Joint Course Info</h5>
             </table>
         </div>
     </div>
-</body>
+{% endblock %}
 </html>
diff --git a/templates/shared/base.html b/templates/shared/base.html
@@ -71,10 +71,10 @@
     </div>
 </nav>
 <hr size="6" color="gold">
-{% block body %}
-{% endblock %}
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/popper.js@1.12.9/dist/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
 </body>
+{% block body %}
+{% endblock %}
 </html>
diff --git a/views/courses.py b/views/courses.py
@@ -81,7 +81,7 @@ async def get_course_history(
         )
 
 
-@router.get("/joint_courses.html/", response_class=HTMLResponse)
+@router.get("/joint_courses/", response_class=HTMLResponse)
 async def get_joint_course_list(request: Request):
     sql: str = sql_scripts.joint_courses_query
     data: dict = courses.get_joint_course_data(sql)

-Original file line number
+Diff line change
             </div>
         </div>
     </div>
 -</body>
 {% endblock %}
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ async def get_course_history(`
`81`	`81`	`)`
`82`	`82`
`83`	`83`
`84`		`-@router.get("/joint_courses.html/", response_class=HTMLResponse)`
	`84`	`+@router.get("/joint_courses/", response_class=HTMLResponse)`
`85`	`85`	`async def get_joint_course_list(request: Request):`
`86`	`86`	`sql: str = sql_scripts.joint_courses_query`
`87`	`87`	`data: dict = courses.get_joint_course_data(sql)`