Skip to content

🔨 Apply coding conventions to NotOwnedSandboxInfo Workspace #1971

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

Merged
merged 1 commit into from
Jun 6, 2019
Merged

🔨 Apply coding conventions to NotOwnedSandboxInfo Workspace #1971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions packages/app/src/app/pages/Sandbox/Editor/Workspace/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import VERSION from '@codesandbox/common/lib/version';
import { observer } from 'mobx-react-lite';
import * as React from 'react';
import React from 'react';

import SocialInfo from 'app/components/SocialInfo';
import { useStore } from 'app/store';
Expand All @@ -14,7 +14,7 @@ import Live from './items/Live';
import { More } from './items/More';
import Deployment from './items/Deployment';
import ConfigurationFiles from './items/ConfigurationFiles';
import NotOwnedSandboxInfo from './items/NotOwnedSandboxInfo';
import { NotOwnedSandboxInfo } from './items/NotOwnedSandboxInfo';

import { Advertisement } from './Advertisement';
import Chat from './Chat';
Expand All @@ -29,7 +29,7 @@ import {
VersionContainer,
} from './elements';

const idToItem = {
const workspaceTabs = {
project: ProjectInfo,
'project-summary': NotOwnedSandboxInfo,
files: Files,
Expand All @@ -52,15 +52,15 @@ const Workspace = () => {
preferences: {
settings: { zenMode },
},
workspace: { openedWorkspaceItem: currentItem },
workspace: { openedWorkspaceItem: activeTab },
} = store;

if (!currentItem) {
if (!activeTab) {
return null;
}

const Component = idToItem[currentItem];
const item = getWorkspaceItems(store).find(({ id }) => id === currentItem);
const Component = workspaceTabs[activeTab];
const item = getWorkspaceItems(store).find(({ id }) => id === activeTab);

return (
<Container>
Expand All @@ -76,7 +76,7 @@ const Workspace = () => {
)}

{!zenMode && (
<div>
<>
{!(isPatron || owned) && <Advertisement />}

<ContactContainer>
Expand All @@ -90,7 +90,7 @@ const Workspace = () => {
<SSEDownNotice />

<ConnectionNotice />
</div>
</>
)}
</Container>
);
Expand Down
11 changes: 6 additions & 5 deletions ...kspace/items/NotOwnedSandboxInfo/index.js → ...tOwnedSandboxInfo/NotOwnedSandboxInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
import React, { useState } from 'react';

import Project from '../../Project';
import Files from '../../Files';
import Dependencies from '../../Dependencies';
import Files from '../../Files';
import Project from '../../Project';
import WorkspaceItem from '../../WorkspaceItem';

export default () => {
export const NotOwnedSandboxInfo = () => {
const [editActions, setEditActions] = useState(null);

return (
<div style={{ marginTop: '1rem' }}>
<Project />

<WorkspaceItem
style={{ marginTop: '.5rem' }}
actions={editActions}
defaultOpen
style={{ marginTop: '.5rem' }}
title="Files"
>
<Files setEditActions={setEditActions} />
</WorkspaceItem>

<WorkspaceItem
style={{ marginTop: '.5rem' }}
defaultOpen
style={{ marginTop: '.5rem' }}
title="Dependencies"
>
<Dependencies />
Expand Down
1 change: 1 addition & 0 deletions packages/app/src/app/pages/Sandbox/Editor/Workspace/items/NotOwnedSandboxInfo/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { NotOwnedSandboxInfo } from './NotOwnedSandboxInfo';