client: consolidate pages #104

Manually merged
Johann150 merged 8 commits from feat/mentions-page into main 2022-09-03 22:30:44 +00:00
Owner

Pulled from 0f1c0a42a2

The following pages are consolidated:

  • Mentions and direct notes are now part of the Notifications page
  • Emoji and federation info are now part of the About page

Changelog: Changed

Pulled from https://github.com/misskey-dev/misskey/commit/0f1c0a42a253dcc5758e4811aaa116708d482305 The following pages are consolidated: - Mentions and direct notes are now part of the Notifications page - Emoji and federation info are now part of the About page Changelog: Changed
norm added 2 commits 2022-09-03 18:32:53 +00:00
Resolve #6389
Fix #8035
Re-add in mentions and direct notes to menu
Some checks failed
ci/woodpecker/push/build Pipeline was successful
ci/woodpecker/push/lint-client Pipeline was successful
ci/woodpecker/push/lint-foundkey-js Pipeline was successful
ci/woodpecker/push/lint-backend Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/pr/lint-foundkey-js Pipeline was successful
ci/woodpecker/pr/lint-backend Pipeline was successful
ci/woodpecker/pr/build Pipeline was successful
ci/woodpecker/pr/lint-client Pipeline failed
ci/woodpecker/pr/test Pipeline failed
9e0936284c
norm force-pushed feat/mentions-page from 0ae5f37bce to f0ba8d1877 2022-09-03 19:15:50 +00:00 Compare
norm changed title from WIP: client: reorganize notifications page to client: reorganize notifications page 2022-09-03 19:15:53 +00:00
norm changed title from client: reorganize notifications page to client: consolidate pages 2022-09-03 19:22:43 +00:00
Author
Owner

changed the title since the change also affected the about page as well

changed the title since the change also affected the about page as well
norm changed title from client: consolidate pages to client: reorganize menus 2022-09-03 19:23:40 +00:00
norm changed title from client: reorganize menus to client: consolidate pages 2022-09-03 19:24:46 +00:00
norm added 1 commit 2022-09-03 19:43:42 +00:00
Add en-US translation for document
Some checks failed
ci/woodpecker/pr/test Pipeline failed
ci/woodpecker/push/lint-client Pipeline was successful
ci/woodpecker/push/build Pipeline was successful
ci/woodpecker/push/lint-backend Pipeline was successful
ci/woodpecker/push/lint-foundkey-js Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/pr/lint-foundkey-js Pipeline was successful
ci/woodpecker/pr/lint-backend Pipeline was successful
ci/woodpecker/pr/build Pipeline was successful
ci/woodpecker/pr/lint-client Pipeline failed
6565289bd9
Johann150 reviewed 2022-09-03 21:09:02 +00:00
@ -4,3 +4,2 @@
<MkSpacer :content-max="800">
<div class="clupoqwt">
<XNotifications class="notifications" :include-types="includeTypes" :unread-only="tab === 'unread'"/>
<div v-if="tab === 'all' || tab === 'unread'">
Owner

I think if you use this as the default/v-else case, you wouldn't have to use this condition and also catch the case where someone enters a URL fragment by hand which does not match any of the defined tabs.

But on the other hand, since other code also depends on it, it might be a good idea to just check that initialTab is a valid tab anyway.

I think if you use this as the default/`v-else` case, you wouldn't have to use this condition and also catch the case where someone enters a URL fragment by hand which does not match any of the defined tabs. But on the other hand, since other code also depends on it, it might be a good idea to just check that `initialTab` is a valid tab anyway.
Author
Owner

I changed that to a v-else case and also added a ternary for the tab ref to make it default to all if it's not a valid tab id.

I changed that to a `v-else` case and also added a ternary for the `tab` ref to make it default to `all` if it's not a valid tab id.
Johann150 marked this conversation as resolved
@ -39,3 +66,3 @@
}
const headerActions = $computed(() => [{
const headerActions = $computed(() => [tab === 'all' ? {
Owner

Since both of these array elements depend on tab === 'all', you might as well write

const headerActions = $computed(() => tab === 'all' ? [
	// ...
] : []);
Since both of these array elements depend on `tab === 'all'`, you might as well write ```ts const headerActions = $computed(() => tab === 'all' ? [ // ... ] : []); ```
norm marked this conversation as resolved
norm added 1 commit 2022-09-03 21:31:23 +00:00
make tab default to 'all' if not valid
Some checks failed
ci/woodpecker/pr/lint-backend Pipeline was successful
ci/woodpecker/pr/build Pipeline was successful
ci/woodpecker/push/lint-backend Pipeline was successful
ci/woodpecker/push/lint-client Pipeline was successful
ci/woodpecker/push/build Pipeline was successful
ci/woodpecker/push/lint-foundkey-js Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/pr/lint-foundkey-js Pipeline was successful
ci/woodpecker/pr/lint-client Pipeline failed
ci/woodpecker/pr/test Pipeline failed
29e3d8175f
norm added 1 commit 2022-09-03 21:40:00 +00:00
make defult about page tab 'overview' if invalid
Some checks failed
ci/woodpecker/pr/lint-backend Pipeline was successful
ci/woodpecker/pr/build Pipeline was successful
ci/woodpecker/pr/lint-foundkey-js Pipeline was successful
ci/woodpecker/push/build Pipeline was successful
ci/woodpecker/push/lint-backend Pipeline was successful
ci/woodpecker/push/lint-client Pipeline was successful
ci/woodpecker/push/lint-foundkey-js Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/pr/lint-client Pipeline failed
ci/woodpecker/pr/test Pipeline failed
74ee7c84d6
Johann150 reviewed 2022-09-03 21:47:41 +00:00
@ -191,3 +191,3 @@
case 'users': return defineAsyncComponent(() => import('./users.vue'));
case 'emojis': return defineAsyncComponent(() => import('./emojis.vue'));
case 'federation': return defineAsyncComponent(() => import('../federation.vue'));
//case 'federation': return defineAsyncComponent(() => import('../federation.vue'));
Owner

I don't think we need to keep this dead code around.

I don't think we need to keep this dead code around.
norm marked this conversation as resolved
norm added 1 commit 2022-09-03 21:55:58 +00:00
remove dead code
Some checks failed
ci/woodpecker/push/build Pipeline was successful
ci/woodpecker/push/lint-client Pipeline was successful
ci/woodpecker/push/lint-foundkey-js Pipeline was successful
ci/woodpecker/push/lint-backend Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/pr/build Pipeline was successful
ci/woodpecker/pr/lint-backend Pipeline was successful
ci/woodpecker/pr/lint-foundkey-js Pipeline was successful
ci/woodpecker/pr/lint-client Pipeline failed
ci/woodpecker/pr/test Pipeline failed
892a900aee
Johann150 manually merged commit 039f6db40a into main 2022-09-03 22:30:44 +00:00
Johann150 deleted branch feat/mentions-page 2022-09-03 22:31:51 +00:00
Sign in to join this conversation.
No reviewers
No labels
feature
fix
upkeep
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: FoundKeyGang/FoundKey#104
No description provided.