diff --git a/Dockerfile b/Dockerfile index cb811351..dad9c2bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,5 +8,5 @@ RUN composer install COPY wait.sh /usr/local/bin/wait.sh RUN chmod +x /usr/local/bin/wait.sh -CMD /usr/local/bin/wait.sh && php artisan migrate && php artisan db:seed && php artisan serve --host=0.0.0.0 --port=8000 +CMD /usr/local/bin/wait.sh && composer dumpautoload && php artisan migrate && php artisan db:seed && php artisan serve --host=0.0.0.0 --port=8000 EXPOSE 8000 diff --git a/resources/assets/js/middleware/auth.js b/resources/assets/js/middleware/auth.js index d1bb7af7..1302a8b7 100644 --- a/resources/assets/js/middleware/auth.js +++ b/resources/assets/js/middleware/auth.js @@ -3,7 +3,11 @@ import store from '~/store' export default async (to, from, next) => { if (!store.getters['auth/check']) { next({ name: 'login' }) - } else { + } + else if (store.getters['auth/user'].role == "admin"){ + next({ name : 'admin.home' }) + } + else { next() } } diff --git a/resources/assets/js/pages/auth/login.vue b/resources/assets/js/pages/auth/login.vue index aae968cf..e35dc708 100644 --- a/resources/assets/js/pages/auth/login.vue +++ b/resources/assets/js/pages/auth/login.vue @@ -55,6 +55,7 @@