diff --git a/composer.json b/composer.json index 63643c6..59c7fd7 100644 --- a/composer.json +++ b/composer.json @@ -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" } ] } diff --git a/resources/js/Global/components/Blocks/Number.vue b/resources/js/Global/components/Blocks/Number.vue index ea8f7d3..ff253f8 100644 --- a/resources/js/Global/components/Blocks/Number.vue +++ b/resources/js/Global/components/Blocks/Number.vue @@ -1,6 +1,6 @@ @@ -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; + } diff --git a/resources/js/Global/components/Drawer/Tile.vue b/resources/js/Global/components/Drawer/Tile.vue index 1766736..6142057 100644 --- a/resources/js/Global/components/Drawer/Tile.vue +++ b/resources/js/Global/components/Drawer/Tile.vue @@ -1,9 +1,11 @@