Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI Fixes #21

Merged
merged 9 commits into from
Feb 5, 2024
Merged

UI Fixes #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1bc3a7b
Updated postgraduate page
NuwanJ Feb 3, 2024
36d4c91
Adding Undergraduate Courses (#14)
NuwanJ Feb 3, 2024
e12e8f7
Add redirection files #16 (#17)
ishanfdo18098 Feb 5, 2024
1724b9f
Intranet (#18)
NuwanJ Feb 5, 2024
d6113f0
Title update
NuwanJ Feb 5, 2024
0a2a5c7
GH Action correction
NuwanJ Feb 5, 2024
a2f0bf3
Fixes for UI
NuwanJ Feb 5, 2024
2ce73f8
Merge branch 'prod' into main
NuwanJ Feb 5, 2024
312eefe
Script correction
NuwanJ Feb 5, 2024
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
22 changes: 11 additions & 11 deletions _data/semesters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,56 +2,56 @@
"semester1": {
"title": "Semester 1",
"description": "All Engineering students follow the same first semester. These courses are credited towards their general programme (first year).",
"url": "/courses/undergraduate/semester1"
"url": "/courses/undergraduate/semester1/"
},
"semester2": {
"title": "Semester 2",
"description": "All Engineering students follow the same second semester. These courses are credited towards their general programme (first year).",
"url": "/courses/undergraduate/semester2"
"url": "/courses/undergraduate/semester2/"
},
"semester3": {
"title": "Semester 3",
"description": "",
"url": "/courses/undergraduate/semester3"
"url": "/courses/undergraduate/semester3/"
},
"semester4": {
"title": "Semester 4",
"description": "",
"url": "/courses/undergraduate/semester4"
"url": "/courses/undergraduate/semester4/"
},
"short-semester": {
"title": "Short Semester",
"description": "During this semester, the students will follow a Guided Software Engineering project with General Elective courses of at least 9 credits. The semester is 7 weeks long.",
"url": "/courses/undergraduate/short-semester"
"url": "/courses/undergraduate/short-semester/"
},
"semester5": {
"title": "Semester 5",
"description": "",
"url": "/courses/undergraduate/semester5"
"url": "/courses/undergraduate/semester5/"
},
"semester6": {
"title": "Semester 6",
"description": "",
"url": "/courses/undergraduate/semester6"
"url": "/courses/undergraduate/semester6/"
},
"semester7": {
"title": "Semester 7",
"description": "This is a short semester of 8 weeks, the students will start their final year projects and follow a few mandatory general elective courses",
"url": "/courses/undergraduate/semester7"
"url": "/courses/undergraduate/semester7/"
},
"semester8": {
"title": "Semester 8",
"description": "",
"url": "/courses/undergraduate/semester8"
"url": "/courses/undergraduate/semester8/"
},
"general-electives": {
"title": "General Electives",
"description": "",
"url": "/courses/undergraduate/general-electives"
"url": "/courses/undergraduate/general-electives/"
},
"technical-electives": {
"title": "Technical Electives",
"description": "",
"url": "/courses/undergraduate/technical-electives"
"url": "/courses/undergraduate/technical-electives/"
}
}
2 changes: 1 addition & 1 deletion pages/courses/postgraduate-courses.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: page_academics
title: Postgraduate Courses
permalink: /courses/postgraduate
permalink: /courses/postgraduate/
navbar_active: Study
---

Expand Down
2 changes: 1 addition & 1 deletion pages/courses/semesters/general-electives.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: semester
permalink: "/courses/undergraduate/general-electives"
permalink: "/courses/undergraduate/general-electives/"

title: General Electives
code: general-electives
Expand Down
4 changes: 2 additions & 2 deletions pages/courses/semesters/semester1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
layout: semester
permalink: "/courses/undergraduate/semester1"
permalink: "/courses/undergraduate/semester1/"

title: Semester 1
code: semester1
description:
description: All Engineering students follow the same first semester. These courses are credited towards their general programme (first year).
---
4 changes: 2 additions & 2 deletions pages/courses/semesters/semester2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
layout: semester
permalink: "/courses/undergraduate/semester2"
permalink: "/courses/undergraduate/semester2/"

title: Semester 2
code: semester2
description:
description: All Engineering students follow the same second semester. These courses are credited towards their general programme (first year).
---
2 changes: 1 addition & 1 deletion pages/courses/semesters/semester3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: semester
permalink: "/courses/undergraduate/semester3"
permalink: "/courses/undergraduate/semester3/"

title: Semester 3
code: semester3
Expand Down
2 changes: 1 addition & 1 deletion pages/courses/semesters/semester4.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: semester
permalink: "/courses/undergraduate/semester4"
permalink: "/courses/undergraduate/semester4/"

title: Semester 4
code: semester4
Expand Down
2 changes: 1 addition & 1 deletion pages/courses/semesters/semester5.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: semester
permalink: "/courses/undergraduate/semester5"
permalink: "/courses/undergraduate/semester5/"

title: Semester 5
code: semester5
Expand Down
2 changes: 1 addition & 1 deletion pages/courses/semesters/semester6.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: semester
permalink: "/courses/undergraduate/semester6"
permalink: "/courses/undergraduate/semester6/"

title: Semester 6
code: semester6
Expand Down
2 changes: 1 addition & 1 deletion pages/courses/semesters/semester7.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: semester
permalink: "/courses/undergraduate/semester7"
permalink: "/courses/undergraduate/semester7/"

title: Semester 7
code: semester7
Expand Down
2 changes: 1 addition & 1 deletion pages/courses/semesters/semester8.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: semester
permalink: "/courses/undergraduate/semester8"
permalink: "/courses/undergraduate/semester8/"

title: Semester 8
code: semester8
Expand Down
4 changes: 2 additions & 2 deletions pages/courses/semesters/short-semester.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
layout: semester
permalink: "/courses/undergraduate/short-semester"
permalink: "/courses/undergraduate/short-semester/"

title: Short Semester
code: short-semester
description: During his semester, the students will follow a Guided Software Engineering project with General Elective courses of at least 9 credits. The semester is 7 weeks long.
description: During this semester, the students will follow a Guided Software Engineering project with General Elective courses of at least 9 credits. The semester is 7 weeks long.
---
2 changes: 1 addition & 1 deletion pages/courses/semesters/technical-electives.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: semester
permalink: "/courses/undergraduate/technical-electives"
permalink: "/courses/undergraduate/technical-electives/"

title: Technical Electives
code: technical-electives
Expand Down
63 changes: 63 additions & 0 deletions pages/courses/undergraduate-courses.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
---
layout: default
permalink: /courses/undergraduate/
title: Undergraduate Courses
---

<div class="bg-secondary p-3 pb-1 rounded">
<h1 class="text-white">{{ page.title }}</h1>
<nav aria-label="breadcrumb">
<ol class="breadcrumb page-breadcrumb">
<li class="breadcrumb-item"><a href="{{ '/' | prepend: site.baseurl }}" class="link-light">Home</a></li>

<li class="breadcrumb-item">
<a href="{{ '/academics' | relative_url }}" class="link-light">
Academics
</a>
</li>

<li class="breadcrumb-item text-white">{{ page.title }}</li>
</ol>
</nav>
</div>

<div class="page-entry">
<div class="container pt-5 py-3">
{%- for sem in site.data.semesters -%}
<div class="container pb-3">
<h4>{{ sem[1]["title"] }}
<small><a class="ms-2 text-muted" href="{{ sem[1]['url'] }}"><i class="fa fa-link"></i></a></small>
</h4>
<p>{{ sem[1]["description"]}}</p>
</div>
<div class="container row">
{% assign sem_id = sem[0] %}
{%- for course in site.data.courses[sem_id]["courses"] -%}

{% assign course_prefix = course.code | slice: 0,2 %}

{% case course_prefix %}
{% when 'CO' %}
{% assign course_color = "btn-outline-primary" %}
{% when 'EE' %}
{% assign course_color = "btn-outline-success" %}
{% when 'EM' %}
{% assign course_color = "btn-outline-danger" %}
{% when 'GP' %}
{% assign course_color = "btn-outline-warning" %}
{% else %}
{% assign course_color = "btn-outline-secondary" %}
{% endcase %}

<div class="col-12 col-sm-6 col-md-4 d-grid">
<a href="{{ course.urls.view | relative_url}}"
class="btn btn-block mb-2 me-2 course-button {{ course_color }}">
<span class="font-monospace">{{course.code }} ({{ course.credits }}C)</span><br>
<b>{{ course.name }}</b></a>
</div>
{%- endfor -%}
</div>
<hr>
{%- endfor -%}
</div>
</div>
2 changes: 1 addition & 1 deletion python_scripts/undergraduate_courses/generate_semester_pages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

outputString = f"""---
layout: semester
permalink: "/courses/undergraduate{ url }"
permalink: "{url}"

title: {title}
code: {semester}
Expand Down
3 changes: 3 additions & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# This is for python_scripts

requests
Loading