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 new design for TopBar #369

Merged
merged 66 commits into from
Feb 5, 2024
Merged

🎨 Implement new design for TopBar #369

merged 66 commits into from
Feb 5, 2024

Conversation

AmandaElvkull
Copy link
Contributor

@AmandaElvkull AmandaElvkull commented Dec 12, 2023 •
edited
Loading

Implementation of new top bar
Will solve :
AB#433208 - Application drawer.
AB#445958 - Field selector.
AB#446407 - Notification tempaltes. This needs to be updated when backend is done.
AB#446468 - New resources . Tutorials needs to be updated when tutorial provider and backend is done. It's possible to hide tutorial item now and its possible to send in children. Resources => learn more => open portal, tutorials & children

Version tag will be updated when review is approved ...

@AmandaElvkull
♻️ Added current field in the button to show
fa12b9e
@AmandaElvkull
🔥 Removed application name at application Icon
7ca316f
@AmandaElvkull
♻️ Change to Resources instead of settings
e62dda1
@AmandaElvkull
⏪ Added app name again in icon
73a4919
@AmandaElvkull
♻️ Change back to settings and transformed field name
4ba6019
@AmandaElvkull
🚧 working on test for fieldselector
8806dbb
@AmandaElvkull
✅ Change from testid and passed fildselector test
bc69091
@AmandaElvkull
🚧 notification template
25fa1bc
@AmandaElvkull
🚧 Field selector test
d3752bb
@AmandaElvkull
🚧 Help button => new resouces
48b053c
@AmandaElvkull
✨ added new icons for top baren
903939b
@AmandaElvkull
🚧 New application drawer
d3ab205
@AmandaElvkull
🚧 Search and add to hide/favorite application drawer
dadf1cb
@AmandaElvkull
🚧 Redirection to portal / application
a37254a
@AmandaElvkull
🚧 Application drawer implement new design & story
0035a39
@AmandaElvkull
🚧 Redirection to portal / application
3c95714
@AmandaElvkull
🚧 Help/resouces
ea78418
@AmandaElvkull
📦 added vite build packages
ec85259
@AmandaElvkull
🚧 Notification templates
70a7c7c
@AmandaElvkull
💄 Added selected colors for topbar button and moved styling to own st…
038e917 
…ylesheet
@AmandaElvkull
🎨 Add/ refactor types for notifications templates and some styling.
ed334f8
@AmandaElvkull
🎨 Cleaned up tutorials and added check if it is current or other page
92672d9
@AmandaElvkull
Merge branch 'main' into fix/TopBar
4bf7c34 
# Conflicts:
#	src/components/Icons/AmplifyIcons.stories.tsx
#	src/components/Icons/AmplifyIcons.tsx
@AmandaElvkull
Merge branch 'main' into fix/TopBar
4804ac0 
# Conflicts:
#	.storybook/preview.js
#	src/components/Icons/AmplifyIcons.stories.tsx
#	src/components/Icons/AmplifyIcons.tsx
#	src/components/Navigation/TopBar/Account.tsx
#	src/components/Navigation/TopBar/FieldSelector.tsx
#	src/components/Navigation/TopBar/Help/HelpMenuItem.tsx
#	src/components/Navigation/TopBar/Notifications.tsx
#	yarn.lock
@AmandaElvkull
♻️ change name on enums for filter/sorting Notifications
b8a377e
@AmandaElvkull
♻️ change for notifications types
904d37b
@AmandaElvkull
🔥 Cleaned up old imports / code blocks
c584e89
@AmandaElvkull
✅ Create test for application drawer
0eddde6
@AmandaElvkull
✅ added test id for tests
8166145
@AmandaElvkull
✅ Test for Application drawer
00f621f
AmandaElvkull and others added 11 commits February 1, 2024 08:17
@AmandaElvkull
🚧 Test for application drawer, notification
59be147 
Signed-off-by: Amanda Elvkull <[email protected]>
@mariush2
🚧 Made Resources.test.tsx work
c190436
@AmandaElvkull
♻️ change to send url instead of function
1307500 
Signed-off-by: Amanda Elvkull <[email protected]>
@AmandaElvkull
Merge branch 'main' of https://github.com/equinor/amplify-components …
7efab9a 
…into fix/TopBar
@AmandaElvkull
✅ fix test for resources / tutorialdialog
8db76e1 
Signed-off-by: Amanda Elvkull <[email protected]>
@AmandaElvkull
✅ Fix testes for application drawer and notifications
98202c0 
Signed-off-by: Amanda Elvkull <[email protected]>
@AmandaElvkull
🎨 Merge chaningapplication and portaltransit to one component
c67faad
@AmandaElvkull
✅ Update test to fix covarge
68ea8a1
@AmandaElvkull
🎨 Change name of tutorialdialog and update styling.
6b66470
@AmandaElvkull
Merge branch 'main' of https://github.com/equinor/amplify-components …
96daa9a 
…into fix/TopBar

# Conflicts:
#	package-lock.json
@AmandaElvkull
🚨 Fixed lint warnings
8b61357
@AmandaElvkull AmandaElvkull marked this pull request as ready for review February 2, 2024 10:52
@AmandaElvkull AmandaElvkull requested a review from a team as a code owner February 2, 2024 10:52
mariush2
mariush2 reviewed Feb 2, 2024
View reviewed changes
.storybook/main.js Outdated Show resolved Hide resolved
mariush2
mariush2 requested changes Feb 2, 2024
View reviewed changes
src/components/Feedback/AnimatedCheckmark.tsx Outdated Show resolved Hide resolved
src/components/Feedback/AnimatedCheckmark.tsx Outdated Show resolved Hide resolved
src/components/Navigation/TopBar/ApplicationDrawer/ApplicationDrawer.test.tsx Outdated Show resolved Hide resolved
src/components/Navigation/TopBar/ApplicationDrawer/ApplicationDrawer.test.tsx Outdated Show resolved Hide resolved
src/components/Navigation/TopBar/ApplicationDrawer/ApplicationDrawer.tsx Outdated Show resolved Hide resolved
src/components/Navigation/TopBar/Notifications/NotificationsTemplate/NotificationTemplate.tsx Outdated Show resolved Hide resolved
src/components/Navigation/TopBar/Resources/TransferToAppDialog.tsx Outdated Show resolved Hide resolved
src/components/Navigation/TopBar/Resources/Tutorials/TutorialInfoDialog.tsx Outdated Show resolved Hide resolved
src/components/Navigation/TopBar/Resources/Tutorials/TutorialItem.test.tsx Outdated Show resolved Hide resolved
src/components/Navigation/TopBar/TopBar.test.tsx Outdated Show resolved Hide resolved
mariush2
mariush2 approved these changes Feb 2, 2024
View reviewed changes
Copy link
Contributor

@mariush2 mariush2 left a comment

Choose a reason for hiding this comment

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

Looks good! Try the promise thingy in the test and if it doesn't work you can just revert back to what you had and push that 😄 Remember to bump the version number in the package.json file as well to release the new top bar 🎉

@AmandaElvkull AmandaElvkull merged commit 175e0f5 into main Feb 5, 2024
5 checks passed
@AmandaElvkull AmandaElvkull deleted the fix/TopBar branch February 5, 2024 06:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mariush2 mariush2 mariush2 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@AmandaElvkull @mariush2 @aslakihle