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

Feature/autoclose profile #413

Merged
merged 59 commits into from
Oct 27, 2022
Merged

Feature/autoclose profile #413

merged 59 commits into from
Oct 27, 2022

Conversation

xinyue296
Copy link
Contributor

Description

Opened profile cards can now be automatically closed when another card is open.

Motivation and Context

How has this been tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

renovate bot and others added 30 commits March 23, 2022 22:26
* Theme provider to Syllabus & context to containers

* Add context on components in Syllabus which may require fix for dark mode

* feat: replace @reach/router to react-router v6

* feat: update header for all apps

* fix: reinstall react-router-dom v6 and history after rebase

* feat: add new themes

* fix: lock files

* feat: install TailwindCSS on Campus

* feat: install TailwindCSS on Syllabus

* feat: change theme-toggle color according to current theme

* fix: change locations of tailwind import; remove unused log

* feat: dark theme on Timetable

* Feat: Added new sidebar icons from material ui icons

* Feat: Separated icons into different component

* fix: added package json and pnpm lock updates

* feat: pass isDark property to styled components

* feat: dark theme on Syllabus (CourseItem not yet)

* fix: wrap ThemeProvider on Nav; use new theme colors

* fix: use className instead of passing theme as props

* feat: dark theme on CourseInfo (not completed)

* fix: Made theme types exportable

* fix: created sidebar wrapper locally instead of bit

* fix: Fixed styling of icon group button

* feat: added user profile icon

* feat: Added dark mode styling to other links

* fix: moved browser router wrapper outside to fix navigation

* fix: used const instead of let for navigation hook

* fix: fixed import order

* feat: CourseInfo dark mode

* feat: Made title logo svg into a component

* fix: made title logo text colour change when theme toggle

* fix: fixed extra stylings when dark mode

* fix: updated package versions and pnpm lock file

* feat: update loading-spinner & solve background color flicker while loading page in dark mode

* feat: added dark mode styling to about us pages

* feat: added dark mode styling to extra pages

* feat: dark theme to mobile bottom nav

* feat: update header & loading-spinner & body tag background color

* feat: added dark mode background

* fix: fixed title logo on sidebar not changing colours when switching modes

* fix: added tab colours when dark mode

* fix: added dark mode colours to partner page text

* feat: dark mode for Labs

* fix: related courses width

* feat: update spinner in Syllabus; dark mode for Campus

* fix: timetable course item scrollable space height

* feat: make timetable course item darker in dark mode

* feat: install tailwind in feeds (not used yet)

* feat: redirecting page styling

* feat: update sign in modal

* feat: updated header component and pnpm lock file accordingly

* fix: updated colors and header dependencies

* fix: eslint fixes for campus folder

* feat: added dark mode styling to campus folder

* fix: eslint fixes in syllabus folder

* fix: updated dark mode styling

* fix: updated dark mode syllabus

* fix: updated dark mode styling root folder

* fix: syllabus border & step arrow color

* fix: fixed styling for social media icons in partners

* fix: removed unused imports

* fix: Or-button dark mode color

* fix: remove FilterWarningsPlugin

* fix: update lock files

* fix: remove -y option

* fix: update lock files

* fix: update @aws-amplify/auth in syllabus

* fix: update loading spinner in Feeds

* fix: add theme prop to LoadingSpinner in Feeds

Co-authored-by: YHhaoareyou <[email protected]>
* feat: dark mode & new messages on welcome modal

* fix: dark mode on sign in modal & user login icon
* feat: added quarterColors for both light and dark mode

* feat: Added google analytics to theme changes

* fix: fixed user profile icon to make it consistent

* fix: code refactoring

* fix: code refactoring in syllabus

* feat: added dark semantic colors

* fix: added colors based on numbers too

* fix: added a todo comment

* fix: fix semantic text colors dark mode

* feat: update quarter switch colors & icons

* feat: update timetable course items and color selector with new theme colors

