fix

angular.json

@@ -44,7 +44,6 @@
         "build": {
           "builder": "@angular-builders/custom-webpack:browser",
           "options": {
-            "localize": ["zh-Hans"],
             "allowedCommonJsDependencies": [
               "glob",
               "aria2",
@@ -82,7 +81,7 @@
               "vendorChunk": true,
               "extractLicenses": false,
               "sourceMap": true,
-              "namedChunks": true
+              "namedChunks": true,
             }
           },
           "defaultConfiguration": "production"

main.js

@@ -5,13 +5,17 @@ if (elevate) return require(`./${elevate}`);
 
 const { ipcMain, app, shell, BrowserWindow, Menu, Tray, Notification } = require('electron');
 const { autoUpdater } = require('electron-updater');
-const { localStorage } = require('electron-browser-storage');
+const Store = require('electron-store');
 
 const isDev = require('electron-is-dev');
 const child_process = require('child_process');
 const path = require('path');
 require('@electron/remote/main').initialize();
 
+const store = new Store();
+const locale = store.get('locale');
+if (locale) app.commandLine.appendSwitch('lang', locale === 'zh-Hans' ? 'zh-CN' : 'en-US');
+
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow;
@@ -81,7 +85,7 @@ autoUpdater.on('update-downloaded', (event) => {
     width: 640,
     height: 360,
   });
-  updateWindow.loadURL(`file://${__dirname}/update.html`);
+  updateWindow.loadFile('projects/update/update.html');
   updateWindow.webContents.on('new-window', function (e, url) {
     e.preventDefault();
     shell.openExternal(url);
@@ -135,10 +139,7 @@ function createAria2c() {
   );
 }
 
-async function getLocale() {
-  const store = await localStorage.getItem('locale');
-  if (store) return store;
-
+function getLocale() {
   return app.getLocale().startsWith('zh') ? 'zh-Hans' : 'en-US';
 }
 
@@ -160,7 +161,7 @@ async function createWindow() {
   if (isDev) {
     mainWindow.loadURL('http://localhost:4200/');
   } else {
-    mainWindow.loadFile(path.join('dist/mycard', await getLocale(), 'index.html'));
+    mainWindow.loadFile(path.join('dist/mycard', getLocale(), 'index.html'));
   }
 
   mainWindow.webContents.on('new-window', function (e, url) {

package.json

@@ -5,8 +5,8 @@
     "ng": "ng",
     "start": "ng serve",
     "start:electron": "electron .",
-    "build": "ng build",
-    "watch": "ng build --watch --configuration development",
+    "build": "ng build --localize --base-href ..",
+    "watch": "ng build --localize --watch --configuration development",
     "pack": "electron-builder --dir",
     "dist": "electron-builder"
   },
@@ -15,10 +15,15 @@
   "author": "zh99998 <zh99998@gmail.com>",
   "dependencies": {
     "@electron/remote": "^1.2.1",
+    "bootstrap": "^5.1.0",
     "electron-browser-storage": "^1.0.7",
     "electron-is-dev": "^2.0.0",
+    "electron-store": "^8.0.0",
+    "electron-sudo": "github:mycard/electron-sudo#mycard",
     "electron-updater": "^4.3.9",
-    "raw-socket": "^1.7.0"
+    "font-awesome": "^4.7.0",
+    "raw-socket": "^1.7.0",
+    "vue": "^2.6.14"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "^12.1.1",
@@ -42,14 +47,12 @@
     "@types/mustache": "^4.1.2",
     "@types/node": "^16.4.13",
     "aria2": "^3.0.1",
-    "bootstrap": "^5.1.0",
     "candy": "https://github.com/moecube/candy/releases/download/v2.2.0/candy.tar.gz",
     "candy-shop": "github:candy-chat/candy-plugins",
     "copy-webpack-plugin": "^9.0.1",
     "electron": "^14.0.0",
     "electron-builder": "^22.11.7",
     "electron-builder-notarize": "^1.2.0",
-    "electron-sudo": "github:mycard/electron-sudo#mycard",
     "exports-loader": "^3.0.0",
     "imports-loader": "^3.0.0",
     "ini": "^2.0.0",
@@ -81,7 +84,9 @@
     "files": [
       "main.js",
       "maotama.js",
-      "dist/mycard"
+      "dist/mycard",
+      "projects/update",
+      "projects/ygopro-result"
     ],
     "extraResources": [
       "bin"

projects/update/update.html

 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta charset='utf-8'>
+  <meta http-equiv='X-UA-Compatible' content='IE=edge'>
+  <meta name='viewport' content='width=device-width, initial-scale=1, shrink-to-fit=no'>
   <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
   <!--<meta name="description" content="">-->
   <!--<meta name="author" content="">-->
   <!--<link rel="icon" href="../../favicon.ico">-->
 
-    <title id="title"></title>
+  <title id='title'></title>
 
   <!-- Bootstrap core CSS -->
-    <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
-    <script src="node_modules/vue/dist/vue.min.js"></script>
+  <link href='../../node_modules/bootstrap/dist/css/bootstrap.min.css' rel='stylesheet'>
+  <script src='../../node_modules/vue/dist/vue.min.js'></script>
   <style>
     h1 {
       margin-top: 10px;
@@ -30,48 +30,50 @@
 
 <body>
 
-<div id="vueApp">
-    <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 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>
+<div id='vueApp'>
+  <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 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>
     </p>
   </div>
 </div>
 
 <script>
-    const {ipcRenderer, remote} = require('electron');
-    const lang = require('./lang.js')
+  const { ipcRenderer } = require('electron');
+  const remote = require('@electron/remote');
+  const lang = require('./lang.js');
 
   var app = new Vue({
     el: '#vueApp',
-        created: function () {
+    created: function() {
       let locale = localStorage.getItem('locale') || remote.app.getLocale();
       if (locale.startsWith('zh-')) {
-                locale = 'zh-CN'
+        locale = 'zh-CN';
       } else {
-                locale = 'en-US'
+        locale = 'en-US';
       }
-            this.pageText = lang['update'][locale]
+      this.pageText = lang['update'][locale];
 
-            document.getElementById('title').innerHTML = this.pageText.pageTitle
+      document.getElementById('title').innerHTML = this.pageText.pageTitle;
     },
     methods: {
-            onClose(){
-                window.close()
+      onClose() {
+        window.close();
       },
-            onUpdate(){
-                ipcRenderer.send('update')
+      onUpdate() {
+        ipcRenderer.send('update');
       }
     },
     data: {
       message: 'Hello Vue!',
-            pageText:{}
+      pageText: {}
     }
-    })
+  });
 
 </script>
 </body>

projects/ygopro-finish/end_YGOPro_single.html → projects/ygopro-result/end_YGOPro_single.html

@@ -2,14 +2,14 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <link href="../node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+    <link href="../../node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
 
     <style>
         @font-face {
             font-family: 'Mogra';
             font-style: normal;
             font-weight: 400;
-            src: url('../font/Mogra-Regular.ttf');
+            src: url('font/Mogra-Regular.ttf');
         }
         html,div,body,td,tr{
             background: rgba(0,0,0,0);

projects/ygopro-result/font/OFL.txt

+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

src/app/app-routing.module.ts

-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-
-const routes: Routes = [];
-
-@NgModule({
-  imports: [RouterModule.forRoot(routes)],
-  exports: [RouterModule]
-})
-export class AppRoutingModule { }

src/app/app.module.ts

 import { CUSTOM_ELEMENTS_SCHEMA, NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 
-import { AppRoutingModule } from './app-routing.module';
 import { MyCardComponent } from './mycard/mycard.component';
 // import { WebviewDirective } from './shared/webview.directive';
 import { FormsModule } from '@angular/forms';
@@ -26,7 +25,6 @@ import { HttpClientModule } from '@angular/common/http';
   ],
   imports: [
     BrowserModule,
-    AppRoutingModule,
     FormsModule,
     HttpClientModule
   ],

src/app/mycard/mycard.component.ts

@@ -5,6 +5,7 @@ import $ from 'jquery';
 import { LoginService } from '../login/login.service';
 import { SettingsService } from '../settings.service';
 import { Tooltip } from 'bootstrap';
+import Store from 'electron-store';
 
 const autoUpdater: Electron.AutoUpdater = remote.getGlobal('autoUpdater');
 const konami_code_logger: string[] = [];
@@ -40,6 +41,33 @@ export class MyCardComponent implements OnInit {
   moesound: ElementRef;
   lastTooltip: Tooltip;
 
+  constructor(public loginService: LoginService, private ref: ChangeDetectorRef, @Inject(LOCALE_ID) public locale: string) {
+    // renderer.listenGlobal('window', 'message', (event) => {
+    //     console.log(event);
+    //     // Do something with 'event'
+    // });
+
+    this.currentWindow.on('maximize', () => this.ref.detectChanges());
+    this.currentWindow.on('unmaximize', () => this.ref.detectChanges());
+
+    autoUpdater.on('error', (error) => {
+      console.dir(error);
+      this.set_update_status('error');
+    });
+    autoUpdater.on('checking-for-update', () => {
+      this.set_update_status('checking-for-update');
+    });
+    autoUpdater.on('update-available', () => {
+      this.set_update_status('update-available');
+    });
+    autoUpdater.on('update-not-available', () => {
+      this.set_update_status('update-not-available');
+    });
+    autoUpdater.on('update-downloaded', (event) => {
+      this.set_update_status('update-downloaded');
+    });
+  }
+
   ngOnInit() {
     this.update_elements = new Map(
       Object.entries({
@@ -73,37 +101,6 @@ export class MyCardComponent implements OnInit {
     // });
   }
 
-  constructor(
-    public loginService: LoginService,
-    private ref: ChangeDetectorRef,
-    @Inject(LOCALE_ID) public locale: string
-  ) {
-    // renderer.listenGlobal('window', 'message', (event) => {
-    //     console.log(event);
-    //     // Do something with 'event'
-    // });
-
-    this.currentWindow.on('maximize', () => this.ref.detectChanges());
-    this.currentWindow.on('unmaximize', () => this.ref.detectChanges());
-
-    autoUpdater.on('error', (error) => {
-      console.dir(error);
-      this.set_update_status('error');
-    });
-    autoUpdater.on('checking-for-update', () => {
-      this.set_update_status('checking-for-update');
-    });
-    autoUpdater.on('update-available', () => {
-      this.set_update_status('update-available');
-    });
-    autoUpdater.on('update-not-available', () => {
-      this.set_update_status('update-not-available');
-    });
-    autoUpdater.on('update-downloaded', (event) => {
-      this.set_update_status('update-downloaded');
-    });
-  }
-
   update_retry() {
     autoUpdater.checkForUpdates();
   }
@@ -131,7 +128,8 @@ export class MyCardComponent implements OnInit {
 
   submit() {
     if (this.localeNew !== this.locale) {
-      localStorage.setItem(SettingsService.SETTING_LOCALE, this.localeNew);
+      const store = new Store();
+      store.set(SettingsService.SETTING_LOCALE, this.localeNew);
       remote.app.relaunch();
       remote.app.quit();
     }

src/app/ygopro/ygopro.component.ts

@@ -709,7 +709,7 @@ export class YGOProComponent implements OnInit, OnDestroy {
         data.exp_rank_ex = exp_rank_ex;
         data.arena_rank_ex = arena_rank_ex;
         if (start_time !== data.start_time) {
-          this.appsService.showResult('app/end_YGOPro_single.html', data, 202, 222);
+          this.appsService.showResult('projects/ygopro-result/end_YGOPro_single.html', data, 202, 222);
         }
       });
     } catch (error) {

src/index.html

 <!doctype html>
-<html lang='en'>
+<html>
 <head>
   <meta charset='utf-8'>
-  <title>Mycard</title>
-  <base href='/'>
+  <title>MyCard</title>
   <meta name='viewport' content='width=device-width, initial-scale=1'>
-  <link rel='icon' type='image/x-icon' href='favicon.ico'>
 </head>
 <body>
 <mycard>
-
-
   <!--<div id="loading">MyCard <span id="version"></span> Loading...</div>-->
   <div id='loading-bar'>
     <span class='navbar-brand'>MyCard</span>