Skip to content
This repository was archived by the owner on Apr 25, 2024. It is now read-only.

Commit d7463d6

Browse files
lyimmilyimmi
committed
fix mdi load after ubuntu 20.04 update & cut some fat from js
1 parent 0bfb6b1 commit d7463d6

File tree

10 files changed

+41
-129
lines changed

10 files changed

+41
-129
lines changed

Diff for: ‎frontend/package-lock.json

+22-69
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎frontend/package.json

+4-11
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,15 @@
99
},
1010
"dependencies": {
1111
"@wailsapp/runtime": "^1.1.1",
12-
"babel-polyfill": "^6.26.0",
1312
"core-js": "^3.6.5",
14-
"js-base64": "^2.6.4",
15-
"lodash": "^4.17.20",
16-
"lru-cache": "^5.1.1",
17-
"material-design-icons-iconfont": "^5.0.1",
1813
"vue": "^2.6.12",
19-
"vue-router": "^3.4.6",
20-
"vuetify": "^2.3.13",
14+
"vue-router": "^3.4.9",
15+
"vuetify": "^2.3.19",
2116
"vuetify-loader": "^1.6.0",
22-
"vuex": "^3.5.1"
17+
"vuex": "^3.6.0"
2318
},
2419
"devDependencies": {
25-
"@mdi/font": "^5.6.55",
20+
"@mdi/font": "^5.8.55",
2621
"@vue/cli-plugin-babel": "^4.5.7",
2722
"@vue/cli-plugin-eslint": "^4.5.7",
2823
"@vue/cli-service": "^4.5.7",
@@ -32,11 +27,9 @@
3227
"eslint": "^7.10.0",
3328
"eslint-plugin-vue": "^6.2.2",
3429
"eventsource-polyfill": "^0.9.6",
35-
"fibers": "^5.0.0",
3630
"sass": "^1.27.0",
3731
"sass-loader": "^8.0.2",
3832
"serialize-javascript": "^5.0.1",
39-
"shvl": "^2.0.1",
4033
"vue-cli-plugin-vuetify-preset-rally": "~1.0.4",
4134
"vue-template-compiler": "^2.6.12",
4235
"webpack-hot-middleware": "^2.25.0"

Diff for: ‎frontend/package.json.md5

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b4b2d142682ff94393b63ce6894c4f6b
1+
78de4214e935576c1750eaa23b222ded

Diff for: ‎frontend/src/App.vue

+1-3
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,11 @@ export default {
8787
computed: {
8888
...mapGetters("Settings", ["darkTheme"]),
8989
},
90-
created() {
90+
mounted() {
9191
if (this.$router.history.current.path !== "/home") {
9292
this.$router.push("home");
9393
}
9494
this.setUpMasterErrorHandler();
95-
},
96-
mounted() {
9795
this.$vuetify.theme.dark = this.darkTheme;
9896
this.$root.$refs.confirm = this.$refs.confirm;
9997
},

Diff for: ‎frontend/src/main.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import "babel-polyfill";
2-
import * as Wails from "@wailsapp/runtime";
31
import Vue from "vue";
42
import store from "./store";
53
import vuetify from "@/plugins/vuetify"; // path to vuetify export
@@ -22,6 +20,8 @@ Vue.config.devtools = true;
2220
Vue.prototype.$config = config;
2321
Vue.prototype.$ticker = new Ticker(250);
2422

23+
import Wails from '@wailsapp/runtime';
24+
2525
Wails.Init(() => {
2626
new Vue({
2727
preset,

Diff for: ‎frontend/src/plugins/vuetify.js

-13
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,15 @@
11
import "@mdi/font/css/materialdesignicons.css"; // Ensure you are using css-loader
22
import Vue from "vue";
33
import Vuetify from "vuetify/lib";
4-
import LRU from "lru-cache";
54

65
Vue.use(Vuetify);
76

8-
const themeCache = new LRU({
9-
max: 10,
10-
maxAge: 1000 * 60 * 60 // 1 hour
11-
});
127

138
export default new Vuetify({
149
icons: {
1510
iconfont: "mdi" // default - only for display purposes
1611
},
1712
theme: {
18-
options: {
19-
themeCache,
20-
minifyTheme: function(css) {
21-
return process.env.NODE_ENV === "production"
22-
? css.replace(/[\r\n|\r|\n]/g, "")
23-
: css;
24-
}
25-
},
2613
themes: {
2714
dark: {}
2815
}

Diff for: ‎frontend/src/shared/dockerMixin.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { mapActions, mapGetters } from "vuex";
2-
// import _ from "lodash";
32
import ErrorHandler from "@/shared/errorHandlerMixin"
43
export default {
54
mixins: [ErrorHandler],

Diff for: ‎go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/labstack/gommon v0.3.0
88
github.com/leaanthony/mewn v0.10.7
99
github.com/mattn/go-colorable v0.1.8 // indirect
10-
github.com/wailsapp/wails v1.8.0
11-
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 // indirect
12-
golang.org/x/text v0.3.3 // indirect
10+
github.com/wailsapp/wails v1.9.1
11+
golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3 // indirect
12+
golang.org/x/text v0.3.4 // indirect
1313
)

Diff for: ‎go.sum

+6-24
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0X
4141
github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
4242
github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
4343
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
44-
github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
45-
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
4644
github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
4745
github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
4846
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
@@ -56,8 +54,6 @@ github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2y
5654
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
5755
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
5856
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
59-
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
60-
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
6157
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
6258
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
6359
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 h1:49lOXmGaUpV9Fz3gd7TFZY106KVlPVa5jcYD1gaQf98=
@@ -81,24 +77,14 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
8177
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
8278
github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
8379
github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
84-
github.com/wailsapp/wails v1.5.0 h1:iTdey6fJG9VEEyo4zpI97bSZHarhu/D0+bHeZ3fJ7yA=
85-
github.com/wailsapp/wails v1.5.0/go.mod h1:yb9AUo9LY/6ktxRfYdekH6kpQoxxRs8xesPkNNQu6ZQ=
86-
github.com/wailsapp/wails v1.6.0 h1:eOyskbxeEYj/hD1kLWMa7dYfYG3PUz+J8ZCrMsiQtFk=
87-
github.com/wailsapp/wails v1.6.0/go.mod h1:mOltlF9JaTgg90B4Eb54UfGPkSmzVMmIXazItzWdorM=
88-
github.com/wailsapp/wails v1.7.1 h1:ne54tk+OZlXI2KLBYBg1FPhkvGzbfpij4XrQY7LbzFc=
89-
github.com/wailsapp/wails v1.7.1/go.mod h1:isZA4Brn4If9+t6Jv0boECyoZpUjUVTbrDdTyb286G0=
90-
github.com/wailsapp/wails v1.8.0 h1:gnQhpwoGM8s2GD5PZrgMKU1PO3pQ9cdKKJgwtkNz2f4=
91-
github.com/wailsapp/wails v1.8.0/go.mod h1:XFZunea+USOCMMgBlz0A0JHLL3oWrRhnOl4baZlRpxo=
80+
github.com/wailsapp/wails v1.9.1 h1:ez/TK8YpU9lvOZ9nkgzUXsWu+xOPFVO57zTy0n5w3hc=
81+
github.com/wailsapp/wails v1.9.1/go.mod h1:XFZunea+USOCMMgBlz0A0JHLL3oWrRhnOl4baZlRpxo=
9282
golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
9383
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
94-
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
9584
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
9685
golang.org/x/image v0.0.0-20200430140353-33d19683fad8 h1:6WW6V3x1P/jokJBpRQYUJnMHRP6isStQwCozxnU7XQw=
9786
golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
9887
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
99-
golang.org/x/net v0.0.0-20190509222800-a4d6f7feada5/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
100-
golang.org/x/net v0.0.0-20191009170851-d66e71096ffb h1:TR699M2v0qoKTOHxeLgp6zPqaQNs74f01a/ob9W0qko=
101-
golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
10288
golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
10389
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
10490
golang.org/x/sys v0.0.0-20180606202747-9527bec2660b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -107,22 +93,18 @@ golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5h
10793
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
10894
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
10995
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
110-
golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862 h1:rM0ROo5vb9AdYJi1110yjWGMej9ITfKddS89P3Fkhug=
111-
golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
11296
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
11397
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
11498
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
11599
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
116100
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
117101
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
118102
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
119-
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM=
120-
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
103+
golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3 h1:kzM6+9dur93BcC2kVlYl34cHU+TYZLanmpSJHVMmL64=
104+
golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
121105
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
122-
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
123-
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
124-
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
125-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
106+
golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
107+
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
126108
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
127109
gopkg.in/AlecAivazis/survey.v1 v1.8.4/go.mod h1:iBNOmqKz/NUbZx3bA+4hAGLRC7fSK7tgtVDT4tB22XA=
128110
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

0 commit comments

Comments
 (0)