sim1222/misskey
1
0
Fork 0
mirror of https://github.com/sim1222/misskey.git synced 2025-08-05 08:14:12 +09:00
Code Issues Projects Releases Wiki Activity

feat: 2つの検索画面の統合 (#9949) (#10038)

Browse Source 
* feat: 検索画面の UI を統一

* fix: エラーの修正

* add: changelog

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
This commit is contained in:
Khsmty
2023-02-25 09:01:21 +09:00
committed by GitHub
parent 68e53f1526
commit 64be363adc
12 changed files with 137 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/frontend/src/ui/classic.header.vue
View File

@ -45,11 +45,11 @@
import { defineAsyncComponent, defineComponent } from 'vue';
import { openInstanceMenu } from './_common_/common';
import { host } from '@/config';
import { search } from '@/scripts/search';
import * as os from '@/os';
import { navbarItemDef } from '@/navbar';
import { openAccountMenu } from '@/account';
import MkButton from '@/components/MkButton.vue';
import { mainRouter } from '@/router';
export default defineComponent({
components: {
@ -103,7 +103,7 @@ export default defineComponent({
},
search() {
search();
mainRouter.push('/search');
},
more(ev) {

4
packages/frontend/src/ui/classic.sidebar.vue
View File

@ -44,12 +44,12 @@
import { defineAsyncComponent, defineComponent } from 'vue';
import { openInstanceMenu } from './_common_/common';
import { host } from '@/config';
import { search } from '@/scripts/search';
import * as os from '@/os';
import { navbarItemDef } from '@/navbar';
import { openAccountMenu } from '@/account';
import MkButton from '@/components/MkButton.vue';
import { StickySidebar } from '@/scripts/sticky-sidebar';
import { mainRouter } from '@/router';
//import MisskeyLogo from '@assets/client/misskey.svg';
export default defineComponent({
@ -120,7 +120,7 @@ export default defineComponent({
},
search() {
search();
mainRouter.push('/search');
},
more(ev) {

5
packages/frontend/src/ui/visitor/a.vue
View File

@ -40,7 +40,6 @@
import { defineComponent } from 'vue';
import XHeader from './header.vue';
import { host, instanceName } from '@/config';
import { search } from '@/scripts/search';
import * as os from '@/os';
import MkButton from '@/components/MkButton.vue';
import { ColdDeviceStorage } from '@/store';
@ -77,7 +76,9 @@ export default defineComponent({
if (ColdDeviceStorage.get('syncDeviceDarkMode')) return;
this.$store.set('darkMode', !this.$store.state.darkMode);
},
's': search,
's': () => {
mainRouter.push('/search');
},
'h|/': this.help,
};
},

5
packages/frontend/src/ui/visitor/b.vue
View File

@ -58,7 +58,6 @@ import { ComputedRef, onMounted, provide } from 'vue';
import XHeader from './header.vue';
import XKanban from './kanban.vue';
import { host, instanceName } from '@/config';
import { search } from '@/scripts/search';
import * as os from '@/os';
import { instance } from '@/instance';
import XSigninDialog from '@/components/MkSigninDialog.vue';
@ -97,7 +96,9 @@ const keymap = $computed(() => {
if (ColdDeviceStorage.get('syncDeviceDarkMode')) return;
defaultStore.set('darkMode', !defaultStore.state.darkMode);
},
's': search,
's': () => {
mainRouter.push('/search');
},
};
});

6
packages/frontend/src/ui/visitor/header.vue
View File

@ -27,7 +27,7 @@ import XSigninDialog from '@/components/MkSigninDialog.vue';
import XSignupDialog from '@/components/MkSignupDialog.vue';
import * as os from '@/os';
import { instance } from '@/instance';
import { search } from '@/scripts/search';
import { mainRouter } from '@/router';
export default defineComponent({
data() {
@ -55,7 +55,9 @@ export default defineComponent({
}, {}, 'closed');
},
search,
search() {
mainRouter.push('/search');
},
},
});
</script>