From 599493892a9efa4e04ba1e4b39dfce9e8b37daf6 Mon Sep 17 00:00:00 2001 From: bryantran24 <158430748+bryantran24@users.noreply.github.com> Date: Fri, 15 Nov 2024 16:14:35 -0500 Subject: [PATCH 01/12] Made slider show below for mobile view --- src/web/src/pages/NewCourseScheduler.vue | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/web/src/pages/NewCourseScheduler.vue b/src/web/src/pages/NewCourseScheduler.vue index fc0094ce1..23b86eea3 100644 --- a/src/web/src/pages/NewCourseScheduler.vue +++ b/src/web/src/pages/NewCourseScheduler.vue @@ -808,6 +808,25 @@ sidebar-panel-nav { width: 25%; } +@media (max-width: 768px) { + .sidebar-panel { + position: static; + width: 100%; + height: auto; + margin: 0; + z-index: 1; + } + + .sidebar { + padding: 0; + } + + .main-body { + display: flex; + flex-direction: column; + } +} + .hidden { visibility: hidden; } From c7a31d301cad405b983f6473d1321f66b9d12ec1 Mon Sep 17 00:00:00 2001 From: bryantran24 <158430748+bryantran24@users.noreply.github.com> Date: Fri, 15 Nov 2024 16:16:06 -0500 Subject: [PATCH 02/12] Move mobile view course selector Instead of mobile view showing course selector at top, I moved it below schedule view. --- src/web/src/pages/NewCourseScheduler.vue | 142 +++++++++++------------ 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/src/web/src/pages/NewCourseScheduler.vue b/src/web/src/pages/NewCourseScheduler.vue index 23b86eea3..14a21ef33 100644 --- a/src/web/src/pages/NewCourseScheduler.vue +++ b/src/web/src/pages/NewCourseScheduler.vue @@ -21,77 +21,6 @@ -
- - -
-
- - - - - - - - - - - - - - - - - - - -
- -
- -
+ + +
+
+ + + + + + + + + + + + + + + + + + + +
+ +
+ + From 2a89f045bb313bd0c64f89a4715b52f8d6aa142e Mon Sep 17 00:00:00 2001 From: bryantran24 <158430748+bryantran24@users.noreply.github.com> Date: Fri, 15 Nov 2024 17:34:28 -0500 Subject: [PATCH 03/12] Updated CRN, Credit, Color blind, export data row Made it work with mobile view and made it fit better --- src/web/src/pages/NewCourseScheduler.vue | 68 ++++++++++++------------ 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/src/web/src/pages/NewCourseScheduler.vue b/src/web/src/pages/NewCourseScheduler.vue index 14a21ef33..c717fc6ca 100644 --- a/src/web/src/pages/NewCourseScheduler.vue +++ b/src/web/src/pages/NewCourseScheduler.vue @@ -72,37 +72,34 @@ - - + +
CRNs: {{ selectedCrns }}
Credits: {{ totalCredits }}
 - - - - - Color Blind Assistance - - - - - - - Export To ICS - - - - Export To Image - - - + + + + Color Blind Assistance + + + + + + Export To ICS + + + + Export To Image + + @@ -773,6 +770,11 @@ sidebar-panel-nav { background: #3d4959 !important; } +.b-dropdown .dropdown-menu { + // shifts export data menu left + transform: translateX(-10px); +} + .slide-enter-active, .slide-leave-active { transition: transform 0.2s ease; @@ -809,22 +811,22 @@ sidebar-panel-nav { } @media (max-width: 768px) { + // basically mobile view showing sidebar at bottom instead + .main-body { + display: flex; + flex-direction: column; + } + .sidebar-panel { position: static; width: 100%; height: auto; margin: 0; - z-index: 1; } .sidebar { padding: 0; } - - .main-body { - display: flex; - flex-direction: column; - } } .hidden { From 1705f4d17148c359aaf5fc29c6cc3e37be10939b Mon Sep 17 00:00:00 2001 From: bryantran24 <158430748+bryantran24@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:28:08 -0500 Subject: [PATCH 04/12] Fixed bug where buttons went into next row --- src/web/src/pages/NewCourseScheduler.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/web/src/pages/NewCourseScheduler.vue b/src/web/src/pages/NewCourseScheduler.vue index c717fc6ca..e02b4b112 100644 --- a/src/web/src/pages/NewCourseScheduler.vue +++ b/src/web/src/pages/NewCourseScheduler.vue @@ -34,8 +34,8 @@ >
- - + + + Add some sections to generate schedules! @@ -58,7 +58,7 @@ {{ this.possibilities.length }} - +
- + +
-->
-
+
-
+
List by Alphabet -
List by Category @@ -317,6 +304,35 @@ export default { diff --git a/src/web/src/pages/ProfExplorer.vue b/src/web/src/pages/ProfExplorer.vue index 1f64d8a02..6430b5312 100644 --- a/src/web/src/pages/ProfExplorer.vue +++ b/src/web/src/pages/ProfExplorer.vue @@ -4,8 +4,12 @@
- List by Alphabet - List by Department + + List by Alphabet + + + List by Department +
@@ -361,20 +365,7 @@ export default { color: #007bff; border: solid #007bff; background-color: transparent; - margin: 0; -} - -@media (max-width: 768px) { - .filter-buttons { - float: none; - display: flex; - flex-direction: row; - justify-content: center; - align-items: center; - width: 100%; - margin-bottom: 20px; - gap: 5px; - } + width: 100%; } .gridContainer { @@ -407,4 +398,17 @@ export default { .h3 { text-align: left; } + +@media (max-width: 768px) { + .filter-buttons { + float: none; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + width: 100%; + margin-bottom: 20px; + gap: 5px; + } +} From 8542b2160579ef06a209fbd7687d76748b512a4b Mon Sep 17 00:00:00 2001 From: bryantran24 <158430748+bryantran24@users.noreply.github.com> Date: Tue, 26 Nov 2024 17:24:53 -0500 Subject: [PATCH 10/12] Fixed next button going under and header navbar colorheaderfixed --- src/web/src/components/Header.vue | 7 ++- src/web/src/pages/NewCourseScheduler.vue | 76 ++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 8 deletions(-) diff --git a/src/web/src/components/Header.vue b/src/web/src/components/Header.vue index deb565383..68b443a7e 100644 --- a/src/web/src/components/Header.vue +++ b/src/web/src/components/Header.vue @@ -33,6 +33,7 @@ @@ -270,10 +271,12 @@ export default { padding: calc(8px - 0.2em); border: 0.2em solid var(--dark-blue-secondary); } -// no idea why but need to manually set this for it to show up -.dark #header-navbar-collapse-toggle { +.dark-mode-toggle { color: var(--dark-text-primary) !important; } +.light-mode-toggle { + color: var(--light-text-primary) !important; +} .drop-down-item { background: hsl(211, 100%, 60%) !important; } diff --git a/src/web/src/pages/NewCourseScheduler.vue b/src/web/src/pages/NewCourseScheduler.vue index 1b226ce83..f5af6cac5 100644 --- a/src/web/src/pages/NewCourseScheduler.vue +++ b/src/web/src/pages/NewCourseScheduler.vue @@ -34,8 +34,9 @@ >
- - + + + + + + + Add some sections to generate schedules! + + + Can't display because of course conflict! + + + Displaying schedule {{ this.index + 1 }} out of + {{ this.possibilities.length }} + + + + + + Prev + + + + + Next + + + + + @@ -736,7 +780,7 @@ export default { } // This is for the button for navigating each schedule option -.schedule-navigation { +#allScheduleData { margin: 8px; } @@ -919,6 +963,15 @@ button:focus { } } +.desktop-schedule-navigation { + visibility: visible; +} + +.mobile-schedule-navigation { + visibility: hidden; + height: 0; +} + @media (max-width: 768px) { // basically mobile view showing sidebar at bottom instead .main-body { @@ -945,8 +998,19 @@ button:focus { padding: 0; } - .schedule-navigation { - padding: 0; + #allScheduleData { + margin: 4px; + } + + .desktop-schedule-navigation { + visibility: hidden; + height: 0; + } + + .mobile-schedule-navigation { + visibility: visible; + height: auto; + padding: 10px; } } From 0258b8b68c5b93d1983f53aa87c0efdab558cb41 Mon Sep 17 00:00:00 2001 From: bryantran24 <158430748+bryantran24@users.noreply.github.com> Date: Fri, 29 Nov 2024 17:32:40 -0500 Subject: [PATCH 11/12] Fixed visibility bugs Made it so you cant scroll screen vertically and removed duplicate schedule navigators. --- src/web/src/pages/NewCourseScheduler.vue | 29 ++++++++++++------------ 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/web/src/pages/NewCourseScheduler.vue b/src/web/src/pages/NewCourseScheduler.vue index f5af6cac5..52954f540 100644 --- a/src/web/src/pages/NewCourseScheduler.vue +++ b/src/web/src/pages/NewCourseScheduler.vue @@ -36,7 +36,7 @@
- + + - + Add some sections to generate schedules! @@ -89,7 +89,7 @@ - + +
+
- + - + @@ -149,6 +150,7 @@
+
@@ -175,7 +177,6 @@ loadingMessage="Courses" :topSpacing="0" /> -