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

Commit f6ddf0d

Browse files
lyimmilyimmi
committed
--enh: layout update, change fa to mdi
1 parent 435e02d commit f6ddf0d

File tree

9 files changed

+684
-690
lines changed

9 files changed

+684
-690
lines changed

Diff for: ‎frontend/package-lock.json

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

Diff for: ‎frontend/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,18 @@
1010
"dependencies": {
1111
"@wailsapp/runtime": "^1.0.0",
1212
"babel-polyfill": "^6.26.0",
13-
"core-js": "^2.6.4",
13+
"core-js": "^2.6.10",
1414
"js-base64": "^2.5.1",
1515
"lodash": "^4.17.15",
1616
"lru-cache": "^5.1.1",
1717
"material-design-icons-iconfont": "^5.0.1",
1818
"vue": "^2.6.10",
1919
"vue-router": "^3.1.2",
20-
"vuetify": "^2.0.10",
20+
"vuetify": "^2.1.4",
2121
"vuetify-loader": "^1.3.0",
2222
"vuex": "^3.1.1"
2323
},
2424
"devDependencies": {
25-
"@fortawesome/fontawesome-free": "^5.10.1",
2625
"@mdi/font": "^3.9.97",
2726
"@vue/cli-plugin-babel": "^3.10.0",
2827
"@vue/cli-plugin-eslint": "^3.10.0",

Diff for: ‎frontend/package.json.md5

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c51a0124f3eb8a253c725ac4e9c197b2
1+
d76a648a7ed1117e66c6e78c89a39705

Diff for: ‎frontend/src/App.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,31 @@
1717
<v-list dense>
1818
<v-list-item @click="$root.$emit('refreshData')" prevent>
1919
<v-list-item-action>
20-
<v-icon>refresh</v-icon>
20+
<v-icon>mdi-refresh</v-icon>
2121
</v-list-item-action>
2222
<v-list-item-content>
2323
<v-list-item-title>Refresh</v-list-item-title>
2424
</v-list-item-content>
2525
</v-list-item>
2626
<v-list-item to="/">
2727
<v-list-item-action>
28-
<v-icon>dashboard</v-icon>
28+
<v-icon>mdi-view-dashboard</v-icon>
2929
</v-list-item-action>
3030
<v-list-item-content>
3131
<v-list-item-title>Dashboard</v-list-item-title>
3232
</v-list-item-content>
3333
</v-list-item>
3434
<v-list-item to="/containers">
3535
<v-list-item-action>
36-
<v-icon>view_module</v-icon>
36+
<v-icon>mdi-docker</v-icon>
3737
</v-list-item-action>
3838
<v-list-item-content>
3939
<v-list-item-title>Containers</v-list-item-title>
4040
</v-list-item-content>
4141
</v-list-item>
4242
<v-list-item to="/settings">
4343
<v-list-item-action>
44-
<v-icon>settings</v-icon>
44+
<v-icon>mdi-settings-outline</v-icon>
4545
</v-list-item-action>
4646
<v-list-item-content>
4747
<v-list-item-title>Settings</v-list-item-title>

Diff for: ‎frontend/src/components/containers/Actions.vue

+12-12
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<v-tooltip bottom v-if="item.state === 'Up'">
55
<template v-slot:activator="{ on }">
66
<v-btn small icon @click="logsContainer(item.name)" v-on="on">
7-
<v-icon :size="15">fa-bars</v-icon>
7+
<v-icon>mdi-format-list-checks</v-icon>
88
</v-btn>
99
</template>
1010
<span>Show container logs</span>
@@ -20,34 +20,34 @@
2020
v-on:click="$root.$emit('execContiner', item.name)"
2121
v-on="on"
2222
>
23-
<v-icon :size="14">fas fa-terminal</v-icon>
23+
<v-icon>mdi-console-line</v-icon>
2424
</v-btn>
2525
</template>
2626
<span>Open container in terminal</span>
2727
</v-tooltip>
2828

2929
<v-tooltip bottom v-if="item.state === 'Up'">
3030
<template v-slot:activator="{ on }">
31-
<v-btn small icon :size="14" @click="toggleContainer('stop', item.name)" v-on="on">
32-
<v-icon>stop</v-icon>
31+
<v-btn small icon @click="toggleContainer('stop', item.name)" v-on="on">
32+
<v-icon>mdi-stop</v-icon>
3333
</v-btn>
3434
</template>
3535
<span>Stop container</span>
3636
</v-tooltip>
3737

3838
<v-tooltip bottom v-else-if="item.state !== 'DOWN'">
3939
<template v-slot:activator="{ on }">
40-
<v-btn small icon :size="14" @click="toggleContainer('start', item.name)" v-on="on">
41-
<v-icon>play_arrow</v-icon>
40+
<v-btn small icon @click="toggleContainer('start', item.name)" v-on="on">
41+
<v-icon>mdi-play</v-icon>
4242
</v-btn>
4343
</template>
4444
<span>Build the containers</span>
4545
</v-tooltip>
4646

4747
<v-tooltip bottom v-else-if="item.state === 'DOWN'">
4848
<template v-slot:activator="{ on }">
49-
<v-btn small icon :size="14" @click="upContainer(item.name)" v-on="on">
50-
<v-icon>arrow_upward</v-icon>
49+
<v-btn small icon @click="upContainer(item.name)" v-on="on">
50+
<v-icon>mdi-arrow-up-bold</v-icon>
5151
</v-btn>
5252
</template>
5353
<span>Up the containers</span>
@@ -56,15 +56,15 @@
5656
<v-menu offset-y>
5757
<template v-slot:activator="{ on }">
5858
<v-btn small icon v-on="on">
59-
<v-icon :size="14">build</v-icon>
59+
<v-icon>mdi-progress-wrench</v-icon>
6060
</v-btn>
6161
</template>
62-
<v-list>
62+
<v-list dense>
6363
<v-list-item @click="buildContainer(item.name)">
64-
<v-list-item-title>Build with cache</v-list-item-title>
64+
<v-list-item-content>Build with cache</v-list-item-content>
6565
</v-list-item>
6666
<v-list-item @click="buildContainer(item.name, true)">
67-
<v-list-item-title>Build without cache</v-list-item-title>
67+
<v-list-item-content>Build without cache</v-list-item-content>
6868
</v-list-item>
6969
</v-list>
7070
</v-menu>

Diff for: ‎frontend/src/components/containers/ConatinersList.vue

+36-23
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,56 @@
44
Containers &nbsp;
55
<v-menu offset-y>
66
<template v-slot:activator="{ on }">
7-
<v-btn color="primary" dark v-on="on" small>Mass actions</v-btn>
7+
<v-btn color="default" x-small dark v-on="on">Mass actions</v-btn>
88
</template>
9-
<v-list>
9+
<v-list dense>
1010
<v-list-item @click="massBuild">
11-
<v-list-item-title>
12-
<v-icon :size="20">build</v-icon>&nbsp;Build
13-
</v-list-item-title>
11+
<v-list-item-icon>
12+
<v-icon>mdi-progress-wrench</v-icon>
13+
</v-list-item-icon>
14+
<v-list-item-content>Build</v-list-item-content>
1415
</v-list-item>
1516
<v-list-item @click="massBuild(true)">
16-
<v-list-item-title>
17-
<v-icon :size="20">build</v-icon>&nbsp;Build without cache
18-
</v-list-item-title>
17+
<v-list-item-icon>
18+
<v-icon>mdi-progress-wrench</v-icon>
19+
</v-list-item-icon>
20+
<v-list-item-content>Build without cache</v-list-item-content>
1921
</v-list-item>
2022
<v-list-item @click="massUp">
21-
<v-list-item-title>
22-
<v-icon>arrow_upward</v-icon>&nbsp;Up
23-
</v-list-item-title>
23+
<v-list-item-icon>
24+
<v-icon>mdi-arrow-up-bold</v-icon>
25+
</v-list-item-icon>
26+
<v-list-item-content>Up</v-list-item-content>
2427
</v-list-item>
2528
<v-list-item @click="massToggle('start')">
26-
<v-list-item-title>
27-
<v-icon>play_arrow</v-icon>&nbsp;Start
28-
</v-list-item-title>
29+
<v-list-item-icon>
30+
<v-icon>mdi-play</v-icon>
31+
</v-list-item-icon>
32+
<v-list-item-content>Start</v-list-item-content>
2933
</v-list-item>
3034
<v-list-item @click="massToggle('stop')">
31-
<v-list-item-title>
32-
<v-icon>stop</v-icon>&nbsp;Stop
33-
</v-list-item-title>
35+
<v-list-item-icon>
36+
<v-icon>mdi-stop</v-icon>
37+
</v-list-item-icon>
38+
<v-list-item-content>Stop</v-list-item-content>
3439
</v-list-item>
3540
<v-list-item @click="downContainers()">
36-
<v-list-item-title>
37-
<v-icon>arrow_downward</v-icon>&nbsp;Down all
38-
</v-list-item-title>
41+
<v-list-item-icon>
42+
<v-icon>mdi-arrow-down-bold</v-icon>
43+
</v-list-item-icon>
44+
<v-list-item-content>Down all</v-list-item-content>
3945
</v-list-item>
4046
</v-list>
4147
</v-menu>
4248
<v-spacer></v-spacer>
43-
<v-text-field v-model="search" append-icon="search" label="Search" single-line hide-details></v-text-field>
49+
<v-text-field
50+
class="mt-0 pt-0"
51+
v-model="search"
52+
append-icon="mdi-database-search"
53+
label="Search"
54+
single-line
55+
hide-details
56+
></v-text-field>
4457
</v-card-title>
4558
<v-card-text>
4659
<v-data-table
@@ -54,7 +67,7 @@
5467
>
5568
<template v-slot:item.favorite="{ item }">
5669
<v-btn text icon :color="item.favorite ? 'yellow' : 'grey'" @click="toggleFavorite(item)">
57-
<v-icon>star</v-icon>
70+
<v-icon>mdi-star</v-icon>
5871
</v-btn>
5972
</template>
6073
<template v-slot:item.state="{ item }">
@@ -98,7 +111,7 @@ export default {
98111
value: "name"
99112
},
100113
{ text: "State", align: "center", sortable: true, value: "state" },
101-
{ text: "Actions", align: "center", value: "action", sortable: false }
114+
{ text: "Actions", align: "left", value: "action", sortable: false }
102115
],
103116
selectedContainers: []
104117
};

