Commit f39f4ac6 authored by nanahira's avatar nanahira

Merge branch 'master' of git.mycard.moe:mycard/mycard-mobile into patch-u16secret

parents e4fc6280 ae590fcf
...@@ -18,7 +18,7 @@ jobs: ...@@ -18,7 +18,7 @@ jobs:
- name: deploy - name: deploy
uses: actions/aws/cli@master uses: actions/aws/cli@master
with: with:
args: s3 --endpoint https://minio.mycard.moe:9000 sync dist s3://mycard/mobile args: s3 --endpoint https://minio.moenext.com:9000 sync dist s3://mycard/mobile
env: env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
...@@ -11,6 +11,7 @@ build: ...@@ -11,6 +11,7 @@ build:
dependencies: [] dependencies: []
tags: tags:
- linux - linux
image: node:16
script: script:
- npm ci - npm ci
- npm run build - npm run build
...@@ -25,6 +26,6 @@ upload_to_minio: ...@@ -25,6 +26,6 @@ upload_to_minio:
tags: tags:
- linux - linux
script: script:
- aws s3 --endpoint=https://minio.mycard.moe:9000 sync --delete dist/ s3://mycard/mobile - aws s3 --endpoint=https://minio.moenext.com:9000 sync --delete dist/ s3://mycard/mobile
only: only:
- master - master
...@@ -13,7 +13,7 @@ deploy: ...@@ -13,7 +13,7 @@ deploy:
skip_cleanup: true skip_cleanup: true
local-dir: dist local-dir: dist
upload-dir: mobile upload-dir: mobile
endpoint: https://minio.mycard.moe:9000 endpoint: https://minio.moenext.com:9000
notifications: notifications:
webhooks: webhooks:
urls: https://sapi.moecube.com:444/notify/travis urls: https://sapi.moecube.com:444/notify/travis
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
"urls": [ "urls": [
"https://sapi.moecube.com:444/apps.json", "https://sapi.moecube.com:444/apps.json",
"https://ygobbs2.com/top/quarterly.json", "https://ygobbs2.com/top/quarterly.json",
"https://mycard.moe/ygopro/api/history", "https://mycard.world/ygopro/api/history",
"https://sapi.moecube.com:444/ygopro/arena/user" "https://sapi.moecube.com:444/ygopro/arena/user"
], ],
"cacheConfig": { "cacheConfig": {
......
...@@ -44,7 +44,7 @@ export class LobbyComponent { ...@@ -44,7 +44,7 @@ export class LobbyComponent {
public storage: StorageService, public storage: StorageService,
private dialog: MatDialog private dialog: MatDialog
) { ) {
const arena_url = new URL('https://mycard.moe/ygopro/arena'); const arena_url = new URL('https://mycard.world/ygopro/arena');
arena_url.searchParams.set('sso', login.token); arena_url.searchParams.set('sso', login.token);
this.arena_url = arena_url.toString(); this.arena_url = arena_url.toString();
......
...@@ -6,7 +6,7 @@ import { environment } from './environments/environment'; ...@@ -6,7 +6,7 @@ import { environment } from './environments/environment';
// migrate // migrate
if (location.host === 'r.my-card.in') { if (location.host === 'r.my-card.in') {
location.replace('https://mycard.moe/mobile/'); location.replace('https://mycard.world/mobile/');
} }
if (environment.production) { if (environment.production) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment