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

Implement desktop menu redesign #1446

Merged
merged 112 commits into from
Feb 7, 2023
Merged

Implement desktop menu redesign #1446

merged 112 commits into from
Feb 7, 2023

Conversation

edwinjue
Copy link
Member

@edwinjue edwinjue commented Feb 3, 2023 •
edited
Loading

Hi @hqasmei,

Thanks for taking a look. There is a lot here. If you need this separated into smaller PRs, please let me know and I will spend some time separating things out. For now, this is everything we are looking to merge for the v2 desktop menu redesign.

@bryantran04 copying you on this in case you have any review comments. Thanks!

Screenshots:
image
image

Resolves #1397
Resolves #1398
Resolves #1370

  • Up to date with dev branch
  • Branch name follows guidelines
  • All PR Status checks are successful
  • Peer reviewed and approved

Any questions? See the getting started guide

@edwinjue
initial content page v2 dependencies
41aaefb
@edwinjue
initial v2 new components
360ea8c
@edwinjue
initial v2 header/footer updates
400c4d8
@edwinjue
initial v2 contact
309ca91
@edwinjue
initial v2 about
98056e2
@edwinjue
initial v2 FAQs
cffac31
@edwinjue
initial v2 privacy
344964a
@edwinjue
refactored all hard coded colers in theme.js to use colors from @them…
9d24f88 
…e/colors.js object
@edwinjue
updated colors in colors.js
d881687
@edwinjue
updated index to make use of webpack aliases
3456e2b
@edwinjue
updated primaryLight from #002449 to #29404F
73a749c
@edwinjue
changed primaryLight back to #002449 because primaryLight affects mor…
5cc7845 
…e aspects than text color
@edwinjue
updated textPrimaryLight to reflect the color of theme.text.primary f…
6564af4 
…or light theme, which is now set to #29404F. replaced all previous references of textPrimaryLight, which was #ffffff, to white
@edwinjue
changed primaryLight to #29404F
2ff1cef
@edwinjue
added jumbo typeography and applied it to the TextHeading component
a4698d6
@edwinjue
made formatting changes to About
7105185
@edwinjue
applied changes to Routes.jsx
afdcf43
@edwinjue
removed maxWidth from footer container so contents can expand the ful…
026a265 
…l width of page
@edwinjue
added some left and right margin to footer content
83babf2
@edwinjue
repositioned footer items per v2 mockup and updated copyright and las…
87d09aa 
…tupdated text to use body3 variant typography
@edwinjue
added more non-breaking spaces between the copyright content to impro…
cc4fed7 
…ve readability
@edwinjue
added missing copyright date
8aea7cf
@edwinjue
added style comment to Header and Footer
50a4ccd
@edwinjue
removed makeStyles
a7eeac5
@edwinjue
removed jumbo custom typography because custom typographies do not se…
209dd9f 
…em to work. used h1 in place of jumbo
@edwinjue
enabling responsiveFontSizes for themes
379c1cb
@edwinjue
updated the name of font weights in typography.js and removed redunda…
1a394da 
…nt font definitions for title in Header
@edwinjue
experimenting with shared font styles
00ab0b7
@edwinjue
several font and layout adjustments
7dfa9b4
@edwinjue
updated sharedLayout names
53dd738
edwinjue added 19 commits November 5, 2022 01:08
@edwinjue
initial NC zoom out
00d1fc1
@edwinjue
added console logs to trace code execution. zoom in/out when selectin…
9d0e9d4 
…g district and adjuacent district so far works as expected. limited pop-ups to be displayed for currently selected district
@edwinjue
resetting the concilId in Redux store value back to null on call to r…
b1c2199 
…eset() and added hasDistrictSelected() method
@edwinjue
initial mouseenter listener on request-circle layer
855277e
@edwinjue
added @hooks
ac6b32f
@edwinjue
Merge branch 'dev' into 1370-implement-desktop-menu-redesign-initial-…
0e485bf 
…clsx-selectedNcZoom
@edwinjue
restored CouncilSelector index.js to last stable
3fe2d5f
@edwinjue
restored Map/Map.jsx to last stable
7c2e84b
@edwinjue
updated CouncilSelector/index.js to collapse instead of expand by def…
64deebb 
…ault
@edwinjue
commented out LocationDetail component since it is no loger in v2 des…
0ba3320 
…ign specs
@edwinjue
changed headerTitle from h6 to h5
f33be08
@edwinjue
initial zoomout
dcc1829
@edwinjue
initial zoomout
f174ad1
@edwinjue
initial zoomout
001aa7a
@edwinjue
initial zoomout
10696da
@edwinjue
initial move selected and unselected to redux state
460247a
@edwinjue
clicking a neighborhood council onthe map displays chip with name of …
1e71843 
…neightborhood council in boundaries input field. zoom out will clear this field
@edwinjue
updated comments and removed console.logs
0f2c0a1
@edwinjue
Merge branch 'dev' into 1370-implement-desktop-menu-redesign-initial-…
b027a59 
…clsx-selectedNcZoom-stable
hqasmei
hqasmei suggested changes Feb 7, 2023
View reviewed changes
Copy link
Contributor

@hqasmei hqasmei left a comment

Choose a reason for hiding this comment

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

Hey Edwin, I took a look at the changes. When you submit a PR there's a tab called checks that shows the files that need fixing to pass the automated github actions. I left comments on the places it showed would fail. Lmk if you have any questions.

client/components/main/Desktop/CouncilSelector/index.js Outdated Show resolved Hide resolved
client/components/main/Desktop/CouncilSelector/index.js Outdated Show resolved Hide resolved
client/components/main/Desktop/CouncilSelector/index.js Outdated Show resolved Hide resolved
client/components/main/Desktop/CouncilSelector/index.js Outdated Show resolved Hide resolved
@edwinjue edwinjue requested a review from hqasmei February 7, 2023 05:53
@edwinjue
Copy link
Member Author

edwinjue commented Feb 7, 2023

Thanks @hqasmei. Should be good to go now

@hqasmei hqasmei merged commit acedbd2 into dev Feb 7, 2023
@hqasmei hqasmei deleted the 1370-implement-desktop-menu-redesign-initial-clsx-selectedNcZoom-stable branch February 7, 2023 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hqasmei hqasmei hqasmei approved these changes

@bryantran04 bryantran04 Awaiting requested review from bryantran04

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@edwinjue @hqasmei