Skip to content

Commit 7c437f3

Browse files
committed
Merge branch 'refactor/editor-files' of https://github.com/ivandevp/codesandbox-client into ivandevp-refactor/editor-files
2 parents ad730a0 + 468801f commit 7c437f3

File tree

6 files changed

+77
-85
lines changed

6 files changed

+77
-85
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,15 @@
13951395
"code"
13961396
]
13971397
},
1398+
{
1399+
"login": "ivandevp",
1400+
"name": "Ivan Medina",
1401+
"avatar_url": "https://avatars3.githubusercontent.com/u/9284690?v=4",
1402+
"profile": "https://twitter.com/ivandevp",
1403+
"contributions": [
1404+
"code"
1405+
]
1406+
},
13981407
{
13991408
"login": "Gobinath-Manokaran",
14001409
"name": "Gobinath-Manokaran",

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ Thanks goes to these wonderful people
232232
</tr>
233233
<tr>
234234
<td align="center"><a href="http://hetpatel33.github.io"><img src="https://avatars0.githubusercontent.com/u/13877514?v=4" width="100px;" alt="Het Patel"/><br /><sub><b>Het Patel</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=hetpatel33" title="Code">💻</a></td>
235+
<td align="center"><a href="https://twitter.com/ivandevp"><img src="https://avatars3.githubusercontent.com/u/9284690?v=4" width="100px;" alt="Ivan Medina"/><br /><sub><b>Ivan Medina</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=ivandevp" title="Code">💻</a></td>
236+
<td align="center"><a href="https://github.com/milap1296"><img src="https://avatars2.githubusercontent.com/u/19545730?v=4" width="100px;" alt="milap1296"/><br /><sub><b>milap1296</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=milap1296" title="Code">💻</a></td>
235237
<td align="center"><a href="https://github.com/Gobinath-Manokaran"><img src="https://avatars2.githubusercontent.com/u/6711914?v=4" width="100px;" alt="Gobinath-Manokaran"/><br /><sub><b>Gobinath-Manokaran</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=Gobinath-Manokaran" title="Code">💻</a></td>
236238
<td align="center"><a href="https://armujahid.me"><img src="https://avatars1.githubusercontent.com/u/3725386?v=4" width="100px;" alt="Abdul Rauf"/><br /><sub><b>Abdul Rauf</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=armujahid" title="Code">💻</a> <a href="https://github.com/codesandbox/codesandbox-client/commits?author=armujahid" title="Documentation">📖</a></td>
237239
<td align="center"><a href="https://github.com/milap1296"><img src="https://avatars2.githubusercontent.com/u/19545730?v=4" width="100px;" alt="milap1296"/><br /><sub><b>milap1296</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=milap1296" title="Code">💻</a></td>

packages/app/src/app/pages/Sandbox/Editor/Workspace/Files/index.js

Lines changed: 0 additions & 83 deletions
This file was deleted.
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
import { getModulePath } from '@codesandbox/common/lib/sandbox/modules';
2+
import { useOvermind } from 'app/overmind';
3+
import React from 'react';
4+
5+
import EditIcons from './DirectoryEntry/Entry/EditIcons';
6+
import DirectoryEntry from './DirectoryEntry/index';
7+
8+
interface IFilesProps {
9+
setEditActions: React.Dispatch<any>;
10+
}
11+
12+
export const Files: React.FC<IFilesProps> = ({ setEditActions }) => {
13+
const {
14+
state: {
15+
editor: { currentSandbox: sandbox },
16+
isLoggedIn,
17+
},
18+
actions: {
19+
editor: { createZipClicked },
20+
},
21+
} = useOvermind();
22+
23+
const _getModulePath = moduleId => {
24+
try {
25+
return getModulePath(sandbox.modules, sandbox.directories, moduleId);
26+
} catch (e) {
27+
return '';
28+
}
29+
};
30+
31+
return (
32+
<DirectoryEntry
33+
root
34+
getModulePath={_getModulePath}
35+
title={sandbox.title || 'Project'}
36+
initializeProperties={({
37+
onCreateModuleClick,
38+
onCreateDirectoryClick,
39+
onUploadFileClick,
40+
}) => {
41+
if (setEditActions) {
42+
setEditActions(
43+
// @ts-ignore
44+
<EditIcons
45+
hovering
46+
forceShow={window.__isTouch}
47+
onCreateFile={onCreateModuleClick}
48+
onCreateDirectory={onCreateDirectoryClick}
49+
onDownload={createZipClicked}
50+
onUploadFile={
51+
isLoggedIn && sandbox.privacy === 0
52+
? onUploadFileClick
53+
: undefined
54+
}
55+
/>
56+
);
57+
}
58+
}}
59+
depth={-1}
60+
id={null}
61+
shortid={null}
62+
/>
63+
);
64+
};

packages/app/src/app/pages/Sandbox/Editor/Workspace/items/Files/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useState } from 'react';
22

33
import { useOvermind } from 'app/overmind';
4-
import Files from '../../Files';
4+
import { Files } from '../../Files';
55
import { Dependencies } from '../../Dependencies';
66
import { WorkspaceItem } from '../../WorkspaceItem';
77
import { ItemTitle } from '../../elements';

packages/app/src/app/pages/Sandbox/Editor/Workspace/items/NotOwnedSandboxInfo/NotOwnedSandboxInfo.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import React, { useState } from 'react';
22
import { useOvermind } from 'app/overmind';
33
import Margin from '@codesandbox/common/lib/components/spacing/Margin';
44
import { Dependencies } from '../../Dependencies';
5-
import Files from '../../Files';
65
import { SandboxInfo } from './SandboxInfo';
76
import { BookmarkTemplateButton } from '../../Project/BookmarkTemplateButton';
7+
import { Files } from '../../Files';
88
import { WorkspaceItem } from '../../WorkspaceItem';
99

1010
export const NotOwnedSandboxInfo = () => {

0 commit comments

Comments
 (0)