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

Jump to bottom

Merge from master to my branch #680

Merged
merged 38 commits into from
Apr 7, 2023
Merged

Merge from master to my branch #680

merged 38 commits into from
Apr 7, 2023

Conversation

skyjune0824
Copy link
Contributor

Issue

Note which issue number(s) this Pull Request closes. All pull requests should close an issue, if one does not exists, make one. This helps us plan and discuss before we decide on implementation

Example:

closes #113

Database Changes/Migrations

If you added/modified a table, notify people of schema change here

Example:

Added table account_semester_selection for a mapping from a students account and semester to a class and section (aka class/section selections)

Test Modifications

Note added unit/integration tests: (all backend changes should contain unit/integration tests with pytest)

Example:

Added test tests/api/db/test_classinfo.py:test_crn_uniqueness to ensure all classes returned from API call don't have repeat CRNs

Test Procedure

Show procedure to test functionality with a clear procedure

Example:

  1. Create a branch
  2. Commit a change to that branch
  3. Push branch
  4. Create Pull Request and fill in PR template

Photos

Show before and after, capture screenshot/gif of finished feature/bug

Additional Info

More info that would help people review your change

DarknessUnder and others added 30 commits January 30, 2023 17:53
@DarknessUnder @dorian451
Creating Contribution Guide (#644)
ef51821 
This merge is a test to see if Lighthouse CI is being honest to us or not

Co-authored-by: dorian451 <112524240+dorian451@users.noreply.github.com>
@Troy-bailan-King
Fix docker (#655)
fbf7a9a 
* Update requirements.txt

* Update requirements.txt
@mlammon11
Color Mode Button/Notification
d668f5f 
-Changed the notification button to a switch
-Added brief text in front so user knows function
- Moved toast notification to top-center of screen
@mlammon11
Delete workspace.xml
6fb893c
@mlammon11
Dropdown
2630464 
added drop down to condense all 3 functions of button/moon
@mlammon11
Drop Down Funcitonal
3372637 
Drop down logic is now functional, still need to add more styling
@mlammon11
Updated Notifications and functions
c411087 
Changed the text and color of notifications. added some logic for functions. currently have one bug where sometimes the first mode clicked is the opposite.
@dorian451
Navbar highlight current page (#632)
cc97966 
* add highlight to currently selected page in navbar
(this took a lot longer than it should have)

* make border thicker

* fix navbar only being highlighted on top-level pages
beep boop Github Action Master Branch CI Prettier hard at work
664038b
@charleschae12
Font and color branch (#625)
1b9b27b 
* Update CourseExplorer.vue

Changed the color of the title same ad other pages.

* Font_and_color_changed
beep boop Github Action Master Branch CI Prettier hard at work
ed35dfb
@DarknessUnder
See if I can't specify sqlAlchemy
5c5e822 
This is a bad news. Since the localhost Docker appears to require us to specify the version.
@DarknessUnder
remove 2020 data
121ae27
@mlammon11
Updated Toggle Style Logic
4f767d4 
Believe to have resolved bug, now working as intended. Need to change text color on dark mode so that its more readable
@mlammon11
More updates
a363b14 
comments to understand logic and other updates
@mlammon11
Cleaning up
fa9b7e1 
just cleaning up code and testings
@mlammon11
New logic update
634e5bc 
updated function logic to hopefully fix errors
@mlammon11
Fixed Dropdown Colors
23b3481 
Dark mode hover color changed so that the text is more visible to the user
@DarknessUnder
update to running fall 2023 instead pf spring 2023
201950c
@DarknessUnder
change to get summer class info
d24e6ef
@DarknessUnder
fixed a summer address link
0ac0274
@mlammon11
Adding Current Item Highlight
acd74a0 
trying to change background color based on currently selected item
@charleschae12
changes explore icon (#661)
96ed3b2 
changes explore icon
beep boop Github Action Master Branch CI Prettier hard at work
598d946
@Troy-bailan-King
Update CourseListing.vue (#667)
ff08d18
beep boop Github Action Master Branch CI Prettier hard at work
68f6c7f
@mlammon11
Current Mode Selected Feature Update
93d391d 
Updated some logic and testing, not fully complete
@mlammon11
More updates
6d657fa 
Still working out logic, changed color to what will most likely be close to final color
@mlammon11
Clean up
680ef82 
removing unnecessary code
@dependabot
Bump json5 from 2.1.3 to 2.2.3 in /tests/integration (#638)
5b261e3 
Bumps [json5](https://github.com/json5/json5) from 2.1.3 to 2.2.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](json5/json5@v2.1.3...v2.2.3)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
mlammon11 and others added 8 commits April 1, 2023 17:36
@mlammon11
Working on fixing cookies
a27eab5 
reworking logic to fix cookie issue not following device theme
@mlammon11
Revert "Working on fixing cookies"
97d7bf0 
This reverts commit a27eab5.
@mlammon11
Update cookie
14f45fc 
trying to fix logic to update cookies correctly
@mlammon11
Fixed Cookie
074af45 
believed to have fixed cookie issue, atleast it works on my local device
@mlammon11
Updating Default Logic
c7b40c4 
changed default logic to toggle follow theme if user gets rid of cookie or its first time loading site
@dorian451
Merge branch 'Repositioning_Color_Theme_mlammon11' into staging
96dbb2c 
# Conflicts:
#	src/web/src/components/Header.vue
beep boop Github Action Master Branch CI Prettier hard at work
aacd80d
@DarknessUnder
Update ci.yaml
b5fe573
@skyjune0824 skyjune0824 merged commit 3f49f69 into animated_collapse Apr 7, 2023
dorian451 added a commit that referenced this pull request Apr 14, 2023
@dorian451
Revert "Merge from master to my branch (#680)"
3dfc7b4 
This reverts commit 3f49f69.
jonha1 pushed a commit that referenced this pull request Apr 21, 2023
@skyjune0824 @charleschae12
@code-factor @DarknessUnder @dorian451 @Troy-bailan-King @mlammon11 @dependabot
Animated collapse (#672)
f7f6cf7 
* Update NewCourseScheduler.vue

Made the hide and open button for the side menu

* Update NewCourseScheduler.vue

* Update NewCourseScheduler.vue

Added the close sidebar function and after the sidebar is closed the schedule image expended to the full screen. Also after the sidebar is closed new button called "Open" appears and if we click it the sidebar opens again.

* Update NewCourseScheduler.vue

* Update NewCourseScheduler.vue

* Update NewCourseScheduler.vue

* Update NewCourseScheduler.vue

* Sidebar creation

* Update Sidebar.vue

* Update NewCourseScheduler.vue

* Update NewCourseScheduler.vue

* Button Activate

* Fix

* Update NewCourseScheduler.vue

* Syntax error fixed

* Animation prototype

* Finally functional animation

* Update NewCourseScheduler.vue

* Size and padding fix

* Column dynamics

* Update NewCourseScheduler.vue

* Merge

* Merge complete

Please work

* Update NewCourseScheduler.vue

* Finalize

* Collapse button design

* Animation finalize

* [CodeFactor] Apply fixes

* Unclickable problem solved

* Color-fix for darkmode

* Bug fix

font-size and color was re-defined, so I fixed it.

* Update NewCourseScheduler.vue

Defalt status of sidebar is now 'open'

* Finalize fixation & animations

Animatino is now rotating for only Y-axis

* Merge from master to my branch (#680)

* Creating Contribution Guide (#644)

This merge is a test to see if Lighthouse CI is being honest to us or not

Co-authored-by: dorian451 <112524240+dorian451@users.noreply.github.com>

* Fix docker (#655)

* Update requirements.txt

* Update requirements.txt

* Color Mode Button/Notification

-Changed the notification button to a switch
-Added brief text in front so user knows function
- Moved toast notification to top-center of screen

* Delete workspace.xml

* Dropdown

added drop down to condense all 3 functions of button/moon

* Drop Down Funcitonal

Drop down logic is now functional, still need to add more styling

* Updated Notifications and functions

Changed the text and color of notifications. added some logic for functions. currently have one bug where sometimes the first mode clicked is the opposite.

* Navbar highlight current page (#632)

* add highlight to currently selected page in navbar
(this took a lot longer than it should have)

* make border thicker

* fix navbar only being highlighted on top-level pages

* beep boop Github Action Master Branch CI Prettier hard at work

* Font and color branch (#625)

* Update CourseExplorer.vue

Changed the color of the title same ad other pages.

* Font_and_color_changed

* beep boop Github Action Master Branch CI Prettier hard at work

* See if  I can't specify sqlAlchemy

This is a bad news. Since the localhost Docker appears to require us to specify the version.

* remove 2020 data

* Updated Toggle Style Logic

Believe to have resolved bug, now working as intended. Need to change text color on dark mode so that its more readable

* More updates

comments to understand logic and other updates

* Cleaning up

just cleaning up code and testings

* New logic update

updated function logic to hopefully fix errors

* Fixed Dropdown Colors

Dark mode hover color changed so that the text is more visible to the user

* update to running fall 2023 instead pf spring 2023

* change to get summer class info

* fixed a summer address link

* Adding Current Item Highlight

trying to change background color based on currently selected item

* changes explore icon (#661)

changes explore icon

* beep boop Github Action Master Branch CI Prettier hard at work

* Update CourseListing.vue (#667)

* beep boop Github Action Master Branch CI Prettier hard at work

* Current Mode Selected Feature Update

Updated some logic and testing, not fully complete

* More updates

Still working out logic, changed color to what will most likely be close to final color

* Clean up

removing unnecessary code

* Bump json5 from 2.1.3 to 2.2.3 in /tests/integration (#638)

Bumps [json5](https://github.com/json5/json5) from 2.1.3 to 2.2.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](json5/json5@v2.1.3...v2.2.3)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Working on fixing cookies

reworking logic to fix cookie issue not following device theme

* Revert "Working on fixing cookies"

This reverts commit a27eab5.

* Update cookie

trying to fix logic to update cookies correctly

* Fixed Cookie

believed to have fixed cookie issue, atleast it works on my local device

* Updating Default Logic

changed default logic to toggle follow theme if user gets rid of cookie or its first time loading site

* beep boop Github Action Master Branch CI Prettier hard at work

* Update ci.yaml

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Harry Tan <32246618+DarknessUnder@users.noreply.github.com>
Co-authored-by: dorian451 <112524240+dorian451@users.noreply.github.com>
Co-authored-by: Troy-bailan-King <97757033+Troy-bailan-King@users.noreply.github.com>
Co-authored-by: Matt Lammon <mlammon11@gmail.com>
Co-authored-by: Matt Lammon <91478985+mlammon11@users.noreply.github.com>
Co-authored-by: I'm a Github Action <beepboop@github.com>
Co-authored-by: charleschae12 <112535899+charleschae12@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update NewCourseScheduler.vue

* Revert "Merge from master to my branch (#680)"

This reverts commit 3f49f69.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Charles Chae <charleschae12@gmail.com>
Co-authored-by: codefactor-io <support@codefactor.io>
Co-authored-by: Harry Tan <32246618+DarknessUnder@users.noreply.github.com>
Co-authored-by: dorian451 <112524240+dorian451@users.noreply.github.com>
Co-authored-by: Troy-bailan-King <97757033+Troy-bailan-King@users.noreply.github.com>
Co-authored-by: Matt Lammon <mlammon11@gmail.com>
Co-authored-by: Matt Lammon <91478985+mlammon11@users.noreply.github.com>
Co-authored-by: I'm a Github Action <beepboop@github.com>
Co-authored-by: charleschae12 <112535899+charleschae12@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@skyjune0824 @DarknessUnder @Troy-bailan-King @mlammon11 @dorian451 @charleschae12