conflit

app/Listeners/LogNotification.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Listeners;
+
+use Illuminate\Notifications\Events\NotificationSent;
+
+class LogNotification
+{
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  \App\Events\OrderShipped  $event
+     * @return void
+     */
+    public function handle(NotificationSent $event)
+    {
+        // Access the order using $event->order...
+    }
+}

public/mix-manifest.json

@@ -1,6 +1,14 @@
 {
+<<<<<<< HEAD
     "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=21cfc18193d7646e47fc",
     "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=c12c4411576c8750d0d9",
     "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=07b23df89bedfb5478cb",
     "/js/vue/User/app.js": "/js/vue/User/app.js?id=cc121c56742824d52899"
+=======
+    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=dc072ea26c92af6777a0",
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=db8af10412509ee0586b",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=76afa0e5e8d8410f111f",
+    "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=8058a4ba779b6aaf4121",
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=7e0e6ca7915af5a841bc"
+>>>>>>> 3e8aadc9625a4d51149fd0d98d1d10ed408f0e69
 }

resources/js/Global/components/Body/Backgrounds/Gradient-Image.vue

@@ -0,0 +1,25 @@
+<template>
+    <div>
+        <div class="backgrounds" :style="'background-image: url('+$_getPath()+'images/Backgrounds/Gradient/'+ImageName+'.jpg);'"></div>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        ImageName: { default: 'Blue' },
+    },
+
+};
+</script>
+
+<style lang="scss" scoped>
+    .backgrounds {
+        background-position: center;
+        background-repeat: no-repeat;
+        background-size: cover;
+        min-width: 100%;
+        min-height: 100%;
+        position:fixed;
+    }
+</style>

resources/js/Global/components/Drawer/SideBar.vue

@@ -16,24 +16,36 @@
 
 		<v-navigation-drawer v-model="drawer" app temporary right>
 			<v-list class="pa-1">
-				<v-list-tile avatar>
-					<v-list-tile-avatar>
-						<img :src="$_getPath()+'images/Global/Tiles/UserLogo.png'" />
-					</v-list-tile-avatar>
-
-					<v-list-tile-content>
-						<v-list-tile-title class="Name">{{ getAuthUser.name }}</v-list-tile-title>
-						<div class="Role">مدیریت</div>
+                <div class="row user-info">
+                    <v-flex lg9 class="pa-3">
+						<img class="Avatar" :src="$_getPath()+'images/Global/Misc/Avatar.png'" />
+                        <div class="Title">
+                            <div class="Name Fa">{{ getAuthUser.name }}</div>
+                            <div class="Role Fa">مدیریت</div>
+                        </div>
+                    </v-flex>
+                    <v-flex lg3>
 						<a class="LogOut">
-							<v-tooltip bottom color="black">
-								<v-btn small @click.native.stop="logout" slot="activator" outline fab color="black" dark>
+							<v-tooltip bottom color="black" transition="slide-x-transition">
+                                <template v-slot:activator="{ on }">
+                                    <v-btn class="mt-4" small @click.native.stop="logout" slot="activator" outlined fab color="black" dark v-on="on">
                                         <v-icon dark>fas fa-power-off</v-icon>
                                     </v-btn>
+                                </template>
 								<span>خروج از حساب کاربری</span>
 							</v-tooltip>
 						</a>
+                    </v-flex>
+                </div>
+				<!-- <v-list-tile avatar>
+					<v-list-tile-avatar>
+					</v-list-tile-avatar>
+
+					<v-list-tile-content>
+						<v-list-tile-title class="Name">{{ getAuthUser.name }}</v-list-tile-title>
+						<div class="Role">مدیریت</div>
 					</v-list-tile-content>
-				</v-list-tile>
+				</v-list-tile> -->
 			</v-list>
 
 			<v-list class="pt-0" dense>
