Skip to content

M
mycard
Commit 351b9dd3 authored by nanahira's avatar nanahira
Browse files
Options

replace urls

parent 2346afde
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 38 deletions
app/app-detail.component.html
View file @ 351b9dd3
......@@ -109,7 +109,7 @@
</tr>
</tbody>
</table>
<a i18n href="https://mycard.moe/ygopro/arena/" target="_blank" class="moreinfo">更多资料</a>
<a i18n href="https://mycard.world/ygopro/arena/" target="_blank" class="moreinfo">更多资料</a>
</div>
<div *ngIf="currentApp.description" class="d-flex">
......@@ -146,7 +146,7 @@
<p>{{item.text}}</p>
<a i18n *ngIf="item.url" [href]="item.url" target="_blank">了解更多</a>
</div>
<!--<a href="https://mycard.moe/ygopro/arena/" target="_blank" class="moreinfo">查看所有新闻</a>-->
<!--<a href="https://mycard.world/ygopro/arena/" target="_blank" class="moreinfo">查看所有新闻</a>-->
</div>
......
app/app-detail.component.ts
View file @ 351b9dd3
......@@ -78,7 +78,7 @@ export class AppDetailComponent implements OnInit, OnChanges {
this.el.nativeElement.style.background = 'white';
}
// let top = await this.http.get('https://ygobbs.com/top.json').map(response => response.json()).toPromise();
// let top = await this.http.get('https://ygobbs2.com/top.json').map(response => response.json()).toPromise();
// console.log(top.topic_list.topics);
// (adsbygoogle = window['adsbygoogle'] || []).push({});
}
......
app/end_YGOPro_single.html
View file @ 351b9dd3
......@@ -115,7 +115,7 @@
<div id="title"></div>
<div>
<div class="icon">
<img id="icon" src="https://ygobbs.com/user_avatar/ygobbs.com/breakegg/25/1.png"/>
<img id="icon" src="https://ygobbs2.com/user_avatar/ygobbs.com/breakegg/25/1.png"/>
</div>
<div class="info">
<span id="myName">myname</span>
......@@ -148,7 +148,7 @@
<!--<div id="title">竞技匹配</div>-->
<!--<div>-->
<!--<div class="icon">-->
<!--<img src="https://ygobbs.com/user_avatar/ygobbs.com/breakegg/25/1.png"/>-->
<!--<img src="https://ygobbs2.com/user_avatar/ygobbs.com/breakegg/25/1.png"/>-->
<!--</div>-->
<!--<div class="info">-->
<!--<span id="myName">myname</span>-->
......@@ -200,5 +200,3 @@
</body>
</html>
app/end_YGOPro_single.ts
View file @ 351b9dd3
......@@ -36,7 +36,7 @@ let data_str = data_url.get('data');
let data = JSON.parse(data_str!);
let titleStr;
let icon = 'https://ygobbs.com/user_avatar/ygobbs.com/' + data.myname + '/120/1.png';
let icon = 'https://ygobbs2.com/user_avatar/ygobbs2.com/' + data.myname + '/120/1.png';
let myMame = data.myname;
let winTimes, loseTimes, rank, rank_up, DP, DP_up, DP_up_sum, EXP, EXP_up;
let winOrLose = 0;
......@@ -146,5 +146,3 @@ let t = setTimeout(function () {
$('html').hover(function () {
clearTimeout(t);
});
app/lobby.component.html
View file @ 351b9dd3
......@@ -9,7 +9,7 @@
<span i18n *ngIf="grouped_apps.installed">已安装</span>
<ul *ngIf="grouped_apps.installed" class="nav nav-pills flex-column">
<li *ngFor="let app of grouped_apps.installed" class="nav-item">
<a (click)="$event.preventDefault(); chooseApp(app)" class="nav-link" [class.active]="app===currentApp" [href]="'https://mycard.moe/' + app.id">
<a (click)="$event.preventDefault(); chooseApp(app)" class="nav-link" [class.active]="app===currentApp" [href]="'https://mycard.world/' + app.id">
<img *ngIf="app.icon" class="icon" [src]="app.icon">
{{app.name}}<i *ngIf="!app.isReady() && !app.status.total" class="spin fa fa-circle-o-notch fa-spin fa-fw"></i>
<div *ngIf="!app.isReady() && app.status.total" class="progress">
......@@ -26,7 +26,7 @@
<span *ngIf="grouped_apps.test">测试</span>
<ul *ngIf="grouped_apps.test" class="nav nav-pills flex-column">
<li *ngFor="let app of grouped_apps.test" class="nav-item">
<a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.moe/' + app.id" class="nav-link" [class.active]="app===currentApp">
<a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.world/' + app.id" class="nav-link" [class.active]="app===currentApp">
<img *ngIf="app.icon" class="icon" [src]="app.icon">
{{app.name}}
</a>
......@@ -36,7 +36,7 @@
<span i18n *ngIf="grouped_apps.recommend">推荐</span>
<ul *ngIf="grouped_apps.recommend" class="nav nav-pills flex-column">
<li *ngFor="let app of grouped_apps.recommend" class="nav-item">
<a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.moe/' + app.id" class="nav-link" [class.active]="app===currentApp">
<a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.world/' + app.id" class="nav-link" [class.active]="app===currentApp">
<img *ngIf="app.icon" class="icon" [src]="app.icon">
{{app.name}}
</a>
......@@ -45,7 +45,7 @@
<span i18n *ngIf="grouped_apps.ygopro">YGOPro 各发行版</span>
<ul *ngIf="grouped_apps.ygopro" class="nav nav-pills flex-column">
<li *ngFor="let app of grouped_apps.ygopro" class="nav-item">
<a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.moe/' + app.id" class="nav-link" [class.active]="app===currentApp">
<a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.world/' + app.id" class="nav-link" [class.active]="app===currentApp">
<img *ngIf="app.icon" class="icon" [src]="app.icon">
{{app.name}}
</a>
......@@ -54,7 +54,7 @@
<span i18n *ngIf="grouped_apps.mysterious">迷之物体</span>
<ul *ngIf="grouped_apps.mysterious" class="nav nav-pills flex-column">
<li *ngFor="let app of grouped_apps.mysterious" class="nav-item">
<a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.moe/' + app.id" class="nav-link" [class.active]="app===currentApp">
<a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.world/' + app.id" class="nav-link" [class.active]="app===currentApp">
<img *ngIf="app.icon" class="icon" [src]="app.icon">
{{app.name}}
</a>
......@@ -63,7 +63,7 @@
<span i18n *ngIf="grouped_apps.touhou">东方 Project</span>
<ul *ngIf="grouped_apps.touhou" class="nav nav-pills flex-column">
<li *ngFor="let app of grouped_apps.touhou" class="nav-item">
<a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.moe/' + app.id" class="nav-link" [class.active]="app===currentApp">
<a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.world/' + app.id" class="nav-link" [class.active]="app===currentApp">
<img *ngIf="app.icon" class="icon" [src]="app.icon">
{{app.name}}
</a>
......@@ -72,7 +72,7 @@
<span i18n *ngIf="grouped_apps.touhou_pc98">东方旧作</span>
<ul *ngIf="grouped_apps.touhou_pc98" class="nav nav-pills flex-column">
<li *ngFor="let app of grouped_apps.touhou_pc98" class="nav-item">
<a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.moe/' + app.id" class="nav-link" [class.active]="app===currentApp">
<a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.world/' + app.id" class="nav-link" [class.active]="app===currentApp">
<img *ngIf="app.icon" class="icon" [src]="app.icon">
{{app.name}}
</a>
......@@ -81,7 +81,7 @@
<span i18n *ngIf="grouped_apps.runtime_installed">已安装的运行库</span>
<ul *ngIf="grouped_apps.runtime_installed" class="nav nav-pills flex-column">
<li *ngFor="let app of grouped_apps.runtime_installed" class="nav-item">
<a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.moe/' + app.id" class="nav-link" [class.active]="app===currentApp">
<a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.world/' + app.id" class="nav-link" [class.active]="app===currentApp">
<img *ngIf="app.icon" class="icon" [src]="app.icon">
{{app.name}}
</a>
......
app/login.component.ts
View file @ 351b9dd3
......@@ -14,7 +14,7 @@ import {shell} from 'electron';
})
export class LoginComponent {
url: string;
readonly return_sso_url = 'https://mycard.moe/login_callback'; // 这个url不会真的被使用，可以填写不存在的
readonly return_sso_url = 'https://mycard.world/login_callback'; // 这个url不会真的被使用，可以填写不存在的
constructor(private loginService: LoginService) {
......@@ -30,18 +30,18 @@ export class LoginComponent {
this.url = url.toString();
if (this.loginService.logging_out) {
url = new URL('https://ygobbs.com/logout');
url = new URL('https://ygobbs2.com/logout');
params = url['searchParams'];
// params.set('redirect', this.url);
// 暂时 hack 一下登出，因为聊天室现在没办法重新初始化，于是登出后刷新页面。
params.set('redirect', 'https://mycard.moe/logout_callback');
params.set('redirect', 'https://mycard.world/logout_callback');
this.url = url.toString();
}
}
return_sso(return_url: string) {
if (return_url === 'https://mycard.moe/logout_callback') {
if (return_url === 'https://mycard.world/logout_callback') {
return location.reload();
}
if (!return_url.startsWith(this.return_sso_url)) {
......
app/mycard.component.html
View file @ 351b9dd3
......@@ -49,7 +49,7 @@
<login class="page" *ngIf="!loginService.logged_in"></login>
<store class="page" *ngIf="loginService.logged_in" [hidden]="currentPage != 'store'"></store>
<lobby class="page" *ngIf="loginService.logged_in" [hidden]="currentPage != 'lobby'"></lobby>
<webview class="page" *ngIf="loginService.logged_in" [hidden]="currentPage != 'community'" src="https://ygobbs.com" (new-window)="openExternal($event.url)"></webview>
<webview class="page" *ngIf="loginService.logged_in" [hidden]="currentPage != 'community'" src="https://ygobbs2.com" (new-window)="openExternal($event.url)"></webview>
<!--<webview #moesound preload="./moesound.js" class="page" *ngIf="loginService.logged_in" [hidden]="currentPage != 'moesound'" src="http://moesound.com/" (new-window)="moesound_newwindow($event.url)" (did-finish-load)="moesound_loaded()"></webview>-->
<about class="page" *ngIf="loginService.logged_in" [hidden]="currentPage != 'about'"></about>
......
app/roster.component.html
View file @ 351b9dd3
......@@ -18,7 +18,7 @@
<!--<div id="friend_list">-->
<!--<ul>-->
<!--<li *ngFor="let contact of roster">-->
<!--<img class="fl" src="https://ygobbs.com//letter_avatar_proxy/v2/letter/q/cdc98d/45.png">-->
<!--<img class="fl" src="https://ygobbs2.com//letter_avatar_proxy/v2/letter/q/cdc98d/45.png">-->
<!--<i class="fa fa-circle green_light"></i>-->
<!--<div class="fl">-->
<!--<p>{{contact.getName()}}</p>-->
......@@ -29,7 +29,7 @@
<!--<div style="clear: both"></div>-->
<!--</li>-->
<!--<li>-->
<!--<img class="fl" src="https://ygobbs.com//letter_avatar_proxy/v2/letter/q/cdc98d/45.png">-->
<!--<img class="fl" src="https://ygobbs2.com//letter_avatar_proxy/v2/letter/q/cdc98d/45.png">-->
<!--<i class="fa fa-circle green_light"></i>-->
<!--<div class="fl">-->
<!--<p>我叫什么名来着</p>-->
......@@ -39,7 +39,7 @@
<!--</li>-->
<!--<li>-->
<!--<img class="fl" src="https://ygobbs.com/user_avatar/ygobbs.com/sky%E7%A5%9E%E6%99%BA/45/16501_1.png">-->
<!--<img class="fl" src="https://ygobbs2.com/user_avatar/ygobbs.com/sky%E7%A5%9E%E6%99%BA/45/16501_1.png">-->
<!--<i class="fa fa-play-circle red_light"></i>-->
<!--<div class="fl">-->
<!--<p>我叫什么名来着</p>-->
......@@ -49,7 +49,7 @@
<!--</li>-->
<!--<li>-->
<!--<img class="fl" src="https://ygobbs.com/user_avatar/ygobbs.com/%E6%98%9F%E5%85%89pokeboy/45/10237_1.png">-->
<!--<img class="fl" src="https://ygobbs2.com/user_avatar/ygobbs.com/%E6%98%9F%E5%85%89pokeboy/45/10237_1.png">-->
<!--<i class="fa fa-question-circle blue_light"></i>-->
<!--<div class="fl">-->
<!--<p>我叫什么名来着</p>-->
......@@ -59,7 +59,7 @@
<!--</li>-->
<!--<li>-->
<!--<img class="fl" src="https://ygobbs.com//user_avatar/ygobbs.com/%E7%B1%B3%E7%B1%B3%E7%B1%B3%E5%BE%B7%E6%8B%89%E4%BB%80/45/17187_1.png">-->
<!--<img class="fl" src="https://ygobbs2.com//user_avatar/ygobbs.com/%E7%B1%B3%E7%B1%B3%E7%B1%B3%E5%BE%B7%E6%8B%89%E4%BB%80/45/17187_1.png">-->
<!--<i class="fa fa-clock-o grey"></i>-->
<!--<div class="fl">-->
<!--<p>我叫什么名来着</p>-->
......@@ -70,4 +70,3 @@
<!--</ul>-->
<!--</div>-->
<!--</div>-->
app/ygopro.component.html
View file @ 351b9dd3
......@@ -126,7 +126,7 @@
<td class="title">{{ room.title }}</td>
<td class="users">
<img *ngFor="let user of room.users" class="avatar rounded"
[src]="'https://ygobbs.com/user_avatar/ygobbs.com/' + user.username + '/25/1.png'"
[src]="'https://ygobbs2.com/user_avatar/ygobbs.com/' + user.username + '/25/1.png'"
data-toggle="tooltip" data-placement="bottom" [title]="user.username"
(error)="avatar_fallback($event)">
</td>
......@@ -420,7 +420,7 @@
</td>
<td class="users">
<img *ngFor="let user of room.users" class="avatar rounded"
[src]="'https://ygobbs.com/user_avatar/ygobbs.com/' + user.username + '/25/1.png'"
[src]="'https://ygobbs2.com/user_avatar/ygobbs.com/' + user.username + '/25/1.png'"
data-toggle="tooltip" data-placement="bottom" [title]="user.username"
(error)="avatar_fallback($event)">
</td>
......
app/ygopro.component.ts
View file @ 351b9dd3
......@@ -544,9 +544,9 @@ export class YGOProComponent implements OnInit, OnDestroy, OnChanges {
this.replays = await this.get_replays();
this.replays2 = await this.get_replays2();
// https://mycard.moe/ygopro/api/user?username=ozxdno
// https://sapi.moecube.com:444/ygopro/arena/user?username=ozxdno
try {
let points = await this.http.get('https://mycard.moe/ygopro/api/user', {
let points = await this.http.get('https://sapi.moecube.com:444/ygopro/arena/user', {
search: {
username: this.loginService.user.username
}
......@@ -745,7 +745,7 @@ export class YGOProComponent implements OnInit, OnDestroy, OnChanges {
win.restore();
});
try {
this.http.get('https://mycard.moe/ygopro/api/history', {
this.http.get('https://sapi.moecube.com:444/ygopro/arena/history', {
search: {
page: 1,
username: this.loginService.user.username,
......@@ -774,7 +774,7 @@ export class YGOProComponent implements OnInit, OnDestroy, OnChanges {
}
});
try {
await this.http.get('https://mycard.moe/ygopro/api/history', {
await this.http.get('https://sapi.moecube.com:444/ygopro/arena/history', {
search: {
page: 1,
username: this.loginService.user.username,
......
lang.js
View file @ 351b9dd3
......@@ -10,7 +10,7 @@ module.exports = {
],
"updateFailed":{
"p1":"如果自动更新失败，请至",
"p2":"https://mycard.moe",
"p2":"https://mycard.world",
"p3":"手动下载最新版本"
},
"actions":{
......
update.html
View file @ 351b9dd3
......@@ -34,7 +34,7 @@
<div class="container">
<h1>{{pageText.updateTitle}}</h1>
<p v-for="(msg, index) in pageText.updateMsg" >{{msg}}</p>
<p>{{pageText.updateFailed.p1}} <a href="https://mycard.moe" target="_blank">{{pageText.updateFailed.p2}}</a> {{pageText.updateFailed.p3}}</p>
<p>{{pageText.updateFailed.p1}} <a href="https://mycard.world" target="_blank">{{pageText.updateFailed.p2}}</a> {{pageText.updateFailed.p3}}</p>
<p id="actions">
<button @click="onClose" type="button" class="btn btn-secondary">{{pageText.actions.close}}</button>
<button @click="onUpdate" type="button" class="btn btn-primary">{{pageText.actions.update}}</button>
......@@ -76,4 +76,3 @@
</script>
</body>
</html>
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