From aa273ccf214a15c099ca1b7f26fd06b5287b4728 Mon Sep 17 00:00:00 2001 From: Crimekillz Date: Sun, 30 Jun 2024 11:34:59 +0200 Subject: [PATCH] Release is default docker-compose version now, fix more dead links and missing texts.... --- docs/docker-package.md | 6 +++--- docs/examples/docker-compose.yml | 8 ++------ locales/de-DE.yml | 4 ++-- .../1605585339718-instance-pinned-pages.ts | 2 +- .../migration/1697289658422-resync-with-orm.ts | 2 +- packages/client/src/navbar.ts | 2 +- packages/client/src/pages/discover.vue | 8 +++++++- packages/client/src/pages/messaging/index.vue | 14 ++++++++++++-- packages/client/src/pages/my-snippets/index.vue | 14 ++++++++++++-- packages/client/src/pages/my-space/index.vue | 3 ++- packages/client/src/pages/news.vue | 9 ++++++++- packages/client/src/pages/notifications.vue | 16 +++++++++++++++- packages/client/src/router.ts | 4 ++-- packages/client/src/ui/universal.vue | 4 ++-- 14 files changed, 70 insertions(+), 26 deletions(-) diff --git a/docs/docker-package.md b/docs/docker-package.md index d74ed8ee5..a232c6905 100644 --- a/docs/docker-package.md +++ b/docs/docker-package.md @@ -7,8 +7,8 @@ 5. # corepack enable && corepack prepare --activate && yarn --immutable 6. Log into your docker registry (for ex. iceshrimp.dev) 7. # docker login iceshrimp.dev - 8. Replace v2023.12.5-trash with however you want the docker tag to be named - 9. # docker build . -t iceshrimp.dev/crimekillz/trashposs:v2023.12.5-poss - 10. # docker push iceshrimp.dev/crimekillz/trashposs:v2023.12.5-poss + 8. Replace v2024.04.1 with however you want the docker tag to be named + 9. # docker build . -t iceshrimp.dev/crimekillz/trashposs:v2024.04.1 + 10. # docker push iceshrimp.dev/crimekillz/trashposs:v2024.04.1 11. Congratulations! You can now refer to that image in your docker-compose.yml diff --git a/docs/examples/docker-compose.yml b/docs/examples/docker-compose.yml index b26897099..80ec70da2 100644 --- a/docs/examples/docker-compose.yml +++ b/docs/examples/docker-compose.yml @@ -2,11 +2,11 @@ version: "3" services: web: - image: iceshrimp.dev/crimekillz/trashposs:dev + image: iceshrimp.dev/crimekillz/trashposs:release ### If you want to build the image locally # build: . ### If you want to build the image locally AND use Docker 20.10 -# build: +# build: # context: . # args: # DOCKER_BUILDKIT: 1 @@ -19,7 +19,6 @@ services: - "3000:3000" networks: - trashnet -# - web environment: NODE_ENV: production volumes: @@ -78,6 +77,3 @@ services: networks: trashnet: - # web: - # external: - # name: web diff --git a/locales/de-DE.yml b/locales/de-DE.yml index fcd367de0..aa428d9ef 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -1364,8 +1364,8 @@ _tutorial: step5_2: "Dein Server hat {timelines} verschiedene Timelines aktiviert." step5_3: "Die {icon} Home-Timeline ist die Timeline, in der du die Beiträge der Nutzerkonten sehen kannst, denen du folgst." - step5_4: "In der {Icon} Local-Timeline kannst du die Beiträge von jedem/jeder sehen - der/die auf diesem Server registriert ist." + step5_4: "In der {icon} Local-Timeline kannst du die Beiträge von allen sehen + die auf diesem Server registriert sind." step5_5: "Die Social-Timeline {icon} ist eine Kombination aus der Home-Timeline und der Local-Timeline." step5_6: "In der Empfohlen-Timeline {icon} kannst du Posts sehen, die von den Admins diff --git a/packages/backend/src/migration/1605585339718-instance-pinned-pages.ts b/packages/backend/src/migration/1605585339718-instance-pinned-pages.ts index 57748fe0a..8d98abbc6 100644 --- a/packages/backend/src/migration/1605585339718-instance-pinned-pages.ts +++ b/packages/backend/src/migration/1605585339718-instance-pinned-pages.ts @@ -5,7 +5,7 @@ export class instancePinnedPages1605585339718 implements MigrationInterface { } async up(queryRunner: QueryRunner): Promise { await queryRunner.query( - `ALTER TABLE "meta" ADD "pinnedPages" character varying(512) array NOT NULL DEFAULT '{"/featured", "/channels", "/discover", "/pages", "/about-misskey"}'::varchar[]`, + `ALTER TABLE "meta" ADD "pinnedPages" character varying(512) array NOT NULL DEFAULT '{"/featured", "/discover", "/about-trashposs"}'::varchar[]`, ); } async down(queryRunner: QueryRunner): Promise { diff --git a/packages/backend/src/migration/1697289658422-resync-with-orm.ts b/packages/backend/src/migration/1697289658422-resync-with-orm.ts index 6c95265c0..509d377f9 100644 --- a/packages/backend/src/migration/1697289658422-resync-with-orm.ts +++ b/packages/backend/src/migration/1697289658422-resync-with-orm.ts @@ -15,7 +15,7 @@ export class ResyncWithOrm1697289658422 implements MigrationInterface { await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "secureMode" SET NOT NULL`); await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "privateMode" SET NOT NULL`); await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "allowedHosts" SET NOT NULL`); - await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/channels,/discover,/pages,/about-trashposs}'`); + await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "pinnedPages" SET DEFAULT '{/featured,/discover,/about-trashposs}'`); await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://iceshrimp.dev/Crimekillz/trashposs'`); await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://iceshrimp.dev/Crimekillz/trashposs/issues/new'`); await queryRunner.query(`COMMENT ON COLUMN "renote_muting"."createdAt" IS 'The created date of the Muting.'`); diff --git a/packages/client/src/navbar.ts b/packages/client/src/navbar.ts index 49ea53199..0a0ccc78c 100644 --- a/packages/client/src/navbar.ts +++ b/packages/client/src/navbar.ts @@ -23,7 +23,7 @@ export const navbarItemDef = reactive({ icon: "ph-tornado ph-bold ph-lg", show: computed(() => $i != null), indicated: computed(() => $i?.hasUnreadMessagingMessage || $i?.hasUnreadAnnouncement), - to: "/my/messaging", + to: "/my/messenger", }, drive: { title: "drive", diff --git a/packages/client/src/pages/discover.vue b/packages/client/src/pages/discover.vue index 62db4532b..6ceb9882d 100644 --- a/packages/client/src/pages/discover.vue +++ b/packages/client/src/pages/discover.vue @@ -144,6 +144,10 @@ import "swiper/scss"; import "swiper/scss/virtual"; import { useRouter } from "@/router.js"; +const props = defineProps<{ + tab?: string; +}>(); + const router = useRouter(); const tabs = ["users", "featured", "channels", "pages", "reel"]; @@ -248,6 +252,7 @@ function setSwiperRef(swiper) { function onSlideChange() { tab = tabs[swiperRef.activeIndex]; + window.history.pushState(null, null, '/discover/' + tab); } function syncSlide(index) { @@ -255,7 +260,8 @@ function syncSlide(index) { } onMounted(() => { - syncSlide(tabs.indexOf(swiperRef.activeIndex)); + tab = tabs[tabs.indexOf(props.tab ?? swiperRef.activeIndex)] ?? tab; + syncSlide(tabs.indexOf(tab)); }); onActivated(() => { diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue index ee9e16296..c16b8d050 100644 --- a/packages/client/src/pages/messaging/index.vue +++ b/packages/client/src/pages/messaging/index.vue @@ -121,7 +121,7 @@ diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts index c8bd527f2..216269591 100644 --- a/packages/client/src/router.ts +++ b/packages/client/src/router.ts @@ -577,7 +577,7 @@ export const routes = [ ], }, { - path: "/my/notifications", + path: "/my/notifications/:tab?", component: page(() => import("./pages/notifications.vue")), loginRequired: true, }, @@ -588,7 +588,7 @@ export const routes = [ }, { name: "messaging", - path: "/my/messaging", + path: "/my/messenger/:tab?", component: page(() => import("./pages/messaging/index.vue")), loginRequired: true, }, diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index 233bf2aa5..598f59afe 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -86,7 +86,7 @@ :aria-label="i18n.t('messaging')" class="button messaging _button" @click=" - mainRouter.push('/my/messaging'); + mainRouter.push('/my/messenger'); updateButtonState(); " > @@ -238,7 +238,7 @@ function updateButtonState(): void { buttonAnimIndex.value = 1; return; } - if (routerState.includes("/my/messaging")) { + if (routerState.includes("/my/messaging") || routerState.includes("/my/messenger")) { buttonAnimIndex.value = 2; return; }