From 176857f88c51f0ee103a42f88e9e52c526ede5db Mon Sep 17 00:00:00 2001
From: SrGooglo <srgooglo@ragestudio.net>
Date: Sun, 5 Mar 2023 04:59:38 +0000
Subject: [PATCH] use settings items order

---
 packages/.DS_Store                              | Bin 6148 -> 39 bytes
 .../app/constants/settings/apparence/index.jsx  |   1 +
 .../app/constants/settings/general/index.jsx    |   1 +
 packages/app/src/pages/settings/index.jsx       |  15 ++++++++++++++-
 4 files changed, 16 insertions(+), 1 deletion(-)
 mode change 100755 => 120000 packages/.DS_Store

diff --git a/packages/.DS_Store b/packages/.DS_Store
deleted file mode 100755
index 83859cfbc2b65890e9521ac979677e8ad9c29fc4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!A{#i5S<MHHmTa?P^nxh`O+J$LTRBrRB{77aI54B4h4aoSjCd@Mvha9rm6fJ
z@DqGTzktu7Z+2H{LRt<SP=$7)**7~oGmhV`cD+O-I>X)?QHzKql(E)8^B3W9);XzJ
z&k|7R8mBv{>PD%G=3<@W|73vYZjrjA=!6QIo<Cj^AD}O<wCKM-75Od5vs7hY;m6$5
zqdzt11;vy?yQr9>ayGRpxatLTy6Q5OhzqHYUrhOIw0L%NbW{%dcE$aQ`e`yK+U-kG
zTc|HCElb&y&4<l{;8>MG5f;NiC(OTa?^9SDN7nwVR64Q4Xg7(=!`726l@(!<#ko#S
zdND%w_mZrq%8nXly@9S1m;ospvT@j28I9hoZ?1Z;-)@dqz0tc@ZP@D@<8ebieZKa7
z=ji10`{>8`=NVoJBA7Uq#|9?tIjn1>T%&su>I}z#W56+R8wTw5BOlx*+2uF}90T{7
z0p1@xD5Gz&GN`u>H2Mkvti!DZHh<!Aj%U%gSQ*3!M3_{dNfq{rAxt{_o{jS@Rt8Nv
z348ev_Q}HDP=tOu>U%nzgm2KbjseHOECUOs+v4;8<G=6!vq`S!7;p^SD+WY;JJ{~v
zmF(F%_i}vJde9>%3&&LkCn+%WQH)qVidUdo;P==7`W7pL@Ic&$fTqDUj)6O6;5TTh
BfS3RP

diff --git a/packages/.DS_Store b/packages/.DS_Store
new file mode 120000
index 00000000..06c32813
--- /dev/null
+++ b/packages/.DS_Store
@@ -0,0 +1 @@
+/opt/comty-federated/packages/.DS_Store
\ No newline at end of file
diff --git a/packages/app/constants/settings/apparence/index.jsx b/packages/app/constants/settings/apparence/index.jsx
index 1dfc4ef0..66d4d443 100755
--- a/packages/app/constants/settings/apparence/index.jsx
+++ b/packages/app/constants/settings/apparence/index.jsx
@@ -10,6 +10,7 @@ export default {
     icon: "Eye",
     label: "Apparence",
     group: "app",
+    order: 1,
     settings: [
         {
             id: "sidebar.floating",
diff --git a/packages/app/constants/settings/general/index.jsx b/packages/app/constants/settings/general/index.jsx
index 4ac6224f..8af7f8d7 100755
--- a/packages/app/constants/settings/general/index.jsx
+++ b/packages/app/constants/settings/general/index.jsx
@@ -7,6 +7,7 @@ export default {
     icon: "Command",
     label: "General",
     group: "app",
+    order: 0,
     settings: [
         {
             "id": "language",
diff --git a/packages/app/src/pages/settings/index.jsx b/packages/app/src/pages/settings/index.jsx
index 6285fccd..2b5537b7 100755
--- a/packages/app/src/pages/settings/index.jsx
+++ b/packages/app/src/pages/settings/index.jsx
@@ -445,7 +445,20 @@ const generateMenuItems = () => {
     })
 
     return groupsKeys.map((groupKey, index) => {
-        const children = groups[groupKey].map((item) => {
+        const ordererItems = groups[groupKey].sort((a, b) => {
+            if (typeof a.order === "undefined") {
+                a.order = groups[groupKey].indexOf(a)
+            }
+
+            if (typeof b.order === "undefined") {
+                b.order = groups[groupKey].indexOf(b)
+            }
+
+            // if value is close to 0, more to the top
+            return a.order - b.order
+        })
+
+        const children = ordererItems.map((item) => {
             return {
                 key: item.id,
                 label: <>