alireza_hassani
/
willaengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: user update

Browse Source
product
Alireza Hassani 4 years ago
parent f6a385a059
commit 0b44bf804f
9 changed files with 204 additions and 20 deletions
Show Stats Download Patch File Download Diff File

5
composer.json
Unescape View File

@ -26,6 +26,7 @@
"wm/service": "dev-master",
"wm/store": "dev-master",
"wm/warehouse": "dev-master",
"wm/finance": "dev-master",
"zircote/swagger-php": "^3.0"
},
"require-dev": {
@ -110,6 +111,10 @@
{
"type": "path",
"url": "./modules/wm-warehouse"
},
{
"type": "path",
"url": "./modules/wm-finance"
}
]
}

11
resources/js/Global/components/Blocks/Number.vue
Unescape View File

@ -1,6 +1,6 @@
<template>
<div :class="`we-number ${theme}`">
<div class="flex-justified-right">
<div class="icon-and-number">
<v-icon v-if="prepend_icon" class="prepend-icon">WMi-{{ prepend_icon}} </v-icon>
<div class="number En Bold" v-html="number"></div>
<v-icon v-if="append_icon" class="append-icon">WMi-{{ append_icon }} </v-icon>
@ -32,9 +32,18 @@
opacity: 0.7;
text-align: left;
}
.we-number .icon-and-number {
display: flex;
justify-content: start;
align-items: center;
}
.we-number.label-center .label {
text-align: center;
}
.we-number.label-center .icon-and-number {
justify-content: center;
align-items: center;
}

9
resources/js/Global/components/Dividers/Section-Title.vue
Unescape View File

@ -1,8 +1,8 @@
<template>
<div :class="`RTL text-lg-right section-title ${theme} ${(icon) ? 'icon-visible' : ''}`">
<v-icon v-if="icon" :color="color">WMi-{{icon}}</v-icon>
<v-icon v-if="icon" :color="color" class="icon">WMi-{{icon}}</v-icon>
<div v-if="letterIcon" :class="`letter-icon En Bold ${color}--text`" >{{ letterIcon }}</div>
<div v-if="number" :class='"step En color-"+color+""' v-text="number"></div>
<div v-if="number" :class='"step En Bold color-"+color+""' v-text="number"></div>
<div class="Title">
<div class="Fa" v-text="titleFa"></div>
<div class="En" v-text="titleEn"></div>
@ -51,6 +51,11 @@ export default {
font-size: 40px;
margin-left: 10px;
}
.section-title.icon-absolute .letter-icon, .section-title.icon-absolute .icon {
position: absolute;
right: 0px;
opacity: 0.2;
}
.section-title.icon-ml-15 .v-icon {
margin-left: 15px !important;
}

82
resources/js/Global/components/Drawer/SideBar.vue
Unescape View File

