From a70dbb7e74356caed2fe03bec05c4e8d5bde4316 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 26 Sep 2021 02:55:11 +0900 Subject: feat(client): MFM関数構文のサジェストを実装 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/components/autocomplete.vue | 47 +++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 18 deletions(-) (limited to 'src/client/components') diff --git a/src/client/components/autocomplete.vue b/src/client/components/autocomplete.vue index 065ee6de2e..e2c1af3356 100644 --- a/src/client/components/autocomplete.vue +++ b/src/client/components/autocomplete.vue @@ -10,12 +10,12 @@
  • {{ $ts.selectUser }}
    • -
      +
      1. {{ hashtag }}
      -
        +
        1. @@ -24,6 +24,11 @@ ({{ emoji.aliasOf }})
        +
          +
        1. + {{ tag }} +
          2. +
        @@ -106,6 +111,8 @@ emojiDefinitions.sort((a, b) => a.name.length - b.name.length); const emojiDb = markRaw(emojiDefinitions.concat(emjdb)); //#endregion +const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'font', 'blur', 'rainbow', 'sparkle']; + export default defineComponent({ props: { type: { @@ -137,11 +144,6 @@ export default defineComponent({ type: Number, required: true, }, - - showing: { - type: Boolean, - required: true - }, }, emits: ['done', 'closed'], @@ -154,18 +156,11 @@ export default defineComponent({ hashtags: [], emojis: [], items: [], + mfmTags: [], select: -1, } }, - watch: { - showing() { - if (!this.showing) { - this.$emit('closed'); - } - } - }, - updated() { this.setPosition(); this.items = (this.$refs.suggests as Element | undefined)?.children || []; @@ -236,7 +231,9 @@ export default defineComponent({ } } - if (this.type == 'user') { + console.log(this.type); + + if (this.type === 'user') { if (this.q == null) { this.users = []; this.fetching = false; @@ -262,7 +259,7 @@ export default defineComponent({ sessionStorage.setItem(cacheKey, JSON.stringify(users)); }); } - } else if (this.type == 'hashtag') { + } else if (this.type === 'hashtag') { if (this.q == null || this.q == '') { this.hashtags = JSON.parse(localStorage.getItem('hashtags') || '[]'); this.fetching = false; @@ -286,7 +283,7 @@ export default defineComponent({ }); } } - } else if (this.type == 'emoji') { + } else if (this.type === 'emoji') { if (this.q == null || this.q == '') { // 最近使った絵文字をサジェスト this.emojis = this.$store.state.recentlyUsedEmojis.map(emoji => emojiDb.find(e => e.emoji == emoji)).filter(x => x != null); @@ -314,6 +311,14 @@ export default defineComponent({ } this.emojis = matched; + } else if (this.type === 'mfmTag') { + console.log(this.q); + if (this.q == null || this.q == '') { + this.mfmTags = MFM_TAGS; + return; + } + + this.mfmTags = MFM_TAGS.filter(tag => tag.startsWith(this.q)); } }, @@ -490,5 +495,11 @@ export default defineComponent({ margin: 0 0 0 8px; } } + + > .mfmTags > li { + + .name { + } + } } -- cgit v1.2.3-freya From 5fd549656b14d2ba79dca70bc87325844ed1a27a Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 26 Sep 2021 02:56:02 +0900 Subject: chore: clean up --- src/client/components/autocomplete.vue | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/client/components') diff --git a/src/client/components/autocomplete.vue b/src/client/components/autocomplete.vue index e2c1af3356..98998293ac 100644 --- a/src/client/components/autocomplete.vue +++ b/src/client/components/autocomplete.vue @@ -231,8 +231,6 @@ export default defineComponent({ } } - console.log(this.type); - if (this.type === 'user') { if (this.q == null) { this.users = []; -- cgit v1.2.3-freya From ebce02c253400907e5c31972785d99863d256bb5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 26 Sep 2021 03:25:52 +0900 Subject: chore: clean up --- src/client/components/autocomplete.vue | 1 - 1 file changed, 1 deletion(-) (limited to 'src/client/components') diff --git a/src/client/components/autocomplete.vue b/src/client/components/autocomplete.vue index 98998293ac..e621b26229 100644 --- a/src/client/components/autocomplete.vue +++ b/src/client/components/autocomplete.vue @@ -310,7 +310,6 @@ export default defineComponent({ this.emojis = matched; } else if (this.type === 'mfmTag') { - console.log(this.q); if (this.q == null || this.q == '') { this.mfmTags = MFM_TAGS; return; -- cgit v1.2.3-freya From 1ac1a968b9edd801aa13e8dae56ca378744d9e2e Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 30 Sep 2021 00:50:45 +0900 Subject: refactor components --- CONTRIBUTING.md | 4 + locales/ja-JP.yml | 2 + package.json | 6 +- src/client/components/abuse-report-window.vue | 2 +- src/client/components/cw-button.vue | 8 +- src/client/components/debobigego/base.vue | 65 +++++ src/client/components/debobigego/button.vue | 81 ++++++ src/client/components/debobigego/debobigego.scss | 52 ++++ src/client/components/debobigego/group.vue | 78 +++++ src/client/components/debobigego/info.vue | 47 +++ src/client/components/debobigego/input.vue | 292 +++++++++++++++++++ .../components/debobigego/key-value-view.vue | 38 +++ src/client/components/debobigego/link.vue | 103 +++++++ src/client/components/debobigego/object-view.vue | 102 +++++++ src/client/components/debobigego/pagination.vue | 42 +++ src/client/components/debobigego/radios.vue | 112 ++++++++ src/client/components/debobigego/range.vue | 122 ++++++++ src/client/components/debobigego/select.vue | 145 ++++++++++ src/client/components/debobigego/suspense.vue | 101 +++++++ src/client/components/debobigego/switch.vue | 132 +++++++++ src/client/components/debobigego/textarea.vue | 161 +++++++++++ src/client/components/debobigego/tuple.vue | 36 +++ src/client/components/dialog.vue | 4 +- src/client/components/forgot-password.vue | 2 +- src/client/components/form-dialog.vue | 28 +- src/client/components/form/base.vue | 65 ----- src/client/components/form/button.vue | 81 ------ src/client/components/form/form.scss | 52 ---- src/client/components/form/group.vue | 78 ----- src/client/components/form/info.vue | 47 --- src/client/components/form/input.vue | 187 ++++++------ src/client/components/form/key-value-view.vue | 38 --- src/client/components/form/link.vue | 103 ------- src/client/components/form/object-view.vue | 102 ------- src/client/components/form/pagination.vue | 42 --- src/client/components/form/radio.vue | 122 ++++++++ src/client/components/form/radios.vue | 88 ++---- src/client/components/form/range.vue | 141 +++++---- src/client/components/form/section.vue | 31 ++ src/client/components/form/select.vue | 247 +++++++++++----- src/client/components/form/slot.vue | 50 ++++ src/client/components/form/suspense.vue | 101 ------- src/client/components/form/switch.vue | 182 ++++++------ src/client/components/form/textarea.vue | 195 +++++++++---- src/client/components/form/tuple.vue | 36 --- src/client/components/instance-stats.vue | 2 +- src/client/components/note-detailed.vue | 2 +- src/client/components/note-preview.vue | 2 +- src/client/components/note.sub.vue | 2 +- src/client/components/note.vue | 2 +- .../components/notification-setting-window.vue | 2 +- src/client/components/page/page.number-input.vue | 2 +- src/client/components/page/page.post.vue | 2 +- src/client/components/page/page.radio-button.vue | 2 +- src/client/components/page/page.switch.vue | 2 +- src/client/components/page/page.text-input.vue | 2 +- src/client/components/page/page.textarea-input.vue | 2 +- src/client/components/page/page.textarea.vue | 2 +- src/client/components/poll-editor.vue | 6 +- src/client/components/sample.vue | 8 +- src/client/components/signin.vue | 10 +- src/client/components/signup.vue | 22 +- src/client/components/tab.vue | 8 +- src/client/components/taskmanager.api-window.vue | 2 +- src/client/components/taskmanager.vue | 2 +- src/client/components/token-generate-window.vue | 6 +- src/client/components/ui/button.vue | 8 - src/client/components/ui/input.vue | 317 --------------------- src/client/components/ui/radio.vue | 122 -------- src/client/components/ui/radios.vue | 58 ---- src/client/components/ui/range.vue | 139 --------- src/client/components/ui/select.vue | 262 ----------------- src/client/components/ui/switch.vue | 144 ---------- src/client/components/ui/textarea.vue | 254 ----------------- src/client/components/user-select-dialog.vue | 4 +- src/client/components/widgets.vue | 2 +- src/client/pages/about-misskey.vue | 14 +- src/client/pages/about.vue | 16 +- src/client/pages/advanced-theme-editor.vue | 30 +- src/client/pages/api-console.vue | 8 +- src/client/pages/channel-editor.vue | 4 +- src/client/pages/channels.vue | 2 +- src/client/pages/docs.vue | 4 +- src/client/pages/emojis.category.vue | 6 +- src/client/pages/explore.vue | 2 +- src/client/pages/federation.vue | 8 +- src/client/pages/gallery/edit.vue | 24 +- src/client/pages/gallery/index.vue | 4 +- src/client/pages/instance-info.vue | 28 +- src/client/pages/instance/abuses.vue | 8 +- src/client/pages/instance/ads.vue | 6 +- src/client/pages/instance/announcements.vue | 4 +- src/client/pages/instance/bot-protection.vue | 42 +-- src/client/pages/instance/database.vue | 10 +- src/client/pages/instance/email-settings.vue | 32 +-- src/client/pages/instance/emoji-edit-dialog.vue | 2 +- src/client/pages/instance/emojis.vue | 4 +- src/client/pages/instance/file-dialog.vue | 2 +- src/client/pages/instance/files-settings.vue | 20 +- src/client/pages/instance/files.vue | 4 +- src/client/pages/instance/index.vue | 12 +- src/client/pages/instance/instance-block.vue | 18 +- src/client/pages/instance/instance.vue | 4 +- src/client/pages/instance/integrations-discord.vue | 18 +- src/client/pages/instance/integrations-github.vue | 18 +- src/client/pages/instance/integrations-twitter.vue | 18 +- src/client/pages/instance/integrations.vue | 16 +- src/client/pages/instance/logs.vue | 6 +- src/client/pages/instance/metrics.vue | 22 +- src/client/pages/instance/object-storage.vue | 36 +-- src/client/pages/instance/other-settings.vue | 18 +- src/client/pages/instance/overview.vue | 24 +- src/client/pages/instance/proxy-account.vue | 16 +- src/client/pages/instance/queue.chart.vue | 6 +- src/client/pages/instance/queue.vue | 4 +- src/client/pages/instance/relays.vue | 10 +- src/client/pages/instance/security.vue | 16 +- src/client/pages/instance/service-worker.vue | 18 +- src/client/pages/instance/settings.vue | 38 +-- src/client/pages/instance/users.vue | 4 +- src/client/pages/mfm-cheat-sheet.vue | 2 +- src/client/pages/my-antennas/editor.vue | 10 +- src/client/pages/my-groups/index.vue | 2 +- .../page-editor/els/page-editor.el.button.vue | 6 +- .../page-editor/els/page-editor.el.canvas.vue | 2 +- .../page-editor/els/page-editor.el.counter.vue | 2 +- .../pages/page-editor/els/page-editor.el.if.vue | 4 +- .../pages/page-editor/els/page-editor.el.note.vue | 4 +- .../els/page-editor.el.number-input.vue | 2 +- .../pages/page-editor/els/page-editor.el.post.vue | 6 +- .../els/page-editor.el.radio-button.vue | 4 +- .../page-editor/els/page-editor.el.section.vue | 2 +- .../page-editor/els/page-editor.el.switch.vue | 4 +- .../page-editor/els/page-editor.el.text-input.vue | 2 +- .../els/page-editor.el.textarea-input.vue | 4 +- .../pages/page-editor/page-editor.blocks.vue | 13 +- .../pages/page-editor/page-editor.script-block.vue | 94 +++--- src/client/pages/page-editor/page-editor.vue | 10 +- src/client/pages/pages.vue | 2 +- src/client/pages/reset-password.vue | 12 +- src/client/pages/reversi/game.setting.vue | 4 +- src/client/pages/room/room.vue | 2 +- src/client/pages/settings/2fa.vue | 10 +- src/client/pages/settings/account-info.vue | 10 +- src/client/pages/settings/accounts.vue | 15 +- src/client/pages/settings/api.vue | 11 +- src/client/pages/settings/apps.vue | 13 +- src/client/pages/settings/custom-css.vue | 15 +- src/client/pages/settings/deck.vue | 15 +- src/client/pages/settings/delete-account.vue | 11 +- src/client/pages/settings/drive.vue | 21 +- src/client/pages/settings/email-address.vue | 11 +- src/client/pages/settings/email-notification.vue | 21 +- src/client/pages/settings/email.vue | 15 +- .../pages/settings/experimental-features.vue | 10 +- src/client/pages/settings/general.vue | 61 ++-- src/client/pages/settings/import-export.vue | 9 +- src/client/pages/settings/index.link.vue | 97 +++++++ src/client/pages/settings/index.vue | 99 ++++--- src/client/pages/settings/integration.vue | 23 +- src/client/pages/settings/menu.vue | 15 +- src/client/pages/settings/mute-block.vue | 13 +- src/client/pages/settings/notifications.vue | 11 +- src/client/pages/settings/other.vue | 17 +- src/client/pages/settings/plugin.install.vue | 15 +- src/client/pages/settings/plugin.manage.vue | 21 +- src/client/pages/settings/plugin.vue | 9 +- src/client/pages/settings/privacy.vue | 29 +- src/client/pages/settings/profile.vue | 35 +-- src/client/pages/settings/reaction.vue | 19 +- src/client/pages/settings/registry.keys.vue | 13 +- src/client/pages/settings/registry.value.vue | 15 +- src/client/pages/settings/registry.vue | 13 +- src/client/pages/settings/security.vue | 15 +- src/client/pages/settings/sounds.vue | 15 +- src/client/pages/settings/theme.install.vue | 13 +- src/client/pages/settings/theme.manage.vue | 11 +- src/client/pages/settings/theme.vue | 27 +- src/client/pages/settings/update.vue | 15 +- src/client/pages/settings/word-mute.vue | 19 +- src/client/pages/test.vue | 8 +- src/client/pages/theme-editor.vue | 30 +- src/client/pages/user-ap-info.vue | 16 +- src/client/pages/user-info.vue | 26 +- src/client/pages/user/index.timeline.vue | 2 +- src/client/pages/welcome.setup.vue | 2 +- src/client/style.scss | 14 +- src/client/ui/_common_/sidebar.vue | 2 +- src/client/ui/chat/note-preview.vue | 2 +- src/client/ui/chat/note.sub.vue | 2 +- src/client/ui/chat/note.vue | 2 +- yarn.lock | 166 ++++++----- 192 files changed, 3628 insertions(+), 3403 deletions(-) create mode 100644 src/client/components/debobigego/base.vue create mode 100644 src/client/components/debobigego/button.vue create mode 100644 src/client/components/debobigego/debobigego.scss create mode 100644 src/client/components/debobigego/group.vue create mode 100644 src/client/components/debobigego/info.vue create mode 100644 src/client/components/debobigego/input.vue create mode 100644 src/client/components/debobigego/key-value-view.vue create mode 100644 src/client/components/debobigego/link.vue create mode 100644 src/client/components/debobigego/object-view.vue create mode 100644 src/client/components/debobigego/pagination.vue create mode 100644 src/client/components/debobigego/radios.vue create mode 100644 src/client/components/debobigego/range.vue create mode 100644 src/client/components/debobigego/select.vue create mode 100644 src/client/components/debobigego/suspense.vue create mode 100644 src/client/components/debobigego/switch.vue create mode 100644 src/client/components/debobigego/textarea.vue create mode 100644 src/client/components/debobigego/tuple.vue delete mode 100644 src/client/components/form/base.vue delete mode 100644 src/client/components/form/button.vue delete mode 100644 src/client/components/form/form.scss delete mode 100644 src/client/components/form/group.vue delete mode 100644 src/client/components/form/info.vue delete mode 100644 src/client/components/form/key-value-view.vue delete mode 100644 src/client/components/form/link.vue delete mode 100644 src/client/components/form/object-view.vue delete mode 100644 src/client/components/form/pagination.vue create mode 100644 src/client/components/form/radio.vue create mode 100644 src/client/components/form/section.vue create mode 100644 src/client/components/form/slot.vue delete mode 100644 src/client/components/form/suspense.vue delete mode 100644 src/client/components/form/tuple.vue delete mode 100644 src/client/components/ui/input.vue delete mode 100644 src/client/components/ui/radio.vue delete mode 100644 src/client/components/ui/radios.vue delete mode 100644 src/client/components/ui/range.vue delete mode 100644 src/client/components/ui/select.vue delete mode 100644 src/client/components/ui/switch.vue delete mode 100644 src/client/components/ui/textarea.vue create mode 100644 src/client/pages/settings/index.link.vue (limited to 'src/client/components') diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 72a7dc4b16..06154f1f44 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -177,6 +177,10 @@ npx ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前 ### JSONのimportに気を付けよう TypeScriptでjsonをimportすると、tscでコンパイルするときにそのjsonファイルも一緒にdistディレクトリに吐き出されてしまう。この挙動により、意図せずファイルの書き換えが発生することがあるので、jsonをimportするときは書き換えられても良いものかどうか確認すること。書き換えされて欲しくない場合は、importで読み込むのではなく、`fs.readFileSync`などの関数を使って読み込むようにすればよい。 +### コンポーネントのスタイル定義でmarginを持たせない +コンポーネント自身がmarginを設定するのは問題の元となることはよく知られている +marginはそのコンポーネントを使う側が設定する + ## その他 ### HTMLのクラス名で follow という単語は使わない 広告ブロッカーで誤ってブロックされる diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index f050ad4df8..f5f859b9ff 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -787,6 +787,8 @@ pubSub: "Pub/Subのアカウント" lastCommunication: "直近の通信" resolved: "解決済み" unresolved: "未解決" +itsOn: "オンになっています" +itsOff: "オフになっています" _accountDelete: accountDelete: "アカウントの削除" diff --git a/package.json b/package.json index 2d0c1cc5fc..9f37bea172 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "@types/websocket": "1.0.4", "@types/ws": "7.4.7", "@typescript-eslint/parser": "4.31.2", - "@vue/compiler-sfc": "3.2.13", + "@vue/compiler-sfc": "3.2.19", "abort-controller": "3.0.0", "apexcharts": "3.28.3", "autobind-decorator": "2.4.0", @@ -233,7 +233,7 @@ "uuid": "8.3.2", "v-debounce": "0.1.2", "vanilla-tilt": "1.7.2", - "vue": "3.2.13", + "vue": "3.2.19", "vue-loader": "16.7.0", "vue-prism-editor": "2.0.0-alpha.2", "vue-router": "4.0.5", @@ -241,7 +241,7 @@ "vue-svg-loader": "0.17.0-beta.2", "vuedraggable": "4.0.1", "web-push": "3.4.5", - "webpack": "5.53.0", + "webpack": "5.54.0", "webpack-cli": "4.8.0", "websocket": "1.0.34", "ws": "8.2.2", diff --git a/src/client/components/abuse-report-window.vue b/src/client/components/abuse-report-window.vue index 266c0d566f..21a19385ae 100644 --- a/src/client/components/abuse-report-window.vue +++ b/src/client/components/abuse-report-window.vue @@ -25,7 +25,7 @@ + + diff --git a/src/client/components/debobigego/button.vue b/src/client/components/debobigego/button.vue new file mode 100644 index 0000000000..b883e817a4 --- /dev/null +++ b/src/client/components/debobigego/button.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/client/components/debobigego/debobigego.scss b/src/client/components/debobigego/debobigego.scss new file mode 100644 index 0000000000..833b656b66 --- /dev/null +++ b/src/client/components/debobigego/debobigego.scss @@ -0,0 +1,52 @@ +._debobigegoPanel { + background: var(--panel); + border-radius: var(--radius); + transition: background 0.2s ease; + + &._debobigegoClickable { + &:hover { + //background: var(--panelHighlight); + } + + &:active { + background: var(--panelHighlight); + transition: background 0s; + } + } +} + +._debobigegoLabel, +._debobigegoCaption { + font-size: 80%; + color: var(--fgTransparentWeak); + + &:empty { + display: none; + } +} + +._debobigegoLabel { + position: sticky; + top: var(--stickyTop, 0px); + z-index: 2; + margin: -8px calc(var(--debobigegoXPadding) * -1) 0 calc(var(--debobigegoXPadding) * -1); + padding: 8px calc(var(--debobigegoContentHMargin) + var(--debobigegoXPadding)) 8px calc(var(--debobigegoContentHMargin) + var(--debobigegoXPadding)); + background: var(--X17); + -webkit-backdrop-filter: var(--blur, blur(10px)); + backdrop-filter: var(--blur, blur(10px)); +} + +._themeChanging_ ._debobigegoLabel { + transition: none !important; + background: transparent; +} + +._debobigegoCaption { + padding: 8px var(--debobigegoContentHMargin) 0 var(--debobigegoContentHMargin); +} + +._debobigegoItem { + & + ._debobigegoItem { + margin-top: 24px; + } +} diff --git a/src/client/components/debobigego/group.vue b/src/client/components/debobigego/group.vue new file mode 100644 index 0000000000..cba2c6ec94 --- /dev/null +++ b/src/client/components/debobigego/group.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/src/client/components/debobigego/info.vue b/src/client/components/debobigego/info.vue new file mode 100644 index 0000000000..41afb03304 --- /dev/null +++ b/src/client/components/debobigego/info.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/client/components/debobigego/input.vue b/src/client/components/debobigego/input.vue new file mode 100644 index 0000000000..d113f04d27 --- /dev/null +++ b/src/client/components/debobigego/input.vue @@ -0,0 +1,292 @@ + + + + + diff --git a/src/client/components/debobigego/key-value-view.vue b/src/client/components/debobigego/key-value-view.vue new file mode 100644 index 0000000000..0e034a2d54 --- /dev/null +++ b/src/client/components/debobigego/key-value-view.vue @@ -0,0 +1,38 @@ + + + + + diff --git a/src/client/components/debobigego/link.vue b/src/client/components/debobigego/link.vue new file mode 100644 index 0000000000..885579eadf --- /dev/null +++ b/src/client/components/debobigego/link.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/src/client/components/debobigego/object-view.vue b/src/client/components/debobigego/object-view.vue new file mode 100644 index 0000000000..ea79daa915 --- /dev/null +++ b/src/client/components/debobigego/object-view.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/src/client/components/debobigego/pagination.vue b/src/client/components/debobigego/pagination.vue new file mode 100644 index 0000000000..2166f5065f --- /dev/null +++ b/src/client/components/debobigego/pagination.vue @@ -0,0 +1,42 @@ + + + + + diff --git a/src/client/components/debobigego/radios.vue b/src/client/components/debobigego/radios.vue new file mode 100644 index 0000000000..071c013afb --- /dev/null +++ b/src/client/components/debobigego/radios.vue @@ -0,0 +1,112 @@ + + + diff --git a/src/client/components/debobigego/range.vue b/src/client/components/debobigego/range.vue new file mode 100644 index 0000000000..26fb0f37c6 --- /dev/null +++ b/src/client/components/debobigego/range.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/src/client/components/debobigego/select.vue b/src/client/components/debobigego/select.vue new file mode 100644 index 0000000000..7a31371afc --- /dev/null +++ b/src/client/components/debobigego/select.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/client/components/debobigego/suspense.vue b/src/client/components/debobigego/suspense.vue new file mode 100644 index 0000000000..e59e0ba12d --- /dev/null +++ b/src/client/components/debobigego/suspense.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/src/client/components/debobigego/switch.vue b/src/client/components/debobigego/switch.vue new file mode 100644 index 0000000000..0ee0881236 --- /dev/null +++ b/src/client/components/debobigego/switch.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/src/client/components/debobigego/textarea.vue b/src/client/components/debobigego/textarea.vue new file mode 100644 index 0000000000..64e8d47126 --- /dev/null +++ b/src/client/components/debobigego/textarea.vue @@ -0,0 +1,161 @@ + + + + + diff --git a/src/client/components/debobigego/tuple.vue b/src/client/components/debobigego/tuple.vue new file mode 100644 index 0000000000..8a4599fd64 --- /dev/null +++ b/src/client/components/debobigego/tuple.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/src/client/components/dialog.vue b/src/client/components/dialog.vue index f3611f050e..dd4932f61f 100644 --- a/src/client/components/dialog.vue +++ b/src/client/components/dialog.vue @@ -40,8 +40,8 @@ import { defineComponent } from 'vue'; import MkModal from '@client/components/ui/modal.vue'; import MkButton from '@client/components/ui/button.vue'; -import MkInput from '@client/components/ui/input.vue'; -import MkSelect from '@client/components/ui/select.vue'; +import MkInput from '@client/components/form/input.vue'; +import MkSelect from '@client/components/form/select.vue'; export default defineComponent({ components: { diff --git a/src/client/components/forgot-password.vue b/src/client/components/forgot-password.vue index 3b5ad6d6ba..cb2380f483 100644 --- a/src/client/components/forgot-password.vue +++ b/src/client/components/forgot-password.vue @@ -35,7 +35,7 @@ import { defineComponent } from 'vue'; import XModalWindow from '@client/components/ui/modal-window.vue'; import MkButton from '@client/components/ui/button.vue'; -import MkInput from '@client/components/ui/input.vue'; +import MkInput from '@client/components/form/input.vue'; import * as os from '@client/os'; export default defineComponent({ diff --git a/src/client/components/form-dialog.vue b/src/client/components/form-dialog.vue index e13592b488..6353b7287e 100644 --- a/src/client/components/form-dialog.vue +++ b/src/client/components/form-dialog.vue @@ -14,23 +14,23 @@ +
        +
        + + + + +
        + + +
        @@ -102,12 +103,28 @@ export default defineComponent({ return { [symbols.PAGE_INFO]: { title: this.$ts.explore, - icon: 'fas fa-hashtag' + icon: 'fas fa-hashtag', + bg: 'var(--bg)', }, - header: { + tab: 'local', + header: computed(() => ({ title: this.$ts.explore, - icon: 'fas fa-hashtag' - }, + icon: 'fas fa-hashtag', + bg: 'var(--bg)', + tabs: [{ + active: this.tab === 'local', + title: this.$ts.local, + onClick: () => { this.tab = 'local'; }, + }, { + active: this.tab === 'remote', + title: this.$ts.remote, + onClick: () => { this.tab = 'remote'; }, + }, { + active: this.tab === 'search', + title: this.$ts.search, + onClick: () => { this.tab = 'search'; }, + },] + })), pinnedUsers: { endpoint: 'pinned-users' }, popularUsers: { endpoint: 'users', limit: 10, noPaging: true, params: { state: 'alive', @@ -200,6 +217,7 @@ export default defineComponent({ .lznhrdub { max-width: 1400px; margin: 0 auto; + padding: 16px; } .localfedi7 { diff --git a/src/client/pages/instance/database.vue b/src/client/pages/instance/database.vue index a8a1e9a54a..ffbeed8b30 100644 --- a/src/client/pages/instance/database.vue +++ b/src/client/pages/instance/database.vue @@ -43,7 +43,8 @@ export default defineComponent({ return { [symbols.PAGE_INFO]: { title: this.$ts.database, - icon: 'fas fa-database' + icon: 'fas fa-database', + bg: 'var(--bg)', }, databasePromiseFactory: () => os.api('admin/get-table-stats', {}).then(res => Object.entries(res).sort((a, b) => b[1].size - a[1].size)), } diff --git a/src/client/pages/instance/email-settings.vue b/src/client/pages/instance/email-settings.vue index 251354a43a..ebf724fcdd 100644 --- a/src/client/pages/instance/email-settings.vue +++ b/src/client/pages/instance/email-settings.vue @@ -66,7 +66,8 @@ export default defineComponent({ return { [symbols.PAGE_INFO]: { title: this.$ts.emailServer, - icon: 'fas fa-envelope' + icon: 'fas fa-envelope', + bg: 'var(--bg)', }, enableEmail: false, email: null, diff --git a/src/client/pages/instance/files-settings.vue b/src/client/pages/instance/files-settings.vue index 8bf4613a76..8aefa9e90d 100644 --- a/src/client/pages/instance/files-settings.vue +++ b/src/client/pages/instance/files-settings.vue @@ -56,7 +56,8 @@ export default defineComponent({ return { [symbols.PAGE_INFO]: { title: this.$ts.files, - icon: 'fas fa-cloud' + icon: 'fas fa-cloud', + bg: 'var(--bg)', }, cacheRemoteFiles: false, proxyRemoteFiles: false, diff --git a/src/client/pages/instance/index.link.vue b/src/client/pages/instance/index.link.vue deleted file mode 100644 index e1f4773800..0000000000 --- a/src/client/pages/instance/index.link.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - - - diff --git a/src/client/pages/instance/index.vue b/src/client/pages/instance/index.vue index 959c4be6cd..e2cb5b8f58 100644 --- a/src/client/pages/instance/index.vue +++ b/src/client/pages/instance/index.vue @@ -1,47 +1,15 @@ diff --git a/src/client/pages/user/index.timeline.vue b/src/client/pages/user/index.timeline.vue index 8796ded469..c3444f26f6 100644 --- a/src/client/pages/user/index.timeline.vue +++ b/src/client/pages/user/index.timeline.vue @@ -1,6 +1,6 @@ diff --git a/src/client/ui/deck/main-column.vue b/src/client/ui/deck/main-column.vue index 2127444769..baf88a9721 100644 --- a/src/client/ui/deck/main-column.vue +++ b/src/client/ui/deck/main-column.vue @@ -7,7 +7,7 @@ - + diff --git a/src/client/ui/default.vue b/src/client/ui/default.vue index 69668ff96d..3518b1a91a 100644 --- a/src/client/ui/default.vue +++ b/src/client/ui/default.vue @@ -13,7 +13,7 @@
        -
        +
        diff --git a/src/client/widgets/notifications.vue b/src/client/widgets/notifications.vue index 01c76850d8..b0245eed6a 100644 --- a/src/client/widgets/notifications.vue +++ b/src/client/widgets/notifications.vue @@ -3,7 +3,7 @@ -
        +
        -- cgit v1.2.3-freya From 3f688a728b59514da94e16764cf356c6b81931ad Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 16 Oct 2021 19:30:31 +0900 Subject: :art: --- src/client/components/ui/window.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/client/components') diff --git a/src/client/components/ui/window.vue b/src/client/components/ui/window.vue index 6a7c61a7d5..00284b0467 100644 --- a/src/client/components/ui/window.vue +++ b/src/client/components/ui/window.vue @@ -382,7 +382,7 @@ export default defineComponent({