From cdae5ed29eb5c500fc2b0f4718396af3c2cd07c0 Mon Sep 17 00:00:00 2001 From: alexsparkes Date: Sat, 3 Feb 2024 01:21:18 +0000 Subject: [PATCH] feat: cleanup, settings UI improvements Co-authored-by: David Ralph --- public/icons/mue_about.png | Bin 0 -> 10597 bytes qodana.yaml | 29 + src/components/helpers/carousel/carousel.scss | 1 - .../helpers/sharemodal/ShareModal.jsx | 2 +- src/components/modals/apps/Apps.jsx | 15 +- src/components/modals/apps/scss/index.scss | 122 +- .../modals/main/scss/settings/_main.scss | 4 - .../scss/settings/modules/tabs/_about.scss | 6 + ...-picker-gradient-picker-custom-styles.scss | 1 - .../modals/main/settings/ChipSelect.jsx | 2 +- .../modals/main/settings/sections/About.jsx | 73 +- .../main/settings/sections/Greeting.jsx | 2 +- .../modals/main/settings/sections/Stats.jsx | 18 +- .../settings/sections/quicklinks/AddModal.jsx | 12 +- src/components/modals/welcome/welcome.scss | 6 +- .../background/scss/_photoinformation.scss | 3 +- .../widgets/quicklinks/quicklinks.scss | 38 +- src/components/widgets/time/clock.scss | 2 +- src/components/widgets/weather/weather.scss | 1 + src/modules/constants.js | 3 - .../achievement_translations/index.js | 2 + .../achievement_translations/pt_BR.json | 8 + src/modules/helpers/settings/modals.js | 8 +- src/translations/bn.json | 1 - src/translations/de_DE.json | 1 - src/translations/en_GB.json | 1 - src/translations/en_US.json | 1 - src/translations/es.json | 1293 ++++++++--------- src/translations/es_419.json | 1 - src/translations/fr.json | 1 - src/translations/id_ID.json | 1 - src/translations/nl.json | 1 - src/translations/no.json | 1 - src/translations/pt.json | 1 - src/translations/pt_BR.json | 5 +- src/translations/ru.json | 1 - src/translations/tr_TR.json | 1293 ++++++++--------- src/translations/zh_CN.json | 1 - 38 files changed, 1526 insertions(+), 1435 deletions(-) create mode 100644 public/icons/mue_about.png create mode 100644 qodana.yaml create mode 100644 src/modules/helpers/settings/achievement_translations/pt_BR.json diff --git a/public/icons/mue_about.png b/public/icons/mue_about.png new file mode 100644 index 0000000000000000000000000000000000000000..e5d7b096ef3bb7cafcfdf1223606a2e6eee66b96 GIT binary patch literal 10597 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 + +#Disable inspections +#exclude: +# - name: +# paths: +# - + +#Execute shell command before Qodana execution (Applied in CI/CD pipeline) +#bootstrap: sh ./prepare-qodana.sh + +#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline) +#plugins: +# - id: #(plugin id can be found at https://plugins.jetbrains.com) + +#Specify Qodana linter for analysis (Applied in CI/CD pipeline) +linter: jetbrains/qodana-js:latest diff --git a/src/components/helpers/carousel/carousel.scss b/src/components/helpers/carousel/carousel.scss index 5c493b1e..46edb938 100644 --- a/src/components/helpers/carousel/carousel.scss +++ b/src/components/helpers/carousel/carousel.scss @@ -10,7 +10,6 @@ &.is-draggable { cursor: move; - cursor: grab; } &.is-dragging { diff --git a/src/components/helpers/sharemodal/ShareModal.jsx b/src/components/helpers/sharemodal/ShareModal.jsx index 05a77f4c..2b10f3ca 100644 --- a/src/components/helpers/sharemodal/ShareModal.jsx +++ b/src/components/helpers/sharemodal/ShareModal.jsx @@ -103,7 +103,7 @@ function ShareModal({ modalClose, data }) { diff --git a/src/components/modals/main/settings/sections/quicklinks/AddModal.jsx b/src/components/modals/main/settings/sections/quicklinks/AddModal.jsx index e7ee19e4..4fa3b8c4 100644 --- a/src/components/modals/main/settings/sections/quicklinks/AddModal.jsx +++ b/src/components/modals/main/settings/sections/quicklinks/AddModal.jsx @@ -11,7 +11,7 @@ function AddModal({ urlError, iconError, addLink, closeModal, edit, editData, ed const [icon, setIcon] = useState(edit ? editData.icon : ''); return ( -
+
{edit @@ -30,15 +30,14 @@ function AddModal({ urlError, iconError, addLink, closeModal, edit, editData, ed placeholder={variables.getMessage('widgets.quicklinks.name')} value={name} onChange={(e) => setName(e.target.value.replace(/(\r\n|\n|\r)/gm, ''))} + style={{ gridColumn: 'span 2' }} /> - setUrl(e.target.value.replace(/(\r\n|\n|\r)/gm, ''))} /> - {urlError} setIcon(e.target.value.replace(/(\r\n|\n|\r)/gm, ''))} /> - {iconError} +
+
+ + {iconError} {urlError} + {edit ? (