@@ -110,6 +122,17 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
+.user-info .Title {
+    float: right;
+}
+.user-info .Avatar {
+    float: right;
+    width: 48px;
+    margin: 0px 10px;
+}
+
+
 .Header .Menu {
 	position: absolute;
 	right: 20px;
@@ -129,7 +152,7 @@ export default {
 	margin: 0px;
 }
 .Name {
-	font-size: 18px;
+	font-size: 16px;
 }
 .Role {
 	font-size: 14px;

resources/js/Global/plugins/globalComponent.js

@@ -1,15 +1,15 @@
 import Vue from 'vue';
 
 
-import VueScrollReveal from "vue-scroll-reveal";
+// import VueScrollReveal from "vue-scroll-reveal";
 
-import "popper.js";
-import "bootstrap-v4-rtl";
-import "bootstrap-v4-rtl/scss/bootstrap-rtl.scss";
-import "bootstrap-select";
-import "bootstrap-select/dist/css/bootstrap-select.css";
+// import "popper.js";
+// import "bootstrap-v4-rtl";
+// import "bootstrap-v4-rtl/scss/bootstrap-rtl.scss";
+// import "bootstrap-select";
+// import "bootstrap-select/dist/css/bootstrap-select.css";
 // import "vuetify/dist/vuetify.min.css"; // Ensure you are using css-loader
-import "@Global/assets/Font-Icons/css/fontello.css";
+// import "@Global/assets/Font-Icons/css/fontello.css";
 import "@Global/scss/style.scss";
 
 // components
@@ -26,13 +26,13 @@ momment.locale('fa');
 Vue.use(jalaliMoment);
 
 
-Vue.use(VueScrollReveal, {
-    class: 'v-scroll-reveal', // A CSS class applied to elements with the v-scroll-reveal directive; useful for animation overrides.
-    duration: 800,
-    scale: 1,
-    distance: '10px',
-    mobile: false
-});
+// Vue.use(VueScrollReveal, {
+//     class: 'v-scroll-reveal', // A CSS class applied to elements with the v-scroll-reveal directive; useful for animation overrides.
+//     duration: 800,
+//     scale: 1,
+//     distance: '10px',
+//     mobile: false
+// });
 
 // Vue.use(Vuetify, {
 // 	iconfont: "fa",

resources/js/Global/scss/Modify.scss

@@ -12,6 +12,10 @@
     max-width: 100%;
 }
 
+a:-webkit-any-link {
+    text-decoration: none;
+}
+
 // a {
 //     color:#000 !important;
 // }

resources/js/Global/scss/style.scss

@@ -24,9 +24,80 @@
     font-style: normal;
 }
 
+@font-face {
+    font-family: 'iranyekan-bold';
+    font-style: normal;
+    font-weight: bold;
+    src: url('../assets/Fonts/IranYekan/eot/iranyekanwebbold.eot');
+    src: url('../assets/Fonts/IranYekan/woff/iranyekanwebbold.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+    url('../assets/Fonts/IranYekan/ttf/iranyekanwebbold.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'iranyekan-thin';
+    font-style: normal;
+    font-weight: 100;
+    src: url('../assets/Fonts/IranYekan/eot/iranyekanwebthin.eot');
+    src: url('../assets/Fonts/IranYekan/woff/iranyekanwebthin.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+    url('../assets/Fonts/IranYekan/ttf/iranyekanwebthin.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'iranyekan-light';
+    font-style: normal;
+    font-weight: 300;
+    src: url('../assets/Fonts/IranYekan/eot/iranyekanweblight.eot');
+    src: url('../assets/Fonts/IranYekan/woff/iranyekanweblight.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+    url('../assets/Fonts/IranYekan/ttf/iranyekanweblight.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'iranyekan-regular';
+    font-style: normal;
+    font-weight: normal;
+    src: url('../assets/Fonts/IranYekan/eot/iranyekanwebregular.eot');
+    src: url('../assets/Fonts/IranYekan/woff/iranyekanwebregular.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+    url('../assets/Fonts/IranYekan/ttf/iranyekanwebregular.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'iranyekan-medium';
+    font-style: normal;
+    font-weight: 500;
+    src: url('../assets/Fonts/IranYekan/eot/iranyekanwebmedium.eot');
+    src: url('../assets/Fonts/IranYekan/woff/iranyekanwebmedium.woff') format('woff'), /* FF3.6+, IE9, Chrome6+, Saf5.1+*/
+    url('../assets/Fonts/IranYekan/ttf/iranyekanwebmedium.ttf') format('truetype');
+}
+
+
+/* ----
+-------------------------------- English Fonts-------------------------------
+-- */
+
+@font-face {
+    font-family: 'Montserrat-ExtraBold';
+    font-style: normal;
+    font-weight: bold;
+    src: url('../assets/Fonts/Montserrat/Montserrat-ExtraBold.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'Montserrat-Regular';
+    font-style: normal;
+    font-weight: 400;
+    src: url('../assets/Fonts/Montserrat/Montserrat-Regular.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'Montserrat-Thin';
+    font-style: normal;
+    font-weight: 200;
+    src: url('../assets/Fonts/Montserrat/Montserrat-Thin.ttf') format('truetype');
+}
+
 body {
     color: #5c6873;
-    font-family: "BYekan", 'Montserrat-Regular' !important;
+    font-family: "iranyekan-regular", 'Montserrat-Regular' !important;
     padding: 0px !important;
     margin: 0px !important;
     font-weight: 100;
@@ -46,10 +117,6 @@ a:hover {
                         General :: Begin
 -------------------------------------------------------- */
 
-.En-Raleway {
-    font-family: 'Raleway', sans-serif;
-}
-
 .En {
     font-family: 'Montserrat-Regular', sans-serif;
 }

resources/js/Home/App.vue

@@ -1,7 +1,7 @@
 <template>
 	<v-app>
 		<div id="app">
-			<wm-background C1="1C0F41" C2="076371" C3="0C1630"></wm-background>
+			<wm-background ImageName="Purple"></wm-background>
 			<app-menu></app-menu>
 			<v-content>
 				<v-container fluid class="Login">
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import Background from "@Global/components/Body/Backgrounds/Gradient-CSS";
+import Background from "@Global/components/Body/Backgrounds/Gradient-Image";
 import Menu from "@Global/components/Drawer/SideBar";
 import { mapMutations } from "vuex";