shift workspace tab (#318)

projectunic0rn · Nov 4, 2020 · 122ac6e · 122ac6e
1 parent 84febf0
commit 122ac6e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pub",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "private": true,
   "scripts": {
     "build": "gatsby build --prefix-paths",

diff --git a/src/components/projects/project-workspace/project-workspace.tsx b/src/components/projects/project-workspace/project-workspace.tsx
@@ -484,33 +484,7 @@ export const ProjectWorkspace: FC<ProjectWorkspaceProps> = (props) => {
                   </ButtonWrapper>
                 </Buttons>
                 <MenuWrapper>
-                  <MultiTabMenu tabs={['Team', 'Workspace']}>
-                    <TabContentContainer>
-                      {project.projectUsers.length > 0 ? (
-                        <Fragment>
-                          {project.projectUsers.map((user) => {
-                            return (
-                              <Link
-                                to={`/profile/${user.userId}/`}
-                                key={user.userId}
-                              >
-                                <ImageContainer>
-                                  <CircularImage
-                                    src={
-                                      user.profilePictureUrl ||
-                                      defaultProfileImage
-                                    }
-                                  />
-                                  <div>{user.username}</div>
-                                </ImageContainer>
-                              </Link>
-                            );
-                          })}
-                        </Fragment>
-                      ) : (
-                        <div>Currently no members.</div>
-                      )}
-                    </TabContentContainer>
+                  <MultiTabMenu tabs={['Workspace', 'Team']}>
                     <TabContentContainerWorkspace>
                       {project.workspaceAppInstalled ? (
                         <Fragment>
@@ -591,6 +565,32 @@ export const ProjectWorkspace: FC<ProjectWorkspaceProps> = (props) => {
                         </Fragment>
                       )}
                     </TabContentContainerWorkspace>
+                    <TabContentContainer>
+                      {project.projectUsers.length > 0 ? (
+                        <Fragment>
+                          {project.projectUsers.map((user) => {
+                            return (
+                              <Link
+                                to={`/profile/${user.userId}/`}
+                                key={user.userId}
+                              >
+                                <ImageContainer>
+                                  <CircularImage
+                                    src={
+                                      user.profilePictureUrl ||
+                                      defaultProfileImage
+                                    }
+                                  />
+                                  <div>{user.username}</div>
+                                </ImageContainer>
+                              </Link>
+                            );
+                          })}
+                        </Fragment>
+                      ) : (
+                        <div>Currently no members.</div>
+                      )}
+                    </TabContentContainer>
                   </MultiTabMenu>
                 </MenuWrapper>
                 <MenuWrapper>