🚚 Move some components to a separate widgets directory

src/settings-renderer/components/AboutDialog.tsx

@@ -14,10 +14,11 @@ declare const window: WindowWithAPIs;
 import React from 'react';
 import { RiExternalLinkFill } from 'react-icons/ri';
 
+import Swirl from './widgets/Swirl';
+import Modal from './widgets/Modal';
+import Button from './widgets/Button';
+
 import * as classes from './AboutDialog.module.scss';
-import Swirl from './Swirl';
-import Modal from './Modal';
-import Button from './Button';
 
 const logo = require('../../../assets/icons/square-icon.svg');
 

src/settings-renderer/components/App.tsx

@@ -13,20 +13,19 @@ declare const window: WindowWithAPIs;
 
 import React from 'react';
 import { Tooltip } from 'react-tooltip';
-
 import { RiSettings4Fill, RiInformation2Fill, RiPaletteFill } from 'react-icons/ri';
 
-import * as classes from './App.module.scss';
-
 import AboutDialog from './AboutDialog';
 import GeneralSettingsDialog from './GeneralSettingsDialog';
 import MenuThemesDialog from './MenuThemesDialog';
-import Button from './Button';
-import Sidebar from './Sidebar';
+import Button from './widgets/Button';
+import Sidebar from './widgets/Sidebar';
 import Preview from './Preview';
 import Properties from './Properties';
 import MenuList from './MenuList';
-import Headerbar from './Headerbar';
+import Headerbar from './widgets/Headerbar';
+
+import * as classes from './App.module.scss';
 
 export default () => {
   const [transparent, setTransparent] = React.useState(true);

src/settings-renderer/components/GeneralSettingsDialog.tsx

@@ -13,9 +13,9 @@ declare const window: WindowWithAPIs;
 
 import React from 'react';
 
-import Modal from './Modal';
-import Swirl from './Swirl';
-import Checkbox from './Checkbox';
+import Modal from './widgets/Modal';
+import Swirl from './widgets/Swirl';
+import Checkbox from './widgets/Checkbox';
 
 interface IProps {
   visible: boolean;

src/settings-renderer/components/MenuThemesDialog.tsx

@@ -10,7 +10,7 @@
 
 import React from 'react';
 
-import Modal from './Modal';
+import Modal from './widgets/Modal';
 
 interface IProps {
   visible: boolean;

src/settings-renderer/components/Button.module.scss → src/settings-renderer/components/widgets/Button.module.scss

@@ -8,7 +8,7 @@
 // SPDX-FileCopyrightText: Simon Schneegans <[email protected]>
 // SPDX-License-Identifier: MIT
 
-@import '../variable.scss';
+@import '../../variable.scss';
 
 .button {
   display: inline-flex;

src/settings-renderer/components/Checkbox.module.scss → src/settings-renderer/components/widgets/Checkbox.module.scss

@@ -8,7 +8,7 @@
 // SPDX-FileCopyrightText: Simon Schneegans <[email protected]>
 // SPDX-License-Identifier: MIT
 
-@import '../variable.scss';
+@import '../../variable.scss';
 
 .checkbox {
   display: flex;

src/settings-renderer/components/Headerbar.module.scss → src/settings-renderer/components/widgets/Headerbar.module.scss

@@ -8,7 +8,7 @@
 // SPDX-FileCopyrightText: Simon Schneegans <[email protected]>
 // SPDX-License-Identifier: MIT
 
-@import '../variable.scss';
+@import '../../variable.scss';
 
 .headerbar {
   color: $text-primary;

src/settings-renderer/components/Modal.module.scss → src/settings-renderer/components/widgets/Modal.module.scss

@@ -8,7 +8,7 @@
 // SPDX-FileCopyrightText: Simon Schneegans <[email protected]>
 // SPDX-License-Identifier: MIT
 
-@import '../variable.scss';
+@import '../../variable.scss';
 
 .modalBackground {
   -webkit-app-region: no-drag;

src/settings-renderer/components/Modal.tsx → src/settings-renderer/components/widgets/Modal.tsx

@@ -10,13 +10,12 @@
 
 import React from 'react';
 import { CSSTransition } from 'react-transition-group';
-
 import { RiCloseLargeFill } from 'react-icons/ri';
 
 import Headerbar from './Headerbar';
+import Button from './Button';
 
 import * as classes from './Modal.module.scss';
-import Button from './Button';
 
 interface IProps {
   visible: boolean;

src/settings-renderer/components/Sidebar.module.scss → src/settings-renderer/components/widgets/Sidebar.module.scss

@@ -8,7 +8,7 @@
 // SPDX-FileCopyrightText: Simon Schneegans <[email protected]>
 // SPDX-License-Identifier: MIT
 
-@import '../variable.scss';
+@import '../../variable.scss';
 
 .sidebar {
   background-color: $background-normal;

src/settings-renderer/components/Swirl.tsx → src/settings-renderer/components/widgets/Swirl.tsx

@@ -10,7 +10,7 @@
 
 import React from 'react';
 
-const swirl = require('../../../assets/images/swirl1.svg');
+const swirl = require('../../../../assets/images/swirl1.svg');
 
 export default () => {
   return (