From 8fb29cfc216aa9db96d81bd2dadfaa4beeb92b19 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Sun, 19 Jun 2022 21:31:58 +0000 Subject: [PATCH] feat(admin): migrate theme + api + utilities to vue 3 composition --- ux/package.json | 27 +- ux/src/components/UserCreateDialog.vue | 1 - ux/src/components/UserEditOverlay.vue | 1 - ux/src/components/UtilCodeEditor.vue | 1 - ux/src/components/WebhookEditDialog.vue | 1 - ux/src/layouts/AdminLayout.vue | 1 - ux/src/pages/AdminApi.vue | 309 ++++++++-------- ux/src/pages/AdminTheme.vue | 457 ++++++++++++------------ ux/src/pages/AdminUtilities.vue | 73 ++-- ux/src/router/routes.js | 8 +- ux/yarn.lock | 328 +++++++---------- 11 files changed, 595 insertions(+), 612 deletions(-) diff --git a/ux/package.json b/ux/package.json index 3db047bd..8bc4b00e 100644 --- a/ux/package.json +++ b/ux/package.json @@ -12,26 +12,26 @@ }, "dependencies": { "@apollo/client": "3.6.8", - "@codemirror/autocomplete": "0.20.3", + "@codemirror/autocomplete": "6.0.2", "@codemirror/basic-setup": "0.20.0", "@codemirror/closebrackets": "0.19.2", - "@codemirror/commands": "0.20.0", + "@codemirror/commands": "6.0.0", "@codemirror/comment": "0.19.1", "@codemirror/fold": "0.19.4", "@codemirror/gutter": "0.19.9", "@codemirror/highlight": "0.19.8", "@codemirror/history": "0.19.2", - "@codemirror/lang-css": "0.20.0", - "@codemirror/lang-html": "0.20.0", - "@codemirror/lang-javascript": "0.20.1", - "@codemirror/lang-json": "0.20.0", - "@codemirror/lang-markdown": "0.20.1", + "@codemirror/lang-css": "6.0.0", + "@codemirror/lang-html": "6.0.0", + "@codemirror/lang-javascript": "6.0.0", + "@codemirror/lang-json": "6.0.0", + "@codemirror/lang-markdown": "6.0.0", "@codemirror/matchbrackets": "0.19.4", - "@codemirror/search": "0.20.1", - "@codemirror/state": "0.20.1", + "@codemirror/search": "6.0.0", + "@codemirror/state": "6.0.1", "@codemirror/tooltip": "0.19.16", - "@codemirror/view": "0.20.7", - "@lezer/common": "0.16.1", + "@codemirror/view": "6.0.1", + "@lezer/common": "1.0.0", "@quasar/extras": "1.14.0", "@tiptap/core": "2.0.0-beta.176", "@tiptap/extension-code-block": "2.0.0-beta.37", @@ -61,6 +61,7 @@ "apollo-upload-client": "17.0.0", "browser-fs-access": "0.29.6", "clipboard": "2.0.11", + "codemirror": "6.0.0", "filesize": "9.0.9", "filesize-parser": "1.5.0", "graphql": "16.5.0", @@ -71,12 +72,12 @@ "luxon": "2.4.0", "pinia": "2.0.14", "pug": "3.0.2", - "quasar": "2.7.2", + "quasar": "2.7.3", "tippy.js": "6.3.7", "uuid": "8.3.2", "v-network-graph": "0.5.19", "vue": "3.2.37", - "vue-codemirror": "5.1.0", + "vue-codemirror": "6.0.0", "vue-i18n": "9.1.10", "vue-router": "4.0.16", "vuedraggable": "4.1.0", diff --git a/ux/src/components/UserCreateDialog.vue b/ux/src/components/UserCreateDialog.vue index df81783b..a6d47616 100644 --- a/ux/src/components/UserCreateDialog.vue +++ b/ux/src/components/UserCreateDialog.vue @@ -178,7 +178,6 @@ defineEmits([ const { dialogRef, onDialogHide, onDialogOK, onDialogCancel } = useDialogPluginComponent() const $q = useQuasar() -defineExpose({ $q }) // I18N diff --git a/ux/src/components/UserEditOverlay.vue b/ux/src/components/UserEditOverlay.vue index 36ab16d5..07ea135d 100644 --- a/ux/src/components/UserEditOverlay.vue +++ b/ux/src/components/UserEditOverlay.vue @@ -510,7 +510,6 @@ import UtilCodeEditor from './UtilCodeEditor.vue' // QUASAR const $q = useQuasar() -defineExpose({ $q }) // STORES diff --git a/ux/src/components/UtilCodeEditor.vue b/ux/src/components/UtilCodeEditor.vue index 927b7214..e2a2e7e7 100644 --- a/ux/src/components/UtilCodeEditor.vue +++ b/ux/src/components/UtilCodeEditor.vue @@ -12,7 +12,6 @@ import { EditorState } from '@codemirror/state' import { defaultKeymap, history, historyKeymap, indentWithTab } from '@codemirror/commands' import { defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language' import { ref, shallowRef, onBeforeMount, onMounted, watch } from 'vue' -import { json } from '@codemirror/lang-json' // PROPS diff --git a/ux/src/components/WebhookEditDialog.vue b/ux/src/components/WebhookEditDialog.vue index 5b4f44ae..b0459f5c 100644 --- a/ux/src/components/WebhookEditDialog.vue +++ b/ux/src/components/WebhookEditDialog.vue @@ -218,7 +218,6 @@ defineEmits([ const { dialogRef, onDialogHide, onDialogOK, onDialogCancel } = useDialogPluginComponent() const $q = useQuasar() -defineExpose({ $q }) // I18N diff --git a/ux/src/layouts/AdminLayout.vue b/ux/src/layouts/AdminLayout.vue index 99731c1a..bca501c2 100644 --- a/ux/src/layouts/AdminLayout.vue +++ b/ux/src/layouts/AdminLayout.vue @@ -203,7 +203,6 @@ const overlays = { // QUASAR const $q = useQuasar() -defineExpose({ $q }) // STORES diff --git a/ux/src/pages/AdminApi.vue b/ux/src/pages/AdminApi.vue index 5c89c440..67f64dce 100644 --- a/ux/src/pages/AdminApi.vue +++ b/ux/src/pages/AdminApi.vue @@ -4,16 +4,16 @@ q-page.admin-api .col-auto img.admin-icon.animated.fadeInLeft(src='/_assets/icons/fluent-rest-api.svg') .col.q-pl-md - .text-h5.text-primary.animated.fadeInLeft {{ $t('admin.api.title') }} - .text-subtitle1.text-grey.animated.fadeInLeft.wait-p2s {{ $t('admin.api.subtitle') }} + .text-h5.text-primary.animated.fadeInLeft {{ t('admin.api.title') }} + .text-subtitle1.text-grey.animated.fadeInLeft.wait-p2s {{ t('admin.api.subtitle') }} .col .flex.items-center - template(v-if='enabled') + template(v-if='state.enabled') q-spinner-rings.q-mr-sm(color='green') - .text-caption.text-green {{$t('admin.api.enabled')}} + .text-caption.text-green {{t('admin.api.enabled')}} template(v-else) q-spinner-rings.q-mr-sm(color='red', size='md') - .text-caption.text-red {{$t('admin.api.disabled')}} + .text-caption.text-red {{t('admin.api.disabled')}} .col-auto q-btn.q-mr-sm.q-ml-md.acrylic-btn( icon='las la-question-circle' @@ -27,24 +27,24 @@ q-page.admin-api icon='las la-redo-alt' flat color='secondary' - :loading='loading > 0' + :loading='state.loading > 0' @click='load' ) q-btn.q-mr-sm( unelevated icon='las la-power-off' - :label='!enabled ? $t(`admin.api.enableButton`) : $t(`admin.api.disableButton`)' - :color='!enabled ? `positive` : `negative`' + :label='!state.enabled ? t(`admin.api.enableButton`) : t(`admin.api.disableButton`)' + :color='!state.enabled ? `positive` : `negative`' @click='globalSwitch' - :disabled='loading > 0' + :disabled='state.loading > 0' ) q-btn( unelevated icon='las la-plus' - :label='$t(`admin.api.newKeyButton`)' + :label='t(`admin.api.newKeyButton`)' color='primary' @click='newKey' - :disabled='loading > 0' + :disabled='state.loading > 0' ) q-separator(inset) .row.q-pa-md.q-col-gutter-md @@ -114,165 +114,166 @@ q-page.admin-api //- v-btn(color='red', dark, @click='revokeConfirm', :loading='revokeLoading') {{$t('admin.api.revoke')}} -