Co-authored-by: Nicholas Narmada <[email protected]>
* feat: Dark mode for pro tips and colors selector popup in Timetable

* feat: update theme colors dependency for all apps
* feat: update the hovering effect for member cards

* fix: remove unused libraries; fix html background color in dark mode; disable card's hyperlink

* fix: makes the code shorter and neater

* fix: syllabus pnpm lock file

* fix: syllabus pnpm lock file

Co-authored-by: YHhaoareyou <[email protected]>
* feat: vite tested by career folder

* feat: replace systemjs import with dynamic import to import vite project

* feat: ignore dynamic import problem caused by webpack

* feat: Migrate Campus from Webpack to Vite

* fix: restore career

* feat: register vite app campus by single-spa-layout

* feat: migrate Syllabus to vite (error unsolved)

* fix: fix lockfile

* fix: solve "exportStar not a function", "undefined global" and use Vite envvar

* feat: migrate syllabus to vite (done)

* remove webpack from all apps except root

* feat: migrate root to vite

* feat: remove webpack related scripts & solve import-map not supported problem in Safari

* feat: import static assets; solve errors of custom props passed to dom

* fix: run eslint fix

* fix: build script & config

* feat: build config & debug global var

* fix: output asset files path

* feat: disable css code split in build

* fix: run eslint fix

* feat: preload css from mf apps to root; replace react-s-alert with react-toastify

* feat: configure public path & env var for each app

* fix: run eslint fix

* feat: service-worker

* fix: eslint fix

* update lock files

* fix: missing package

* fix: externalize styles from other mf app

* fix: campus room badge styles

