Skip to content

Commit

Permalink
rearranged dep
Browse files Browse the repository at this point in the history 
- changed to use yarn to manage jquery and bootstrap, which were the last two dependencies that were not being managed under yarn.
- changed iconfont.css from res/lib/ to res/fonts/ and deleted the res/lib/ folder because it's no longer necessary.
  • Loading branch information
@RoderickQiu
RoderickQiu committed Jul 19, 2020
1 parent 65e75e8 commit 5c8db09
Show file tree
Hide file tree
Showing 15 changed files with 55 additions and 96 deletions.
12 changes: 4 additions & 8 deletions about.html
View file
Expand Up @@ -6,16 +6,12 @@
<meta charset="UTF-8" />
<meta http-equiv="Content-Type" content="text/html" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />
<!-- solve the electron-jquery conflict, style changed due to a vscode problem -->
<script>
if (typeof module === 'object') {
window.module = module; module = undefined;
}
window.$ = require("jquery/dist/jquery.slim.min.js");
</script>
<!-- solve the electron-jquery conflict, style changed due to a vscode problem -->
<script src="res/lib/jquery.slim.min.js"></script>
<script src="res/lib/bootstrap.min.js"></script>
<link rel="stylesheet" type="text/css" href="res/lib/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="res/lib/iconfont.css" />
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="res/fonts/iconfont.css" />
<link rel="stylesheet" type="text/css" href="style.css" />
</head>

Expand Down
12 changes: 3 additions & 9 deletions floating.html
View file
Expand Up @@ -7,16 +7,10 @@
<meta http-equiv="Content-Type" content="text/html" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />
<script>
if (typeof module === 'object') {
window.module = module; module = undefined;
}
window.$ = require("jquery/dist/jquery.slim.min.js");
</script>
<!-- solve the electron-jquery conflict, style changed due to a vscode problem -->
<!-- solve the electron-jquery conflict -->
<script src="res/lib/jquery.slim.min.js"></script>
<script src="res/lib/bootstrap.min.js"></script>
<link rel="stylesheet" type="text/css" href="res/lib/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="res/lib/iconfont.css" />
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="res/fonts/iconfont.css" />
<link rel="stylesheet" type="text/css" href="style.css" />
</head>

Expand Down
16 changes: 7 additions & 9 deletions index.html
View file
Expand Up @@ -6,18 +6,16 @@
<meta charset="UTF-8" />
<meta http-equiv="Content-Type" content="text/html" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />
<script>
if (typeof module === 'object') {
window.module = module; module = undefined;
}
</script>
<!-- solve the electron-jquery conflict, style changed due to a vscode problem -->
<link rel="preload" as="style" href="loader.css" onload="this.rel='stylesheet'">
<!-- loader style preload -->
<script src="res/lib/jquery.slim.min.js"></script>
<script src="res/lib/bootstrap.bundle.min.js"></script>
<link rel="stylesheet" type="text/css" href="res/lib/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="res/lib/iconfont.css" />
<script>
window.$ = require("jquery/dist/jquery.slim.min.js");
require("popper.js");
require("bootstrap/dist/js/bootstrap.min.js");
</script>
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="res/fonts/iconfont.css" />
<link rel="stylesheet" type="text/css" href="style.css" />
</head>

Expand Down
5 changes: 4 additions & 1 deletion package.json
View file
Expand Up @@ -26,6 +26,7 @@
"dependencies": {
"@types/winreg": "1.2.30",
"auto-launch": "5.0.5",
"bootstrap": "^4.5.0",
"cmd-or-ctrl": "0.3.1",
"compare-version": "0.1.2",
"copy-to-clipboard": "3.3.1",
Expand All @@ -34,9 +35,11 @@
"electron-debug": "3.1.0",
"electron-store": "6.0.0",
"i18n": "0.10.0",
"jquery": "^3.5.1",
"leancloud-storage": "4.6.1",
"node-notifier": "7.0.1",
"node-shi": "0.4.2",
"popper.js": "^1.16.1",
"request": "2.88.2",
"windows-release": "3.3.1",
"winreg": "1.2.4"
Expand All @@ -45,4 +48,4 @@
"electron": "8.4.0",
"electron-builder": "22.6.1"
}
}
}
12 changes: 3 additions & 9 deletions placeholder.html
View file
Expand Up @@ -7,16 +7,10 @@
<meta http-equiv="Content-Type" content="text/html" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />
<script>
if (typeof module === 'object') {
window.module = module; module = undefined;
}
window.$ = require("jquery/dist/jquery.slim.min.js");
</script>
<!-- solve the electron-jquery conflict, style changed due to a vscode problem -->
<!-- solve the electron-jquery conflict -->
<script src="res/lib/jquery.slim.min.js"></script>
<script src="res/lib/bootstrap.min.js"></script>
<link rel="stylesheet" type="text/css" href="res/lib/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="res/lib/iconfont.css" />
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="res/fonts/iconfont.css" />
<link rel="stylesheet" type="text/css" href="style.css" />
</head>

Expand Down
0 res/lib/iconfont.css → res/fonts/iconfont.css
View file
File renamed without changes.
7 changes: 0 additions & 7 deletions res/lib/bootstrap.bundle.min.js
View file

This file was deleted.

7 changes: 0 additions & 7 deletions res/lib/bootstrap.min.css
View file

This file was deleted.

7 changes: 0 additions & 7 deletions res/lib/bootstrap.min.js
View file

This file was deleted.

2 changes: 0 additions & 2 deletions res/lib/jquery.slim.min.js
View file

This file was deleted.

