diff --git a/packages/.DS_Store b/packages/.DS_Store deleted file mode 100755 index 83859cfb..00000000 Binary files a/packages/.DS_Store and /dev/null differ 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: <>