Diff for: ‎frontend/src/components/dashboards/Statuses.vue

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<v-list disabled dense>
66
<v-list-item dense>
77
<v-list-item-icon small>
8-
<v-icon color="error" v-if="dockerVersion === ''">error</v-icon>
9-
<v-icon color="success" v-else>check</v-icon>
8+
<v-icon color="error" v-if="dockerVersion === ''">mdi-alert-circle-outline</v-icon>
9+
<v-icon color="success" v-else>mdi-check</v-icon>
1010
</v-list-item-icon>
1111
<v-list-item-content>
1212
<v-list-item-title>
@@ -19,8 +19,8 @@
1919

2020
<v-list-item>
2121
<v-list-item-icon>
22-
<v-icon color="error" v-if="dockerComposeVersion === ''">error</v-icon>
23-
<v-icon color="success" v-else>check</v-icon>
22+
<v-icon color="error" v-if="dockerComposeVersion === ''">mdi-alert-circle-outline</v-icon>
23+
<v-icon color="success" v-else>mdi-check</v-icon>
2424
</v-list-item-icon>
2525
<v-list-item-content>
2626
<v-list-item-title>
@@ -33,8 +33,8 @@
3333

3434
<v-list-item>
3535
<v-list-item-icon>
36-
<v-icon color="error" v-if="laradockPath === ''">error</v-icon>
37-
<v-icon color="success" v-else>check</v-icon>
36+
<v-icon color="error" v-if="laradockPath === ''">mdi-alert-circle-outline</v-icon>
37+
<v-icon color="success" v-else>mdi-check</v-icon>
3838
</v-list-item-icon>
3939
<v-list-item-content>
4040
<v-list-item-title>
@@ -47,8 +47,8 @@
4747

