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

Reset Dev Branch #370

Merged
merged 50 commits into from
Nov 4, 2023
Merged

Reset Dev Branch #370

merged 50 commits into from
Nov 4, 2023

Conversation

leeaj8-uci
Copy link
Contributor

No description provided.

alanchangxyz and others added 30 commits August 22, 2022 15:08
aka da 2022 website revamp

* Experiment with react-page-scroller on homepage, add summary view
* Start About Us 1st view
* Change photo align on about page tab 1
* Add first iteration of new navbar, change Home/About button styles
* Render navbar position as absolute to remove from page hierarchies
* Move navbar back to all pages and fix scroll issue due to oversized width
* Add framer-motion and mess around on homepage tab 1
* Animate navbar first iteration
* Tweak homepage tab1 animations
* Add cross-page animations iteration 1
* Add temporary mobile styles for homepage tab 1
* Add 7/20 progress
* Globalize css font/colors and remove unnecessary ind. styles from common comps
* Add first version of new member cards
* Polish profile cards
* Fix membercard animation bug
* Adjust profilecard overlay css
* Change linkedin svg color
* Fix profilecard linkedin link not clicking
* Adjust x on member tab animations
* Reduce rotate animation on members page
* Fix Zoya title
* Add homepage tab 2 first iteration
* Change a to links on homepage 2 to try fixing animation
* Start new apply page
* Fix z index on navbar not overriding profile card linkedin logos
* Add custom purple scroll bar + fix Our Team page color + animations
* Change titles back to ____ Director
* Change animation out for Our Team page to slide down
* Merge navbar/footer updates
* Merge contact page desktop version
* Merge apply page and contact page changes
* Add Our Team mobile
* Tweak contact page mobile cutoff
* Start new projects page
* Merge homepage pt1
* project page
* Finish projects page and our team page
* Fix compile error
* Merge homepage changes
* Fix Our Team page minimum height
* Fix homepage section heights from percents to px
* Finish About Us Page + moving all pages together
* Change route renders to components, Mingjia is now an OCH dev
* Change TBD project titles to TBA
* Add more margin to mobile options container on homepage
* Set height on socials container instead of using margin
* Change action tense on 2021-22 project data
* Try to remove two scrollbars on contact page mobile
* Fix socials container issue on homepage
* Minifix contact socials with same issue as homepage
* Fixed margin on projects header mobile
* Fix variable widths on apply page
* Fix desktop heights for Apply sections
* Add a little more height to apply 2
* Fix timeline height issue on mobile
* Add fixes for About page section sizes, alumni companies pic
* Resolve eslint line temporarily
* Fix homepage section 1 text align
* Fix values spacing on desktop
* Try to fix scrolling issue on Our Team page with explicit scrolling
* Add descale to rotate animations to avoid extra scrollbars
* Try fixing mobile scrolling on Our Team again
* Add 2021-2022 members
* Remove duplicate members from 2021-2022
* Remove more duplicates
* Add 2022-23 rec timeline dates
* Change some heights on Apply mobile
* Fix apply page 2 on mid size devices
* Clean up package.json and unused projects json
* Minor tweak on mid size Our Team page
* Change header font weights back to 600
* Change font sizes on apply buttons to 20px

Co-authored-by: claudeisakeeb <[email protected]>
Co-authored-by: Mingjia Wang <[email protected]>
Co-authored-by: Meghna Kaligotla <[email protected]>
Co-authored-by: Justine Chou <[email protected]>
* Add Advance OC project data

* Remove unused images+files and move other assets to respective page folders
* Add NPO team tab names and change Brie/Madhu photos

* Change home 1 animation to scale in/out + add new Jenny photo

* Add new Hang photo

* Remove overflow x to get rid of horizontal scroll bars

* Replace Max/Noah photos

* Add 2022-23 application link

* Change AdvanceOC to Cell Dogs on members page
Closes recruitment links after 9/30 deadline
+
- Commonize animations & resolve ESLint commit errors
- Shorten Madhu name & change Alan image
- Remove some elements from selectable hierarchy for easier highlighting
- Make ProjectCards and social logos on homepage easier to view on mobile
* Remove 2021-2022 members & tab
* Remove old member image files
* Prep members.js with new import area for bootcamp task
- Update to React 18 + ReactDOM 6 + bump other dependencies
- Add Redirect component and refactor Discord link to use this component
- Add redirect to homepage on 404
- Add member info for 2022-23 devs/designers
- Revise eslintrc to avoid local webpack compile issues

