-
Notifications
You must be signed in to change notification settings - Fork 2
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
Implement new Sidebar #49
Merged
Merged
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
a43e0b0
Update deps and rework Avatar
dherault 8780e66
Add atomic colors
dherault 9ed7668
Update deps
dherault 13723eb
Import images and icons
dherault 83241ed
Fix exports
dherault 43cdff9
Add bottom nav on Sidebar
dherault 3990338
Fix collapse bug
dherault 03c2d83
Design Sidebar scrollbar
dherault afb4feb
Complete Sidebar
dherault 1fbb4db
Fix collapse, again
dherault 493cc35
Rename userOrganization to userAccount
dherault File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,6 +40,7 @@ function Template(args: any) { | |
createItem({ | ||
name: 'User Attributes', | ||
Icon: ScrollIcon, | ||
url: '/user-attributes', | ||
}), | ||
createItem({ | ||
name: 'Password', | ||
|
@@ -257,6 +258,13 @@ function Template(args: any) { | |
> | ||
Go to /explore/public | ||
</button> | ||
<button | ||
type="button" | ||
style={{ marginTop: '1rem' }} | ||
onClick={() => setActiveUrl('/user-attributes')} | ||
> | ||
Go to /user-attributes | ||
</button> | ||
</Flex> | ||
</Flex> | ||
) | ||
|
@@ -265,8 +273,17 @@ function Template(args: any) { | |
export const Default = Template.bind({}) | ||
|
||
Default.args = { | ||
user: { | ||
name: 'Jane Smith', | ||
email: '[email protected]', | ||
}, | ||
userName: 'Jane Smith', | ||
userOrganization: 'Plural', | ||
onUserClick: () => window.alert('User clicked'), | ||
onNotificationsClick: () => window.alert('Notifications clicked'), | ||
onUpdateClick: () => window.alert('Update clicked'), | ||
notificationsCount: 8, | ||
hasUpdate: true, | ||
} | ||
|
||
export const NoOrganization = Template.bind({}) | ||
|
||
NoOrganization.args = { | ||
userName: 'Jane Smith', | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should probably keep the naming here in line with the api, which has it as
account
notorganization
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, np