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.

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

Akeyl mobile fixes #14

Open
wants to merge 451 commits into
base: main
Choose a base branch
from
Open
Changes from 23 commits
Commits
Show all changes
451 commits
Select commit Hold shift + click to select a range
aff622c
Fixed Admin Course Page
Ryzon3 Jun 20, 2022
5b511cd
Fixed some positioning and commenting out a debug button
liuj-42 Jun 21, 2022
e83f292
Merge branch 'main' into graph-view
liuj-42 Jun 21, 2022
6be4510
Merge branch 'main' into james-issues-changes
liuj-42 Jun 21, 2022
cbc2bb5
added 5px margin to bottom
michaelni678 Jun 21, 2022
6d251aa
change some css for graph view
liuj-42 Jun 21, 2022
d44aa2a
Merge branch 'james-issues-changes' into graph-view
liuj-42 Jun 21, 2022
9a8ca2f
Primary color changes / added documentation in vuetify.js
CryptidGrrrl Jun 21, 2022
242cfe1
fix description tooltips not showing
liuj-42 Jun 21, 2022
0c800ad
change description on hover icon states
liuj-42 Jun 21, 2022
703f260
Added CI information
Ryzon3 Jun 21, 2022
397b292
Added About page
Ryzon3 Jun 21, 2022
46ccc5e
added selection bar
michaelni678 Jun 21, 2022
2ddea10
cards now are uniform height
liuj-42 Jun 21, 2022
52845e9
Merge pull request #75 from anderm18/SelectedBar
Ryzon3 Jun 21, 2022
941b55c
Added one question to FAQ
Ryzon3 Jun 21, 2022
57fec4b
Added one "s" to a word on the FAQ
Ryzon3 Jun 21, 2022
6338643
Merge branch 'main' into 32-light-mode-changes
CryptidGrrrl Jun 21, 2022
14e7b35
Tuning breadcrumbs.
dimitri-lopez Jun 21, 2022
b189b44
Remove 6000 level, closes #80
Ryzon3 Jun 23, 2022
b2f1d27
Added a line in the remaining tab if a 4000 level course is required
Benjamin-Avrahami Jun 24, 2022
7079c09
Added a line in the remaining tab if a minor can be made from this pa…
Benjamin-Avrahami Jun 24, 2022
ca0fd40
Cleaned up the formatting a little and added some spacing
Benjamin-Avrahami Jun 24, 2022
e4481f7
Fixed ~40 warnings before merging
Ryzon3 Jun 24, 2022
0491c96
Merge pull request #64 from anderm18/james-issues-changes
Ryzon3 Jun 24, 2022
fd343f6
Merge branch 'main' into ButtonsAddMarginHomepage
Ryzon3 Jun 24, 2022
bad8c90
Merge pull request #70 from anderm18/ButtonsAddMarginHomepage
Ryzon3 Jun 24, 2022
752fe74
working on getting the graph tabs to grow/shrink
liuj-42 Jun 24, 2022
ba2e916
Merge branch 'main' into 32-light-mode-changes
liuj-42 Jun 24, 2022
f8e8a08
Fixed warnings
Ryzon3 Jun 24, 2022
1f13235
Moved info from "Remaining" tab to above the tabs
Benjamin-Avrahami Jun 24, 2022
3c194d5
Fixed more warnings.
Ryzon3 Jun 24, 2022
f9099c8
Fixed bug on course table page
Ryzon3 Jun 24, 2022
faf6879
Merge pull request #84 from anderm18/main
dicosn Jun 24, 2022
52110ae
I added divider on homepage
dicosn Jun 24, 2022
3f0abf8
fix #78
liuj-42 Jun 24, 2022
bcd246c
Added admin portal to change pathway section, closes #33
Ryzon3 Jun 24, 2022
2de8a7d
clean up code
liuj-42 Jun 24, 2022
3c47975
Merge branch 'main' into graph-view
liuj-42 Jun 24, 2022
47b2e0f
fixing lots of warnings, description on hover doesnt work again :(
liuj-42 Jun 24, 2022
64b99e8
removing unused code
liuj-42 Jun 24, 2022
e5a5321
Fixing sorting on coursetables.
dimitri-lopez Jun 25, 2022
47056ca
Fixing auto-tab toggle button.
dimitri-lopez Jun 25, 2022
cdbc7f7
Merge pull request #74 from anderm18/32-light-mode-changes
anderm18 Jun 27, 2022
e0d6b19
Merge pull request #85 from anderm18/AdminPathwayPageChanges
anderm18 Jun 27, 2022
2949101
redirecting users to our github
anderm18 Jun 27, 2022
6449996
Homepage buttons now fixed. Fixes #82
dimitri-lopez Jun 27, 2022
e19d7e6
Merging styling on homepage
dimitri-lopez Jun 27, 2022
0a9d741
Tweaking logo to be more vibrant.
dimitri-lopez Jun 28, 2022
f81bd24
removed duplicate buttons
michaelni678 Jun 28, 2022
9ba6103
test commit
liuj-42 Jun 28, 2022
c50f7a7
fix #76
liuj-42 Jun 28, 2022
dbd5f9d
made all course titles take up only 1 line
liuj-42 Jun 28, 2022
c042752
Removed {colors} from vuetify.js
CryptidGrrrl Jun 28, 2022
5d6e3d5
Fixed whitespace issues in the FromClasses page
CryptidGrrrl Jun 28, 2022
0285575
Updated AboutPage.vue
CryptidGrrrl Jun 28, 2022
0ab1528
Merge pull request #94 from anderm18/93-FAQ-page-dropdowns
CryptidGrrrl Jun 29, 2022
2fc612d
Scraped the catalog for prereqs but not pushed to json
Benjamin-Avrahami Jun 29, 2022
f16d6ea
Changed method of scraping for speed and alignment with the rest of t…
Benjamin-Avrahami Jun 29, 2022
f276ad2
Pushed updated info to json
Benjamin-Avrahami Jun 29, 2022
6926b73
Removed old method
Benjamin-Avrahami Jun 29, 2022
c55e0d9
Changed type of prereq from list to string and removed whitespace
Benjamin-Avrahami Jun 29, 2022
aaae520
Merge branch 'main' into 72/79-pathway-information
Benjamin-Avrahami Jun 29, 2022
40bf8a9
Merge pull request #81 from anderm18/72/79-pathway-information
Benjamin-Avrahami Jun 29, 2022
ae8efeb
Got a basic selection in place
Benjamin-Avrahami Jun 30, 2022
073c4ac
Added space under the dropdown and changed the storage
Benjamin-Avrahami Jun 30, 2022
e05e55d
Got the chosen year to persist across refreshes
Benjamin-Avrahami Jun 30, 2022
f315952
Added year selection menu to a number of pages
Benjamin-Avrahami Jun 30, 2022
afe21e0
course modifiers are now all on one line in graph view
liuj-42 Jun 30, 2022
6499eee
resize buttons now work
liuj-42 Jun 30, 2022
62bbfa4
Merge pull request #95 from anderm18/prereq-scraper
Ryzon3 Jun 30, 2022
4e7b288
getting cards to grow/shrink
liuj-42 Jun 30, 2022
7dbe54e
Added crosslisted section for a course closes #92
Ryzon3 Jun 30, 2022
fad00e3
Merge branch 'main' into graph-view
liuj-42 Jun 30, 2022
55b874e
Removed placeholder text and fixed warnings
Benjamin-Avrahami Jul 1, 2022
261b203
Fixed merge error and some warnings
Benjamin-Avrahami Jul 1, 2022
bc45d57
removing unused css
liuj-42 Jul 1, 2022
6222527
Merge branch 'main' into james-issues-changes
liuj-42 Jul 1, 2022
1482108
Merge branch 'main' into accessiblity-issues
dicosn Jul 1, 2022
edbc6da
customized scrollbar
michaelni678 Jul 1, 2022
0c0299b
FIxed issues with multiple "one of"s in a pathway
Ryzon3 Jul 1, 2022
ed3c9d7
Turned Bookmark into component
Ryzon3 Jul 1, 2022
2860275
Fixed deletion bug
Ryzon3 Jul 1, 2022
540870e
Added bookmarks to the MyPathway component
Ryzon3 Jul 1, 2022
b3d370e
Fixed warnings and bugs
Ryzon3 Jul 2, 2022
f19f83b
Fixed bug in pathway scraper
Ryzon3 Jul 2, 2022
5550f1c
Merge branch 'main' into ryan-various-issues
Ryzon3 Jul 2, 2022
954c48e
fix courses.json temp
Ryzon3 Jul 2, 2022
c67e76a
bugfix for key error in pathwaypage
Ryzon3 Jul 2, 2022
9fdcb39
Merge pull request #100 from anderm18/ryan-various-issues
Ryzon3 Jul 2, 2022
ab5ecdd
Updated JSON files
Ryzon3 Jul 2, 2022
aa7bc08
Fixed some bugs in pathway scraper
Ryzon3 Jul 3, 2022
d1a3c03
Merged branch with main
Benjamin-Avrahami Jul 4, 2022
b95ed3d
Merge pull request #96 from anderm18/88-different-years
Benjamin-Avrahami Jul 4, 2022
8137923
Added cross listings to the pathway page
Benjamin-Avrahami Jul 4, 2022
82be2bf
Merge branch 'main' of github.com:anderm18/HASSPathways into 101-cros…
Benjamin-Avrahami Jul 4, 2022
060439e
Added cross listings in my pathway and fixed warnings
Benjamin-Avrahami Jul 4, 2022
dce1b8f
Merge branch 'main' into removeDupElems
Benjamin-Avrahami Jul 5, 2022
18a076e
Merge branch 'main' of github.com:anderm18/HASSPathways into 101-cros…
Benjamin-Avrahami Jul 5, 2022
b2e7e1d
Merge pull request #89 from anderm18/removeDupElems
Benjamin-Avrahami Jul 5, 2022
4db236b
Added cross listings for the rest of the pages
Benjamin-Avrahami Jul 5, 2022
d8c0558
Updated json file to make code a little cleaner
Benjamin-Avrahami Jul 5, 2022
d67c3eb
courses no longer duplicate
michaelni678 Jul 5, 2022
79c386c
Merge branch 'main' into james-issues-changes
anderm18 Jul 5, 2022
658e85b
Merge pull request #98 from anderm18/james-issues-changes
anderm18 Jul 5, 2022
2c058df
Revert "James issues changes"
anderm18 Jul 5, 2022
feabb11
Merge pull request #105 from anderm18/revert-98-james-issues-changes
anderm18 Jul 5, 2022
c6241f7
Messed with mode button
dicosn Jul 11, 2022
131c195
Merge pull request #99 from anderm18/custom_scrollbar
anderm18 Jul 12, 2022
d94883b
Merge pull request #103 from anderm18/101-crosslisting
anderm18 Jul 12, 2022
33adfa1
added padding
michaelni678 Jul 12, 2022
05d8257
resizing is now automatic
liuj-42 Jul 12, 2022
f49c508
removing unused/commented out stuff
liuj-42 Jul 12, 2022
8a664cf
Made Darkmode button into switch
dicosn Jul 12, 2022
6ec1b18
Merge pull request #104 from anderm18/removeDupeGlitch
anderm18 Jul 12, 2022
9c54dd8
Merge branch 'main' into accessiblity-issues
dicosn Jul 12, 2022
3388268
writing comments and removing some more unused stuff
liuj-42 Jul 12, 2022
54c2d2f
Merge remote-tracking branch 'origin/main' into graph-view
liuj-42 Jul 12, 2022
be2609c
Changed pathway scraper to use API
Ryzon3 Jul 14, 2022
7c3973b
Adding an sis scraper and its output file.
dimitri-lopez Jul 14, 2022
abcd197
fixed graph view showing standard view too
liuj-42 Jul 14, 2022
92c1e80
Fixed various bugs and Bram changes
Ryzon3 Jul 14, 2022
44e717b
Merge branch 'main' of https://github.com/anderm18/HASSPathways
Ryzon3 Jul 14, 2022
d81a3fc
Merge branch 'main' into graph-view
liuj-42 Jul 15, 2022
e22462e
footer is on the bottom again (fix #113)
liuj-42 Jul 15, 2022
0bc967b
Revert "Merge branch 'main' of https://github.com/anderm18/HASSPathways"
Ryzon3 Jul 15, 2022
786d39a
Restoring SIS scraper
Ryzon3 Jul 15, 2022
e2dd762
footer is on the bottom again (fix #113)
liuj-42 Jul 18, 2022
0f1bbcd
Merge pull request #111 from anderm18/CenterTextLearnPage
anderm18 Jul 18, 2022
b33a93a
Merge pull request #112 from anderm18/accessiblity-issues
anderm18 Jul 18, 2022
24f4878
fixing buttons
anderm18 Jul 18, 2022
e8b0279
trying again : (
anderm18 Jul 18, 2022
701953e
again lmao
anderm18 Jul 18, 2022
c13104c
Adding overwrite json file to sis scraper
dimitri-lopez Jul 18, 2022
2750fca
Fixing up the bugs in sis scraper
dimitri-lopez Jul 18, 2022
fdb7fd8
Added some basic multi year json
Ryzon3 Jul 18, 2022
51e548e
Merge branch 'main' into multi-year-json
Ryzon3 Jul 18, 2022
cff6d10
sis_scraper will now scrape ALL departments + fixing recursion bug
dimitri-lopez Jul 19, 2022
5c221de
Sorting classes based on ID rather than SUBJ
dimitri-lopez Jul 19, 2022
fb826a6
Sorting classes on ID rather than SUBJ closes #118
dimitri-lopez Jul 19, 2022
c7dd3d8
Merge remote-tracking branch 'origin/main'
dimitri-lopez Jul 19, 2022
005c01a
Revert "Merge branch 'main' into graph-view"
liuj-42 Jul 19, 2022
1d5cb46
Revert "Merge remote-tracking branch 'origin/main' into graph-view"
liuj-42 Jul 19, 2022
71d7575
Merge branch 'main' into graph-view
liuj-42 Jul 19, 2022
603efd2
adding year selection
liuj-42 Jul 19, 2022
79cd1ed
manually adding YearSelection bc git didnt recognize that for some re…
liuj-42 Jul 19, 2022
ed02770
PathwayPage.vue successfully merged
liuj-42 Jul 19, 2022
f2a6648
getting rid of debug button
liuj-42 Jul 19, 2022
9077d79
text is now normal length for standard view
liuj-42 Jul 19, 2022
8dbc22f
Fixed bugs in scrapers
Ryzon3 Jul 19, 2022
26b018c
Add pycache to the gitignore
Ryzon3 Jul 19, 2022
ce1c0f1
Merge branch 'main' into multi-year-json
Ryzon3 Jul 19, 2022
faa3e8a
Fix gitignore
Ryzon3 Jul 19, 2022
5cc4c62
Moved year selection button to header
michaelni678 Jul 19, 2022
466ee47
click me to toggle view length
graya4 Jul 19, 2022
83c4c5c
admin button
graya4 Jul 19, 2022
9c7f477
admin search
graya4 Jul 19, 2022
74040b9
Right-aligning chips
dimitri-lopez Jul 19, 2022
07e6734
remove unused import
liuj-42 Jul 19, 2022
7695791
fix #122 and add flex wrap to the graph tabs
liuj-42 Jul 19, 2022
c0dc333
add a media query to make the graph containers only wrap if the scree…
liuj-42 Jul 19, 2022
ad2058e
my pathways page button
graya4 Jul 19, 2022
c2ba83e
Merge pull request #123 from anderm18/yearSelectionHeader
Ryzon3 Jul 19, 2022
550c002
Fixed more scraper bugs
Ryzon3 Jul 19, 2022
f051377
re-enabling checkboxes for graph view
liuj-42 Jul 19, 2022
9329ddb
edit a class to only apply during graph view
liuj-42 Jul 19, 2022
1034cf2
checkbox broke for a second, fixed it again
liuj-42 Jul 19, 2022
aaad66d
pre-requisite chip added
liuj-42 Jul 19, 2022
3071f3b
Merge branch 'main' into graph-view
liuj-42 Jul 19, 2022
583cf9a
fix some stuff that broke during merge
liuj-42 Jul 19, 2022
b69f63c
Fixed the outdated instructions
dicosn Jul 22, 2022
1def522
Merge pull request #128 from anderm18/accessiblity-issues
dicosn Jul 22, 2022
7aa76e4
trying to fix economics
liuj-42 Jul 22, 2022
3acb833
Update pathways from main
liuj-42 Jul 22, 2022
d111e73
Added catalog link to about page
michaelni678 Jul 22, 2022
7d1681c
fixing econ pathway
liuj-42 Jul 22, 2022
4c17c58
Merge branch 'main' into graph-view
liuj-42 Jul 22, 2022
24de8a6
moving code around
liuj-42 Jul 22, 2022
a5af902
removing debug button
liuj-42 Jul 22, 2022
62f0c56
Merge branch 'main' into AkeylMobileFixes
graya4 Jul 26, 2022
ef6e410
Finished multi year scraper
Ryzon3 Jul 26, 2022
4ed7294
adjusted search bar to be centered on mobile
graya4 Jul 26, 2022
cdd21e6
Added some more description text
Ryzon3 Jul 26, 2022
b7329f9
Merge pull request #130 from anderm18/AboutPage_cataloglink
Ryzon3 Jul 26, 2022
6b22100
Unrounded the components
michaelni678 Jul 26, 2022
13ae477
pre-requisites now show up
liuj-42 Jul 26, 2022
8b6f87a
pre-requisites now show up
liuj-42 Jul 26, 2022
8bf275d
Added linter and ran it to fix errors
Ryzon3 Jul 26, 2022
cf23383
Ran linter to fix many warnings on branch
Ryzon3 Jul 26, 2022
51c8200
consolidating 2 functions into 1 and fixing a bug in graph view
liuj-42 Jul 26, 2022
63347ea
pre-requisites now show up on my pathways page
liuj-42 Jul 26, 2022
50cbe83
running npm run lint
liuj-42 Jul 26, 2022
cb8dd72
Merge pull request #121 from anderm18/graph-view
anderm18 Jul 27, 2022
b1d8140
Merge branch 'main' into AkeylMobileFixes
anderm18 Jul 27, 2022
18afb01
Merge pull request #126 from anderm18/AkeylMobileFixes
anderm18 Jul 27, 2022
9a4490b
Merge pull request #132 from anderm18/remove_border_radius_admin
anderm18 Jul 27, 2022
a3d4124
removing access to admin portal for launch
anderm18 Jul 27, 2022
3d4c6ee
the purge
anderm18 Jul 27, 2022
c5255b4
Born out of blood, But they'd never know it
anderm18 Jul 27, 2022
43a4525
ok wait ther we go
anderm18 Jul 27, 2022
237dabe
removing admin access after thanos snap
anderm18 Jul 27, 2022
0349db0
redirect users to us
anderm18 Jul 27, 2022
91482a2
adding all of the stuff that i changed
liuj-42 Jul 29, 2022
0f179c6
updating prerequisites to work with scaper updates
liuj-42 Jul 29, 2022
82984da
fix footer not being sticky and also checkboxes dont display above th…
liuj-42 Jul 29, 2022
882d219
prerequisites now show up on my pathways page
liuj-42 Jul 29, 2022
eb186b4
adding bookmark icon back to my pathways page
liuj-42 Jul 29, 2022
a65c5e9
Overhaul of dark mode switch
dicosn Jul 29, 2022
545afd1
fix prop from being passed as a string to a boolean instead
liuj-42 Jul 29, 2022
4117d25
Merge pull request #139 from anderm18/graph-view-2
anderm18 Jul 29, 2022
8de39f8
Made the light mode the right side of the toggle
Benjamin-Avrahami Jul 30, 2022
edb75bb
Merging
Benjamin-Avrahami Jul 30, 2022
19f8d47
Added AdminSearchPage
Ryzon3 Jul 31, 2022
a553901
Merge branch 'main' into advanced-search
Ryzon3 Jul 31, 2022
08d844e
Fixed issues with merge
Ryzon3 Jul 31, 2022
3a08a82
Revert pathway scraper code and remove duplicates
Benjamin-Avrahami Aug 1, 2022
843ba4d
fixed issue 142 for multiyear
Benjamin-Avrahami Aug 1, 2022
ca0fa18
Adding chips to the search page
dimitri-lopez Aug 2, 2022
78bd56b
Adding chips to the search page
dimitri-lopez Aug 2, 2022
3f1e602
Merge branch 'main' into advanced-search
dimitri-lopez Aug 2, 2022
8998999
Revert "Adding chips to the search page"
dimitri-lopez Aug 2, 2022
15c0678
Adding advanced search features to the choose page
dimitri-lopez Aug 2, 2022
5acae6f
Changing chips to reduce latency
dimitri-lopez Aug 2, 2022
bf9fdbd
Adding an example of using the advanced search
dimitri-lopez Aug 2, 2022
5efa75e
Moved the alert out of the way
michaelni678 Aug 2, 2022
944461a
Switch is finally done
dicosn Aug 2, 2022
e3479c9
Merge pull request #147 from anderm18/dicosn-issues
anderm18 Aug 2, 2022
e82a844
Merge pull request #149 from anderm18/FixPrereqAlert
anderm18 Aug 2, 2022
65cb4cd
Merge pull request #144 from anderm18/jsonDuplicates
anderm18 Aug 2, 2022
0d89c74
Converted store to seperate file and added years.json
Ryzon3 Aug 2, 2022
f6f9989
Added years.json functionality
Ryzon3 Aug 2, 2022
5d9682b
Ran linter and fixed data,js
Ryzon3 Aug 5, 2022
dcebb40
Merge branch 'main' into multi-year-json
Ryzon3 Aug 5, 2022
6ec74cd
fix depts.json bug
Ryzon3 Aug 5, 2022
0dd271b
FIxed multi year bugs
Ryzon3 Aug 9, 2022
12ec9e3
Adding a period to the example
dimitri-lopez Aug 9, 2022
b25587a
Test commit
Aug 9, 2022
df8b7b9
Merge branch 'main' into advanced-search
Ryzon3 Aug 9, 2022
83f718a
Merge pull request #143 from anderm18/advanced-search
Ryzon3 Aug 9, 2022
64121a7
Merge branch 'main' into multi-year-json
Ryzon3 Aug 9, 2022
1d163ef
fix courses with undefined data not showing up on my pathways page
liuj-42 Aug 9, 2022
d1e352c
Fixed merge issues on fromClassesPage
Ryzon3 Aug 9, 2022
e8cbeac
Fixed AdvancedSearchPage for Multi year JSON
Ryzon3 Aug 9, 2022
737b32f
Fixed warnings
Ryzon3 Aug 11, 2022
37d40c4
Fixed more warnings
Ryzon3 Aug 11, 2022
97992f6
Merge branch 'main' into multi-year-json
Ryzon3 Aug 11, 2022
7c64937
Merge pull request #156 from anderm18/multi-year-json
Ryzon3 Aug 11, 2022
93fcf7a
Fixed Admin Pages to work with multi year
Ryzon3 Aug 12, 2022
86a606a
Fixed warnings
Ryzon3 Aug 12, 2022
de6dcd0
fix deleting pathways on mypathways page not updaing the page
liuj-42 Aug 12, 2022
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
28 changes: 15 additions & 13 deletions frontend/src/components/CourseTable.vue
Original file line number Diff line number Diff line change
@@ -77,8 +77,10 @@ export default {
},
computed: {
filteredCourses() {
let tempCourses = JSON.parse(JSON.stringify(this.courses));
if(this.search && this.search !== ''){
// let tempCourses = JSON.parse(JSON.stringify(this.courses));
let tempCourses = this.courses;

if(this.search && this.search != ''){
tempCourses = Object.fromEntries(Object.entries(tempCourses)
.filter(([key]) => key
.toUpperCase()
@@ -94,23 +96,24 @@ export default {
tempCourses[course]["hasData"] = true;
}
}
return tempCourses;

tempCourses = Object.values(tempCourses).sort(
function(a, b){
if(a.subj == b.subj){
if(a.ID < b.ID) return -1
else return 1
} else if (a.subj < b.subj) return -1
else return 1
}
)
return tempCourses
}
},
methods: {
deselectAll() {
this.$children.forEach(child => {
if (child.setSelected) child.setSelected(0);
});
},
getSelected() {
return this.$children
.filter( child => child.$options._componentTag == "CourseTableCourse" && child.selected )
.map( child => true )
// // console.log(this.$children)
// return this.$children
// .filter(child => child.isSelected)
// .map(child => child.key);
}
}
}
@@ -123,7 +126,6 @@ export default {
gap: 10px 20px;
}
.table-header-search {
transform: scale(0.8);
transform-origin: bottom left;
}

2 changes: 1 addition & 1 deletion frontend/src/components/CourseTableCourse.vue
Original file line number Diff line number Diff line change
@@ -129,7 +129,7 @@ export default {
opacity: 2.0;
}
.class-card {
max-width: 700px;
/* max-width: 700px; */
border-radius: 0;

&.class-card--selected {
8 changes: 4 additions & 4 deletions frontend/src/components/DarkLightModeButton.vue
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<template #activator="{on}">
<v-btn
class="mr-2 button"
small fab tile elevation="0"
small fab elevation="0"
v-on="on"
@click="darkMode"
>
@@ -13,12 +13,12 @@
</v-btn>
</template>
<span>Switch to Light Mode</span>
</v-tooltip>
</v-tooltip>
<v-tooltip v-else bottom>
<template #activator="{on}">
<v-btn
class="mr-2 button"
small fab tile elevation="0"
small fab elevation="0"
v-on="on"
@click="darkMode"
>
@@ -51,7 +51,7 @@ export default {
}

.button {
opacity: 0.8;
opacity: 0.7;
}

.button:hover {
2 changes: 1 addition & 1 deletion frontend/src/components/MyPathway.vue
Original file line number Diff line number Diff line change
@@ -28,8 +28,8 @@
<v-icon
v-bind="attrs"
dense
v-on="on"
color="red"
v-on="on"
@click="listAction('delete')"
>
mdi-delete
1 change: 0 additions & 1 deletion frontend/src/components/PathwayCategory.vue
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@

<v-card-title class="font-weight-bold text-truncate card-title">
{{ title }}

</v-card-title>
</v-img>

5 changes: 0 additions & 5 deletions frontend/src/data/data.js
Original file line number Diff line number Diff line change
@@ -6,11 +6,6 @@ import pathwayCategoriesJSON from './json/pathway_categories.json'
// Sort pathways in pathway categories
pathwayCategoriesJSON.forEach(category => category.pathways.sort());

// Add key prop if not already exists
for (let obj of Object.values(coursesJSON))
if (!obj.key)
obj.key = obj.prefix + obj.ID;

// Prevent accidental modification
Object.freeze(coursesJSON);
Object.freeze(pathwaysJSON);
62 changes: 46 additions & 16 deletions frontend/src/pages/AdminPortal/AdminCoursePage.vue
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
<v-row>
<v-col>
<v-text-field
v-model="dept"
v-model="subj"
outlined dense
label="Department Code"
class="text-input"
@@ -44,6 +44,13 @@
class="text-input"
/>

<v-text-field
v-model="off_text"
outlined dense
label="Offered Text"
class="text-input"
/>

<v-checkbox
v-model="CI"
label="Communication Intensive"
@@ -74,6 +81,18 @@
class="mt-1 mb-8"
dense :hide-details="true"
/>
<v-checkbox
v-model="even"
label="Offered even years"
class="mt-1 mb-8"
dense :hide-details="true"
/>
<v-checkbox
v-model="odd"
label="Offered odd years"
class="mt-1 mb-8"
dense :hide-details="true"
/>
<v-select
v-model="myPathways"
:items="pathways"
@@ -118,9 +137,12 @@ export default {
CI: false,
HI: false,
description: "",
off_text: "",
fall: false,
summer: false,
spring: false,
odd: false,
even: false,
major_rest: false,
minors: [],
myPathways: [],
@@ -138,7 +160,7 @@ export default {
if(course) {
return breadcrumbs.admin_course_page.map(x => x || {
text: course.name,
href: '/admin-portal/course?class=' + encodeURIComponent(course.name.slice().toLowerCase().replace(/ /g, '_'))
href: '/admin-portal/course?class=' + course.name
});
}
else {
@@ -153,24 +175,27 @@ export default {
const course = this.getCourse();
if(course) {
this.name = course.name;
this.dept = course.prefix;
this.subj = course.subj;
this.ID = course.ID;
this.CI = course.properties.CI;
this.HI = course.properties.HI;
this.description = course.description;
this.fall = course.offered.fall;
this.summer = course.offered.summer;
this.spring = course.offered.spring;
this.off_text = course.offered.text;
this.major_rest = course.properties.major_restricted;
this.even = course.offered.even;
this.odd = course.offered.odd;
}
let myPathways = new Set();
for(const key in pathways) {
const singlePathway = pathways[key];
if(course) {
for(const prio in singlePathway) {
if(prio.substring(0, 8) == "priority") {
if(singlePathway[prio] instanceof Object && !(singlePathway[prio] instanceof Array)) {
const array = singlePathway[prio];
if(array.includes(course.name.slice().toLowerCase().replace(/ /g, '_'))) {
if(Object.keys(array).includes(course.name)) {
myPathways.add(singlePathway.name);
}
this.pathways.push(singlePathway.name);
@@ -186,40 +211,45 @@ export default {
if(!this.$route.query.class) {
return null;
}

return courses[this.$route.query.class];
},
submit() {
let newCourse = this.getCourse();
if(!newCourse) {
newCourse = {
ID: "",
description: "",
name: "",
prefix: "",
ID: 0,
offered: {
even: false,
fall: false,
odd: false,
spring: false,
summer: false,
text: ""
},
properties: {
CI: 0,
HI: 0,
major_restricted: 0
},
description: "",
offered: {
fall: 0,
summer: 0,
spring: 0
},
key: ""
subj: "",
};
}
newCourse.name = this.name;
newCourse.prefix = this.dept;
newCourse.subj = this.subj;
newCourse.ID = this.ID;
newCourse.properties.CI = this.CI;
newCourse.properties.HI = this.HI;
newCourse.description = this.description;
newCourse.offered.fall = this.fall;
newCourse.offered.summer = this.summer;
newCourse.offered.spring = this.spring;
newCourse.offered.even = this.even;
newCourse.offered.odd = this.odd;
newCourse.offered.text = this.off_text;
newCourse.properties.major_restricted = this.major_rest;
newCourse.key = this.name.slice().toLowerCase().replace(/ /g, '_');

const endpoint = 'http://127.0.0.1:5000/edit'
axios.post(endpoint, {
75 changes: 29 additions & 46 deletions frontend/src/pages/AdminPortal/AdminHomePage.vue
Original file line number Diff line number Diff line change
@@ -4,46 +4,26 @@
<Breadcrumbs :breadcrumbs="breadcrumbs" />
<h1>Welcome to the Admin Portal!</h1>
<p>Here you can edit the courses and pathways on the website!</p>

<v-divider class="my-4" />

<ul>
<li v-bind="attrs" v-on="on">
<router-link
id="admin-btn"
:to="{ name: 'admin-pathway' }"
class="text-decoration-none"
>
<v-icon left dark>
mdi-magnify
</v-icon>
Search for a class by pathway
</router-link>
</li>
<li v-bind="attrs" v-on="on">
<router-link
id="admin-btn"
:to="{ name: 'admin-search-course-code' }"
class="text-decoration-none"
>
<v-icon left dark>
mdi-book-edit
</v-icon>
Edit a class by course code
</router-link>
</li>
<li v-bind="attrs" v-on="on">
<router-link
id="admin-btn"
:to="{ name: 'admin-course' }"
class="text-decoration-none"
>
<v-icon left dark>
mdi-book-plus
</v-icon>
Add a new course to the website
</router-link>
</li>
<ul id="btn-cntnr">
<v-btn id="admn-btn" :to="{ name: 'admin-pathway' }" class="text-decoration-none">
<v-icon left dark>
mdi-magnify
</v-icon>
Search for a class by pathway
</v-btn>
<v-btn id="admn-btn" :to="{ name: 'admin-search-course-code' }" class="text-decoration-none">
<v-icon left dark>
mdi-book-edit
</v-icon>
Edit a class by course code
</v-btn>
<v-btn id="admn-btn" :to="{ name: 'admin-course' }" class="text-decoration-none">
<v-icon left dark>
mdi-book-plus
</v-icon>
Add a new course to the website
</v-btn>
</ul>
</v-container>
</div>
@@ -66,17 +46,20 @@ export default {
</script>

<style scoped>
ul li {
#btn-cntnr {
padding: 0px !important;
text-align: center;
}
#admn-btn {
list-style: none;
text-align: center;
min-width: 26vw;
display: inline-block;
background-color: #f73e3e;
padding: 3px;
margin: 0px 0px 2vw 2vw;
}
#admin-btn {
margin: 0px 1vw 1vw 0px;
height: 50px;
max-width: 900px;
color: white;
font-size: 20px;
font-size: 15px !important;
padding-top: 15px;
}
</style>
Loading