Skip to content

Commit 84ab4f8

Browse files
GruceGruce
committed
update
1 parent e436ad6 commit 84ab4f8

File tree

17 files changed

+199
-54
lines changed

17 files changed

+199
-54
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "enab",
3-
"version": "1.5.6",
3+
"version": "1.5.7",
44
"description": "Enab System",
55
"main": "./dist/main/index.js",
66
"scripts": {

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,21 @@ input[type=checkbox]:checked+[data-chakra-component="CControlBox"]>*, input[type
408408
}
409409
}
410410

411+
411412
.card-header {
412413
background-color: #ffffff08;
413414
border-bottom: 1px solid #ffffff21;
415+
}
416+
417+
.carousel-inner {
418+
border-radius: $r-1 !important;
419+
}
420+
421+
[data-chakra-component="CCircularProgress"] > svg {
422+
circle:nth-child(1) {
423+
color: #fff !important;
424+
}
425+
circle:nth-child(2) {
426+
color: #5cc9a7 !important;
427+
}
414428
}

‎src/renderer/assets/scss/variables.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ $tb-4: #000000cc;
1414
$t-2: #fcfcfc90;
1515
$t-3: #eaecf340;
1616
.t-1{background: $t-1 !important;backdrop-filter: blur(5px);-webkit-backdrop-filter: blur(5px);}
17+
.t-1-h{transition: 0.1s linear; &:hover{@extend .t-1}}
1718
.tb-0{background: $tb-0 !important;backdrop-filter: blur(5px);-webkit-backdrop-filter: blur(5px);}
1819
.tb-1{background: $tb-1 !important;backdrop-filter: blur(5px);-webkit-backdrop-filter: blur(5px);}
1920
.tb-2{background: $tb-2 !important;backdrop-filter: blur(5px);-webkit-backdrop-filter: blur(5px);}

‎src/renderer/components/supermarket/Home/Ads.vue‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<template>
2+
<div>
3+
4+
<div v-if="loading" class="text-center mt-3">
5+
<UtilitiesLoading size="4" />
6+
</div>
7+
<div v-else>
8+
<b-carousel id="carousel-fade" style="text-shadow: 0px 0px 2px #000" class="mb-3" fade indicators img-width="1024" img-height="480">
9+
<a v-for="ad in ads" :key="ad.id" :href="ad.url" target="_blank">
10+
<b-carousel-slide :img-src="ad.image"></b-carousel-slide>
11+
</a>
12+
</b-carousel>
13+
</div>
14+
15+
</div>
16+
</template>
17+
18+
<script>
19+
import { mapMutations, mapGetters, mapActions, mapState } from "vuex";
20+
21+
export default {
22+
computed: {
23+
...mapGetters({
24+
ads: "supermarket/utilities/ads",
25+
}),
26+
},
27+
async created() {
28+
await this.fetchAds(this.$auth.user.supermarket.id);
29+
this.loading = false
30+
},
31+
data() {
32+
return {
33+
loading: true,
34+
};
35+
},
36+
methods: {
37+
...mapActions({
38+
fetchAds: "supermarket/utilities/fetchAds",
39+
}),
40+
},
41+
};
42+
</script>
43+
44+
<style lang="scss" scoped>
45+
</style>

‎src/renderer/components/supermarket/Home/Performance.vue‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<template>
2-
<div class="height show-scrollr">
2+
<div>
3+
<SupermarketHomeRank />
4+
35
<SupermarketHomePerformanceDailyGoals />
46

57
<SupermarketHomePerformanceMonthlyStatics class="mt-3" />
@@ -11,8 +13,5 @@ export default {};
1113
</script>
1214

1315
<style lang="scss" scoped>
14-
.height {
15-
min-height: calc(100vh - 10rem) !important;
16-
max-height: calc(100vh - 10rem) !important;
17-
}
16+
1817
</style>

‎src/renderer/components/supermarket/Home/Rank.vue‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<template>
2+
<div class="t-1 b-1 rounded-lg mb-3 p-4 w-100">
3+
<div class="w-100 text-center mb-3">
4+
<img class="mx-auto rank-img mb-1" src="https://icons-for-free.com/iconfiles/png/512/page+quality+rank+icon-1320190816917337266.png" alt="">
5+
<div @click="showDetails = !showDetails" class="t-1-h p-3 r-2 pointer">
6+
<div class="d-flex justify-content-between align-items-center">
7+
<span class="fs-5 badge r-2">مبتدئ</span>
8+
<span><small>الى المستوى التالي</small></span>
9+
</div>
10+
<div class="progress progress-md mt-2" style="height: 8px">
11+
<div class="progress-bar bg-success" role="progressbar" :style="'width: 50%;'" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"></div>
12+
</div>
13+
</div>
14+
</div>
15+
<div v-if="showDetails" class="row px-3">
16+
<div class="col-12 p-0 b-1 r-2">
17+
<!-- مستوى العمل -->
18+
<div class="d-flex align-items-center goal p-3 r-2">
19+
<div class="icon icon-shape p-2 t-1">
20+
<i class="fas fa-signal text-white"></i>
21+
</div>
22+
<div class="pr-3 w-100">
23+
<span class="text-light mb-0 p-1">مستوى العمل</span>
24+
<span class="float-left p-1 px-2 r-1 t-1 text-light ml-3">5</span>
25+
</div>
26+
</div>
27+
28+
<!-- نقاط الخبرة -->
29+
<div class="d-flex align-items-center goal p-3 r-2">
30+
<div class="icon icon-shape p-2 t-1">
31+
<i class="fas fa-brain text-white"></i>
32+
</div>
33+
<div class="pr-3 w-100">
34+
<span class="text-light mb-0 p-1">نقاط الخبرة</span>
35+
<span class="float-left p-1 px-2 r-1 t-1 text-light ml-3">1648763</span>
36+
</div>
37+
</div>
38+
39+
</div>
40+
</div>
41+
</div>
42+
</template>
43+
44+
<script>
45+
export default {
46+
data() {
47+
return {
48+
showDetails: false,
49+
};
50+
},
51+
};
52+
</script>
53+
54+
<style lang="scss" scoped>
55+
.goal {
56+
transition: 0.15s ease-in-out;
57+
&:hover {
58+
background: $t-1 !important;
59+
}
60+
}
61+
62+
.rank-img {
63+
width: 10rem;
64+
border: 1px solid $t-1;
65+
padding: 0.5rem;
66+
border-radius: 50%;
67+
-moz-border-radius: 50%;
68+
-webkit-border-radius: 50%;
69+
}
70+
</style>

