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

Waitp 1201 basic web layout #4620

Merged

alexd-bes merged 23 commits into epic-frontend-rewrite from waitp-1201-basic-web-layout

Jun 7, 2023

Contributor

alexd-bes commented Jun 7, 2023

Issue WAITP-1201: Basic desktop layout

Changes:

Added layout files for Modal, AuthModal, Sidebar, menus, TopBar, and general layout
Added stories for key elements
Added decorator for react router to use in storybook
Applied layout to views

alexd-bes added 15 commits

June 6, 2023 15:34


          WAITP-1201 Top bar

b39520c


          WAITP-1201 Add map layout part 1

5e83872


          WAITP-1201 Map layout part 2

5fc06ca


          WAITP-1201 Update map layout

e1eee28


          WAITP-1202 Update map layout and add context for sidebar

8b38926


          WAITP-1201 add types for context

0f17cfc


          WAITP-1201 fix types

e74a999


          WAITP-1201 add comments

6e570c5


          WAITP-1201 AuthModal layout

4563ab0


          WAITP-1201 update menus

c11c89c


          WAITP-1201 Add buttons to auth modal

ac83ccb


          WAITP-1201 Set user views as auth modals

ce9e2f9


          WAITP-1201 Update comments and folder structure

2910f3d


          WAITP-1201 Add stories

4756f2d


          WAITP-1201 remove storybook-react-router

703698a

alexd-bes commented

View reviewed changes

packages/ui-components/src/components/EnvBanner.tsx

-                  color?: CSSStyleDeclaration['color'];
-                }
-              ) => {
+              export const EnvBanner = ({ color = '#f39c12' }: { color?: CSSStyleDeclaration['color'] }) => {
                 const deploymentName = process.env.REACT_APP_DEPLOYMENT_NAME;

Contributor Author

alexd-bes Jun 7, 2023

This is just formatting

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/Routes.tsx Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/layout/Layout.tsx Outdated Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/layout/Layout.tsx Outdated Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/pages/Project.tsx Outdated Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/theme/constants.ts Outdated Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/theme/constants.ts Outdated Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/layout/Sidebar/Sidebar.tsx Outdated Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/context/SidebarContext.tsx Outdated Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/layout/Main.tsx Outdated Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/layout/Main.tsx Outdated Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/components/Modal.tsx Outdated Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/components/Modal.tsx Outdated Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/layout/TopBar/Logo.tsx Outdated Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/layout/TopBar/TopBar.tsx Outdated Show resolved Hide resolved


          WAITP-1201 tweaks

3584e1b

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/theme/theme.ts Outdated Show resolved Hide resolved


          WAITP-1201 remove theme variables

743bc5c

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/components/DropDownMenu.tsx Outdated Show resolved Hide resolved


          WAITP-1201 remove dropdown and stories

6bdebd2

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/components/Modal.tsx Outdated Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/layout/MapLayout/MapLayout.tsx Outdated Show resolved Hide resolved

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/layout/Layout.tsx Show resolved Hide resolved

alexd-bes added 3 commits

June 8, 2023 11:40


          WAITP-1201 move mapdiv

2f6ec51


          WAITP-1201 remove extra height line

755d464


          WAITP-1201 keep padding in close button

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/layout/Sidebar/Sidebar.tsx Outdated Show resolved Hide resolved


          Update packages/tupaia-web/src/layout/Sidebar/Sidebar.tsx

bc20138

Co-authored-by: Tom Caiger <caigertom@gmail.com>

tcaiger reviewed

View reviewed changes

packages/tupaia-web/src/layout/Sidebar/Sidebar.tsx Show resolved Hide resolved


          Update min-width

579007b

Co-authored-by: Tom Caiger <caigertom@gmail.com>

tcaiger approved these changes

View reviewed changes

Contributor

tcaiger left a comment

Thanks for all the changes. It's looking really good now and it's great to get rid of some of that legacy logic.

tcaiger approved these changes

View reviewed changes

Contributor

tcaiger left a comment

Thanks for all the changes. It's looking really good now and it's great to get rid of some of that legacy logic.

alexd-bes merged commit 22053e0 into epic-frontend-rewrite

alexd-bes deleted the waitp-1201-basic-web-layout branch

June 7, 2023 23:53

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

Labels

None yet