From 957a1149e000943427eafd203fc8d091136a7426 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 15 Feb 2019 14:52:21 +0900 Subject: [PATCH] =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E7=B5=90=E6=9E=9C=E3=82=92?= =?UTF-8?q?=E5=86=85=E9=83=A8=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=8D?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/app/desktop/script.ts | 4 +- .../desktop/views/deck/deck.search-column.vue | 99 +++++++++++++++++++ .../desktop/views/{pages => home}/search.vue | 74 +++++--------- src/client/app/desktop/views/home/tag.vue | 1 - 4 files changed, 128 insertions(+), 50 deletions(-) create mode 100644 src/client/app/desktop/views/deck/deck.search-column.vue rename src/client/app/desktop/views/{pages => home}/search.vue (69%) diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts index 2c2c287458..138cf6e632 100644 --- a/src/client/app/desktop/script.ts +++ b/src/client/app/desktop/script.ts @@ -18,7 +18,6 @@ import MkUserFollowingOrFollowers from './views/pages/user-following-or-follower import MkSelectDrive from './views/pages/selectdrive.vue'; import MkDrive from './views/pages/drive.vue'; import MkMessagingRoom from './views/pages/messaging-room.vue'; -import MkSearch from './views/pages/search.vue'; import MkReversi from './views/pages/games/reversi.vue'; import MkShare from './views/pages/share.vue'; import MkFollow from '../common/views/pages/follow.vue'; @@ -133,6 +132,7 @@ init(async (launch, os) => { ? { path: '/', name: 'index', component: MkDeck, children: [ { path: '/@:user', name: 'user', component: () => import('./views/deck/deck.user-column.vue').then(m => m.default) }, { path: '/notes/:note', name: 'note', component: () => import('./views/deck/deck.note-column.vue').then(m => m.default) }, + { path: '/search', component: () => import('./views/deck/deck.search-column.vue').then(m => m.default) }, { path: '/tags/:tag', name: 'tag', component: () => import('./views/deck/deck.hashtag-column.vue').then(m => m.default) }, { path: '/featured', component: () => import('./views/deck/deck.featured-column.vue').then(m => m.default) }, { path: '/i/favorites', component: () => import('./views/deck/deck.favorites-column.vue').then(m => m.default) } @@ -141,6 +141,7 @@ init(async (launch, os) => { { path: '', name: 'index', component: MkHomeTimeline }, { path: '/@:user', name: 'user', component: () => import('./views/home/user/user.vue').then(m => m.default) }, { path: '/notes/:note', name: 'note', component: () => import('./views/home/note.vue').then(m => m.default) }, + { path: '/search', component: () => import('./views/home/search.vue').then(m => m.default) }, { path: '/tags/:tag', name: 'tag', component: () => import('./views/home/tag.vue').then(m => m.default) }, { path: '/featured', component: () => import('./views/home/featured.vue').then(m => m.default) }, { path: '/i/favorites', component: () => import('./views/home/favorites.vue').then(m => m.default) } @@ -150,7 +151,6 @@ init(async (launch, os) => { { path: '/i/drive/folder/:folder', component: MkDrive }, { path: '/i/settings', component: MkSettings }, { path: '/selectdrive', component: MkSelectDrive }, - { path: '/search', component: MkSearch }, { path: '/share', component: MkShare }, { path: '/games/reversi/:game?', component: MkReversi }, { path: '/@:user/following', name: 'userFollowing', component: MkUserFollowingOrFollowers }, diff --git a/src/client/app/desktop/views/deck/deck.search-column.vue b/src/client/app/desktop/views/deck/deck.search-column.vue new file mode 100644 index 0000000000..d732f524da --- /dev/null +++ b/src/client/app/desktop/views/deck/deck.search-column.vue @@ -0,0 +1,99 @@ + + + diff --git a/src/client/app/desktop/views/pages/search.vue b/src/client/app/desktop/views/home/search.vue similarity index 69% rename from src/client/app/desktop/views/pages/search.vue rename to src/client/app/desktop/views/home/search.vue index fc31673ba8..993467b4bf 100644 --- a/src/client/app/desktop/views/pages/search.vue +++ b/src/client/app/desktop/views/home/search.vue @@ -1,12 +1,14 @@ - diff --git a/src/client/app/desktop/views/home/tag.vue b/src/client/app/desktop/views/home/tag.vue index 9e0978fb09..182c8f3512 100644 --- a/src/client/app/desktop/views/home/tag.vue +++ b/src/client/app/desktop/views/home/tag.vue @@ -98,7 +98,6 @@ export default Vue.extend({ box-shadow var(--shadow) border-radius var(--round) overflow hidden - overflow hidden .empty display block