Skip to content

Commit

Permalink
feat: move urls
Browse files Browse the repository at this point in the history
  • Loading branch information
zkrising committed Apr 5, 2024
1 parent 821cc34 commit 287b5fa
Show file tree
Hide file tree
Showing 51 changed files with 190 additions and 113 deletions.
110 changes: 110 additions & 0 deletions .github/workflows/client.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
name: Client CI/CD

on:
push:
branches:
- "main"
paths:
- "client/**"
- "common/**"

pull_request:
branches:
- "main"
paths:
- "server/**"
- "common/**"
workflow_dispatch:

jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- uses: pnpm/action-setup@v2
with:
version: 7.20.0

- uses: actions/setup-node@v3
with:
node-version: 16
cache: pnpm

- name: Install dependencies
run: pnpm --filter tachi-client... --filter . install

- name: Lint
run: pnpm --filter tachi-client lint

- name: Typecheck
run: pnpm --filter tachi-client typecheck

deploy:
runs-on: [ubuntu-latest]
needs: test
if: ${{ github.event_name == 'push' }}
steps:
- name: Checkout
uses: actions/checkout@v3

- uses: pnpm/action-setup@v2
with:
version: 7.20.0

- uses: actions/setup-node@v3
with:
node-version: 16
cache: pnpm

- name: Enable SSH Key
run: |
mkdir -p ~/.ssh
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
sudo chmod 600 ~/.ssh/id_rsa
echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
env:
SSH_PRIVATE_KEY: ${{secrets.SSH_PRIVATE_KEY}}
SSH_KNOWN_HOSTS: ${{secrets.SSH_KNOWN_HOSTS}}

- name: Install dependencies
run: pnpm --filter tachi-client... --filter . install

- name: Build Bokutachi
run: pnpm --filter tachi-client build
env:
VITE_GIT_REPO: "GitHub:zkldi/Tachi"
VITE_TCHIC_MODE: "boku"
VITE_GOATCOUNTER: "https://tachi.goatcounter.com/count"
VITE_RECAPTCHA_KEY: "6LdRRKopAAAAAGNmmGSmUvkD64nysrFgSSWLq9LL"
VITE_SERVER_URL: "https://boku.tachi.ac"
VITE_DISCORD: "https://discord.gg/E4n8ZZF5ES"
VITE_CDN_URL: "https://cdn-boku.tachi.ac"
TACHI_NAME: "Bokutachi"
BUILD_OUT_DIR: "~/boku"

- name: Build Kamaitachi
run: pnpm --filter tachi-client build
env:
VITE_GOATCOUNTER: "https://tachi.goatcounter.com/count"
VITE_SERVER_URL: "https://kamai.tachi.ac"
VITE_EAG_CLIENT_ID: "C341A6CA3E72D48F0B20E84C045D15BFACD88E0A"
VITE_FLO_CLIENT_ID: "F0C0F66355B954F5DB5472AE21C59295403D60CC"
VITE_DISCORD: "https://discord.gg/NNgGJbpQUj"
VITE_TCHIC_MODE: "kamai"
VITE_CDN_URL: "https://cdn-kamai.tachi.ac"
VITE_GIT_REPO: "GitHub:zkldi/Tachi"
VITE_RECAPTCHA_KEY: "6LdRRKopAAAAAGNmmGSmUvkD64nysrFgSSWLq9LL"
TACHI_NAME: "Kamaitachi"
BUILD_OUT_DIR: ~/kamai

- name: Deploy Kamaitachi
run: scp -r ~/kamai ci@"$SSH_HOST":tachi-client
env:
SSH_HOST: ${{secrets.SSH_HOST}}

- name: Deploy Bokutachi
run: scp -r ~/boku ci@"$SSH_HOST":tachi-client
env:
SSH_HOST: ${{secrets.SSH_HOST}}
2 changes: 1 addition & 1 deletion .github/workflows/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
defaults:
run:
working-directory: ./server
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
if: ${{ github.event_name == 'push' }}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ properly is _just_ as important!

By using Tachi, you get access to powerful, novel rhythm game score-tracking features, like automatically breaking your scores into sessions, setting goals and rivals, and more!

