Skip to content

Commit 68dda27

Browse files
committed
Refactor Desktop to use styled components
1 parent f650285 commit 68dda27

11 files changed

Lines changed: 335 additions & 19 deletions

File tree

package-lock.json

Lines changed: 287 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"preview": "vite preview"
1111
},
1212
"dependencies": {
13+
"@emotion/react": "^11.11.1",
14+
"@emotion/styled": "^11.11.0",
1315
"@types/pako": "^2.0.1",
1416
"@types/uuid": "^9.0.4",
1517
"base64-js": "^1.5.1",

src/App.css

Whitespace-only changes.

src/App.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
1-
import Desktop from "./components/Desktop";
1+
import { Global, css } from "@emotion/react";
22

3-
import "./App.css";
3+
import Desktop from "./components/Desktop";
4+
import useSystemSettings from "./stores/systemSettingsStore";
45

56
function App() {
7+
const settings = useSystemSettings();
68
return (
79
<div className="App">
10+
<Global
11+
styles={css`
12+
background-color: ${settings.mainColor};
13+
color: ${settings.fontColor};
14+
`}
15+
/>
816
<Desktop />
917
</div>
1018
);
File renamed without changes.

src/ContextMenu/ContextMenu.tsx renamed to src/components/ContextMenu/ContextMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useRef } from "react";
2-
import MenuItems, { MenuItemProps } from "../components/MenuItems";
3-
import useDetectMouseDownOutside from "../hooks/useDetectMouseDownOutside";
2+
import MenuItems, { MenuItemProps } from "../MenuItems";
3+
import useDetectMouseDownOutside from "../../hooks/useDetectMouseDownOutside";
44

55
import "./ContextMenu.scss";
66

src/components/Desktop/Desktop.tsx

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,47 @@
1+
import styled from "@emotion/styled";
2+
13
import TopBar from "../TopBar";
24
import Content from "../Content";
35
import BottomBar from "../BottomBar";
46
import useSystemSettings from "../../stores/systemSettingsStore";
57

6-
import "./Desktop.scss";
7-
88
interface DesktopProps {}
99

10+
const StyledDesktop = styled.div`
11+
height: 100dvh;
12+
width: 100dvw;
13+
display: grid;
14+
grid-template-rows: 42px auto 84px;
15+
grid-template-columns: auto;
16+
grid-template-areas:
17+
"top-bar"
18+
"content"
19+
"bottom-bar";
20+
gap: 10px;
21+
`;
22+
23+
const StyledBackground = styled.div<{ backgroundUrl: string }>`
24+
height: 100%;
25+
width: 100%;
26+
position: absolute;
27+
grid-area: none;
28+
z-index: -1;
29+
background-image: url(${(props) => props.backgroundUrl});
30+
background-size: cover;
31+
background-repeat: no-repeat;
32+
background-position: center;
33+
`;
34+
1035
// eslint-disable-next-line no-empty-pattern
1136
function Desktop({}: DesktopProps) {
1237
const settings = useSystemSettings();
1338
return (
14-
<div id="desktop" style={{ color: settings.fontColor }}>
15-
<div
16-
id="desktop__background"
17-
style={{
18-
backgroundImage: `url(${settings.background})`,
19-
}}
20-
/>
39+
<StyledDesktop id="desktop">
40+
<StyledBackground id="background" backgroundUrl={settings.background} />
2141
<TopBar />
2242
<Content />
2343
<BottomBar />
24-
</div>
44+
</StyledDesktop>
2545
);
2646
}
2747

src/programs/FileBrowser/DirectoryOrFile/DirectoryOrFile.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import useLocalFS, {
55
isFSDirectory,
66
} from "../../../stores/localFS";
77
import "./DirectoryOrFile.scss";
8-
import ContextMenu from "../../../ContextMenu/ContextMenu";
8+
import ContextMenu from "../../../components/ContextMenu/ContextMenu";
99
import { ContextMenuAction, getFSObjectContextMenu } from "../contextMenus";
1010
import { ReactComponent as FolderIcon } from "../../../assets/icons/folder-icon.svg";
1111
import useBindKeyToAction from "../../../hooks/useBindKeyToAction";

src/programs/FileBrowser/MainContent/MainContent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import useLocalFS, {
77
import "./MainContent.scss";
88
import { getMainContentContextItems } from "../contextMenus";
99
import AppPopup from "../../../components/AppPopup";
10-
import ContextMenu from "../../../ContextMenu/ContextMenu";
10+
import ContextMenu from "../../../components/ContextMenu/ContextMenu";
1111
import DirectoryOrFile from "../DirectoryOrFile/DirectoryOrFile";
1212
import HeaderBar from "../../../components/HeaderBar";
1313
import Box from "../../../components/Box";

0 commit comments

Comments
 (0)