ready for prod

.gitlab-ci.yml

@@ -32,7 +32,9 @@ npm_build:
   stage: build
   tags:
     - linux
-  script: npm run build
+  script:
+    - mv neos.config.prod.json neos.config.json
+    - npm run build:prod
   artifacts:
     paths:
       - dist
@@ -46,18 +48,5 @@ deploy:
   dependencies: 
     - npm_build
   script:
-    - sudo apt-get install rsync
-    - 'rsync -atv --progress --human-readable --delete --exclude="neos-assets/" dist/ kirayamato@8.142.104.5:$NEOS_DEPLOY_PATH'
-    - 'rsync -atv --progress --human-readable --delete neos-assets/ kirayamato@8.142.104.5:$NEOS_DEPLOY_PATH/neos-assets'
-    - 'rsync -atv --progress --human-readable --delete ygopro-database kirayamato@8.142.104.5:$NEOS_DEPLOY_PATH/ygopro-database'
-  before_script:
-    - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
-
-    - eval $(ssh-agent -s)
-
-    - ssh-add <(echo "$NEOS_SSH_PRIVATE_KEY" | base64 -d)
-
-    - mkdir -p ~/.ssh
-    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
-    - chmod 700 ~/.ssh
-
+    - mv neos-assets dist/
+    - aws s3 --endpoint=https://minio.mycard.moe:9000 sync --delete dist/ s3://mycard/neos

.gitmodules

 [submodule "neos-protobuf"]
 	path = neos-protobuf
   url = https://code.mycard.moe/mycard/neos-protobuf.git
-[submodule "ygopro-database"]
-	path = ygopro-database
-  url = https://code.mycard.moe/mycard/ygopro-database.git

neos.config.json

 {
   "version": 4948,
-  "servers": [{
+  "servers": [
+    {
       "ip": "koishi-r.momobako.com",
       "port": "7211"
-  }],
+    }
+  ],
   "assetsPath": "/neos-assets",
   "cardImgUrl": "https://cdn02.moecube.com:444/images/ygopro-images-zh-CN",
   "cardsDbUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/cards.cdb",

neos.config.prod.json

+{
+  "version": 4948,
+  "servers": [
+    {
+      "ip": "koishi-r.momobako.com",
+      "port": "7211"
+    }
+  ],
+  "assetsPath": "https://cdn02.moecube.com:444/neos/neos-assets",
+  "cardImgUrl": "https://cdn02.moecube.com:444/images/ygopro-images-zh-CN",
+  "cardsDbUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/cards.cdb",
+  "ui": {
+    "ground": {
+      "width": 9.9,
+      "height": 8
+    },
+    "card": {
+      "transform": {
+        "x": 0.8,
+        "y": 1,
+        "z": 0.05
+      },
+      "rotation": {
+        "x": 1.55,
+        "y": 0,
+        "z": 0
+      },
+      "reverseRotation": {
+        "x": 1.55,
+        "y": 3.1,
+        "z": 0
+      },
+      "defenceRotation": {
+        "x": 1.55,
+        "y": 1.55,
+        "z": 0
+      },
+      "handRotation": {
+        "x": 1,
+        "y": 0,
+        "z": 0
+      },
+      "handHoverScaling": {
+        "x": 1.2,
+        "y": 1.2,
+        "z": 1
+      },
+      "floating": 0.02
+    },
+    "layout": {
+      "header": {
+        "height": 80
+      },
+      "content": {
+        "height": 800
+      },
+      "sider": {
+        "width": 300
+      },
+      "footer": {
+        "height": 80
+      }
+    }
+  }
+}

package.json

@@ -33,6 +33,7 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build && cp -r neos-assets dist/",
+    "build:prod": "tsc && vite build --base=https://cdn02.moecube.com:444/neos/",
     "preview": "vite preview",
     "lint": "eslint --ext .ts --ext .tsx src",
     "fmt": "eslint --ext .ts --ext .tsx src --fix",

ygopro-database @ 97dc1a6b

-Subproject commit 97dc1a6bbb51d55a2cabb1524ea2aa39521cd26e