-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix conflict css by swap the json render lib
- Loading branch information
Showing
6 changed files
with
28 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,12 @@ | ||
<script lang="ts" setup> | ||
// @ts-expect-error we don't have to know | ||
import { JsonViewer } from 'vue3-json-viewer' | ||
import 'vue3-json-viewer/dist/index.css' | ||
import JsonViewer from 'vue-json-pretty' | ||
import 'vue-json-pretty/lib/styles.css' | ||
defineProps<{ | ||
value: any | ||
}>() | ||
</script> | ||
|
||
<template> | ||
<JsonViewer :value="value" class="rounded-lg" /> | ||
<JsonViewer :data="value" class="rounded-lg border-base bg-base-100 border p-4" :deep="1" /> | ||
</template> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,9 @@ | ||
import type { DeepPartial } from '@trpc/server' | ||
import { merge } from 'lodash-es' | ||
import enGB from '../../bancho.py/locales/en-GB' | ||
import type { GlobalI18n } from '~/locales/@types' | ||
import { type ServerLocale } from './@types' | ||
|
||
export default merge(enGB, { | ||
export default { | ||
landing: { | ||
content: `Welcome to {title}, a fully-featured osu! private server. We feature state-of-the-art RX and AP algorithms, while also providing PP calculation support for all modes. | ||
We have global leaderboards and unlimited times for changing your name. | ||
Our catgirl bot is available 24/7 in the group to assist you with score queries and other services. | ||
For more details, please join our QQ group: 792778662. | ||
The new version of Guccho is currently in the testing phase. If you encounter any issues or have suggestions for improvements, please feel free to contact us and communicate.`, | ||
Use the link located at the right bottom to find out more ppy.sb players in our Tencent QQ group or Discord server.`, | ||
}, | ||
} as const satisfies DeepPartial<GlobalI18n>) | ||
} satisfies ServerLocale |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,9 @@ | ||
import { merge } from 'lodash-es' | ||
import frFR from '../../bancho.py/locales/fr-FR' | ||
import type { ServerLocale } from './@types' | ||
|
||
export default merge(frFR, { | ||
export default { | ||
landing: { | ||
// TODO update fr tranlsate | ||
content: `Bienvenue sur {title} ,un serveur privé osu! complet. Nous disposons d'algorithmes Relax et Autopilot avancés, tout en calculant les pp pour tous les modes. | ||
Nous avons un classement général et vous pouvez également changer de pseudo comme bon vous semble. | ||
Notre bot catgirl est disponible 24/7 sur le groupe pour vous aider. | ||
Pour plus de détails, veuillez rejoindre notre groupe QQ: 792778662。 | ||
La nouvelle version de Guccho est actuellement dans sa phase de test. Si vous rencontrez des problèmes ou avez des suggestions, n'hésitez pas à nous contacter.`, | ||
Nous avons un classement général et vous pouvez également changer de pseudo comme bon vous semble.`, | ||
}, | ||
} satisfies ServerLocale as ServerLocale) | ||
} satisfies ServerLocale |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,15 @@ | ||
import { merge } from 'lodash-es' | ||
import zhCN from '../../bancho.py/locales/zh-CN' | ||
import type { ServerLocale } from './@types' | ||
import { CountryCode } from '~/def/country-code' | ||
|
||
export default merge(zhCN, { | ||
export default { | ||
landing: { | ||
content: `欢迎来到 {title} ,一个面向全模式的osu!私服。我们有最先进的RX,AP算法,同时为全模式提供PP计算支持。 | ||
我们拥有全图排行榜,以及无限次数的改名机会。 | ||
群内的兽耳机器人24小时为您提供成绩查询等服务。 | ||
详情请加QQ群: 792778662。 | ||
Guccho 新版本目前仍在测试阶段,如出现问题或有改进建议,欢迎与我们联系与沟通。`, | ||
欢迎通过页面右下方的链接加入QQ群或Discord服务器,和其他玩家一起享受游戏生活! | ||
我们拥有全图排行榜,以及无限次数的改名机会。`, | ||
}, | ||
country: { | ||
[CountryCode.HongKong]: '香港特别行政区', | ||
[CountryCode.Macao]: '澳门特别行政区', | ||
[CountryCode.Taiwan]: '台湾省', | ||
}, | ||
} satisfies ServerLocale as ServerLocale) | ||
} satisfies ServerLocale |