Co-authored-by: Caroline Nguyen <[email protected]>
Co-authored-by: ThatMegamind <[email protected]>
Co-authored-by: ctc-devops <[email protected]>
Co-authored-by: Kei Asakawa <[email protected]>
Co-authored-by: Avent Chiu <[email protected]>
Co-authored-by: leeaj8-uci <[email protected]>
Co-authored-by: evanpservito <[email protected]>
Co-authored-by: Arjun Sivakumar <[email protected]>
Co-authored-by: “Michelle <[email protected]>
Co-authored-by: NwinNwin <[email protected]>
Co-authored-by: Dang Nguyen Nguyen <[email protected]>
Co-authored-by: Subin Kim <[email protected]>
Co-authored-by: Orviel Alzate <[email protected]>
Co-authored-by: Kade Na <[email protected]>
Co-authored-by: echen <[email protected]>
Co-authored-by: RaymondYan38 <[email protected]>
Co-authored-by: RaymondYan38 <[email protected]>
Co-authored-by: joshualipton <[email protected]>
Co-authored-by: michellelin1 <[email protected]>
Co-authored-by: kristenyee <[email protected]>
Co-authored-by: kristenyee <[email protected]>
Co-authored-by: michellelin1 <[email protected]>
Co-authored-by: liannejl <[email protected]>
Co-authored-by: Rochelle Nixon <[email protected]>
Co-authored-by: Rochelle Nixon <[email protected]>
Co-authored-by: Rachel <[email protected]>
Co-authored-by: Kainoa Nishida <[email protected]>
Co-authored-by: Rayan Tighiouart <[email protected]>
Co-authored-by: Mia Schroeder <[email protected]>
Co-authored-by: Aokijiop <[email protected]>
Co-authored-by: MatthewCCChang <[email protected]>
Co-authored-by: Maithy Le <[email protected]>
Co-authored-by: Jacqueline Thai <[email protected]>
Co-authored-by: Sravan <[email protected]>
Co-authored-by: koryz22 <[email protected]>
Co-authored-by: Noah Arsala <[email protected]>
Co-authored-by: maannddyy <[email protected]>
Co-authored-by: clairexia1 <[email protected]>
Co-authored-by: Myron Zhou <[email protected]>
Co-authored-by: Kevin Liu <[email protected]>
Co-authored-by: Kyle Doliente <[email protected]>
Co-authored-by: Ted Kim <[email protected]>
Co-authored-by: siennabaird <[email protected]>
* Also bumps loader-utils from 2.0.3 to 2.0.4 in /website

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.3 to 2.0.4.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md)
- [Commits](webpack/loader-utils@v2.0.3...v2.0.4)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Alan Chang <[email protected]>
jrock-3 and others added 20 commits August 12, 2023 19:11
## Changes Made
- Updated alt-text on all pages to improve accessibility
- Disabled animations when user prefers reduced motion
- Changed links to the same page to also scroll user to the top of the page
- Updated text on the 'Projects' page
- Updated CTC's portfolio
- Other visual changes based on designer feedback
---------

Co-authored-by: jrock03 <[email protected]>
* Add initial active project data

* Add conditional logic for displaying projects or coming soon box

* Do same for Projects page

* Update project card styling (and associated layout edits)

* Update NPO images

* Create new CurrentProjectSection component

* Minort fix to use flex-start

* Update apply page
Bumps [semver](https://github.com/npm/node-semver) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v6.3.1/CHANGELOG.md)
- [Commits](npm/node-semver@v6.3.0...v6.3.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](salesforce/tough-cookie@v4.1.2...v4.1.3)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.2.0 to 4.3.1.
- [Changelog](https://github.com/adobe/css-tools/blob/main/History.md)
- [Commits](https://github.com/adobe/css-tools/commits)

---
updated-dependencies:
- dependency-name: "@adobe/css-tools"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.21.4 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@leeaj8-uci leeaj8-uci closed this Nov 4, 2023
@leeaj8-uci leeaj8-uci reopened this Nov 4, 2023
@leeaj8-uci leeaj8-uci merged commit 59eb7d3 into dev Nov 4, 2023
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.

4 participants