‎src/renderer/components/supermarket/Home/welcome.vue‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
<template>
22
<div>
3-
<div class="card tb-2 rounded-lg border-0">
4-
<div class="card-body text-center">
5-
<div class="row py-4">
6-
<div class="col-8">
7-
<h1 class="text-white text-right fs-1">
8-
مرحباً
9-
</h1>
10-
</div>
11-
</div>
3+
<div class="card t-1 b-1 rounded-lg mb-3">
4+
<div class="card-body text-center p-5">
5+
<h1 class="text-white text-right fs-1">
6+
مرحباً
7+
</h1>
128
</div>
139
</div>
1410
</div>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<SupermarketMenuUpdateProgress />
1111

1212
<!-- Components -->
13-
<div class="row d-flex align-content-stretch flex-wrap">
13+
<div class="row mb-3">
14+
<SupermarketMenuQuickAccess />
15+
</div>
16+
<div class="row d-flex align-content-stretch flex-wrap components-height">
1417
<!-- Quick Access Buttons -->
15-
<div class="col-1">
16-
<SupermarketMenuQuickAccess />
17-
</div>
1818
<!-- Quick Change Buttons -->
1919
<div class="col-3">
2020
<SupermarketMenuQuickChange />
@@ -42,7 +42,7 @@
4242
</div>
4343
</div>
4444
<!-- User Configuration -->
45-
<div class="col-3 d-flex flex-column">
45+
<div class="col-4 d-flex flex-column">
4646
<div class="row flex-fill">
4747
<div class="col-12">
4848
<SupermarketMenuUserProfile />
@@ -56,7 +56,7 @@
5656
</div>
5757
</div>
5858

59-
<div class="row mt-5">
59+
<div class="row mt-4">
6060
<div class="text-center text-light"> عنب، مع كل الحب <i class="fas fa-heart text-danger"></i> </div>
6161
</div>
6262
</div>
@@ -85,7 +85,7 @@ export default {
8585
}
8686
8787
.night {
88-
background: rgba(0, 0, 0, 0.4) !important;
88+
background: rgba(0, 0, 0, 0.7) !important;
8989
}
9090
9191
.main-menu {
@@ -94,9 +94,9 @@ export default {
9494
right: 0;
9595
width: 100vw;
9696
height: 100vh;
97-
backdrop-filter: blur(10px);
98-
-webkit-backdrop-filter: blur(10px);
99-
background: rgba(0, 0, 0, 0.1);
97+
backdrop-filter: blur(50px);
98+
-webkit-backdrop-filter: blur(50px);
99+
background: rgba(0, 0, 0, 0.5);
100100
z-index: 10;
101101
.container {
102102
// margin-top: 2rem;
@@ -111,15 +111,15 @@ export default {
111111
.content {
112112
height: 100%;
113113
padding: 10px;
114-
background: rgba(255, 255, 255, 0.05);
114+
background: rgba(255, 255, 255, 0.1);
115115
border: 1px solid $t-3;
116116
border-radius: $r-2;
117117
transition: 0.3s ease-out;
118118
}
119119
120120
.pointer:hover {
121121
cursor: pointer;
122-
background: rgba(255, 255, 255, 0.2);
122+
background: rgba(255, 255, 255, 0.3);
123123
&.bg-success {
124124
background: #146c43 !important;
125125
}

‎src/renderer/components/supermarket/Menu/Header.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<div class="row mx-0 mb-3">
3+
<div class="row mx-0 mb-2">
44
<div class="col-6 p-0">
55
<div class="text-light">
66
<div class="display-4">

‎src/renderer/components/supermarket/Menu/Notifications.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ export default {
3535
}
3636
3737
.max-height {
38-
min-height: 380px !important;
39-
max-height: 380px !important;
38+
min-height: 30vh !important;
39+
max-height: 30vh !important;
4040
}
4141
4242
// @media (max-height: 1420px) {

0 commit comments

Comments
 (0)