Skip to content

Commit 61138d5

Browse files
GruceGruce
committed
update
1 parent 7f2903a commit 61138d5

File tree

7 files changed

+512
-197
lines changed

7 files changed

+512
-197
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "enab",
3-
"version": "1.5.3",
3+
"version": "1.5.4",
44
"description": "Enab System",
55
"main": "./dist/main/index.js",
66
"scripts": {
@@ -57,9 +57,9 @@
5757
"electron-log": "^4.4.1",
5858
"electron-updater": "^4.3.9",
5959
"modified-pos-printer": "^1.2.4",
60+
"node-sass": "4.14.1",
6061
"nuxt-i18n": "^6.28.1",
6162
"pusher-js": "^7.0.3",
62-
"sass": "^1.42.1",
6363
"socket.io-client": "2.3.0",
6464
"vue-long-click": "^0.0.4",
6565
"vue-select": "^3.12.2",

‎src/renderer/assets/scss/style.scss‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,18 @@ input.vs__search {
280280
cursor: pointer;
281281
}
282282

283+
.group-links {
284+
transition: 0.2s ease-in;
285+
background: $tb-1 !important;
286+
.pointer:hover {
287+
background: $tb-2 !important;
288+
}
289+
}
290+
291+
.active {
292+
background: $tb-2;
293+
}
294+
283295
.dg-content-footer{
284296
direction: ltr !important;
285297
}

‎src/renderer/components/Utilities/TitleBarManagement.vue‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<template>
2+
<div class="group-links p-1 r-1">
3+
<span @click="minimize()" v-b-tooltip.hover.bottom title="تصغير" class="badge py-2 px-3 pointer">
4+
<i class="fas fa-window-minimize"></i>
5+
</span>
6+
<span @click="maximize()" v-b-tooltip.hover.bottom title="تكبير" class="badge py-2 px-3 pointer">
7+
<i class="fas fa-window-maximize"></i>
8+
</span>
9+
<span @click="exit()" v-b-tooltip.hover.bottom title="الخروج من النظام" class="badge py-2 px-3 pointer text-danger-h">
10+
<i class="fas fa-window-close"></i>
11+
</span>
12+
</div>
13+
</template>
14+
15+
<script>
16+
const { remote } = require("electron");
17+
var win = remote.BrowserWindow.getFocusedWindow();
18+
19+
export default {
20+
methods: {
21+
maximize() {
22+
win.maximize();
23+
},
24+
minimize() {
25+
win.minimize();
26+
},
27+
exit() {
28+
this.$dialog
29+
.confirm("هل انت متأكد من إغلاق النظام؟", {
30+
okText: "متأكد",
31+
cancelText: "الغاء",
32+
reverse: false,
33+
})
34+
.then(() => {
35+
remote.app.exit();
36+
});
37+
},
38+
},
39+
};
40+
</script>
41+
42+
<style lang="scss" scoped>
43+
</style>

‎src/renderer/components/supermarket/Navbar.vue‎

Lines changed: 2 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -8,56 +8,17 @@
88
<nuxt-link :to="nav.link" v-for="nav in navs" :key="nav.title">
99
<span :class="{ 'active' : $nuxt.$route.path === nav.link}" class="badge py-2 px-3 pointer mx-1">
1010
<i class="fas" :class="nav.icon"></i>
11-
<span v-if="$nuxt.$route.path === nav.link">
11+
<span v-if="$nuxt.$route.path === nav.link" class="mr-2">
1212
{{ nav.title }}
1313
</span>
1414
</span>
1515
</nuxt-link>
16-
<!-- <nuxt-link to="/supermarket">
17-
<span :class="{ 'active' : $nuxt.$route.path === '/supermarket'}" class="badge py-2 px-3 pointer">
18-
<i class="fas fa-home"></i>
19-
</span>
20-
</nuxt-link>
21-
22-
<nuxt-link to="/supermarket/new-order">
23-
<span :class="{ 'active' : $nuxt.$route.path === '/supermarket/new-order'}" class="badge py-2 px-3 pointer">
24-
<i class="fas fa-cash-register"></i>
25-
</span>
26-
</nuxt-link>
27-
28-
<nuxt-link to="/supermarket/control">
29-
<span :class="{ 'active' : $nuxt.$route.path === '/supermarket/control'}" class="badge py-2 px-3 pointer">
30-
<i class="fas fa-list-ul"></i>
31-
</span>
32-
</nuxt-link>
33-
34-
<nuxt-link to="/supermarket/analytics">
35-
<span :class="{ 'active' : $nuxt.$route.path === '/supermarket/analytics'}" class="badge py-2 px-3 pointer">
36-
<i class="fas fa-chart-pie"></i>
37-
</span>
38-
</nuxt-link>
39-
40-
<nuxt-link to="/supermarket/services">
41-
<span :class="{ 'active' : $nuxt.$route.path === '/supermarket/services'}" class="badge py-2 px-3 pointer">
42-
<i class="fas fa-cubes"></i>
43-
</span>
44-
</nuxt-link>
45-
46-
<nuxt-link to="/supermarket/settings">
47-
<span :class="{ 'active' : $nuxt.$route.path === '/supermarket/settings'}" class="badge py-2 px-3 pointer">
48-
<i class="fas fa-cog"></i>
49-
</span>
50-
</nuxt-link> -->
5116
</div>
5217

5318
</div>
5419
<div class="col-6">
5520
<div dir="ltr" class="text-white ml-3 d-flex align-items-center">
5621
<div dir="rtl" class="d-flex">
57-
<!-- <div class="mr-1">
58-
<div class="fs-5 px-3">{{ datetime }}</div>
59-
</div> -->
60-
6122
<div class="mr-1">
6223

6324
<!-- Is Updating -->
@@ -88,17 +49,7 @@
8849
</nuxt-link>
8950
</div> -->
9051

91-
<div class="mr-3 group-links p-1 r-1">
92-
<span @click="minimize" v-b-tooltip.hover.bottom title="تصغير" class="badge py-2 px-3 pointer">
93-
<i class="fas fa-window-minimize"></i>
94-
</span>
95-
<span @click="maximize" v-b-tooltip.hover.bottom title="تكبير" class="badge py-2 px-3 pointer">
96-
<i class="fas fa-window-maximize"></i>
97-
</span>
98-
<span @click="exit" v-b-tooltip.hover.bottom title="الخروج من النظام" class="badge py-2 px-3 pointer text-danger-h">
99-
<i class="fas fa-window-close"></i>
100-
</span>
101-
</div>
52+
<UtilitiesTitleBarManagement class="mr-3" />
10253
</div>
10354
</div>
10455
</div>
@@ -111,7 +62,6 @@
11162
<script>
11263
import { mapMutations, mapGetters, mapActions, mapState } from "vuex";
11364
const { remote, ipcRenderer } = require("electron");
114-
var win = remote.BrowserWindow.getFocusedWindow();
11565
11666
export default {
11767
computed: {
@@ -137,23 +87,6 @@ export default {
13787
// setInterval(this.getNow, 1000);
13888
},
13989
methods: {
140-
maximize() {
141-
win.maximize();
142-
},
143-
minimize() {
144-
win.minimize();
145-
},
146-
exit() {
147-
this.$dialog
148-
.confirm("هل انت متأكد من إغلاق النظام؟", {
149-
okText: "متأكد",
150-
cancelText: "الغاء",
151-
reverse: false,
152-
})
153-
.then(() => {
154-
remote.app.exit();
155-
});
156-
},
15790
updateCompleted() {
15891
ipcRenderer.send("restart_app");
15992
},
@@ -195,44 +128,4 @@ div {
195128
);
196129
transition: 0.15s ease-in-out;
197130
}
198-
.nav-pills .nav-link.active,
199-
.nav-pills .show > .nav-link {
200-
background-color: $tb-1;
201-
border-radius: 0.3rem;
202-
color: #ffffff;
203-
}
204-
205-
.nav-pills .nav-link,
206-
.nav-pills > .nav-link {
207-
color: #ffffff;
208-
transition: 0.3s;
209-
margin: 0 1px;
210-
&:hover {
211-
background-color: $tb-1;
212-
}
213-
}
214-
215-
.signout-icon {
216-
transform: scale(-1);
217-
}
218-
219-
.pointer:hover {
220-
cursor: pointer;
221-
}
222-
223-
.btn-icon-label {
224-
transition: 0.2s ease-in;
225-
background: $tb-1 !important;
226-
.pointer:hover {
227-
background: $tb-2 !important;
228-
}
229-
}
230-
231-
.active {
232-
background: $tb-2 !important;
233-
}
234-
235-
.group-links {
236-
@extend .btn-icon-label;
237-
}
238131
</style>

‎src/renderer/components/supermarket/Neworder/Order.vue‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -198,20 +198,20 @@ export default {
198198

199199
<style lang="scss">
200200
.main-height {
201-
min-height: calc(100vh - 13rem) !important;
202-
max-height: calc(100vh - 13rem) !important;
201+
min-height: calc(100vh - 14.8rem) !important;
202+
max-height: calc(100vh - 14.8rem) !important;
203203
}
204204
.h-items-height {
205-
min-height: calc(100vh - 12rem) !important;
206-
max-height: calc(100vh - 12rem) !important;
205+
min-height: calc(100vh - 16rem) !important;
206+
max-height: calc(100vh - 16rem) !important;
207207
}
208208
.h-sub-items-height {
209-
min-height: calc(100vh - 14.75rem) !important;
210-
max-height: calc(100vh - 14.75rem) !important;
209+
min-height: calc(100vh - 18.2rem) !important;
210+
max-height: calc(100vh - 18.2rem) !important;
211211
}
212212
.h-list-height {
213-
min-height: calc(100vh - 28rem) !important;
214-
max-height: calc(100vh - 28rem) !important;
213+
min-height: calc(100vh - 30rem) !important;
214+
max-height: calc(100vh - 30rem) !important;
215215
}
216216
.products-list .list-group-item{
217217
background: $t-1;

‎src/renderer/components/supermarket/Services/MultipleOrder.vue‎

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,19 @@
11
<template>
22
<!-- Service ID = 2 -->
3-
<div>
4-
<ul class="nav nav-pills p-0 mb-2">
5-
<li @click="selectOrder(i)" class="nav-item" v-for="(order, i) in ordersList" :key="i">
6-
<a class="nav-link r-2" :class="order.enabled ? 'active' : ''" href="#">الطلب {{ i+1 }}</a>
7-
</li>
8-
<div class="me-auto d-flex">
9-
<li @click="removeOrder()" class="nav-item ml-1">
10-
<a class="nav-link nav-link-button tb-1 btn-icon-label r-2" href="#">
11-
<span class="btn-inner--text">
12-
حذف الطلب
13-
</span>
14-
<span class="btn-inner--icon">
15-
<i class="fas fa-minus"></i>
16-
</span>
17-
</a>
18-
</li>
19-
<li @click="newOrder()" class="nav-item">
20-
<a class="nav-link nav-link-button tb-1 btn-icon-label r-2" href="#">
21-
<span class="btn-inner--text">
22-
طلب جديد
23-
</span>
24-
<span class="btn-inner--icon">
25-
<i class="fas fa-plus"></i>
26-
</span>
27-
</a>
28-
</li>
29-
</div>
30-
</ul>
3+
<div class="mb-3">
4+
<div class="group-links p-2 r-2">
5+
<span :class="order.enabled ? 'active' : ''" @click="selectOrder(i)" v-for="(order, i) in ordersList" :key="i" class="badge r-2 py-3 px-3 pointer mx-1 fs-6">
6+
الطلب {{ i+1 }}
7+
</span>
8+
9+
<span @click="newOrder()" class="badge r-2 py-3 px-3 pointer mx-1 float-left fs-6">
10+
طلب جديد
11+
</span>
12+
13+
<span @click="removeOrder()" class="badge r-2 py-3 px-3 pointer mx-1 float-left text-danger-h fs-6">
14+
حذف الطلب
15+
</span>
16+
</div>
3117
</div>
3218
</template>
3319

@@ -66,19 +52,19 @@ export default {
6652
</script>
6753

6854
<style lang="scss" scoped>
69-
.nav-pills{
70-
.active{
55+
.nav-pills {
56+
.active {
7157
background: $t-3;
7258
}
73-
.nav-link{
59+
.nav-link {
7460
color: #fff;
7561
}
7662
}
7763
78-
.nav-link-button{
79-
transition: .3s ease-out;
64+
.nav-link-button {
65+
transition: 0.3s ease-out;
8066
81-
&:hover{
67+
&:hover {
8268
background: $tb-2 !important;
8369
}
8470
}

0 commit comments

Comments
 (0)