@ -15,7 +15,7 @@
</div>-->
</v-container>
<v-navigation-drawer v-model="drawer" app temporary right width="320">
<v-navigation-drawer v-model="drawer" app temporary right width="420">
<v-list class="pa-1">
<div class="row user-info">
<v-flex lg9 class="pa-3">
@ -48,6 +48,30 @@
</template>
</a>
</v-list>
<div class="footer">
<div class="flex-justified-space-between links">
<div class="flex-justified-right texts">
<a href="https://www.willaarts.ir/ContactUs" class="WM-Link"> تماس با ما </a>
<a href="https://www.willaarts.ir/AboutUs" class="WM-Link"> درباره ی ما </a>
<a href="https://www.willaarts.ir/FAQ" class="WM-Link"> سوالات متداول </a>
</div>
<div class="social-media flex-justified-left">
<a href="https://www.aparat.com/WillaArts" class="WM-Link"> <v-icon>WMi-aparat</v-icon> </a>
<a href="https://www.instagram.com/willaarts.ir/" class="WM-Link"> <v-icon>WMi-instagram-2</v-icon> </a>
<a href="https://www.linkedin.com/in/willaartsgroup/" class="WM-Link"> <v-icon>WMi-linkedin-1</v-icon> </a>
</div>
</div>
<a href="https://www.willaarts.ir/ContactUs" class="WM-Link">
<div class="flex-justified-center water-mark">
<v-icon class="text--32">WMi-willa-engine</v-icon>
<div class="text-right">
<div class="Fa"> قدرت گرفته از سیستم ویـــــلااِنجین </div>
<div class="En"> Powered By WillaEngine IMS </div>
</div>
</div>
</a>
</div>
</v-navigation-drawer>
</v-layout>
</template>
@ -66,14 +90,14 @@ export default {
hints: true,
drawer: false,
Items: [
{ titleEn: 'My Profile', titleFa: ' حساب کاربری من ', icon: 'user', permissionClass: null, href: '/user/profile' },
{ titleEn: 'My Profile', titleFa: ' حساب کاربری من ', icon: 'user', permissionClass: null, href: '/user/dashboard' },
{
titleEn: " My Users ",
titleFa: " کاربران مجموعه ی من ",
icon: "users",
permissionClass: "User::index",
module: "core",
href: Routes.user(),
href: '/user/home',
tileClass: 'red-theme',
},
{
@ -212,6 +236,7 @@ export default {
bottom: 0px;
background-color: white;
width: 600px;
}
.drawer.open {
@ -220,4 +245,55 @@ export default {
.v-application .caption {
font-family: iranyekan-regular!important;
}
.footer {
position: absolute;
bottom: 0px;
width: 420px;
padding-bottom: 10px;
text-align: center;
padding-left: 20px;
}
.footer .water-mark {
}
.footer .links {
width: 420px;
border-bottom: 1px solid #eeeeee;
padding-bottom: 10px;
margin: auto;
}
.footer .links .texts a {
font-size: 14px;
color: #9e9e9e;
margin-right: 20px;
transition: 0.2s;
}
.footer .links .social-media {
padding-left: 10px;
}
.footer .links .social-media a {
margin-right: 5px;
transition: 0.2s;
}
.footer .links .social-media a .v-icon {
color: #9e9e9e;
font-size: 16px;
}
.footer .links a:hover, .footer .links .social-media a:hover .v-icon {
color: #000;
}
.footer .water-mark .v-icon {
font-size: 50px;
color: #000;
}
.footer .water-mark .Fa {
font-size: 16px;
}
.footer .water-mark .En {
font-size: 8px;
text-transform: uppercase;
letter-spacing: 4px;
margin-right: -4px;
}
</style>

35
resources/js/Global/components/Drawer/Tile.vue
Unescape View File

@ -1,9 +1,11 @@
<template>
<div class="Tile" :class="tileClass">
<i v-if="icon" class="pre-icon" :class="'WMi-'+icon"/>
<div class="Title">
<div class="TitleFa Fa">{{ TitleFa }}</div>
<div class="TitleEn En">{{ TitleEn }}</div>
<div class="flex-justified-right">
<i v-if="icon" class="pre-icon" :class="'WMi-'+icon"/>
<div class="Title">
<div class="TitleFa Fa">{{ TitleFa }}</div>
<div class="TitleEn En">{{ TitleEn }}</div>
</div>
</div>
<v-icon v-if="hasDetail" class="post-icon">WMi-left-open </v-icon>
<!-- <i v-if="hasDetail" class="WMi-left-open post-icon"></i> -->
@ -22,7 +24,7 @@ export default {
</script>
<style scoped>
.Tile {
padding: 1em;
padding: 0.4em;
padding-right: 20px;
cursor: pointer;
display: -webkit-inline-flex;
@ -76,29 +78,36 @@ export default {
-webkit-transform: scaleX(1);
transform: scaleX(1);
}
.Tile:hover, .Tile:hover .post-icon, .Tile:hover .pre-icon, .Tile:hover .TitleEn {
color: #fff;
}
.Tile .pre-icon {
padding-left: 5px;
margin-top: 5px;
font-size: 35px;
opacity: 0.2;
opacity: 1;
transition: 300ms cubic-bezier(1, 0, 0, 1);
}
.Tile .Title {
padding-left: 10px;
margin-right:-30px;
margin-right: 0px;
transition: 300ms cubic-bezier(1, 0, 0, 1);
}
.Tile .TitleFa {
font-size: 16px;
font-size: 18px;
line-height: 22px;
color: #000;
transition: 300ms cubic-bezier(1, 0, 0, 1);
}
.Tile .TitleEn {
letter-spacing: 3px;
line-height: 20px;
font-size: 10px;
color: #a29da9;
color: #a0a0a0;
text-transform: uppercase;
transition: 300ms cubic-bezier(1, 0, 0, 1);
}
.Tile:hover, .Tile:hover .post-icon, .Tile:hover .pre-icon, .Tile:hover .TitleEn, .Tile:hover .TitleFa {
color: #fff;
}
.Tile .post-icon::before {
margin-top: 0px;

75
resources/js/Global/components/Inputs/Check-List.vue
Unescape View File

@ -0,0 +1,75 @@
<template>
<v-row :class="`ma-0 mt-2 checklist`">
<v-col xl="12" class="pt-4 pb-0 pr-0"> <section-title theme="sm" title-fa="چک لیست" title-en="check list" /></v-col>
<v-col xl="12" class="task-item row ma-0 mt-1 pt-1 pb-1 section-bordered flex-justified-space-between" :class="(task_status) ? 'done' : ''">
<div class="flex-justified-right">
<div class="En Bold text--24 counter">1</div>
<v-switch :color="$_color('task')" inset class="mr-2" v-model="task_status" />
<div class="Fa pr-2 text"> چک کردن سئو وبسایت وردک </div>
</div>
<div class="flex-justified-left">
<v-btn fab x-small :color="$_color('task')" dark>
<v-icon dark>WMi-pencil</v-icon>
</v-btn>
<v-btn fab x-small color="red" dark>
<v-icon dark>WMi-minus</v-icon>
</v-btn>
</div>
</v-col>
<v-col xl="12" class="row ma-0 mt-1 pt-1 pb-1 section-bordered flex-justified-right">
<v-text-field
v-validate="'min:4'"
label=" متن آیتم را وارد کنید "
color="cyan"
prepend-icon="WMi-text"
></v-text-field>
<v-btn
fab
small
color="cyan"
dark
class="mr-3"
>
<v-icon dark>WMi-plus</v-icon>
</v-btn>
</v-col>
<!-- <div class="add-button-row flex-justified-center">-->
<!-- <v-icon>WMi-plus</v-icon>-->
<!-- </div>-->
</v-row>
</template>
<script>
export default {
props: {
},
data: function () {
return {
task_status: false,
};
},
};
</script>
<style lang="scss" scoped>
.checklist .counter {
width: 30px;
border-left: 1px solid #eeeeec;
}
.checklist .task-item {
transition: 0.2s;
border-radius: 5px;
}
.task-item.done {
border: 1px solid var(--color-purple);
background-color: var(--color-bg-purple);
}
.task-item .text {
transition: 2.0s;
}
.task-item.done .text {
text-decoration: line-through;
text-decoration-color: var(--color-purple);
}
</style>

4
resources/js/Global/scss/Misc.scss vendored
Unescape View File

@ -29,7 +29,9 @@
Borders :: Begin
-------------------------------------------------------- */
.border-none {
border-width: 0px !important;
}
.border {
border: 1px solid;
}

2
resources/js/Global/utils/module-color/moduleColor.js vendored
Unescape View File

@ -18,6 +18,8 @@ export default {
// --------------------------
sms:"orange",
authorize:"blue",
user:"black",
roll_call:"black",
// --------------------------
// Admin

1
webpack.mix.js vendored
Unescape View File

@ -37,6 +37,7 @@ require('./modules/wm-product/webpack.mix');
require('./modules/wm-service/webpack.mix');
require('./modules/wm-store/webpack.mix');
require('./modules/wm-warehouse/webpack.mix');
require('./modules/wm-finance/webpack.mix');
// require('./modules/wm-web-builder/webpack.mix');
// require('./modules/wm-reservation/webpack.mix');

Write Preview
Loading…
Cancel
Save