There are way more features that Tachi has, and you can read about all of them [here](https://docs.bokutachi.xyz/wiki/features).
There are way more features that Tachi has, and you can read about all of them [here](https://docs.tachi.ac/wiki/features).

## Setup

Check the [Documentation](https://docs.bokutachi.xyz/contributing/setup) for how to set Tachi up.
Check the [Documentation](https://docs.tachi.ac/contributing/setup) for how to set Tachi up.

You can then check the component-specific guides to see how to run those components and contribute back.

Expand Down
10 changes: 5 additions & 5 deletions bot/src/slashCommands/commands/faq.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ const NEUTRAL_FAQ_ENTRIES: Record<string, string> = {
duplicates: `Scores on ${ServerConfig.name} are deduplicated based on your score and lamp (and some other things).
If you happen to get the exact same score twice, ${ServerConfig.name} will **ignore** the second one!
There are legitimate reasons for this -- it's very common for people to import the same scores twice through file uploads or import scripts.
For more info on why this is a fundamental limitation of ${ServerConfig.name}, check [the documentation](https://docs.bokutachi.xyz/wiki/score-oddities/#deduplication-false-positives-all-games).`,
For more info on why this is a fundamental limitation of ${ServerConfig.name}, check [the documentation](https://docs.tachi.ac/wiki/score-oddities/#deduplication-false-positives-all-games).`,
contribute: `Contributing to ${ServerConfig.name} in any way will get you the Contributor role, and a cool green name.\n
Contributors who save us hours (or more) of dev time, or are just generally really supportive will get the Significant Contributor role, and an even cooler orange name.
${ServerConfig.name} is an Open Source project. Feel free to read our [contribution guide](https://docs.bokutachi.xyz/contributing/), or just generally ask for stuff to help out with!`,
docs: `Documentation for ${ServerConfig.name} is stored at https://docs.bokutachi.xyz.`,
${ServerConfig.name} is an Open Source project. Feel free to read our [contribution guide](https://docs.tachi.ac/contributing/), or just generally ask for stuff to help out with!`,
docs: `Documentation for ${ServerConfig.name} is stored at https://docs.tachi.ac.`,
pbs: `A PB is all of your best scores on that specific chart joined together.
For most games, this means joining your best score with your best lamp.
Read more about this [here](https://docs.bokutachi.xyz/wiki/pbs-scores/)`,
Read more about this [here](https://docs.tachi.ac/wiki/pbs-scores/)`,
filter_directives: `Filter Directives are a fancy way of *filtering* rows inside a table.
They provide an advanced toolkit for users to perform complex queries on their data.
Read more about them [here](https://docs.bokutachi.xyz/wiki/filter-directives/)`,
Read more about them [here](https://docs.tachi.ac/wiki/filter-directives/)`,
dans: `Dans are good as a milestone for your skill. However, focusing too much on dans can be massively detrimental to your skill as a player.\n
Playing a fixed set of charts all the time will not expose you to more things, and will generally slow down your improvement as a player. Furthermore, they're stressful, and designed to be played *just* at the cusp of what you can play.\n
In short. Don't play dans too much.`,
Expand Down
2 changes: 1 addition & 1 deletion client/example/.env
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ BROWSER="none"
VITE_TCHIC_MODE="omni"
VITE_SERVER_URL="https://127.0.0.1:8080"
VITE_CDN_URL="https://127.0.0.1:8080/cdn"
VITE_GIT_REPO="GitHub:TNG-dev/Tachi"
VITE_GIT_REPO="GitHub:zkldi/Tachi"
VITE_EAG_CLIENT_ID=""
VITE_MIN_CLIENT_ID=""
VITE_FLO_CLIENT_ID=""
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/pages/RegisterPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export default function RegisterPage() {
<h4>
Hey! Before you make an account, please read the{" "}
<a
href="https://docs.bokutachi.xyz/wiki/rules/"
href="https://docs.tachi.ac/wiki/rules/"
target="_blank"
rel="noopener noreferrer"
onAuxClick={ReadRulesWait}
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/pages/dashboard/import/BeatorajaIRPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function BeatorajaIRPage({ game }: { game: "bms" | "pms" }) {
<ol className="instructions-list">
<li>
Download the latest version of the {name} IR{" "}
<ExternalLink href="https://github.com/TNG-dev/tachi-beatoraja-ir/releases">
<ExternalLink href="https://github.com/zkldi/Tachi-beatoraja-ir/releases">
here
</ExternalLink>
.
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/pages/dashboard/import/ITGHookPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default function ITGHookPage() {
<strong style={{ fontSize: "1.15rem" }}>
Edit <code>HttpAllowHosts=*.groovestats.com</code> in{" "}
<code>Preferences.ini</code> to{" "}
<code>HttpAllowHosts=*.bokutachi.xyz,bokutachi.xyz,*.groovestats.com</code>
<code>HttpAllowHosts=*.boku.tachi.ac,boku.tachi.ac,*.groovestats.com</code>
</strong>
</li>
<li>
Expand Down
4 changes: 2 additions & 2 deletions client/src/app/pages/dashboard/import/ImportPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default function ImportPage({ user }: { user: UserDocument }) {
<DiscordLink>Discord</DiscordLink>.
<br />
Know how to program, and want to write a script yourself? Check out{" "}
<ExternalLink href="https://docs.bokutachi.xyz/codebase/batch-manual">
<ExternalLink href="https://docs.tachi.ac/codebase/batch-manual">
Batch Manual
</ExternalLink>
.
Expand Down Expand Up @@ -558,7 +558,7 @@ function ImportTypeInfoCard({
<>
This is for programmers to create their own import scripts. <br /> Check
the{" "}
<ExternalLink href="https://docs.bokutachi.xyz/codebase/batch-manual">
<ExternalLink href="https://docs.tachi.ac/codebase/batch-manual">
documentation
</ExternalLink>
.
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/pages/dashboard/misc/SupportBanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export default function SupportBanner({ user }: { user: UserDocument }) {
<br />
<br />
Alternatively, you can star or contribute to the fully-open-source{" "}
<ExternalLink href="https://github.com/TNG-Dev/Tachi">GitHub Repo</ExternalLink>.
<ExternalLink href="https://github.com/zkldi/Tachi">GitHub Repo</ExternalLink>.
This makes me look cool to employers!
</span>
</Card>
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/pages/dashboard/misc/SupportMePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function SupportMePage() {
</p>
<p>
Alternatively, you can star the{" "}
<ExternalLink href="https://github.com/TNG-Dev/Tachi">GitHub Repo</ExternalLink>.
<ExternalLink href="https://github.com/zkldi/Tachi">GitHub Repo</ExternalLink>.
This makes me look cool to employers!
</p>
</div>
Expand Down
8 changes: 4 additions & 4 deletions client/src/app/pages/dashboard/users/UserIntegrationsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ function OAuthClientPage() {
with {TachiConfig.name}.
<br />
You can read the documentation{" "}
<ExternalLink href="https://docs.bokutachi.xyz/codebase/infrastructure/api-clients/">
<ExternalLink href="https://docs.tachi.ac/codebase/infrastructure/api-clients/">
here
</ExternalLink>
!
Expand Down Expand Up @@ -239,7 +239,7 @@ function CreateNewOAuthClient({ setClients }: { setClients: SetState<TachiAPICli
In what format should a generated API Key be shown to the user? This
only applies to Client File Flow. <code>%%TACHI_KEY%%</code> will be
replaced with the generated key. Read more about client file flow{" "}
<ExternalLink href="https://docs.bokutachi.xyz/codebase/infrastructure/file-flow/">
<ExternalLink href="https://docs.tachi.ac/codebase/infrastructure/file-flow/">
here
</ExternalLink>
.
Expand Down Expand Up @@ -555,7 +555,7 @@ function EditClientModal({
/>
<Muted>
Where to send webhook events to. Please read the{" "}
<ExternalLink href="https://docs.bokutachi.xyz/api/webhooks/main/">
<ExternalLink href="https://docs.tachi.ac/api/webhooks/main/">
Webhook Documentation
</ExternalLink>{" "}
before using this, as there are necessary security precautions.
Expand All @@ -573,7 +573,7 @@ function EditClientModal({
In what format should a generated API Key be shown to the user? This only
applies to Client File Flow. <code>%%TACHI_KEY%%</code> will be replaced
with the generated key. Read more about client file flow{" "}
<ExternalLink href="https://docs.bokutachi.xyz/codebase/infrastructure/file-flow/">
<ExternalLink href="https://docs.tachi.ac/codebase/infrastructure/file-flow/">
here
</ExternalLink>
.
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/pages/dashboard/utils/SeedsViewer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default function SeedsViewer() {
To view the state of a given commit or repository, use the select boxes below.
<br />
For more information what all of this is about and how it works, see{" "}
<ExternalLink href="https://docs.bokutachi.xyz/contributing/components/seeds">
<ExternalLink href="https://docs.tachi.ac/contributing/components/seeds">
the documentation
</ExternalLink>
.
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/imports/TISInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default function TISInfo({ name }: { name: string }) {
<ol className="instructions-list">
<li>
Download the latest version of the {TachiConfig.name} Import Scripts{" "}
<ExternalLink href="https://github.com/TNG-dev/tachi-import-scripts/releases">
<ExternalLink href="https://github.com/zkldi/Tachi-import-scripts/releases">
here
</ExternalLink>
.
Expand Down
6 changes: 3 additions & 3 deletions client/src/components/layout/footer/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export function Footer() {
</Nav.Link>
<Nav.Link
as={ExternalLink}
href="https://docs.bokutachi.xyz/wiki/rules"
href="https://docs.tachi.ac/wiki/rules"
className={linkClassNames}
>
Rules
Expand Down Expand Up @@ -82,14 +82,14 @@ export function Footer() {
)}
<Nav.Link
as={ExternalLink}
href="https://github.com/tng-dev/tachi"
href="https://github.com/zkldi/Tachi"
className={linkClassNames}
>
Source Code
</Nav.Link>
<Nav.Link
as={ExternalLink}
href="https://docs.bokutachi.xyz/"
href="https://docs.tachi.ac/"
className={linkClassNames}
>
Developer Documentation
Expand Down
6 changes: 0 additions & 6 deletions client/src/components/layout/misc/EmailVerify.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@ export default function EmailVerify({
)}
<br />
It might've ended up in your spam, so check there too!
<br />
<b>
Our domain ends with <code>.xyz</code>! As such, most email services will throw our
email in spam, or hold it in limbo for a couple minutes. Please be patient. Sending
email from an <code>.xyz</code> domain SUCKS!
</b>
<Divider />
<Button
onClick={async () => {
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/seeds/SeedsPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default function SeedsPicker({
// a repo is one of the following:
// null - nothing has been selected yet
// "local" - we're referring to the files on the local development disk
// "GitHub:NAME/REPO" - we're referring to a repository on github, like GitHub:TNG-Dev/Tachi
// "GitHub:NAME/REPO" - we're referring to a repository on github, like GitHub:zkldi/Tachi
const [repo, setRepo] = useState<string | null>(null);

// to list commits, we need to know what branch we're looking at.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default function FilterDirectivesIndicator<D>({
component={
<>
You can use{" "}
<ExternalLink href="https://docs.bokutachi.xyz/wiki/filter-directives/">
<ExternalLink href="https://docs.tachi.ac/wiki/filter-directives/">
<strong>Filter Directives</strong>
</ExternalLink>{" "}
inside this filter box.
Expand All @@ -78,7 +78,7 @@ export default function FilterDirectivesIndicator<D>({
<p>
This is a slightly advanced feature for{" "}
<HoverText hover="nerds">power users</HoverText>. You can read about it{" "}
<a href="https://docs.bokutachi.xyz/wiki/filter-directives/">here</a>
<a href="https://docs.tachi.ac/wiki/filter-directives/">here</a>
.<br />
The quick explanation is that you can use directives like{" "}
<code>Title=conflict Score&gt;=100</code> to perform advanced filters!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function InnerImportInputViewer({
<Muted>
For information on what each argument means,{" "}
<ExternalLink
href={`https://github.com/TNG-dev/Tachi/blob/release/2.1/server/src/lib/score-import/import-types/${importType}/parser.ts`}
href={`https://github.com/zkldi/Tachi/blob/main/server/src/lib/score-import/import-types/${importType}/parser.ts`}
>
view the signature of the parser function for <code>{importType}</code>
</ExternalLink>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default function PBNote() {
return (
<small>
Your PB is the combination of your best score and your best clear. Read more{" "}
<ExternalLink href="https://docs.bokutachi.xyz/wiki/pbs-scores/"> here</ExternalLink>.
<ExternalLink href="https://docs.tachi.ac/wiki/pbs-scores/"> here</ExternalLink>.
</small>
);
}
2 changes: 1 addition & 1 deletion client/src/lib/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ try {
<div>Welp. Looks like we're down. Sorry about that.</div>
<div>Chances are, this is just a temporary outage and will be fixed soon.</div>
<div style="font-size: 1.25rem; margin-top: 1rem; margin-bottom: 1rem;">
Please be patient, <a href="https://github.com/TNG-dev/Tachi">Tachi is maintained by a very small team.</a>
Please be patient, <a href="https://github.com/zkldi/Tachi">Tachi is maintained by a very small team.</a>
</div>
<div>An error message can be found in the console. (<code>Ctrl-Shift-I</code>)</div>
${
Expand Down
6 changes: 2 additions & 4 deletions database-seeds/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@ really do anything you want with them.

## Contribution Info

All work should be merged into `staging`. That branch is synced with the staging deploys of Tachi.

Changes will then be merged and cherry picked into `release/v*` whenever is best.
All work should be merged into `main`.

## What Databases Are Here?

Nothing private, nothing pertaining to an instance of Tachi. These are backbone files, such
as songs, charts, and folders.

You can read more about what all these documents mean in [common/](https://github.com/TNG-dev/Tachi/tree/staging/common).
You can read more about what all these documents mean in [common/](https://github.com/zkldi/Tachi/tree/main/common).

- `songs-{game}`

Expand Down
Loading

0 comments on commit 287b5fa

Please sign in to comment.