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

Projects link in settings #4663

Merged
merged 4 commits into from
Dec 15, 2023
Merged

Projects link in settings #4663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb75cd8
projects link in settings
ruggi Dec 15, 2023
aea90b8
snap
ruggi Dec 15, 2023
039b4fe
snap?
ruggi Dec 15, 2023
7e4b85e
remove copypasta
ruggi Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions editor/src/components/navigator/left-pane/settings-pane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
FlexRow,
H2,
HeadlessStringInput,
Icons,
PopupList,
Section,
SectionBodyArea,
Expand Down Expand Up @@ -247,6 +248,25 @@ export const SettingsPane = React.memo(() => {
>
<Section>
{isMyProject === 'yes' ? null : <ForksGiven />}
<UIGridRow padded variant='<-------------1fr------------->' style={{ marginBottom: 8 }}>
<a href='/projects' target='_blank' rel='noopener rofererrer'>
<Button
highlight
spotlight
outline={false}
style={{
width: '100%',
cursor: 'pointer',
height: UtopiaTheme.layout.inputHeight.default,
background: colorTheme.dynamicBlue.value,
color: colorTheme.bg1.value,
gap: 4,
}}
>
<Icons.ExternalLinkSmaller color='black' /> All projects
</Button>
</a>
</UIGridRow>
<UIGridRow padded variant='<---1fr--->|------172px-------|'>
<span style={{ color: colorTheme.fg2.value }}>Name</span>
{userState.loginState.type !== 'LOGGED_IN' ? (
Expand Down
36 changes: 16 additions & 20 deletions editor/src/components/user-bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,16 @@ export const SinglePlayerUserBar = React.memo(() => {
'SinglePlayerUserBar amIOwner',
)
return (
<a href='/projects' target='_blank' rel='noopener rofererrer'>
<div
style={{
width: 24,
height: 24,
position: 'relative',
}}
>
<Avatar userPicture={userPicture} isLoggedIn={true} />
{amIOwner ? <OwnerBadge /> : null}
</div>
</a>
<div
style={{
width: 24,
height: 24,
position: 'relative',
}}
>
<Avatar userPicture={userPicture} isLoggedIn={true} />
{amIOwner ? <OwnerBadge /> : null}
</div>
)
})
SinglePlayerUserBar.displayName = 'SinglePlayerUserBar'
Expand Down Expand Up @@ -219,14 +217,12 @@ const MultiplayerUserBar = React.memo(() => {
)
}),
)}
<a href='/projects' target='_blank' rel='noopener rofererrer'>
<MultiplayerAvatar
name={multiplayerInitialsFromName(myUser.name)}
color={multiplayerColorFromIndex(myUser.colorIndex)}
picture={myUser.avatar}
isOwner={amIOwner}
/>
</a>
<MultiplayerAvatar
name={multiplayerInitialsFromName(myUser.name)}
color={multiplayerColorFromIndex(myUser.colorIndex)}
picture={myUser.avatar}
isOwner={amIOwner}
/>
</div>
)
})
Expand Down
Loading