17 changes: 7 additions & 10 deletions settings.html
View file
Expand Up @@ -6,18 +6,15 @@
<meta charset="UTF-8" />
<meta http-equiv="Content-Type" content="text/html" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />
<script>
if (typeof module === 'object') {
window.module = module; module = undefined;
}
</script>
<!-- solve the electron-jquery conflict, style changed due to a vscode problem -->
<link rel="preload" as="style" href="loader.css" onload="this.rel='stylesheet'">
<!-- loader style preload -->
<script src="res/lib/jquery.slim.min.js"></script>
<script src="res/lib/bootstrap.bundle.min.js"></script>
<link rel="stylesheet" type="text/css" href="res/lib/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="res/lib/iconfont.css" />
<script>
window.$ = require("jquery/dist/jquery.slim.min.js");
require("popper.js");
require("bootstrap/dist/js/bootstrap.min.js");
</script>
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="res/fonts/iconfont.css" />
<link rel="stylesheet" type="text/css" href="style.css" />
</head>

Expand Down
15 changes: 5 additions & 10 deletions statistics.html
View file
Expand Up @@ -6,18 +6,13 @@
<meta charset="UTF-8" />
<meta http-equiv="Content-Type" content="text/html" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />
<script>
if (typeof module === 'object') {
window.module = module; module = undefined;
}
</script>
<!-- solve the electron-jquery conflict, style changed due to a vscode problem -->
<link rel="preload" as="style" href="loader.css" onload="this.rel='stylesheet'">
<!-- loader style preload -->
<script src="res/lib/jquery.slim.min.js"></script>
<script src="res/lib/bootstrap.bundle.min.js"></script>
<link rel="stylesheet" type="text/css" href="res/lib/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="res/lib/iconfont.css" />
<script>
window.$ = require("jquery/dist/jquery.slim.min.js");
</script>
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="res/fonts/iconfont.css" />
<link rel="stylesheet" type="text/css" href="style.css" />
</head>

Expand Down
13 changes: 4 additions & 9 deletions timer.html
View file
Expand Up @@ -7,16 +7,11 @@
<meta http-equiv="Content-Type" content="text/html" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />
<script>
if (typeof module === 'object') {
window.module = module; module = undefined;
}
window.$ = require("jquery/dist/jquery.slim.min.js");
require("bootstrap/dist/js/bootstrap.min.js");
</script>
<!-- solve the electron-jquery conflict, style changed due to a vscode problem -->
<!-- solve the electron-jquery conflict -->
<script src="res/lib/jquery.slim.min.js"></script>
<script src="res/lib/bootstrap.min.js"></script>
<link rel="stylesheet" type="text/css" href="res/lib/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="res/lib/iconfont.css" />
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="res/fonts/iconfont.css" />
<link rel="stylesheet" type="text/css" href="style.css" />
</head>

Expand Down
11 changes: 3 additions & 8 deletions tourguide.html
View file
Expand Up @@ -7,15 +7,10 @@
<meta http-equiv="Content-Type" content="text/html" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimal-ui" />
<script>
if (typeof module === 'object') {
window.module = module; module = undefined;
}
window.$ = require("jquery/dist/jquery.slim.min.js");
</script>
<!-- solve the electron-jquery conflict, style changed due to a vscode problem -->
<script src="res/lib/jquery.slim.min.js"></script>
<script src="res/lib/bootstrap.min.js"></script>
<link rel="stylesheet" type="text/css" href="res/lib/iconfont.css" />
<link rel="stylesheet" type="text/css" href="res/lib/bootstrap.min.css" />
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="res/fonts/iconfont.css" />
<link rel="stylesheet" type="text/css" href="style.css" />
</head>

Expand Down
15 changes: 15 additions & 0 deletions yarn.lock
View file
Expand Up @@ -436,6 +436,11 @@ boolean@^3.0.0:
resolved "https://registry.npm.taobao.org/boolean/download/boolean-3.0.1.tgz#35ecf2b4a2ee191b0b44986f14eb5f052a5cbb4f"
integrity sha1-NezytKLuGRsLRJhvFOtfBSpcu08=

bootstrap@^4.5.0:
version "4.5.0"
resolved "https://registry.npm.taobao.org/bootstrap/download/bootstrap-4.5.0.tgz#97d9dbcb5a8972f8722c9962483543b907d9b9ec"
integrity sha1-l9nby1qJcvhyLJliSDVDuQfZuew=

boxen@^4.2.0:
version "4.2.0"
resolved "https://registry.npm.taobao.org/boxen/download/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
Expand Down Expand Up @@ -1491,6 +1496,11 @@ javascript-state-machine@^2.3.5:
resolved "https://registry.npm.taobao.org/javascript-state-machine/download/javascript-state-machine-2.4.0.tgz#d8be31ec38f24ac1a1832f0b672fc3cd5f79c96e"
integrity sha1-2L4x7DjySsGhgy8LZy/DzV95yW4=

jquery@^3.5.1:
version "3.5.1"
resolved "https://registry.npm.taobao.org/jquery/download/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
integrity sha1-17TQjhv9uGrS8aPQOeoXMEcXq7U=

js-pinyin@^0.1.9:
version "0.1.9"
resolved "https://registry.npm.taobao.org/js-pinyin/download/js-pinyin-0.1.9.tgz#cdf19335645ddb20d4630df1058aac25d256adfd"
Expand Down Expand Up @@ -2044,6 +2054,11 @@ pkg-up@^3.1.0:
dependencies:
find-up "^3.0.0"

popper.js@^1.16.1:
version "1.16.1"
resolved "https://registry.npm.taobao.org/popper.js/download/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
integrity sha1-KiI8s9x7YhPXQOQDcr5A3kPmWxs=

prepend-http@^2.0.0:
version "2.0.0"
resolved "https://registry.npm.taobao.org/prepend-http/download/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
Expand Down

0 comments on commit 5c8db09

Please sign in to comment.