Merge branch 'develop' of https://github.com/KIRAKIRA-DOUGA/KIRAKIRA-…

…Cerasus into develop

README.md

@@ -5,7 +5,7 @@
 # 项目代号 ｢<ruby>Cerasus<rp>（</rp><rt>[第13都市](https://zh.moegirl.org.cn/zh-hans/DARLING_in_the_FRANXX#cite_ref-10:~:text=%E7%AC%AC13%E9%83%BD%E5%B8%82%EF%BC%88Plantation%EF%BC%89%5B9%5D%E2%80%9C%E6%A8%B1%EF%BC%88Cerasus%EF%BC%89%E2%80%9D)</rt><rp>）</rp></ruby>｣
 ![State](https://img.shields.io/badge/STATE-ALPHA-red?style=flat-square)
 ![Tag](https://img.shields.io/badge/TAG-0.0.0-orange?style=flat-square)
-![License](https://img.shields.io/badge/LICENSE-BSD%202‐Clause-green?style=flat-square)
+![License](https://img.shields.io/badge/LICENSE-BSD%203‐Clause-green?style=flat-square)
 ![Commit Activity](https://img.shields.io/github/commit-activity/y/KIRAKIRA-DOUGA/KIRAKIRA-Cerasus?style=flat-square)
 
 前端

README_en-US.md

@@ -3,7 +3,7 @@
 # Project Code Name ｢<ruby>Cerasus<rp>（</rp><rt>[Plantation](https://zh.moegirl.org.cn/zh-hans/DARLING_in_the_FRANXX#cite_ref-10:~:text=%E7%AC%AC13%E9%83%BD%E5%B8%82%EF%BC%88Plantation%EF%BC%89%5B9%5D%E2%80%9C%E6%A8%B1%EF%BC%88Cerasus%EF%BC%89%E2%80%9D)</rt><rp>）</rp></ruby>｣
 ![State](https://img.shields.io/badge/STATE-ALPHA-red?style=flat-square)
 ![Tag](https://img.shields.io/badge/TAG-0.0.0-orange?style=flat-square)
-![License](https://img.shields.io/badge/LICENSE-BSD%202‐Clause-green?style=flat-square)
+![License](https://img.shields.io/badge/LICENSE-BSD%203‐Clause-green?style=flat-square)
 ![Commit Activity](https://img.shields.io/github/commit-activity/y/KIRAKIRA-DOUGA/KIRAKIRA-Cerasus?style=flat-square)
 
 Front-end

components/UploadEditor.vue

@@ -172,7 +172,7 @@
 							<ComboBoxItem id="tech">{{ t.category.tech }}</ComboBoxItem>
 							<ComboBoxItem id="design">{{ t.category.design }}</ComboBoxItem>
 							<ComboBoxItem id="game">{{ t.category.game }}</ComboBoxItem>
-							<ComboBoxItem id="other">{{ t.category.other }}</ComboBoxItem>
+							<ComboBoxItem id="misc">{{ t.category.misc }}</ComboBoxItem>
 						</ComboBox>
 					</section>
 

locales/English.ts

@@ -13,7 +13,7 @@ const English: LocaleIdentifiers = {
 		tech: "Tech",
 		design: "Design",
 		game: "Game",
-		other: "Other",
+		misc: "Misc",
 	},
 	content: "Content",
 	search: "Search",

locales/Indonesian.ts

@@ -13,7 +13,7 @@ const Indonesian: LocaleIdentifiers = {
 		tech: "Tech",
 		design: "Desain",
 		game: "Game",
-		other: "Lainnya",
+		misc: "Lainnya", // NEW
 	},
 	content: "Konten",
 	search: "Cari",

locales/Japanese.ts

@@ -13,7 +13,7 @@ const Japanese: LocaleIdentifiers = {
 		tech: "技術",
 		design: "デザイン",
 		game: "ゲーム",
-		other: "総合",
+		misc: "総合",
 	},
 	content: "コンテンツ",
 	search: "検索",

locales/Korean.ts

@@ -13,7 +13,7 @@ const Korean: LocaleIdentifiers = {
 		tech: "Tech",
 		design: "Design",
 		game: "Game",
-		other: "Other",
+		misc: "Misc",
 	},
 	content: "Content",
 	search: "Search",

locales/SChinese.ts

@@ -11,7 +11,7 @@ const SChinese = {
 		tech: "科技",
 		design: "设计",
 		game: "游戏",
-		other: "综合",
+		misc: "综合",
 	},
 	content: "内容",
 	search: "搜索",

locales/TChinese.ts

@@ -13,7 +13,7 @@ const TChinese: LocaleIdentifiers = {
 		tech: "科技",
 		design: "設計",
 		game: "遊戲",
-		other: "綜合",
+		misc: "綜合",
 	},
 	content: "內容",
 	search: "搜索",

locales/Vietnamese.ts

@@ -13,7 +13,7 @@ const Vietnamese: LocaleIdentifiers = {
 		tech: "Công nghệ",
 		design: "Thiết kế",
 		game: "Trò chơi",
-		other: "Khác",
+		misc: "Khác", // NEW
 	},
 	content: "Nội dung",
 	search: "Tìm kiếm",
@@ -270,7 +270,7 @@ const Vietnamese: LocaleIdentifiers = {
 	push_to_feed: "Dán lên tường",
 	cover: "Bìa",
 	select_cover: "Chọn bìa",
-	follow: "Đang theo dõi",
+	follow: "Theo dõi",
 	follow_verb: "Theo dõi",
 	following: "Đang theo dõi",
 	fans: "Người hâm mộ",

nuxt.config.ts

@@ -1,13 +1,13 @@
 // https://v3.nuxtjs.org/api/configuration/nuxt.config
 
+import pomsky from "@pomsky-lang/unplugin";
 import defineAlias from "./helpers/alias";
 import styleResources from "./helpers/style-resources";
 import cssDoodleLoader from "./plugins/vite/css-doodle";
 import docsLoader from "./plugins/vite/docs";
 import vitePluginScssVariables from "./plugins/vite/scss-variables";
 import scssVariablesLoader from "./plugins/vite/scss-variables-loader";
 import { environment } from "./utils/environment";
-import pomsky from "@pomsky-lang/unplugin";
 /* import vueNestedSFC from "vite-plugin-vue-nested-sfc";
 import CopyPlugin from "copy-webpack-plugin";
 const wasmFile = resolve("node_modules/mediainfo.js/dist/MediaInfoModule.wasm"); */
@@ -124,13 +124,6 @@ export default defineNuxtConfig({
 		},
 	},
 	nitro: {
-		devProxy: {
-			"/api": {
-				target: "https://kirakira.dev/api",
-				prependPath: true,
-				changeOrigin: true,
-			},
-		},
 		compressPublicAssets: {
 			brotli: true,
 		},

package.json

@@ -13,12 +13,11 @@
 	"homepageFallback": [
 		"https://cerasus.kirakira.moe/",
 		"https://kira.calibur.tv/",
-		"https://kirakira-cerasus.vercel.app/",
-		"https://kirakira.dev/"
+		"https://kirakira-cerasus.vercel.app/"
 	],
 	"github": "https://github.com/KIRAKIRA-DOUGA/KIRAKIRA-Cerasus",
 	"bugs": "https://github.com/KIRAKIRA-DOUGA/KIRAKIRA-Cerasus/issues",
-	"license": "BSD 2-Clause",
+	"license": "BSD 3-Clause",
 	"author": "KIRAKIRA Project Team",
 	"scripts": {
 		"build": "nuxt build && nuxt start",
@@ -109,8 +108,6 @@
 		"dashjs": "^4.7.1",
 		"gsap": "^3.11.4",
 		"js-confetti": "^0.11.0",
-		"kirakira-backend": "file:packages/kirakira-backend",
-		"kirakirabackend": "file:packages/kirakira-backend",
 		"lottie-web": "^5.12.2",
 		"mediainfo.js": "^0.1.9",
 		"mitt": "^3.0.0",