Commit a9445abf authored by GaiaXalter's avatar GaiaXalter 💬

手动合并:mycard/ygopro-arena-web:develop

parent 5ce3ebe5
Pipeline #9048 failed with stages
in 2 minutes and 46 seconds
......@@ -13,6 +13,7 @@ build:
script:
- npm ci
- npm run build
- npm run replace
artifacts:
paths:
- dist/
......
......@@ -31,5 +31,6 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
' Tip: built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n'
))
process.exit(0)
})
})
......@@ -7,7 +7,7 @@ module.exports = {
index: path.resolve(__dirname, '../dist/index.html'),
assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: 'assets',
assetsPublicPath: './',
assetsPublicPath: 'https://cdn02.moecube.com:444/ygopro/',
productionSourceMap: false,
// Gzip off by default as many popular static hosts such as
// Surge or Netlify already gzip all static assets for you.
......
......@@ -4,21 +4,21 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>MCPro决斗数据库</title>
<link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="assets/css/styles.css">
<link rel="stylesheet" href="assets/css/font-awesome.min.css">
<!--<link rel="stylesheet" href="assets/layui/css/layui.css">-->
<!--<link rel="shortcut icon" href="assets/img/mycardlogo.ico">-->
<title>MCPro 决斗数据库</title>
<link rel="stylesheet" href="https://cdn02.moecube.com:444/ygopro/assets/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="https://cdn02.moecube.com:444/ygopro/assets/css/styles.css">
<link rel="stylesheet" href="https://cdn02.moecube.com:444/ygopro/assets/css/font-awesome.min.css">
<!--<link rel="stylesheet" href="https://cdn02.moecube.com:444/ygopro/assets/layui/css/layui.css">-->
<!--<link rel="shortcut icon" href="https://cdn02.moecube.com:444/ygopro/assets/img/mycardlogo.ico">-->
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
</head>
<body>
<div id="app"></div>
<!-- built files will be auto injected -->
<script src="assets/js/jquery.min.js"></script>
<script src="assets/layui/layui.all.js"></script>
<script src="assets/bootstrap/js/bootstrap.min.js"></script>
<script src="https://cdn02.moecube.com:444/ygopro/assets/js/jquery.min.js"></script>
<script src="https://cdn02.moecube.com:444/ygopro/assets/layui/layui.all.js"></script>
<script src="https://cdn02.moecube.com:444/ygopro/assets/bootstrap/js/bootstrap.min.js"></script>
</body>
</html>
\ No newline at end of file
</html>
{
"name": "ygopro-arena-web-new",
"name": "ygopro-arena-web",
"version": "1.0.0",
"description": "A Vue.js project",
"author": "ganjingcun <343747757@qq.com>",
"description": "MCPro 决斗数据库前端",
"author": "ganjingcun <343747757@qq.com>,GaiaXalter <1239760263@qq.com>",
"private": true,
"scripts": {
"dev": "node build/dev-server.js",
"build": "node build/build.js"
"build": "node build/build.js",
"replace": "sed -r -i 's/href=\\.\\//href=https:\\/\\/cdn02.moecube.com:444\\/ygopro\\//g' ./dist/index.html"
},
"dependencies": {
"bootstrap": "5.1.3",
......
......@@ -57,7 +57,7 @@ export default class Api {
}
static getAvatar(opt) {
return Vue.http.get(`https://api.moecube.com/accounts/users/${opt.username}.avatar`)
return Vue.http.get(`https://sapi.moecube.com:444/accounts/users/${opt.username}.avatar`)
}
static getCardInfo(opt) {
......
......@@ -3,7 +3,7 @@ module.exports = {
lang: 'Language',
cn: '中文',
en: 'English',
database: 'MCPro决斗数据库',
database: 'MCPro 决斗数据库',
forum: '社区',
rank: '玩家排行',
battlelog: '战报系统',
......@@ -224,4 +224,3 @@ module.exports = {
}
}
......@@ -6,12 +6,12 @@
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<link rel="stylesheet" href="assets/deck/base.min.css" />
<link rel="stylesheet" href="assets/deck/fancy.min.css" />
<link rel="stylesheet" href="assets/deck/main.css" />
<script src="assets/deck/compatibility.min.js"></script>
<script src="assets/deck/theViewer.min.js"></script>
<!--<script src="assets/js/dom-to-image.min.js"></script>-->
<link rel="stylesheet" href="https://cdn02.moecube.com:444/ygopro/assets/deck/base.min.css" />
<link rel="stylesheet" href="https://cdn02.moecube.com:444/ygopro/assets/deck/fancy.min.css" />
<link rel="stylesheet" href="https://cdn02.moecube.com:444/ygopro/assets/deck/main.css" />
<script src="https://cdn02.moecube.com:444/ygopro/assets/deck/compatibility.min.js"></script>
<script src="https://cdn02.moecube.com:444/ygopro/assets/deck/theViewer.min.js"></script>
<!--<script src="https://cdn02.moecube.com:444/ygopro/assets/js/dom-to-image.min.js"></script>-->
<script>
try {
theViewer.defaultViewer = new theViewer.Viewer({});
......@@ -28,7 +28,7 @@
<div id="page-container">
<div id="pf1" class="pf w0 h0" data-page-no="1">
<div class="pc pc1 w0 h0">
<img class="bi x0 y0 w1 h1" alt="" src="assets/deck/bg1.png" />
<img class="bi x0 y0 w1 h1" alt="" src="https://cdn02.moecube.com:444/ygopro/assets/deck/bg1.png" />
<div class="c x1 y1 w2 h2">
<div class="t m0 x2 h3 y2 ff1 fs0 fc0 sc0 ls0 ws0">Yu<span class="ls1">#<span class="ls2">Gi</span>#<span class="ls3">Oh!)Deck)Lis<span class="_ _0"></span>t)Form<span
class="ls1">)<span class="_ _1"> </span>)</span>
......
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