diff --git a/CHANGELOG.md b/CHANGELOG.md index 302de5ab5..9c4a412e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,11 @@ You should also include the user name that made the change. ## 12.x.x (unreleased) +### Changes +- ハイライトがみつけるに統合されました +- カスタム絵文字ページはインスタンス情報ページに統合されました +- 連合ページはインスタンス情報ページに統合されました + ### Improvements - Client: Fix URL-encoded routing - Server: Allow GET method for some endpoints @syuilo diff --git a/packages/client/src/menu.ts b/packages/client/src/menu.ts index 5e281f4ea..653e26e9c 100644 --- a/packages/client/src/menu.ts +++ b/packages/client/src/menu.ts @@ -35,11 +35,6 @@ export const menuDef = reactive({ indicated: computed(() => $i != null && $i.hasPendingReceivedFollowRequest), to: '/my/follow-requests', }, - featured: { - title: 'featured', - icon: 'fas fa-fire-alt', - to: '/featured', - }, explore: { title: 'explore', icon: 'fas fa-hashtag', diff --git a/packages/client/src/pages/explore.featured.vue b/packages/client/src/pages/explore.featured.vue new file mode 100644 index 000000000..12de9e412 --- /dev/null +++ b/packages/client/src/pages/explore.featured.vue @@ -0,0 +1,16 @@ + + + diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue new file mode 100644 index 000000000..bdc96b33a --- /dev/null +++ b/packages/client/src/pages/explore.users.vue @@ -0,0 +1,143 @@ + + + + + diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue index cd0dba781..c59fb639d 100644 --- a/packages/client/src/pages/explore.vue +++ b/packages/client/src/pages/explore.vue @@ -1,90 +1,39 @@ - - diff --git a/packages/client/src/pages/featured.vue b/packages/client/src/pages/featured.vue deleted file mode 100644 index 4e3f67c76..000000000 --- a/packages/client/src/pages/featured.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts index 0018e719e..3102302ce 100644 --- a/packages/client/src/router.ts +++ b/packages/client/src/router.ts @@ -61,9 +61,6 @@ export const routes = [{ }, { path: '/about-misskey', component: page(() => import('./pages/about-misskey.vue')), -}, { - path: '/featured', - component: page(() => import('./pages/featured.vue')), }, { path: '/theme-editor', component: page(() => import('./pages/theme-editor.vue')),