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

Jump to bottom

REAL working staging build! #1094

Merged

Peedee2002 merged 128 commits into devsoc-unsw:331-staging from Peedee2002:fix-degree-wizard-bugs

Feb 4, 2024

Collaborator

Peedee2002 commented Dec 13, 2023 •

edited

Loading

Only functionality change:

Circles.Mozilla.Firefox.2023-12-13.12-19-26.mp4

tiny fix that makes the degreeInfo get read properly, and to hide the menu if you selected the degree already. The degree remains editable though.

This merges !1061 as well.

This basically gets you a functional Circles user backend. Everything works, including graphical selector and progression checker.

Some tests are still failing, but tbh it is because those tests are broken.

The only slices still left are the courseTabs and settings slices, which I dont think we should remove tbh.

The backend tests pass tho

renovate bot and others added 30 commits

March 22, 2023 17:25


          chore(deps): update dependency eslint to v8.36.0 (#957)

98669e0

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency @testing-library/dom to v8.20.0 (#961)

901e5a8

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: olli <[email protected]>


          chore(deps): update renovate config

e947f76

Group minor, patches together.


          chore(deps): update mikefarah/yq action to v4.32.2 (#978)

52d072c

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): lock file maintenance (#945)

22bfc54

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          fix(deps): update weekly patch updates (#944)

54d35cb

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): group mypy

1f4d3ac


          feat(frontend): cache course descriptions (#1004)

cf454b1

* cache `GET /courses/*` requests

* put types in `src/types`

* rename the cache ref variables


          chore(deps): update mypy to v1 (major) (#1029)

45fd621

* chore(deps): update mypy to v1

* update tuple[int, int] -> tuple[int, optional[int]] for mypy

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: imagine-hussain <[email protected]>


          chore(deps): update dependency @testing-library/dom to v9 (#1020)

ef3350b

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency @testing-library/react to v14 (#1021)

611e4ae

* chore(deps): update dependency @testing-library/react to v14

* chore(fe-test): use act, fix degree search test

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Leonardo Fan <[email protected]>


          chore(deps): update dependency eslint-plugin-simple-import-sort to v10 (

2ffbbaa

#1022)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency jsdom to v21 (#1023)

aceda75

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): update dependency typescript to v5 (#1028)

7c4985c

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          fix(deps): update dependency @ant-design/colors to v7 (#1030)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          fix(deps): update dependency @ant-design/icons to v5 (#1031)

f4f9006

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          fix(deps): update dependency framer-motion to v10 (#1040)

3f4c47d

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          feat: CF-400: dark mode improvements (#1003)

1b129d5

* feat: dark mode functionality added for editMarkModal's input and button elements

* feat: dark mode improvement for editMarkModal's cancel button

* feat: dark mode improvements for OptionHeader icons underneath the 'Term Planner' tab

* feat: dark mode added for the select menu in the settingsMenu tooltip under the TermPlanner tab

* feat: dark mode added to SettingMenu's DatePicker element

* feat: dark mode for export button done + editModalMark bug fixed

* fix: making sure the css for the select element in settingsMenu does not affect other select elements

* feat: dark mode improvement for popconfirm for unplan wanring, import tooltip, also moved the button for import and export tooltip to common styles

* feat: dark mode scrollbar added

* feat: dark mode scrollbar on courseSelector menu had ugly white padding, fixed it to be #333 color instead

* fix: href in courseSelector not very readable in dark mode, made the text a bit brighter and made a styled component for it

* feat: dark mode added for search bar

* feat: dark mode added for remove planner button

* fix: forgot to add the new styles.ts file

* feat: progressBar's text color and trailing color fixed

* feat: dividing line in courseDescription changed from white to a dark grey

* feat: bug icon turned into dark mode

* feat: dark mode added for quick add and remove buttons in course menu

* feat: courseProgression progress bar trailing color changed to dark grey

* feat: progress on dark mode for graph, need to save this commit before I merge in the latest changes since the graph was changed

* feat: dark mode for graph complete (nodes, arrows, hover states) + label now changes on hover (non-dark mode feature)

* feat: buttons on graphical selector are dark mode

* feat: saving progress on converting courseDescription panel to dark mode

* feat: dark mode added to the sidebar

* feat: sidebardrawer color changed, box shadow added to tabs so it looks more visible in dark mode

* feat: new images added in help menu in course selector, dark mode versions added too

* feat: TermPlanner's help menu tooltips now have dark mode pics and gifs

---------

Co-authored-by: Daysure <[email protected]>


          feat: CF-423: additional styling on course node hover (#1034)

857d612

* feat: dark mode functionality added for editMarkModal's input and button elements

* feat: dark mode improvement for editMarkModal's cancel button

* feat: dark mode improvements for OptionHeader icons underneath the 'Term Planner' tab

* feat: dark mode added for the select menu in the settingsMenu tooltip under the TermPlanner tab

* feat: dark mode added to SettingMenu's DatePicker element

* feat: dark mode for export button done + editModalMark bug fixed

* fix: making sure the css for the select element in settingsMenu does not affect other select elements

* feat: dark mode improvement for popconfirm for unplan wanring, import tooltip, also moved the button for import and export tooltip to common styles

* feat: dark mode scrollbar added

* feat: dark mode scrollbar on courseSelector menu had ugly white padding, fixed it to be #333 color instead

* fix: href in courseSelector not very readable in dark mode, made the text a bit brighter and made a styled component for it

* feat: dark mode added for search bar

* feat: dark mode added for remove planner button

* fix: forgot to add the new styles.ts file

* feat: progressBar's text color and trailing color fixed

* feat: dividing line in courseDescription changed from white to a dark grey

* feat: bug icon turned into dark mode

* feat: dark mode added for quick add and remove buttons in course menu

* feat: courseProgression progress bar trailing color changed to dark grey

* feat: progress on dark mode for graph, need to save this commit before I merge in the latest changes since the graph was changed

* feat: dark mode for graph complete (nodes, arrows, hover states) + label now changes on hover (non-dark mode feature)

* feat: buttons on graphical selector are dark mode

* feat: saving progress on converting courseDescription panel to dark mode

* feat: dark mode added to the sidebar

* feat: sidebardrawer color changed, box shadow added to tabs so it looks more visible in dark mode

* feat: new images added in help menu in course selector, dark mode versions added too

* feat: TermPlanner's help menu tooltips now have dark mode pics and gifs

* feat: highlight adjacent nodes and edges on hover

* feat: highlight adjacent nodes opacity updated

* refactor: graph.ts, changing function names and object names to be more readable:

* feat: implemented a function that checks if a course is a prereq based on GraphData without calling the backend

* fix: two graphs get rendered if you switch tabs fast enough

* feat: created a function to store a hashmap of prereqs for later use for node styling

* fix: updated the function that checks for coursePrerequisite

Other options are:
1. Rely on GraphData, however it gets laggy when you hover over too many nodes
2. API call - would get slow with multiple requests
3. CourseEdge info gets stored into a hashmap at initialisation, so checking for prereqs is fast afterwards

* refactor: graph.ts function and object names made more readable

* refactor: rewriting the returns and using spread operator to reduce repetition in graph.ts

* feat: highlight prerequisite nodes on hover

* refactor: splitting functions up as they were getting too long

* fix: if the dark mode button is toggled on and off, it repaints the canvas more than one time

* feat: highlighted incoming edge if it's a prerequisite as well

* feat: forgot to add pics into the HelpMenu for the new graphical selector hover node feature

---------

Co-authored-by: Daysure <[email protected]>
Co-authored-by: Leonardo Fan <[email protected]>


          chore(deps): update dependency mypy to v1.2.0 (#1049)

f93a3b6

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          chore(deps): remove react-svg as not used (#1044)

4c8c6bc


          chore(deps): group vite

dadc0fa


          chore(deps): update dependency requests to v2.31.0 [security] (#1055)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          Make course menu bar resizeable (#1042)

cc74c22


          wip: forgot to commit earlier, started transfering

810bd3d


          hotfix: fix the type err in the run script

ed997de


          feat: CF-356: unlocked course nodes added to graphical selector (#1035)

453ffb0

Different course node stylings added for the following states:
- course node is added to the planner
- course node is unlocked (i.e. meets the prereqs for that course)
- course node that is locked
https://csesoc.atlassian.net/browse/CF-356
---------

Co-authored-by: Daysure <[email protected]>
Co-authored-by: Leonardo Fan <[email protected]>


          fix(deps): update weekly minor updates (#1050)

c52a681

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>


          fix: no double canvas


          wip: no more useSelector

c2f3573

Peedee2002 requested a review from imagine-hussain as a code owner

January 4, 2024 02:57

Peedee2002 added 2 commits

January 5, 2024 03:06


          remove most reducers and try to get tests passing

efd1c03


          fix all main workflows

99d5cb0

Peedee2002 changed the title ~~improve the experience of running run_app.py and make fixes to degree step to match old behaviour~~ REAL working staging build!

Peedee2002 and others added 4 commits

January 5, 2024 15:00


          bugfix in backend

a0b4253


          fix: commented out ctf code (#1096)

7ad2d70


          Merge branch 'dev' of github.com:devsoc-unsw/circles into fix-degree-…

0ec8d39

…wizard-bugs


          fix typescript

483998e

Collaborator Author

Peedee2002 commented Jan 8, 2024

I updated this with dev, and updated all dependencies to latest. I will then try to update it with code from:

christian/feat/add-login-page
react-query-prog-checker
react-query-graphical-selector

For the other branches that are open rn @ollibowers @martanman would you mind checking them and deleting all the ones that are either encompassed by this one (not the 3 listed there ofc) or letting me know what they are so i can add them here?

Peedee2002 added 9 commits

January 17, 2024 20:59


          fix small issue in run script

f3ea6b7


          Merge branch 'react-query-prog-checker' of github.com:devsoc-unsw/cir…

a4ee8b7

…cles into fix-degree-wizard-bugs


          fix themes

37a5e82


          Merge branch 'react-query-graphical-selector' of github.com:devsoc-un…

91e0bb5

…sw/circles into fix-degree-wizard-bugs


          fix cast

dd79ad7


          fixed a small reload issue

9b0655f


          Merge branch 'christian/feat/add-login-page' of github.com:devsoc-uns…

c2afff4

…w/circles into fix-degree-wizard-bugs


          done combining the branches

e278c86


          dodgy fix for crashing on term planner

75ffbd7

ollibowers requested review from ollibowers and removed request for leonardo-fan and imagine-hussain

February 3, 2024 12:34

ollibowers reviewed

View reviewed changes

.vscode/settings.json Show resolved Hide resolved

ollibowers reviewed

View reviewed changes

frontend/src/components/GoogleAuthFlow/GoogleAuthFlow.tsx

		@@ -0,0 +1,30 @@
		import { useEffect } from 'react';

Collaborator

ollibowers Feb 3, 2024

will probs need deleting later again, but is ok for now

ollibowers reviewed

View reviewed changes

frontend/src/utils/getAllCourseOfferings.ts

                 return year in course.legacyOfferings && course.legacyOfferings[year].includes(term);
               };
+              export const courseHasOfferingNew = (course: Course, term: Term): boolean => {
+                // TODO: Work out how legacy offerings work now
+                return course.terms.includes(term);

Collaborator

ollibowers Feb 4, 2024 •

edited

Loading

will need to check if this actually works (after merge)

ollibowers reviewed

View reviewed changes

frontend/src/utils/api/coursesApi.ts

+                  .flatMap((x) => Object.values(x))
+                  .flat()
+                  .concat(planner.unplanned)
+                  .forEach(async (id) => {

Collaborator

ollibowers Feb 4, 2024

i question this, (but will address post merge)

ollibowers reviewed

View reviewed changes

frontend/src/pages/ProgressionChecker/Dashboard/Dashboard.tsx

-                const { courses } = useSelector((state: RootState) => state.planner);
-                const { programCode, programName } = useSelector((state: RootState) => state.degree);
+                const programName = (useQuery('progam', fetchAllDegrees).data?.programs || { [programCode]: '' })[

Collaborator

ollibowers Feb 4, 2024

progam 🗣️ 🗣️

ollibowers reviewed

View reviewed changes

frontend/src/pages/TermPlanner/ExportPlannerMenu/ExportPlannerMenu.tsx

@@ @@ -45,8 +21,6 @@ const ExportPlannerMenu = ({ plannerRef }: Props) => { @@
                     exportComponentAsPNG(plannerRef, exportFields);
                   } else if (format === 'jpg') {
                     exportComponentAsJPEG(plannerRef, exportFields);
-                  } else if (format === 'json') {
-                    exportComponentAsJSON();

Collaborator

ollibowers Feb 4, 2024

we might want to bring this back via a backend route later

ollibowers reviewed

View reviewed changes

frontend/src/pages/TermPlanner/OptionsHeader/OptionsHeader.tsx

                           >
                             <S.OptionButton>
                               <FaRegCalendarTimes style={iconStyles} />
                             </S.OptionButton>
                           </Popconfirm>
                         </Tooltip>
                       )}
-                      {areYearsHidden && (

Collaborator

ollibowers Feb 4, 2024

again, might want to bring this back in the future? kinda a nice feature

ollibowers reviewed

View reviewed changes

frontend/src/pages/TermPlanner/TermBox/TermBox.tsx

-                const dispatch = useDispatch();
-                const handleCompleteTerm = () => {
-                  dispatch(toggleTermComplete(name));
+                const toggleLockTerm = async () => {

Collaborator

ollibowers Feb 4, 2024

move this out

Peedee2002 merged commit a5e25f1 into devsoc-unsw:331-staging

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet