Skip to content

Commit 122ac6e

Browse files
authored
shift workspace tab (#318)
1 parent 84febf0 commit 122ac6e

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pub",
3-
"version": "1.4.0",
3+
"version": "1.5.0",
44
"private": true,
55
"scripts": {
66
"build": "gatsby build --prefix-paths",

src/components/projects/project-workspace/project-workspace.tsx

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -484,33 +484,7 @@ export const ProjectWorkspace: FC<ProjectWorkspaceProps> = (props) => {
484484
</ButtonWrapper>
485485
</Buttons>
486486
<MenuWrapper>
487-
<MultiTabMenu tabs={['Team', 'Workspace']}>
488-
<TabContentContainer>
489-
{project.projectUsers.length > 0 ? (
490-
<Fragment>
491-
{project.projectUsers.map((user) => {
492-
return (
493-
<Link
494-
to={`/profile/${user.userId}/`}
495-
key={user.userId}
496-
>
497-
<ImageContainer>
498-
<CircularImage
499-
src={
500-
user.profilePictureUrl ||
501-
defaultProfileImage
502-
}
503-
/>
504-
<div>{user.username}</div>
505-
</ImageContainer>
506-
</Link>
507-
);
508-
})}
509-
</Fragment>
510-
) : (
511-
<div>Currently no members.</div>
512-
)}
513-
</TabContentContainer>
487+
<MultiTabMenu tabs={['Workspace', 'Team']}>
514488
<TabContentContainerWorkspace>
515489
{project.workspaceAppInstalled ? (
516490
<Fragment>
@@ -591,6 +565,32 @@ export const ProjectWorkspace: FC<ProjectWorkspaceProps> = (props) => {
591565
</Fragment>
592566
)}
593567
</TabContentContainerWorkspace>
568+
<TabContentContainer>
569+
{project.projectUsers.length > 0 ? (
570+
<Fragment>
571+
{project.projectUsers.map((user) => {
572+
return (
573+
<Link
574+
to={`/profile/${user.userId}/`}
575+
key={user.userId}
576+
>
577+
<ImageContainer>
578+
<CircularImage
579+
src={
580+
user.profilePictureUrl ||
581+
defaultProfileImage
582+
}
583+
/>
584+
<div>{user.username}</div>
585+
</ImageContainer>
586+
</Link>
587+
);
588+
})}
589+
</Fragment>
590+
) : (
591+
<div>Currently no members.</div>
592+
)}
593+
</TabContentContainer>
594594
</MultiTabMenu>
595595
</MenuWrapper>
596596
<MenuWrapper>

0 commit comments

Comments
 (0)