Co-authored-by: AustinZhu <[email protected]>
…fig (#387)

* fix: remove custom sw

* feat: add link to aboutus page from home

* fix: eslint
* fix: fixing the responsive design for members card

* fix: fixing the responsive design for members card

* fix: font color, repeated className, figure tag
* fix: add cleanupOutdatedCaches option

* use custom sw & force update

* skipWaiting and claim before cleanupOutdatedCaches

* add ts files to NetworkFirst cache

* remove ts from cache

* register sw on index.html

* change sw from ts to js

* test updates to trigger build

* registerSW in index.html

* remove unused code and comment of registering sw

* update files to trigger build
…losing tab on cards (#390)

* feat: add a profile card component;
add hover & click effect;
add closing tab on cards

* fix: rename profile card & prop; type for useState
YHhaoareyou and others added 21 commits May 30, 2022 00:12
* add script-src-elem to Content Security Policy

* fix csp

* add blob:https: to csp
* fix style prelload link

* refactor index.html & add env variables

* remove slash from the end of base path env var

* import other mf's css files as external

* run eslint fix

* run eslint fix
Github -> GitHub
# Conflicts:
#	root/src/index.ejs
* filter feeds by language

* feat: styling lang filter button

* feat: Back button to Feeds list page

* Remove using @apply in css file due to amp style problem
@xinyue296 xinyue296 requested a review from YHhaoareyou October 20, 2022 14:02
Copy link
Contributor

@YHhaoareyou YHhaoareyou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@YHhaoareyou YHhaoareyou merged commit 2c97d45 into master Oct 27, 2022
@YHhaoareyou YHhaoareyou deleted the feature/autoclose-profile branch October 27, 2022 16:44
YHhaoareyou added a commit that referenced this pull request Oct 27, 2022
goat-kj pushed a commit that referenced this pull request Nov 7, 2022
* fix(deps): update dependency @aws-amplify/auth to v4 (#352)

Co-authored-by: Renovate Bot <[email protected]>

* Feature: Added Dark theme (#365)

* Theme provider to Syllabus & context to containers

* Add context on components in Syllabus which may require fix for dark mode

* feat: replace @reach/router to react-router v6

* feat: update header for all apps

* fix: reinstall react-router-dom v6 and history after rebase

* feat: add new themes

* fix: lock files

* feat: install TailwindCSS on Campus

* feat: install TailwindCSS on Syllabus

* feat: change theme-toggle color according to current theme

* fix: change locations of tailwind import; remove unused log

* feat: dark theme on Timetable

* Feat: Added new sidebar icons from material ui icons

* Feat: Separated icons into different component

* fix: added package json and pnpm lock updates

* feat: pass isDark property to styled components

* feat: dark theme on Syllabus (CourseItem not yet)

* fix: wrap ThemeProvider on Nav; use new theme colors

* fix: use className instead of passing theme as props

* feat: dark theme on CourseInfo (not completed)

* fix: Made theme types exportable

* fix: created sidebar wrapper locally instead of bit

* fix: Fixed styling of icon group button

* feat: added user profile icon

* feat: Added dark mode styling to other links

* fix: moved browser router wrapper outside to fix navigation

* fix: used const instead of let for navigation hook

* fix: fixed import order

* feat: CourseInfo dark mode

* feat: Made title logo svg into a component

* fix: made title logo text colour change when theme toggle

* fix: fixed extra stylings when dark mode

* fix: updated package versions and pnpm lock file

* feat: update loading-spinner & solve background color flicker while loading page in dark mode

* feat: added dark mode styling to about us pages

* feat: added dark mode styling to extra pages

* feat: dark theme to mobile bottom nav

* feat: update header & loading-spinner & body tag background color

* feat: added dark mode background

* fix: fixed title logo on sidebar not changing colours when switching modes

* fix: added tab colours when dark mode

* fix: added dark mode colours to partner page text

* feat: dark mode for Labs

* fix: related courses width

* feat: update spinner in Syllabus; dark mode for Campus

* fix: timetable course item scrollable space height

* feat: make timetable course item darker in dark mode

* feat: install tailwind in feeds (not used yet)

* feat: redirecting page styling

* feat: update sign in modal

* feat: updated header component and pnpm lock file accordingly

* fix: updated colors and header dependencies

* fix: eslint fixes for campus folder

* feat: added dark mode styling to campus folder

* fix: eslint fixes in syllabus folder

* fix: updated dark mode styling

* fix: updated dark mode syllabus

* fix: updated dark mode styling root folder

* fix: syllabus border & step arrow color

* fix: fixed styling for social media icons in partners

* fix: removed unused imports

* fix: Or-button dark mode color

* fix: remove FilterWarningsPlugin

* fix: update lock files

* fix: remove -y option

* fix: update lock files

* fix: update @aws-amplify/auth in syllabus

* fix: update loading spinner in Feeds

* fix: add theme prop to LoadingSpinner in Feeds

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

* fix: clear search keywords when onclick related courses

* Debug: mobile dark mode debug (#373)

* feat: dark mode & new messages on welcome modal

* fix: dark mode on sign in modal & user login icon

* chore(deps): update dependency eslint-plugin-react to v7.29.4 (#361)

Co-authored-by: Renovate Bot <[email protected]>

* chore(deps): update dependency ts-loader to v9.2.8 (#359)

Co-authored-by: Renovate Bot <[email protected]>

* feat: remove unused dependencies (#377)

* Feature/darktheme colors (#378)

* feat: added quarterColors for both light and dark mode

* feat: Added google analytics to theme changes

* fix: fixed user profile icon to make it consistent

* fix: code refactoring

* fix: code refactoring in syllabus

* feat: added dark semantic colors

* fix: added colors based on numbers too

* fix: added a todo comment

* fix: fix semantic text colors dark mode

* feat: update quarter switch colors & icons

* feat: update timetable course items and color selector with new theme colors

Co-authored-by: Nicholas Narmada <[email protected]>

* Feature: Timetable dark theme (#379)

* feat: Dark mode for pro tips and colors selector popup in Timetable

* feat: update theme colors dependency for all apps

* feat: add the hovering effect to the member cards (#381)

* feat: update the hovering effect for member cards

* fix: remove unused libraries; fix html background color in dark mode; disable card's hyperlink

* fix: makes the code shorter and neater

* fix: syllabus pnpm lock file

* fix: syllabus pnpm lock file

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

* Migrate from Webpack to Vite (#382)

* feat: vite tested by career folder

* feat: replace systemjs import with dynamic import to import vite project

* feat: ignore dynamic import problem caused by webpack

* feat: Migrate Campus from Webpack to Vite

* fix: restore career

* feat: register vite app campus by single-spa-layout

* feat: migrate Syllabus to vite (error unsolved)

* fix: fix lockfile

* fix: solve "exportStar not a function", "undefined global" and use Vite envvar

* feat: migrate syllabus to vite (done)

* remove webpack from all apps except root

* feat: migrate root to vite

* feat: remove webpack related scripts & solve import-map not supported problem in Safari

* feat: import static assets; solve errors of custom props passed to dom

* fix: run eslint fix

* fix: build script & config

* feat: build config & debug global var

* fix: output asset files path

* feat: disable css code split in build

* fix: run eslint fix

* feat: preload css from mf apps to root; replace react-s-alert with react-toastify

* feat: configure public path & env var for each app

* fix: run eslint fix

* feat: service-worker

* fix: eslint fix

* update lock files

* fix: missing package

* fix: externalize styles from other mf app

* fix: campus room badge styles

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

* fix: env without using dotenv explicitly (#385)

* fix: packages version

* fix: change env var name

* fix: remove systemjs package; add peer dependencies

* fix: feeds domain on staging/prod

* Feature: About Us page link from Home page & split Home from Root-config (#387)

* fix: remove custom sw

* feat: add link to aboutus page from home

* fix: eslint

* Feature/fix card padding (#388)

* fix: fixing the responsive design for members card

* fix: fixing the responsive design for members card

* fix: font color, repeated className, figure tag

* fix: install missing dependency: @aws-amplify/core

* fix: remove course function

* feat: alert translation

* fix: eslint

* feat: add workbox runtimeCaching config

* Fix service worker to enable it to replace old one (#389)

* fix: add cleanupOutdatedCaches option

* use custom sw & force update

* skipWaiting and claim before cleanupOutdatedCaches

* add ts files to NetworkFirst cache

* remove ts from cache

* register sw on index.html

* change sw from ts to js

* test updates to trigger build

* registerSW in index.html

* remove unused code and comment of registering sw

* update files to trigger build

* feat: add a profile card component; add hover & click effect; add a closing tab on cards (#390)

* feat: add a profile card component;
add hover & click effect;
add closing tab on cards

* fix: rename profile card & prop; type for useState

* fix: syllabus minor styling issues

* Update README.md

* Migrate from Webpack to Vite (#386)

* fix(deps): update dependency @aws-amplify/auth to v4 (#352)

Co-authored-by: Renovate Bot <[email protected]>

* Feature: Added Dark theme (#365)

* Theme provider to Syllabus & context to containers

* Add context on components in Syllabus which may require fix for dark mode

* feat: replace @reach/router to react-router v6

* feat: update header for all apps

* fix: reinstall react-router-dom v6 and history after rebase

* feat: add new themes

* fix: lock files

* feat: install TailwindCSS on Campus

* feat: install TailwindCSS on Syllabus

* feat: change theme-toggle color according to current theme

* fix: change locations of tailwind import; remove unused log

* feat: dark theme on Timetable

* Feat: Added new sidebar icons from material ui icons

* Feat: Separated icons into different component

* fix: added package json and pnpm lock updates

* feat: pass isDark property to styled components

* feat: dark theme on Syllabus (CourseItem not yet)

* fix: wrap ThemeProvider on Nav; use new theme colors

* fix: use className instead of passing theme as props

* feat: dark theme on CourseInfo (not completed)

* fix: Made theme types exportable

* fix: created sidebar wrapper locally instead of bit

* fix: Fixed styling of icon group button

* feat: added user profile icon

* feat: Added dark mode styling to other links

* fix: moved browser router wrapper outside to fix navigation

* fix: used const instead of let for navigation hook

* fix: fixed import order

* feat: CourseInfo dark mode

* feat: Made title logo svg into a component

* fix: made title logo text colour change when theme toggle

* fix: fixed extra stylings when dark mode

* fix: updated package versions and pnpm lock file

* feat: update loading-spinner & solve background color flicker while loading page in dark mode

* feat: added dark mode styling to about us pages

* feat: added dark mode styling to extra pages

* feat: dark theme to mobile bottom nav

* feat: update header & loading-spinner & body tag background color

* feat: added dark mode background

* fix: fixed title logo on sidebar not changing colours when switching modes

* fix: added tab colours when dark mode

* fix: added dark mode colours to partner page text

* feat: dark mode for Labs

* fix: related courses width

* feat: update spinner in Syllabus; dark mode for Campus

* fix: timetable course item scrollable space height

* feat: make timetable course item darker in dark mode

* feat: install tailwind in feeds (not used yet)

* feat: redirecting page styling

* feat: update sign in modal

* feat: updated header component and pnpm lock file accordingly

* fix: updated colors and header dependencies

* fix: eslint fixes for campus folder

* feat: added dark mode styling to campus folder

* fix: eslint fixes in syllabus folder

* fix: updated dark mode styling

* fix: updated dark mode syllabus

* fix: updated dark mode styling root folder

* fix: syllabus border & step arrow color

* fix: fixed styling for social media icons in partners

* fix: removed unused imports

* fix: Or-button dark mode color

* fix: remove FilterWarningsPlugin

* fix: update lock files

* fix: remove -y option

* fix: update lock files

* fix: update @aws-amplify/auth in syllabus

* fix: update loading spinner in Feeds

* fix: add theme prop to LoadingSpinner in Feeds

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

* fix: clear search keywords when onclick related courses

* Debug: mobile dark mode debug (#373)

* feat: dark mode & new messages on welcome modal

* fix: dark mode on sign in modal & user login icon

* chore(deps): update dependency eslint-plugin-react to v7.29.4 (#361)

Co-authored-by: Renovate Bot <[email protected]>

* chore(deps): update dependency ts-loader to v9.2.8 (#359)

Co-authored-by: Renovate Bot <[email protected]>

* feat: remove unused dependencies (#377)

* Feature/darktheme colors (#378)

* feat: added quarterColors for both light and dark mode

* feat: Added google analytics to theme changes

* fix: fixed user profile icon to make it consistent

* fix: code refactoring

* fix: code refactoring in syllabus

* feat: added dark semantic colors

* fix: added colors based on numbers too

* fix: added a todo comment

* fix: fix semantic text colors dark mode

* feat: update quarter switch colors & icons

* feat: update timetable course items and color selector with new theme colors

Co-authored-by: Nicholas Narmada <[email protected]>

* Feature: Timetable dark theme (#379)

* feat: Dark mode for pro tips and colors selector popup in Timetable

* feat: update theme colors dependency for all apps

* feat: add the hovering effect to the member cards (#381)

* feat: update the hovering effect for member cards

* fix: remove unused libraries; fix html background color in dark mode; disable card's hyperlink

* fix: makes the code shorter and neater

* fix: syllabus pnpm lock file

* fix: syllabus pnpm lock file

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

* Migrate from Webpack to Vite (#382)

* feat: vite tested by career folder

* feat: replace systemjs import with dynamic import to import vite project

* feat: ignore dynamic import problem caused by webpack

* feat: Migrate Campus from Webpack to Vite

* fix: restore career

* feat: register vite app campus by single-spa-layout

* feat: migrate Syllabus to vite (error unsolved)

* fix: fix lockfile

* fix: solve "exportStar not a function", "undefined global" and use Vite envvar

* feat: migrate syllabus to vite (done)

* remove webpack from all apps except root

* feat: migrate root to vite

* feat: remove webpack related scripts & solve import-map not supported problem in Safari

* feat: import static assets; solve errors of custom props passed to dom

* fix: run eslint fix

* fix: build script & config

* feat: build config & debug global var

* fix: output asset files path

* feat: disable css code split in build

* fix: run eslint fix

* feat: preload css from mf apps to root; replace react-s-alert with react-toastify

* feat: configure public path & env var for each app

* fix: run eslint fix

* feat: service-worker

* fix: eslint fix

* update lock files

* fix: missing package

* fix: externalize styles from other mf app

* fix: campus room badge styles

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

* fix: env without using dotenv explicitly (#385)

* fix: packages version

* fix: change env var name

* fix: remove systemjs package; add peer dependencies

* fix: feeds domain on staging/prod

* Feature: About Us page link from Home page & split Home from Root-config (#387)

* fix: remove custom sw

* feat: add link to aboutus page from home

* fix: eslint

* Feature/fix card padding (#388)

* fix: fixing the responsive design for members card

* fix: fixing the responsive design for members card

* fix: font color, repeated className, figure tag

* fix: install missing dependency: @aws-amplify/core

* fix: remove course function

* feat: alert translation

* fix: eslint

* feat: add workbox runtimeCaching config

* Fix service worker to enable it to replace old one (#389)

* fix: add cleanupOutdatedCaches option

* use custom sw & force update

* skipWaiting and claim before cleanupOutdatedCaches

* add ts files to NetworkFirst cache

* remove ts from cache

* register sw on index.html

* change sw from ts to js

* test updates to trigger build

* registerSW in index.html

* remove unused code and comment of registering sw

* update files to trigger build

* feat: add a profile card component; add hover & click effect; add a closing tab on cards (#390)

* feat: add a profile card component;
add hover & click effect;
add closing tab on cards

* fix: rename profile card & prop; type for useState

* fix: syllabus minor styling issues

* Update README.md

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Nicholas Narmada <[email protected]>
Co-authored-by: Nicholas Narmada <[email protected]>
Co-authored-by: Xinyue Tao <[email protected]>
Co-authored-by: AustinZhu <[email protected]>

* add script-src-elem to Content Security Policy (#391)

* Hotfix (#392)

* add script-src-elem to Content Security Policy

* fix csp

* Hotfix (#393)

* add script-src-elem to Content Security Policy

* fix csp

* add blob:https: to csp

* fix blob in csp

* fix: remove csp

* fix: remove all webpack-related packages & setting

* Allow all in CSP

* Fix: preload style, csp allow all, refactor index html & env var (#404)

* fix style prelload link

* refactor index.html & add env variables

* remove slash from the end of base path env var

* import other mf's css files as external

* run eslint fix

* run eslint fix

* Update README.md (#397)

Github -> GitHub

* chore(deps): update dependency esbuild to v0.14.43 (#384)

Co-authored-by: Renovate Bot <[email protected]>

* chore(deps): update dependencies

* chore(deps): update dependencies

* chore(deps): update dependencies

* fix: preload & enable styles from other mf app

* fix: packages version (fix React to v17)

* Language filter for Feeds (#409)

* filter feeds by language

* feat: styling lang filter button

* feat: Back button to Feeds list page

* Remove using @apply in css file due to amp style problem

* feat: auto close profile cards

* fix: Enable close button

* fix: remove redundant onclick

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Nicholas Narmada <[email protected]>
Co-authored-by: YHhaoareyou <[email protected]>
Co-authored-by: Nicholas Narmada <[email protected]>
Co-authored-by: AustinZhu <[email protected]>
Co-authored-by: Ikko Ashimine <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants