diff --git a/config/app.php b/config/app.php index 4b6def4..37abb4f 100644 --- a/config/app.php +++ b/config/app.php @@ -224,7 +224,6 @@ return [ 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, - 'AuthFinder' => App\CorePackages\Authenticate\AuthFinderFacade::class, ], diff --git a/public/mix-manifest.json b/public/mix-manifest.json new file mode 100644 index 0000000..2e30511 --- /dev/null +++ b/public/mix-manifest.json @@ -0,0 +1,7 @@ +{ + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=7fcd283086b499f2c4eb", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=4271ddf84160f6db9559", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=42a67229cb063f0afead", + "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=31627036c5ddd8a0c6ba", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=140e6ef646d3001986ba" +} diff --git a/resources/js/Global/components/Drawer/SideBar.vue b/resources/js/Global/components/Drawer/SideBar.vue index d301d68..c87ed3b 100644 --- a/resources/js/Global/components/Drawer/SideBar.vue +++ b/resources/js/Global/components/Drawer/SideBar.vue @@ -2,7 +2,7 @@ fas fa-bars - + fas fa-home
@@ -51,6 +51,7 @@ \ No newline at end of file diff --git a/resources/js/Global/mixins/commingSoon.js b/resources/js/Global/mixins/commingSoon.js index 3acfc88..a57d6d0 100644 --- a/resources/js/Global/mixins/commingSoon.js +++ b/resources/js/Global/mixins/commingSoon.js @@ -9,10 +9,7 @@ var CommingSoonArray = [ "crm-setting", "crm-client-filter", "crm-statistics", - "user-list-filter", - "user-roles", - ]; const commingSoon = { methods: { diff --git a/resources/js/Global/services/storage.services.js b/resources/js/Global/services/storage.services.js index bea4c34..ffd195e 100644 --- a/resources/js/Global/services/storage.services.js +++ b/resources/js/Global/services/storage.services.js @@ -3,6 +3,7 @@ import qs from 'qs'; const TOKEN_KEY = 'access_token' const USER = 'user' const PERMISSION = 'permission' +const VIRTUALACTIVITY = 'virtual_activity' /** * Manage the how Access Tokens are being stored and retreived from storage. * @@ -58,5 +59,22 @@ const PermissionService = { localStorage.removeItem(PERMISSION) }, } +const VirtualActivityService = { + get() { + if (localStorage.getItem(VIRTUALACTIVITY)) { + return qs.parse(localStorage.getItem(VIRTUALACTIVITY)) + } + return null; + }, + + save(virtualActivity = null) { + virtualActivity = qs.stringify(virtualActivity); + localStorage.setItem(VIRTUALACTIVITY, virtualActivity) + }, + + remove() { + localStorage.removeItem(PERMISSION) + }, +} -export { TokenService, UserService, PermissionService } +export { TokenService, UserService, PermissionService, VirtualActivityService } diff --git a/resources/js/Global/utils/common/routes.js b/resources/js/Global/utils/common/routes.js index b1a5877..78b87f6 100644 --- a/resources/js/Global/utils/common/routes.js +++ b/resources/js/Global/utils/common/routes.js @@ -4,5 +4,8 @@ export default { }, main() { return process.env.MIX_PUSHER_APP_ROUTE_MAIN || "/Main/Home"; - } + }, + user() { + return "/User/List"; + }, } diff --git a/resources/js/Home/store/getters.js b/resources/js/Home/store/getters.js index fab8971..02a61be 100644 --- a/resources/js/Home/store/getters.js +++ b/resources/js/Home/store/getters.js @@ -1,4 +1,2 @@ export default { - getClientTypes: state => state.clientTypes, - getPhoneTypes: state => state.phoneTypes }; diff --git a/resources/js/Home/store/state.js b/resources/js/Home/store/state.js index fd1f162..ce7bc92 100644 --- a/resources/js/Home/store/state.js +++ b/resources/js/Home/store/state.js @@ -1,4 +1,2 @@ export default { - PaymentConfirmation: false, - TrialConfirmation: false, }; \ No newline at end of file diff --git a/resources/js/Home/views/AddModule.vue b/resources/js/Home/views/AddModule.vue index 14e62f9..9967bbf 100644 --- a/resources/js/Home/views/AddModule.vue +++ b/resources/js/Home/views/AddModule.vue @@ -1,215 +1,259 @@ diff --git a/resources/js/Home/views/Home.vue b/resources/js/Home/views/Home.vue index db0604d..63349c2 100644 --- a/resources/js/Home/views/Home.vue +++ b/resources/js/Home/views/Home.vue @@ -18,11 +18,11 @@ > - + diff --git a/resources/js/SharedRoutes/index.js b/resources/js/SharedRoutes/index.js deleted file mode 100644 index e1e87d7..0000000 --- a/resources/js/SharedRoutes/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import sharedPath from './path'; - - -// let paths = []; - -// paths = paths.concat(sharedPath); - -export default sharedPath; diff --git a/resources/js/SharedRoutes/path.js b/resources/js/SharedRoutes/path.js deleted file mode 100644 index 5e5b837..0000000 --- a/resources/js/SharedRoutes/path.js +++ /dev/null @@ -1,7 +0,0 @@ -export default [ - // { - // path: '/CRM/MyTasks', - // name: 'MyTasks', - // view: 'Common/views/Tasks' - // } -]; diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js deleted file mode 100644 index c1f8ac3..0000000 --- a/resources/js/bootstrap.js +++ /dev/null @@ -1,56 +0,0 @@ - -window._ = require('lodash'); - -/** - * We'll load jQuery and the Bootstrap jQuery plugin which provides support - * for JavaScript based Bootstrap features such as modals and tabs. This - * code may be modified to fit the specific needs of your application. - */ - -try { - window.Popper = require('popper.js').default; - window.$ = window.jQuery = require('jquery'); - - require('bootstrap'); -} catch (e) {} - -/** - * We'll load the axios HTTP library which allows us to easily issue requests - * to our Laravel back-end. This library automatically handles sending the - * CSRF token as a header based on the value of the "XSRF" token cookie. - */ - -window.axios = require('axios'); - -window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; - -/** - * Next we will register the CSRF Token as a common header with Axios so that - * all outgoing HTTP requests automatically have it attached. This is just - * a simple convenience so we don't have to attach every token manually. - */ - -let token = document.head.querySelector('meta[name="csrf-token"]'); - -if (token) { - window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content; -} else { - console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token'); -} - -/** - * Echo exposes an expressive API for subscribing to channels and listening - * for events that are broadcast by Laravel. Echo and event broadcasting - * allows your team to easily build robust real-time web applications. - */ - -// import Echo from 'laravel-echo' - -// window.Pusher = require('pusher-js'); - -// window.Echo = new Echo({ -// broadcaster: 'pusher', -// key: process.env.MIX_PUSHER_APP_KEY, -// cluster: process.env.MIX_PUSHER_APP_CLUSTER, -// encrypted: true -// }); diff --git a/resources/js/services/acl/role.js b/resources/js/services/acl/role.js deleted file mode 100644 index a521c4c..0000000 --- a/resources/js/services/acl/role.js +++ /dev/null @@ -1,17 +0,0 @@ -import { TokenService } from '@/services' - -const $hasRole = function(roles) { - if (TokenService.getToken()) { - roles = roles.split('|'); - for (const role of roles) { - if(TokenService.getInfo().roles && Array.isArray(TokenService.getInfo().roles) && TokenService.getInfo().roles.includes(role)) { - return true; - } - } - } - return false; -}; - -export { - $hasRole -} \ No newline at end of file diff --git a/resources/js/services/global/errorHandler.service.js b/resources/js/services/global/errorHandler.service.js deleted file mode 100644 index 1f7d37b..0000000 --- a/resources/js/services/global/errorHandler.service.js +++ /dev/null @@ -1,49 +0,0 @@ -import axios from "axios"; -import toast from "./toast.service"; -// import {TokenService, ApiService} from '@/services'; -// import store from "@/store" -// import router from '@/router' -function errorResponseHandler(error) { - - // check for errorHandle config - if ( - error.config.hasOwnProperty("errorHandle") && - error.config.errorHandle === false - ) { - return Promise.reject(error); - } - - // if has response show the error - if (error.response) { - if(typeof error.response.data.errors !== 'undefined') { - for (const key in error.response.data.errors) { - if (error.response.data.errors.hasOwnProperty(key)) { - let title = (error.response.data.title) ? error.response.data.title : undefined; - toast.error(error.response.data.errors[key], title); - } - } - } - if(error.response.status == 401) { - // TokenService.removeToken(); - // TokenService.removeRefreshToken(); - // TokenService.removeInfo(); - // ApiService.removeAuthHeader(); - // store.commit('auth/logoutSuccess', {}, {root: true}) - // router.push({ name: `Dashboard` }); - } - - } -} -function successHandler(response) { - if(response.status == 200) { - if(typeof response.data.message !== 'undefined') { - toast.success(response.data.message, response.data.title); - } - } - return response; -} - -// apply interceptor on response -axios.interceptors.response.use(successHandler, errorResponseHandler); - -export default errorResponseHandler; diff --git a/resources/js/services/global/toast.service.js b/resources/js/services/global/toast.service.js deleted file mode 100644 index 79150f2..0000000 --- a/resources/js/services/global/toast.service.js +++ /dev/null @@ -1,21 +0,0 @@ -import "izitoast/dist/css/iziToast.min.css"; -import iZtoast from "izitoast"; - -const toast = { - error: (message, title = "Error") => { - return iZtoast.error({ - title: title, - message: message, - position: "bottomCenter" - }); - }, - success: (message, title = "Success") => { - return iZtoast.success({ - title: title, - message: message, - position: "bottomCenter" - }); - } -}; - -export default toast; diff --git a/resources/js/services/mixin/hasRole.js b/resources/js/services/mixin/hasRole.js deleted file mode 100644 index bd1fc48..0000000 --- a/resources/js/services/mixin/hasRole.js +++ /dev/null @@ -1,6 +0,0 @@ -import {$hasRole} from '../acl/role'; -export default { - methods: { - $hasRole - }, -} \ No newline at end of file