4848
<v-list-item>
4949
<v-list-item-icon>
50-
<v-icon color="error" v-if="appStatus.dotEnv">error</v-icon>
51-
<v-icon color="success" v-else>check</v-icon>
50+
<v-icon color="error" v-if="appStatus.dotEnv">mdi-alert-circle-outline</v-icon>
51+
<v-icon color="success" v-else>mdi-check</v-icon>
5252
</v-list-item-icon>
5353
<v-list-item-content>
5454
<v-list-item-title>.env</v-list-item-title>

Diff for: ‎frontend/src/components/settings/index.vue

+6-7
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
class="ml-6 mt-6"
1616
v-if="tab === 'tab-env'"
1717
>
18-
<v-icon>fa-save</v-icon>
18+
<v-icon>mdi-content-save</v-icon>
1919
</v-btn>
2020
</v-fab-transition>
2121
<v-tabs-items v-model="tab">
@@ -42,7 +42,7 @@
4242
@click="storeLaradockPath"
4343
:disabled="dockerComposeYmlPath === ''"
4444
>
45-
<v-icon>done</v-icon>
45+
<v-icon>mdi-check</v-icon>
4646
</v-btn>
4747
</template>
4848
</v-text-field>
@@ -84,7 +84,7 @@
8484
<v-col cols="12" xs="12">
8585
<v-text-field
8686
class="mr-10"
87-
prepend-icon="search"
87+
prepend-icon="mdi-database-search"
8888
label="Search in .env file"
8989
v-model="envFilter"
9090
hide-details
@@ -137,7 +137,7 @@ export default {
137137
dockerComposeYmlPath: "",
138138
terminalPathTmp: "",
139139
tab: null,
140-
form: {},
140+
form: {}
141141
};
142142
},
143143
mounted() {
@@ -151,16 +151,15 @@ export default {
151151
...mapGetters("Settings", ["laradockPath", "terminalPath"]),
152152
darkTheme: {
153153
set(value) {
154-
this.$store.dispatch("Settings/setDarkTheme", value)
154+
this.$store.dispatch("Settings/setDarkTheme", value);
155155
},
156156
get() {
157-
return this.$store.getters["Settings/darkTheme"]
157+
return this.$store.getters["Settings/darkTheme"];
158158
}
159159
}
160160
},
161161
watch: {
162162
darkTheme(val) {
163-
console.log(val);
164163
this.$vuetify.theme.dark = val;
165164
}
166165
},

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

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
// You still need to register Vuetify itself
2-
// src/plugins/vuetify.js
3-
import "material-design-icons-iconfont";
4-
import "@fortawesome/fontawesome-free/css/all.css"; // Ensure you are using css-loader
5-
1+
import "@mdi/font/css/materialdesignicons.css"; // Ensure you are using css-loader
62
import Vue from "vue";
73
import Vuetify from "vuetify/lib";
84
import LRU from "lru-cache";
@@ -16,7 +12,7 @@ const themeCache = new LRU({
1612

1713
export default new Vuetify({
1814
icons: {
19-
iconfont: "fa" // default - only for display purposes
15+
iconfont: "mdi" // default - only for display purposes
2016
},
2117
theme: {
2218
options: {
@@ -28,14 +24,7 @@ export default new Vuetify({
2824
}
2925
},
3026
themes: {
31-
dark: {
32-
primary: "#00bcd4",
33-
secondary: "#607d8b",
34-
accent: "#205cae",
35-
warning: "#009688",
36-
info: "#2196f3",
37-
success: "#4caf50"
38-
}
27+
dark: {}
3928
}
4029
}
4130
});

0 commit comments

Comments
 (0)