diff options
| author | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2023-04-05 00:41:49 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-05 00:41:49 +0900 |
| commit | 7bd0001e763a12c2b2aeb5cf4417f802cd4fbb4c (patch) | |
| tree | 62ca232417372612f78761f26669b56a80d35733 /packages/frontend/src/pages | |
| parent | Merge branch 'develop' into fix/visibility-widening (diff) | |
| parent | enhance(backend): improve cache (diff) | |
| download | misskey-7bd0001e763a12c2b2aeb5cf4417f802cd4fbb4c.tar.gz misskey-7bd0001e763a12c2b2aeb5cf4417f802cd4fbb4c.tar.bz2 misskey-7bd0001e763a12c2b2aeb5cf4417f802cd4fbb4c.zip | |
Merge branch 'develop' into fix/visibility-widening
Diffstat (limited to 'packages/frontend/src/pages')
5 files changed, 17 insertions, 10 deletions
diff --git a/packages/frontend/src/pages/notifications.vue b/packages/frontend/src/pages/notifications.vue index a5c7cdaa71..1789606cd8 100644 --- a/packages/frontend/src/pages/notifications.vue +++ b/packages/frontend/src/pages/notifications.vue @@ -2,8 +2,8 @@ <MkStickyContainer> <template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template> <MkSpacer :content-max="800"> - <div v-if="tab === 'all' || tab === 'unread'"> - <XNotifications class="notifications" :include-types="includeTypes" :unread-only="unreadOnly"/> + <div v-if="tab === 'all'"> + <XNotifications class="notifications" :include-types="includeTypes"/> </div> <div v-else-if="tab === 'mentions'"> <MkNotes :pagination="mentionsPagination"/> @@ -26,7 +26,6 @@ import { notificationTypes } from '@/const'; let tab = $ref('all'); let includeTypes = $ref<string[] | null>(null); -let unreadOnly = $computed(() => tab === 'unread'); const mentionsPagination = { endpoint: 'notes/mentions' as const, @@ -77,10 +76,6 @@ const headerTabs = $computed(() => [{ title: i18n.ts.all, icon: 'ti ti-point', }, { - key: 'unread', - title: i18n.ts.unread, - icon: 'ti ti-loader', -}, { key: 'mentions', title: i18n.ts.mentions, icon: 'ti ti-at', diff --git a/packages/frontend/src/pages/user/activity.following.vue b/packages/frontend/src/pages/user/activity.following.vue index 54360024f3..1c7c991aac 100644 --- a/packages/frontend/src/pages/user/activity.following.vue +++ b/packages/frontend/src/pages/user/activity.following.vue @@ -77,7 +77,10 @@ async function renderChart() { barPercentage: 0.7, categoryPercentage: 0.7, fill: true, - } satisfies ChartDataset, extra); + /* @see <https://github.com/misskey-dev/misskey/pull/10365#discussion_r1155511107> + } satisfies ChartData, extra); + */ + }, extra); } chartInstance = new Chart(chartEl, { diff --git a/packages/frontend/src/pages/user/activity.heatmap.vue b/packages/frontend/src/pages/user/activity.heatmap.vue index 2dcb754c9b..ada0166eda 100644 --- a/packages/frontend/src/pages/user/activity.heatmap.vue +++ b/packages/frontend/src/pages/user/activity.heatmap.vue @@ -113,6 +113,9 @@ async function renderChart() { const a = c.chart.chartArea ?? {}; return (a.bottom - a.top) / 7 - marginEachCell; }, + /* @see <https://github.com/misskey-dev/misskey/pull/10365#discussion_r1155511107> + }] satisfies ChartData[], + */ }], }, options: { diff --git a/packages/frontend/src/pages/user/activity.notes.vue b/packages/frontend/src/pages/user/activity.notes.vue index 7dd02ad6d4..8a946aebac 100644 --- a/packages/frontend/src/pages/user/activity.notes.vue +++ b/packages/frontend/src/pages/user/activity.notes.vue @@ -76,7 +76,10 @@ async function renderChart() { borderRadius: 4, barPercentage: 0.9, fill: true, - } satisfies ChartDataset, extra); + /* @see <https://github.com/misskey-dev/misskey/pull/10365#discussion_r1155511107> + } satisfies ChartData, extra); + */ + }, extra); } chartInstance = new Chart(chartEl, { diff --git a/packages/frontend/src/pages/user/activity.pv.vue b/packages/frontend/src/pages/user/activity.pv.vue index 6a7506e388..0e9c581e1e 100644 --- a/packages/frontend/src/pages/user/activity.pv.vue +++ b/packages/frontend/src/pages/user/activity.pv.vue @@ -77,7 +77,10 @@ async function renderChart() { barPercentage: 0.7, categoryPercentage: 0.7, fill: true, - } satisfies ChartDataset, extra); + /* @see <https://github.com/misskey-dev/misskey/pull/10365#discussion_r1155511107> + } satisfies ChartData, extra); + */ + }, extra); } chartInstance = new Chart(chartEl, { |