From eaf3fed5c789dcd030a25d4dd1d97ac5002da0a3 Mon Sep 17 00:00:00 2001
From: TolaMironcenko <mironcenkotola@gmail.com>
Date: Tue, 11 Mar 2025 12:55:13 +0700
Subject: [PATCH] refactor

---
 style.scss                                   | 40 ++------------------
 widget/Bar.tsx                               |  2 +-
 widget/modules/Media/Media.scss              | 33 ++++++++++++++++
 widget/{ => modules/Media}/Media.tsx         |  0
 widget/modules/Powermenu/PowerMenu.scss      | 22 +++++++++++
 widget/modules/{ => Powermenu}/PowerMenu.tsx |  0
 widget/modules/export.ts                     | 24 ++++++------
 7 files changed, 73 insertions(+), 48 deletions(-)
 create mode 100644 widget/modules/Media/Media.scss
 rename widget/{ => modules/Media}/Media.tsx (100%)
 create mode 100644 widget/modules/Powermenu/PowerMenu.scss
 rename widget/modules/{ => Powermenu}/PowerMenu.tsx (100%)

diff --git a/style.scss b/style.scss
index a66af7c..54a3290 100644
--- a/style.scss
+++ b/style.scss
@@ -1,4 +1,6 @@
 // https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gtk/theme/Adwaita/_colors-public.scss
+@use "./widget/modules/Media/Media.scss";
+@use "./widget/modules/Powermenu/PowerMenu.scss";
 $fg-color: #{"@theme_fg_color"};
 $bg-color: #{"@theme_bg_color"};
 
@@ -121,41 +123,7 @@ window.Bar {
     // }
 }
 
-window.Media {
-    margin: 5px;
-    padding: 5px;
-    background-color: transparent;
-    box {
-        margin: 5px;
-        background-color: black;
-        border-radius: 25px;
-        padding: 2px;
-    }
-
-    box.title {
-        padding: 5px;
-        margin: 0;
-        label {
-            font-weight: bold;
-            font-size: 1.1em;
-        }
-    }
-
-    .Cover {
-        min-width: 120px;
-        min-height: 120px;
-        border-radius: 9px;
-        margin-right: 0.6rem;
-        background-size: contain;
-        background-position: center;
-    }
-
-    label.artist {
-        padding: 5px;
-    }
-}
-
-window.Powermenu {
+/* window.Powermenu {
     margin: 5px;
     background-color: transparent;
     box {
@@ -176,4 +144,4 @@ window.Powermenu {
             }
         }
     }
-}
+} */
diff --git a/widget/Bar.tsx b/widget/Bar.tsx
index 03ce632..eea21af 100644
--- a/widget/Bar.tsx
+++ b/widget/Bar.tsx
@@ -11,9 +11,9 @@ import {
   FocusedClient,
   Time,
   SysTray,
+  Media,
 } from "./modules/export";
 import { close_all_menus } from "./utils/windows";
-import Media from "./Media";
 
 export default function Bar(gdkmonitor: Gdk.Monitor) {
   const { TOP, LEFT, RIGHT } = Astal.WindowAnchor;
diff --git a/widget/modules/Media/Media.scss b/widget/modules/Media/Media.scss
new file mode 100644
index 0000000..60301da
--- /dev/null
+++ b/widget/modules/Media/Media.scss
@@ -0,0 +1,33 @@
+window.Media {
+    margin: 5px;
+    padding: 5px;
+    background-color: transparent;
+    box {
+        margin: 5px;
+        background-color: black;
+        border-radius: 25px;
+        padding: 2px;
+    }
+
+    box.title {
+        padding: 5px;
+        margin: 0;
+        label {
+            font-weight: bold;
+            font-size: 1.1em;
+        }
+    }
+
+    .Cover {
+        min-width: 120px;
+        min-height: 120px;
+        border-radius: 9px;
+        margin-right: 0.6rem;
+        background-size: contain;
+        background-position: center;
+    }
+
+    label.artist {
+        padding: 5px;
+    }
+}
diff --git a/widget/Media.tsx b/widget/modules/Media/Media.tsx
similarity index 100%
rename from widget/Media.tsx
rename to widget/modules/Media/Media.tsx
diff --git a/widget/modules/Powermenu/PowerMenu.scss b/widget/modules/Powermenu/PowerMenu.scss
new file mode 100644
index 0000000..4966e3e
--- /dev/null
+++ b/widget/modules/Powermenu/PowerMenu.scss
@@ -0,0 +1,22 @@
+window.Powermenu {
+    margin: 5px;
+    background-color: transparent;
+    box {
+        margin: 5px;
+        background-color: black;
+        border-radius: 25px;
+        // padding: 10px;
+        button {
+            all: unset;
+            margin: 2px;
+            padding: 5px 15px 5px 13px;
+            background-color: black;
+            border-radius: 25px;
+            transition: 300ms;
+
+            &:hover {
+                background-color: gray;
+            }
+        }
+    }
+}
diff --git a/widget/modules/PowerMenu.tsx b/widget/modules/Powermenu/PowerMenu.tsx
similarity index 100%
rename from widget/modules/PowerMenu.tsx
rename to widget/modules/Powermenu/PowerMenu.tsx
diff --git a/widget/modules/export.ts b/widget/modules/export.ts
index c08be52..dd41294 100644
--- a/widget/modules/export.ts
+++ b/widget/modules/export.ts
@@ -1,21 +1,23 @@
 import BatteryLevel from "./Battery";
 import Cpu from "./Cpu";
 import FocusedClient from "./FocusedClient";
-import PowerMenu from "./PowerMenu";
+import PowerMenu from "./Powermenu/PowerMenu";
 import Ram from "./Ram";
 import Storage from "./Storage";
 import SysTray from "./SysTray";
 import Time from "./Time";
 import Workspaces from "./Workspaces";
+import Media from "./Media/Media";
 
 export {
-    BatteryLevel,
-    Cpu,
-    FocusedClient,
-    PowerMenu,
-    Ram,
-    Storage,
-    SysTray,
-    Time,
-    Workspaces
-}
\ No newline at end of file
+  BatteryLevel,
+  Cpu,
+  FocusedClient,
+  PowerMenu,
+  Ram,
+  Storage,
+  SysTray,
+  Time,
+  Workspaces,
+  Media,
+};