Skip to content

M
Moecube Store
Commit 6a0bf980 authored by 神楽坂玲奈's avatar 神楽坂玲奈
Browse files
Options

Merge remote-tracking branch 'origin/mobile1' into mobile1 

# Conflicts:
#	src/app/layout/layout.component.html
parents 7ec097b0 cf566a8d
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 78 deletions
package.json
View file @ 6a0bf980
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve --host 0.0.0.0", "start": "ng serve --host 0.0.0.0",
"build": "ng build --source-map --base-href https://cdn02.moecube.com:444/store/remake/ --deploy-url https://cdn02.moecube.com:444/store/remake/", "build": "ng build --source-map --base-href https://cdntx.moecube.com.moecube.com/store/remake/ --deploy-url https://cdntx.moecube.com.moecube.com/store/remake/",
"test": "ng test" "test": "ng test"
}, },
"private": true, "private": true,
......
src/app/layout/layout.component.html
View file @ 6a0bf980
...@@ -24,58 +24,50 @@ ...@@ -24,58 +24,50 @@
</div> </div>
</nav> </nav>
<div id="banner" style="position:relative" class="home-banner text-center my-custom-container"> <div id="banner" style="position:relative" class="home-banner text-center my-custom-container">
<div class="banner-content"> <div style="width:100%;position: relative;top:10vh;text-align: center;">
<img <div class="container">
class="banner-img title-img no-select" <div class="row">
src="assets/img/font-2.png" <img
draggable="false" class="no-select col-lg-6 col-sm-10 custom-width"
alt="标题图"/> draggable="false"
<img style="margin:0 auto;width:480px;position: relative;top:10VH;margin-bottom:0.5em;"
class="banner-img desc-img no-select" src="assets/img/font-2.png"
src="assets/img/desc.png" />
draggable="false"
alt="描述图"/>
<div class="banner-flex">
<div class="left-content">
<a [href]="latest_current">
<img
src="assets/img/button-3_1.png"
class="downLoadClass"
alt="下载按钮"/>
</a>
</div> </div>
</div>
<div class="right-content"> <br/>
<div class="ad_ds">广告赞助</div> <div class="container">
<a [href]="ad_current"> <div class="row">
<img <img class="no-select col-lg-8 col-sm-9 custom-width" draggable="false"
src="assets/img/ad1.png" style="width:580px;position: relative;margin:1em auto 2em;"
class="ad" src="assets/img/desc.png"/>
alt="赞助商链接"/>
</a>
</div> </div>
</div> </div>
<div style="margin:0 auto;position: relative; top:-50px;">
<a [href]="latest_current">
<img
src="assets/img/button-3_1.png"
minwidth="20vw"
style="position: relative;top:80px; border-radius: 3px; border: 1px solid #F2F6FC"
/>
</a>
</div>
</div> </div>
<div class="scroll-indicator no-select">
<p> <div class="no-select" style="position:absolute;bottom:0;left:50%;z-index:0;color:#fff;font-size: 1.2em;">
向下 <p style="position:relative;left: -50%;">向下
<svg id="down" class="icon" viewBox="0 0 1024 1024" version="1.1" width="48" height="48"> <svg id="down" t="1688375022718" class="icon" viewBox="0 0 1024 1024" version="1.1"
width="48" height="48">
<path <path
d="M533.333333 388.266667L358.4 213.333333 298.666667 277.333333l234.666666 234.666667L768 277.333333 708.266667 213.333333l-174.933334 174.933334z m0 260.266666l-174.933333-174.933333L298.666667 533.333333l234.666666 234.666667 234.666667-234.666667-59.733333-59.733333-174.933334 174.933333z" d="M533.333333 388.266667L358.4 213.333333 298.666667 277.333333l234.666666 234.666667L768 277.333333 708.266667 213.333333l-174.933334 174.933334z m0 260.266666l-174.933333-174.933333L298.666667 533.333333l234.666666 234.666667 234.666667-234.666667-59.733333-59.733333-174.933334 174.933333z"
fill="#ffffff" fill="#ffffff" p-id="2645"></path>
p-id="2645"
></path>
</svg> </svg>
滚动 滚动
</p> </p>
</div> </div>
</div> </div>
</div> </div>
<!-- 游戏王全卡模拟器--> <!-- 游戏王全卡模拟器-->
<div class="priority my-custom-container container-fluid text-center bg-blue-dark "> <div class="priority my-custom-container container-fluid text-center bg-blue-dark ">
<div class="row"> <div class="row">
...@@ -155,21 +147,19 @@ ...@@ -155,21 +147,19 @@
<div class="col-3 mb-4"> <div class="col-3 mb-4">
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">
<img class="section-third-pic col-12 rounded" <img class="section-third-pic col-12 rounded"
src="https://cdn02.moecube.com:444/store/en-US/assets/ozns_1.jpg"/> src="https://cdntx.moecube.com.moecube.com/store/en-US/assets/ozns_1.jpg"/>
</div> </div>
</div> </div>
<div class="col-3 mb-4"> <div class="col-3 mb-4">
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">
<a [href]="ad_current"> <img class="section-third-pic col-12 rounded"
<img class="section-third-pic col-12 rounded" src="https://cdntx.moecube.com.moecube.com/store/en-US/assets/eddyviolet_1.jpg"/>
src="assets/img/ad1.png"/>
</a>
</div> </div>
</div> </div>
<div class="col-3 mb-4"> <div class="col-3 mb-4">
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">
<img class="section-third-pic col-12 rounded" <img class="section-third-pic col-12 rounded"
src="https://cdn02.moecube.com:444/store/en-US/assets/df02_1.jpg"/> src="https://cdntx.moecube.com.moecube.com/store/en-US/assets/df02_1.jpg"/>
</div> </div>
</div> </div>
<div class="col-3 mb-4"> <div class="col-3 mb-4">
...@@ -180,21 +170,19 @@ ...@@ -180,21 +170,19 @@
<div class="col-3 mb-4"> <div class="col-3 mb-4">
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">
<img class="section-third-pic col-12 rounded" <img class="section-third-pic col-12 rounded"
src="https://cdn02.moecube.com:444/store/en-US/assets/ozns_2.jpg"/> src="https://cdntx.moecube.com.moecube.com/store/en-US/assets/ozns_2.jpg"/>
</div> </div>
</div> </div>
<div class="col-3 mb-4"> <div class="col-3 mb-4">
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">
<a [href]="ad_current"> <img class="section-third-pic col-12 rounded"
<img class="section-third-pic col-12 rounded" src="https://cdntx.moecube.com.moecube.com/store/en-US/assets/eddyviolet_2.jpg"/>
src="assets/img/ad2.png"/>
</a>
</div> </div>
</div> </div>
<div class="col-3 mb-4"> <div class="col-3 mb-4">
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">
<img class="section-third-pic col-12 rounded" <img class="section-third-pic col-12 rounded"
src="https://cdn02.moecube.com:444/store/en-US/assets/df02_2.jpg"/> src="https://cdntx.moecube.com.moecube.com/store/en-US/assets/df02_2.jpg"/>
</div> </div>
</div> </div>
...@@ -215,7 +203,7 @@ ...@@ -215,7 +203,7 @@
</div> </div>
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">
<img class="section-third-pic col-12 rounded" <img class="section-third-pic col-12 rounded"
src="https://cdn02.moecube.com:444/store/en-US/assets/ozns_1.jpg"/> src="https://cdntx.moecube.com.moecube.com/store/en-US/assets/ozns_1.jpg"/>
</div> </div>
</div> </div>
</div> </div>
...@@ -223,15 +211,13 @@ ...@@ -223,15 +211,13 @@
<div class="carousel-item"> <div class="carousel-item">
<div class="row"> <div class="row">
<div class="d-flex justify-content-center mb-4 "> <div class="d-flex justify-content-center mb-4 ">
<a [href]="ad_current"> <img class="section-third-pic col-12 rounded"
<img class="section-third-pic col-12 rounded" src="https://cdntx.moecube.com.moecube.com/store/en-US/assets/eddyviolet_1.jpg"/>
src="assets/img/ad1.png"/>
</a>
</div> </div>
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">
<img class="section-third-pic col-12 rounded" <img class="section-third-pic col-12 rounded"
src="https://cdn02.moecube.com:444/store/en-US/assets/df02_1.jpg"/> src="https://cdntx.moecube.com.moecube.com/store/en-US/assets/df02_1.jpg"/>
</div> </div>
</div> </div>
</div> </div>
...@@ -244,22 +230,20 @@ ...@@ -244,22 +230,20 @@
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">
<img class="section-third-pic col-12 rounded" <img class="section-third-pic col-12 rounded"
src="https://cdn02.moecube.com:444/store/en-US/assets/ozns_2.jpg"/> src="https://cdntx.moecube.com.moecube.com/store/en-US/assets/ozns_2.jpg"/>
</div> </div>
</div> </div>
</div> </div>
<div class="carousel-item"> <div class="carousel-item">
<div class="row"> <div class="row">
<div class="d-flex justify-content-center mb-4"> <div class="d-flex justify-content-center mb-4">
<a [href]="ad_current"> <img class="section-third-pic col-12 rounded"
<img class="section-third-pic col-12 rounded" src="https://cdntx.moecube.com.moecube.com/store/en-US/assets/eddyviolet_2.jpg"/>
src="assets/img/ad2.png"/>
</a>
</div> </div>
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">
<img class="section-third-pic col-12 rounded" <img class="section-third-pic col-12 rounded"
src="https://cdn02.moecube.com:444/store/en-US/assets/df02_2.jpg"/> src="https://cdntx.moecube.com.moecube.com/store/en-US/assets/df02_2.jpg"/>
</div> </div>
</div> </div>
</div> </div>
...@@ -381,8 +365,8 @@ ...@@ -381,8 +365,8 @@
实时玩家排行 <br/> 实时玩家排行 <br/>
排表、打印实卡比赛卡表等特色功能 <br/> 排表、打印实卡比赛卡表等特色功能 <br/>
</p> </p>
<p style="font-size: 1em;color:#313154;">{{ matchCount.year }}年{{ matchCount.month }} <p style="font-size: 1em;color:#313154;">{{matchCount.year}}年{{matchCount.month}}
月进行了 {{ matchCount.count }} 场对战</p> 月进行了 {{matchCount.count}} 场对战</p>
<button class="btn btn-primary" (click)='navigateToUrl("https://mycard.world/ygopro/arena")'>>>&nbsp;进入决斗数据库 <button class="btn btn-primary" (click)='navigateToUrl("https://mycard.world/ygopro/arena")'>>>&nbsp;进入决斗数据库
</button> </button>
</div> </div>
...@@ -413,7 +397,7 @@ ...@@ -413,7 +397,7 @@
</div> </div>
</div> </div>
</div> </div>
<!--决斗数据库--> <!--决斗数据库-->
<div class="priority d-lg-none my-custom-container container-fluid text-center bg-blue-light"> <div class="priority d-lg-none my-custom-container container-fluid text-center bg-blue-light">
<div class="col-12 mt-0 mb-0 details detailText"> <div class="col-12 mt-0 mb-0 details detailText">
<p style="font-size: 1.6em;color:#313154">决斗数据库</p> <p style="font-size: 1.6em;color:#313154">决斗数据库</p>
...@@ -423,8 +407,7 @@ ...@@ -423,8 +407,7 @@
实时玩家排行 <br/> 实时玩家排行 <br/>
排表、打印实卡比赛卡表等特色功能 <br/> 排表、打印实卡比赛卡表等特色功能 <br/>
</p> </p>
<p style="font-size: 1em;color:#313154;">{{ matchCount.year }}年{{ matchCount.month }} <p style="font-size: 1em;color:#313154;">{{matchCount.year}}年{{matchCount.month}}月进行了 {{matchCount.count}}
月进行了 {{ matchCount.count }}
场对战</p> 场对战</p>
<button class="btn btn-primary" (click)='navigateToUrl("https://mycard.world/ygopro/arena")'>>>&nbsp;进入决斗数据库 <button class="btn btn-primary" (click)='navigateToUrl("https://mycard.world/ygopro/arena")'>>>&nbsp;进入决斗数据库
</button> </button>
...@@ -448,6 +431,4 @@ ...@@ -448,6 +431,4 @@
class="footer container-fluid text-center text-white align-items-center bg-black custom-footer d-flex justify-content-center"> class="footer container-fluid text-center text-white align-items-center bg-black custom-footer d-flex justify-content-center">
<p class="m-3">© MyCard 2021 all rights reserved.</p> <p class="m-3">© MyCard 2021 all rights reserved.</p>
</footer> </footer>
</div> </div>
src/app/layout/layout.component.ts
View file @ 6a0bf980
...@@ -25,16 +25,16 @@ export class LayoutComponent implements OnInit, AfterViewInit { ...@@ -25,16 +25,16 @@ export class LayoutComponent implements OnInit, AfterViewInit {
}; };
latest_win32 = this.http latest_win32 = this.http
.get('https://cdn02.moecube.com:444/downloads/latest.yml', {responseType: 'text'}) .get('https://cdntx.moecube.com.moecube.com/downloads/latest.yml', {responseType: 'text'})
.pipe(map(rawData => 'https://cdn02.moecube.com:444/downloads/' + yaml.parse(rawData).path)); .pipe(map(rawData => 'https://cdntx.moecube.com.moecube.com/downloads/' + yaml.parse(rawData).path));
latest_linux = this.http latest_linux = this.http
.get('https://cdn02.moecube.com:444/downloads/latest-linux.yml', {responseType: 'text'}) .get('https://cdntx.moecube.com.moecube.com/downloads/latest-linux.yml', {responseType: 'text'})
.pipe(map(rawData => 'https://cdn02.moecube.com:444/downloads/' + yaml.parse(rawData).path)); .pipe(map(rawData => 'https://cdntx.moecube.com.moecube.com/downloads/' + yaml.parse(rawData).path));
latest_drawin = this.http latest_drawin = this.http
.get('https://cdn02.moecube.com:444/downloads/latest-mac.yml', {responseType: 'text'}) .get('https://cdntx.moecube.com.moecube.com/downloads/latest-mac.yml', {responseType: 'text'})
.pipe(map((rawData) => 'https://cdn02.moecube.com:444/downloads/' + yaml.parse(rawData).path.replace('-mac.zip', '.dmg'))); .pipe(map((rawData) => 'https://cdntx.moecube.com.moecube.com/downloads/' + yaml.parse(rawData).path.replace('-mac.zip', '.dmg')));
latest_current = 'https://ocean-h5.doinggame.com/?v=last' latest_current = 'https://ocean-h5.doinggame.com/?v=last'
ad_current = 'https://ocean-h5.doinggame.com/?v=last' ad_current = 'https://ocean-h5.doinggame.com/?v=last'
...@@ -45,7 +45,7 @@ export class LayoutComponent implements OnInit, AfterViewInit { ...@@ -45,7 +45,7 @@ export class LayoutComponent implements OnInit, AfterViewInit {
}) })
.pipe(map((data: any) => data.global_reports.find((item: { type: any; }) => item.type === 'signups').total)); .pipe(map((data: any) => data.global_reports.find((item: { type: any; }) => item.type === 'signups').total));
stats_online = this.http.get('https://api.moecube.com/stats/online', {responseType: 'text'}).pipe( stats_online = this.http.get('https://sapi.moecube.com:444/stats/online', {responseType: 'text'}).pipe(
map(rawText => { map(rawText => {
const doc = new DOMParser().parseFromString(rawText, 'text/xml'); const doc = new DOMParser().parseFromString(rawText, 'text/xml');
const node = doc.querySelector('#content > table > tbody > tr:nth-child(2) > td:nth-child(2)'); const node = doc.querySelector('#content > table > tbody > tr:nth-child(2) > td:nth-child(2)');
......
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