diff --git a/resources/js/vue/App.vue b/resources/js/vue/Admin/App.vue
similarity index 100%
rename from resources/js/vue/App.vue
rename to resources/js/vue/Admin/App.vue
diff --git a/resources/js/vue/components/core/Drawer.vue b/resources/js/vue/Admin/components/core/Drawer.vue
similarity index 92%
rename from resources/js/vue/components/core/Drawer.vue
rename to resources/js/vue/Admin/components/core/Drawer.vue
index 9f1a4068..65b17679 100644
--- a/resources/js/vue/components/core/Drawer.vue
+++ b/resources/js/vue/Admin/components/core/Drawer.vue
@@ -94,39 +94,45 @@ export default {
         text: 'Dashboard'
       },
       {
-        to: {name: 'MyInfo'},
+        to: {name: 'My Info'},
         icon: 'mdi-account',
         text: 'My Info'
       },
       {
-        to: {name: 'AllResultTest'},
+        to: {name: 'All ResultTest'},
         icon: 'description',
         text: 'All Test Result'
       },
       {
-        to: {name: 'ManageUsers'},
+        to: {name: 'Manage Users'},
         icon: 'far fa-address-book',
         text: 'Manage Users',
         role: 'Admin|Supervisor',
       },
       {
-        to: {name: 'ListTestType'},
+        to: {name: 'List TestType'},
         icon: 'fas fa-vial',
         text: 'List Test Type',
         role: 'Admin'
       },
       {
-        to: {name: 'AllItem'},
+        to: {name: 'All Item'},
         icon: 'done',
         text: 'Items',
         role: 'Admin'
       },
       {
-        to: {name: 'AllPackage'},
+        to: {name: 'All Package'},
         icon: 'done',
         text: 'Packages',
         role: 'Admin'
       },
+      {
+        to: {name: 'All Cycle'},
+        icon: 'done',
+        text: 'Cycles',
+        role: 'Admin'
+      },
       {
         to: {name: 'Statistics'},
         icon: 'fas fa-chart-bar',
diff --git a/resources/js/vue/components/core/Filter.vue b/resources/js/vue/Admin/components/core/Filter.vue
similarity index 100%
rename from resources/js/vue/components/core/Filter.vue
rename to resources/js/vue/Admin/components/core/Filter.vue
diff --git a/resources/js/vue/components/core/Footer.vue b/resources/js/vue/Admin/components/core/Footer.vue
similarity index 100%
rename from resources/js/vue/components/core/Footer.vue
rename to resources/js/vue/Admin/components/core/Footer.vue
diff --git a/resources/js/vue/components/core/Modal.vue b/resources/js/vue/Admin/components/core/Modal.vue
similarity index 100%
rename from resources/js/vue/components/core/Modal.vue
rename to resources/js/vue/Admin/components/core/Modal.vue
diff --git a/resources/js/vue/components/core/Toolbar.vue b/resources/js/vue/Admin/components/core/Toolbar.vue
similarity index 100%
rename from resources/js/vue/components/core/Toolbar.vue
rename to resources/js/vue/Admin/components/core/Toolbar.vue
diff --git a/resources/js/vue/components/core/View.vue b/resources/js/vue/Admin/components/core/View.vue
similarity index 100%
rename from resources/js/vue/components/core/View.vue
rename to resources/js/vue/Admin/components/core/View.vue
diff --git a/resources/js/vue/components/helper/Offset.vue b/resources/js/vue/Admin/components/helper/Offset.vue
similarity index 100%
rename from resources/js/vue/components/helper/Offset.vue
rename to resources/js/vue/Admin/components/helper/Offset.vue
diff --git a/resources/js/vue/components/index.js b/resources/js/vue/Admin/components/index.js
similarity index 100%
rename from resources/js/vue/components/index.js
rename to resources/js/vue/Admin/components/index.js
diff --git a/resources/js/vue/components/material/Card.vue b/resources/js/vue/Admin/components/material/Card.vue
similarity index 100%
rename from resources/js/vue/components/material/Card.vue
rename to resources/js/vue/Admin/components/material/Card.vue
diff --git a/resources/js/vue/components/material/Cards.vue b/resources/js/vue/Admin/components/material/Cards.vue
similarity index 100%
rename from resources/js/vue/components/material/Cards.vue
rename to resources/js/vue/Admin/components/material/Cards.vue
diff --git a/resources/js/vue/components/material/ChartCard.vue b/resources/js/vue/Admin/components/material/ChartCard.vue
similarity index 100%
rename from resources/js/vue/components/material/ChartCard.vue
rename to resources/js/vue/Admin/components/material/ChartCard.vue
diff --git a/resources/js/vue/components/material/Notification.vue b/resources/js/vue/Admin/components/material/Notification.vue
similarity index 100%
rename from resources/js/vue/components/material/Notification.vue
rename to resources/js/vue/Admin/components/material/Notification.vue
diff --git a/resources/js/vue/components/material/StatsCard.vue b/resources/js/vue/Admin/components/material/StatsCard.vue
similarity index 100%
rename from resources/js/vue/components/material/StatsCard.vue
rename to resources/js/vue/Admin/components/material/StatsCard.vue
diff --git a/resources/js/vue/components/modal/Base.vue b/resources/js/vue/Admin/components/modal/Base.vue
similarity index 100%
rename from resources/js/vue/components/modal/Base.vue
rename to resources/js/vue/Admin/components/modal/Base.vue
diff --git a/resources/js/vue/components/modal/auth/ChangePassword.vue b/resources/js/vue/Admin/components/modal/auth/ChangePassword.vue
similarity index 100%
rename from resources/js/vue/components/modal/auth/ChangePassword.vue
rename to resources/js/vue/Admin/components/modal/auth/ChangePassword.vue
diff --git a/resources/js/vue/components/modal/auth/VerifyCode.vue b/resources/js/vue/Admin/components/modal/auth/VerifyCode.vue
similarity index 100%
rename from resources/js/vue/components/modal/auth/VerifyCode.vue
rename to resources/js/vue/Admin/components/modal/auth/VerifyCode.vue
diff --git a/resources/js/vue/components/modal/barcode/Barcode.vue b/resources/js/vue/Admin/components/modal/barcode/Barcode.vue
similarity index 53%
rename from resources/js/vue/components/modal/barcode/Barcode.vue
rename to resources/js/vue/Admin/components/modal/barcode/Barcode.vue
index 90e58acc..626fa588 100644
--- a/resources/js/vue/components/modal/barcode/Barcode.vue
+++ b/resources/js/vue/Admin/components/modal/barcode/Barcode.vue
@@ -1,18 +1,18 @@
 <template>
     <v-container grid-list-xs>
         <material-card color="black" title="Barcode Image">
-            <v-layout align-left justify-left wrap class="px-5 my-3">
+            <v-layout id="printMe" align-left justify-left wrap class="px-5 my-3">
                 <h3 class="ml-3">Barcode And QRCode Image</h3>
                 <v-flex xs12>
                     <hr class="v-divider theme--light">
                 </v-flex>
                 <v-layout row wrap class="ml-4">
-                    <v-flex xs12 md6 sm6>
+                    <v-flex xs12 md6 sm6 v-if="barcodeimg">
                         <img :src="barcodeimg">
                     </v-flex>
                 </v-layout>
                 <v-layout row wrap class="ml-4">
-                    <v-flex xs12 md6 sm6>
+                    <v-flex xs12 md6 sm6 v-if="QRCodeimg">
                         <img :src="QRCodeimg">
                     </v-flex>
                 </v-layout>
@@ -32,22 +32,49 @@
 import { mapGetters } from "vuex";
 export default {
     data: () => ({
-        barcodeimg : {},
-        QRCodeimg : {}
+        barcodeimg : null,
+        QRCodeimg : null
     }),
     created() {
-        this.barcodeimg = this.getModalProperties.result.data.data.Barcode;
-        this.QRCodeimg  = this.getModalProperties.result.data.data.QRCode;
+        this.barcodeimg = this.getModalProperties.result.data.data.Barcode ? this.getModalProperties.result.data.data.Barcode : null;
+        this.QRCodeimg  = this.getModalProperties.result.data.data.QRCode ? this.getModalProperties.result.data.data.QRCode : null;
     },
     computed: {
         ...mapGetters("modal", ["getModalProperties"])
     },
     methods: {
         print() {
-            let popup = window.open();
-            popup.document.write(`<img src="${this.barcodeimg}" style="padding:50px" /><img src="${this.QRCodeimg}" />`);
-            popup.focus(); 
-            popup.print();
+            const prtHtml = document.getElementById("printMe").innerHTML;
+
+            // Get all stylesheets HTML
+            let stylesHtml = "";
+            for (const node of [
+                ...document.querySelectorAll('link[rel="stylesheet"], style')
+            ]) {
+                stylesHtml += node.outerHTML;
+            }
+
+            // Open the print window
+            const WinPrint = window.open(
+                "",
+                "",
+                "left=0,top=0,width=800,height=900,toolbar=0,scrollbars=0,status=0"
+            );
+
+            WinPrint.document.write(`<!DOCTYPE html>
+            <html>
+            <head>
+                ${stylesHtml}
+            </head>
+            <body>
+                ${prtHtml}
+            </body>
+            </html>`);
+
+            WinPrint.document.close();
+            WinPrint.focus();
+            WinPrint.print();
+            WinPrint.close();
         }
     }
 };
diff --git a/resources/js/vue/components/modal/cycle/Show.vue b/resources/js/vue/Admin/components/modal/cycle/Show.vue
similarity index 100%
rename from resources/js/vue/components/modal/cycle/Show.vue
rename to resources/js/vue/Admin/components/modal/cycle/Show.vue
diff --git a/resources/js/vue/components/modal/item/show.vue b/resources/js/vue/Admin/components/modal/item/show.vue
similarity index 100%
rename from resources/js/vue/components/modal/item/show.vue
rename to resources/js/vue/Admin/components/modal/item/show.vue
diff --git a/resources/js/vue/components/modal/package/Show.vue b/resources/js/vue/Admin/components/modal/package/Show.vue
similarity index 100%
rename from resources/js/vue/components/modal/package/Show.vue
rename to resources/js/vue/Admin/components/modal/package/Show.vue
diff --git a/resources/js/vue/components/modal/testresult/Show.vue b/resources/js/vue/Admin/components/modal/testresult/Show.vue
similarity index 100%
rename from resources/js/vue/components/modal/testresult/Show.vue
rename to resources/js/vue/Admin/components/modal/testresult/Show.vue
diff --git a/resources/js/vue/components/modal/ticket/NewMessage.vue b/resources/js/vue/Admin/components/modal/ticket/NewMessage.vue
similarity index 100%
rename from resources/js/vue/components/modal/ticket/NewMessage.vue
rename to resources/js/vue/Admin/components/modal/ticket/NewMessage.vue
diff --git a/resources/js/vue/components/modal/ticket/ShowMessages.vue b/resources/js/vue/Admin/components/modal/ticket/ShowMessages.vue
similarity index 100%
rename from resources/js/vue/components/modal/ticket/ShowMessages.vue
rename to resources/js/vue/Admin/components/modal/ticket/ShowMessages.vue
diff --git a/resources/js/vue/components/modal/user/Role.vue b/resources/js/vue/Admin/components/modal/user/Role.vue
similarity index 100%
rename from resources/js/vue/components/modal/user/Role.vue
rename to resources/js/vue/Admin/components/modal/user/Role.vue
diff --git a/resources/js/vue/components/ticket/SendMessage.vue b/resources/js/vue/Admin/components/ticket/SendMessage.vue
similarity index 100%
rename from resources/js/vue/components/ticket/SendMessage.vue
rename to resources/js/vue/Admin/components/ticket/SendMessage.vue
diff --git a/resources/js/vue/config/urls.js b/resources/js/vue/Admin/config/urls.js
similarity index 100%
rename from resources/js/vue/config/urls.js
rename to resources/js/vue/Admin/config/urls.js
diff --git a/resources/js/vue/config/utils.js b/resources/js/vue/Admin/config/utils.js
similarity index 100%
rename from resources/js/vue/config/utils.js
rename to resources/js/vue/Admin/config/utils.js
diff --git a/resources/js/vue/fontello/fontello-embedded.css b/resources/js/vue/Admin/fontello/fontello-embedded.css
similarity index 100%
rename from resources/js/vue/fontello/fontello-embedded.css
rename to resources/js/vue/Admin/fontello/fontello-embedded.css
diff --git a/resources/js/vue/fontello/fontello-embedded.scss b/resources/js/vue/Admin/fontello/fontello-embedded.scss
similarity index 100%
rename from resources/js/vue/fontello/fontello-embedded.scss
rename to resources/js/vue/Admin/fontello/fontello-embedded.scss
diff --git a/resources/js/vue/i18n/index.js b/resources/js/vue/Admin/i18n/index.js
similarity index 100%
rename from resources/js/vue/i18n/index.js
rename to resources/js/vue/Admin/i18n/index.js
diff --git a/resources/js/vue/lang/en/Common.json b/resources/js/vue/Admin/lang/en/Common.json
similarity index 100%
rename from resources/js/vue/lang/en/Common.json
rename to resources/js/vue/Admin/lang/en/Common.json
diff --git a/resources/js/vue/lang/en/Core/Footer.json b/resources/js/vue/Admin/lang/en/Core/Footer.json
similarity index 100%
rename from resources/js/vue/lang/en/Core/Footer.json
rename to resources/js/vue/Admin/lang/en/Core/Footer.json
diff --git a/resources/js/vue/lang/en/Core/Toolbar.json b/resources/js/vue/Admin/lang/en/Core/Toolbar.json
similarity index 100%
rename from resources/js/vue/lang/en/Core/Toolbar.json
rename to resources/js/vue/Admin/lang/en/Core/Toolbar.json
diff --git a/resources/js/vue/lang/en/Home.json b/resources/js/vue/Admin/lang/en/Home.json
similarity index 100%
rename from resources/js/vue/lang/en/Home.json
rename to resources/js/vue/Admin/lang/en/Home.json
diff --git a/resources/js/vue/lang/index.js b/resources/js/vue/Admin/lang/index.js
similarity index 100%
rename from resources/js/vue/lang/index.js
rename to resources/js/vue/Admin/lang/index.js
diff --git a/resources/js/vue/main.js b/resources/js/vue/Admin/main.js
similarity index 100%
rename from resources/js/vue/main.js
rename to resources/js/vue/Admin/main.js
diff --git a/resources/js/vue/plugins/axios.js b/resources/js/vue/Admin/plugins/axios.js
similarity index 100%
rename from resources/js/vue/plugins/axios.js
rename to resources/js/vue/Admin/plugins/axios.js
diff --git a/resources/js/vue/plugins/chart/BarChart.js b/resources/js/vue/Admin/plugins/chart/BarChart.js
similarity index 100%
rename from resources/js/vue/plugins/chart/BarChart.js
rename to resources/js/vue/Admin/plugins/chart/BarChart.js
diff --git a/resources/js/vue/plugins/chart/LineChart.js b/resources/js/vue/Admin/plugins/chart/LineChart.js
similarity index 100%
rename from resources/js/vue/plugins/chart/LineChart.js
rename to resources/js/vue/Admin/plugins/chart/LineChart.js
diff --git a/resources/js/vue/plugins/chart/PieChart.js b/resources/js/vue/Admin/plugins/chart/PieChart.js
similarity index 100%
rename from resources/js/vue/plugins/chart/PieChart.js
rename to resources/js/vue/Admin/plugins/chart/PieChart.js
diff --git a/resources/js/vue/plugins/chartist.js b/resources/js/vue/Admin/plugins/chartist.js
similarity index 100%
rename from resources/js/vue/plugins/chartist.js
rename to resources/js/vue/Admin/plugins/chartist.js
diff --git a/resources/js/vue/plugins/index.js b/resources/js/vue/Admin/plugins/index.js
similarity index 100%
rename from resources/js/vue/plugins/index.js
rename to resources/js/vue/Admin/plugins/index.js
diff --git a/resources/js/vue/plugins/theme.js b/resources/js/vue/Admin/plugins/theme.js
similarity index 100%
rename from resources/js/vue/plugins/theme.js
rename to resources/js/vue/Admin/plugins/theme.js
diff --git a/resources/js/vue/plugins/vuetify.js b/resources/js/vue/Admin/plugins/vuetify.js
similarity index 100%
rename from resources/js/vue/plugins/vuetify.js
rename to resources/js/vue/Admin/plugins/vuetify.js
diff --git a/resources/js/vue/router/index.js b/resources/js/vue/Admin/router/index.js
similarity index 100%
rename from resources/js/vue/router/index.js
rename to resources/js/vue/Admin/router/index.js
diff --git a/resources/js/vue/router/paths.js b/resources/js/vue/Admin/router/paths.js
similarity index 100%
rename from resources/js/vue/router/paths.js
rename to resources/js/vue/Admin/router/paths.js
diff --git a/resources/js/vue/services/acl/role.js b/resources/js/vue/Admin/services/acl/role.js
similarity index 100%
rename from resources/js/vue/services/acl/role.js
rename to resources/js/vue/Admin/services/acl/role.js
diff --git a/resources/js/vue/services/auth/storage.service.js b/resources/js/vue/Admin/services/auth/storage.service.js
similarity index 100%
rename from resources/js/vue/services/auth/storage.service.js
rename to resources/js/vue/Admin/services/auth/storage.service.js
diff --git a/resources/js/vue/services/auth/user.service.js b/resources/js/vue/Admin/services/auth/user.service.js
similarity index 100%
rename from resources/js/vue/services/auth/user.service.js
rename to resources/js/vue/Admin/services/auth/user.service.js
diff --git a/resources/js/vue/services/global/api.service.js b/resources/js/vue/Admin/services/global/api.service.js
similarity index 100%
rename from resources/js/vue/services/global/api.service.js
rename to resources/js/vue/Admin/services/global/api.service.js
diff --git a/resources/js/vue/services/global/errorHandler.service.js b/resources/js/vue/Admin/services/global/errorHandler.service.js
similarity index 100%
rename from resources/js/vue/services/global/errorHandler.service.js
rename to resources/js/vue/Admin/services/global/errorHandler.service.js
diff --git a/resources/js/vue/services/global/toast.service.js b/resources/js/vue/Admin/services/global/toast.service.js
similarity index 100%
rename from resources/js/vue/services/global/toast.service.js
rename to resources/js/vue/Admin/services/global/toast.service.js
diff --git a/resources/js/vue/services/index.js b/resources/js/vue/Admin/services/index.js
similarity index 100%
rename from resources/js/vue/services/index.js
rename to resources/js/vue/Admin/services/index.js
diff --git a/resources/js/vue/services/mixin/hasRole.js b/resources/js/vue/Admin/services/mixin/hasRole.js
similarity index 100%
rename from resources/js/vue/services/mixin/hasRole.js
rename to resources/js/vue/Admin/services/mixin/hasRole.js
diff --git a/resources/js/vue/services/services.rar b/resources/js/vue/Admin/services/services.rar
similarity index 100%
rename from resources/js/vue/services/services.rar
rename to resources/js/vue/Admin/services/services.rar
diff --git a/resources/js/vue/store/actions.js b/resources/js/vue/Admin/store/actions.js
similarity index 100%
rename from resources/js/vue/store/actions.js
rename to resources/js/vue/Admin/store/actions.js
diff --git a/resources/js/vue/store/getters.js b/resources/js/vue/Admin/store/getters.js
similarity index 100%
rename from resources/js/vue/store/getters.js
rename to resources/js/vue/Admin/store/getters.js
diff --git a/resources/js/vue/store/index.js b/resources/js/vue/Admin/store/index.js
similarity index 100%
rename from resources/js/vue/store/index.js
rename to resources/js/vue/Admin/store/index.js
diff --git a/resources/js/vue/store/modules/app/mutations.js b/resources/js/vue/Admin/store/modules/app/mutations.js
similarity index 100%
rename from resources/js/vue/store/modules/app/mutations.js
rename to resources/js/vue/Admin/store/modules/app/mutations.js
diff --git a/resources/js/vue/store/modules/app/state.js b/resources/js/vue/Admin/store/modules/app/state.js
similarity index 100%
rename from resources/js/vue/store/modules/app/state.js
rename to resources/js/vue/Admin/store/modules/app/state.js
diff --git a/resources/js/vue/store/modules/auth/actions.js b/resources/js/vue/Admin/store/modules/auth/actions.js
similarity index 100%
rename from resources/js/vue/store/modules/auth/actions.js
rename to resources/js/vue/Admin/store/modules/auth/actions.js
diff --git a/resources/js/vue/store/modules/auth/getters.js b/resources/js/vue/Admin/store/modules/auth/getters.js
similarity index 100%
rename from resources/js/vue/store/modules/auth/getters.js
rename to resources/js/vue/Admin/store/modules/auth/getters.js
diff --git a/resources/js/vue/store/modules/auth/mutations.js b/resources/js/vue/Admin/store/modules/auth/mutations.js
similarity index 100%
rename from resources/js/vue/store/modules/auth/mutations.js
rename to resources/js/vue/Admin/store/modules/auth/mutations.js
diff --git a/resources/js/vue/store/modules/auth/state.js b/resources/js/vue/Admin/store/modules/auth/state.js
similarity index 100%
rename from resources/js/vue/store/modules/auth/state.js
rename to resources/js/vue/Admin/store/modules/auth/state.js
diff --git a/resources/js/vue/store/modules/index.js b/resources/js/vue/Admin/store/modules/index.js
similarity index 100%
rename from resources/js/vue/store/modules/index.js
rename to resources/js/vue/Admin/store/modules/index.js
diff --git a/resources/js/vue/store/modules/modal/getters.js b/resources/js/vue/Admin/store/modules/modal/getters.js
similarity index 100%
rename from resources/js/vue/store/modules/modal/getters.js
rename to resources/js/vue/Admin/store/modules/modal/getters.js
diff --git a/resources/js/vue/store/modules/modal/mutations.js b/resources/js/vue/Admin/store/modules/modal/mutations.js
similarity index 100%
rename from resources/js/vue/store/modules/modal/mutations.js
rename to resources/js/vue/Admin/store/modules/modal/mutations.js
diff --git a/resources/js/vue/store/modules/modal/state.js b/resources/js/vue/Admin/store/modules/modal/state.js
similarity index 100%
rename from resources/js/vue/store/modules/modal/state.js
rename to resources/js/vue/Admin/store/modules/modal/state.js
diff --git a/resources/js/vue/store/mutations.js b/resources/js/vue/Admin/store/mutations.js
similarity index 100%
rename from resources/js/vue/store/mutations.js
rename to resources/js/vue/Admin/store/mutations.js
diff --git a/resources/js/vue/store/state.js b/resources/js/vue/Admin/store/state.js
similarity index 100%
rename from resources/js/vue/store/state.js
rename to resources/js/vue/Admin/store/state.js
diff --git a/resources/js/vue/styles/css/Assets/Main.scss b/resources/js/vue/Admin/styles/css/Assets/Main.scss
similarity index 100%
rename from resources/js/vue/styles/css/Assets/Main.scss
rename to resources/js/vue/Admin/styles/css/Assets/Main.scss
diff --git a/resources/js/vue/styles/css/Assets/WM-ModernTheme.scss b/resources/js/vue/Admin/styles/css/Assets/WM-ModernTheme.scss
similarity index 100%
rename from resources/js/vue/styles/css/Assets/WM-ModernTheme.scss
rename to resources/js/vue/Admin/styles/css/Assets/WM-ModernTheme.scss
diff --git a/resources/js/vue/styles/index.scss b/resources/js/vue/Admin/styles/index.scss
similarity index 100%
rename from resources/js/vue/styles/index.scss
rename to resources/js/vue/Admin/styles/index.scss
diff --git a/resources/js/vue/styles/material-dashboard/_alerts.scss b/resources/js/vue/Admin/styles/material-dashboard/_alerts.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_alerts.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_alerts.scss
diff --git a/resources/js/vue/styles/material-dashboard/_buttons.scss b/resources/js/vue/Admin/styles/material-dashboard/_buttons.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_buttons.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_buttons.scss
diff --git a/resources/js/vue/styles/material-dashboard/_cards.scss b/resources/js/vue/Admin/styles/material-dashboard/_cards.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_cards.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_cards.scss
diff --git a/resources/js/vue/styles/material-dashboard/_checkboxes.scss b/resources/js/vue/Admin/styles/material-dashboard/_checkboxes.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_checkboxes.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_checkboxes.scss
diff --git a/resources/js/vue/styles/material-dashboard/_colors.scss b/resources/js/vue/Admin/styles/material-dashboard/_colors.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_colors.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_colors.scss
diff --git a/resources/js/vue/styles/material-dashboard/_dropdown.scss b/resources/js/vue/Admin/styles/material-dashboard/_dropdown.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_dropdown.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_dropdown.scss
diff --git a/resources/js/vue/styles/material-dashboard/_fixed-plugin.scss b/resources/js/vue/Admin/styles/material-dashboard/_fixed-plugin.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_fixed-plugin.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_fixed-plugin.scss
diff --git a/resources/js/vue/styles/material-dashboard/_footer.scss b/resources/js/vue/Admin/styles/material-dashboard/_footer.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_footer.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_footer.scss
diff --git a/resources/js/vue/styles/material-dashboard/_inputs.scss b/resources/js/vue/Admin/styles/material-dashboard/_inputs.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_inputs.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_inputs.scss
diff --git a/resources/js/vue/styles/material-dashboard/_misc.scss b/resources/js/vue/Admin/styles/material-dashboard/_misc.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_misc.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_misc.scss
diff --git a/resources/js/vue/styles/material-dashboard/_mixins.scss b/resources/js/vue/Admin/styles/material-dashboard/_mixins.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_mixins.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_mixins.scss
diff --git a/resources/js/vue/styles/material-dashboard/_sidebar.scss b/resources/js/vue/Admin/styles/material-dashboard/_sidebar.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_sidebar.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_sidebar.scss
diff --git a/resources/js/vue/styles/material-dashboard/_tables.scss b/resources/js/vue/Admin/styles/material-dashboard/_tables.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_tables.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_tables.scss
diff --git a/resources/js/vue/styles/material-dashboard/_tabs.scss b/resources/js/vue/Admin/styles/material-dashboard/_tabs.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_tabs.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_tabs.scss
diff --git a/resources/js/vue/styles/material-dashboard/_toolbar.scss b/resources/js/vue/Admin/styles/material-dashboard/_toolbar.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_toolbar.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_toolbar.scss
diff --git a/resources/js/vue/styles/material-dashboard/_tooltips.scss b/resources/js/vue/Admin/styles/material-dashboard/_tooltips.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_tooltips.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_tooltips.scss
diff --git a/resources/js/vue/styles/material-dashboard/_typography.scss b/resources/js/vue/Admin/styles/material-dashboard/_typography.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_typography.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_typography.scss
diff --git a/resources/js/vue/styles/material-dashboard/_variables.scss b/resources/js/vue/Admin/styles/material-dashboard/_variables.scss
similarity index 100%
rename from resources/js/vue/styles/material-dashboard/_variables.scss
rename to resources/js/vue/Admin/styles/material-dashboard/_variables.scss
diff --git a/resources/js/vue/utils/vuex.js b/resources/js/vue/Admin/utils/vuex.js
similarity index 100%
rename from resources/js/vue/utils/vuex.js
rename to resources/js/vue/Admin/utils/vuex.js
diff --git a/resources/js/vue/views/Auth/ForgotPassword.vue b/resources/js/vue/Admin/views/Auth/ForgotPassword.vue
similarity index 100%
rename from resources/js/vue/views/Auth/ForgotPassword.vue
rename to resources/js/vue/Admin/views/Auth/ForgotPassword.vue
diff --git a/resources/js/vue/views/Auth/Login.vue b/resources/js/vue/Admin/views/Auth/Login.vue
similarity index 100%
rename from resources/js/vue/views/Auth/Login.vue
rename to resources/js/vue/Admin/views/Auth/Login.vue
diff --git a/resources/js/vue/views/Auth/Register.vue b/resources/js/vue/Admin/views/Auth/Register.vue
similarity index 100%
rename from resources/js/vue/views/Auth/Register.vue
rename to resources/js/vue/Admin/views/Auth/Register.vue
diff --git a/resources/js/vue/views/Cycle/AddEdit.vue b/resources/js/vue/Admin/views/Cycle/AddEdit.vue
similarity index 100%
rename from resources/js/vue/views/Cycle/AddEdit.vue
rename to resources/js/vue/Admin/views/Cycle/AddEdit.vue
diff --git a/resources/js/vue/views/Cycle/List.vue b/resources/js/vue/Admin/views/Cycle/List.vue
similarity index 100%
rename from resources/js/vue/views/Cycle/List.vue
rename to resources/js/vue/Admin/views/Cycle/List.vue
diff --git a/resources/js/vue/views/Dashboard.vue b/resources/js/vue/Admin/views/Dashboard.vue
similarity index 100%
rename from resources/js/vue/views/Dashboard.vue
rename to resources/js/vue/Admin/views/Dashboard.vue
diff --git a/resources/js/vue/views/Item/AddEdit.vue b/resources/js/vue/Admin/views/Item/AddEdit.vue
similarity index 100%
rename from resources/js/vue/views/Item/AddEdit.vue
rename to resources/js/vue/Admin/views/Item/AddEdit.vue
diff --git a/resources/js/vue/views/Item/List.vue b/resources/js/vue/Admin/views/Item/List.vue
similarity index 100%
rename from resources/js/vue/views/Item/List.vue
rename to resources/js/vue/Admin/views/Item/List.vue
diff --git a/resources/js/vue/views/MedicalCenter/AddEdit.vue b/resources/js/vue/Admin/views/MedicalCenter/AddEdit.vue
similarity index 100%
rename from resources/js/vue/views/MedicalCenter/AddEdit.vue
rename to resources/js/vue/Admin/views/MedicalCenter/AddEdit.vue
diff --git a/resources/js/vue/views/MedicalCenter/List.vue b/resources/js/vue/Admin/views/MedicalCenter/List.vue
similarity index 100%
rename from resources/js/vue/views/MedicalCenter/List.vue
rename to resources/js/vue/Admin/views/MedicalCenter/List.vue
diff --git a/resources/js/vue/views/MedicalCenter/OperatorList.vue b/resources/js/vue/Admin/views/MedicalCenter/OperatorList.vue
similarity index 100%
rename from resources/js/vue/views/MedicalCenter/OperatorList.vue
rename to resources/js/vue/Admin/views/MedicalCenter/OperatorList.vue
diff --git a/resources/js/vue/views/NotWorking/AddNewTest.vue b/resources/js/vue/Admin/views/NotWorking/AddNewTest.vue
similarity index 100%
rename from resources/js/vue/views/NotWorking/AddNewTest.vue
rename to resources/js/vue/Admin/views/NotWorking/AddNewTest.vue
diff --git a/resources/js/vue/views/NotWorking/Icons.vue b/resources/js/vue/Admin/views/NotWorking/Icons.vue
similarity index 100%
rename from resources/js/vue/views/NotWorking/Icons.vue
rename to resources/js/vue/Admin/views/NotWorking/Icons.vue
diff --git a/resources/js/vue/views/NotWorking/Maps.vue b/resources/js/vue/Admin/views/NotWorking/Maps.vue
similarity index 100%
rename from resources/js/vue/views/NotWorking/Maps.vue
rename to resources/js/vue/Admin/views/NotWorking/Maps.vue
diff --git a/resources/js/vue/views/NotWorking/Notifications.vue b/resources/js/vue/Admin/views/NotWorking/Notifications.vue
similarity index 100%
rename from resources/js/vue/views/NotWorking/Notifications.vue
rename to resources/js/vue/Admin/views/NotWorking/Notifications.vue
diff --git a/resources/js/vue/views/NotWorking/TableList.vue b/resources/js/vue/Admin/views/NotWorking/TableList.vue
similarity index 100%
rename from resources/js/vue/views/NotWorking/TableList.vue
rename to resources/js/vue/Admin/views/NotWorking/TableList.vue
diff --git a/resources/js/vue/views/NotWorking/Typography.vue b/resources/js/vue/Admin/views/NotWorking/Typography.vue
similarity index 100%
rename from resources/js/vue/views/NotWorking/Typography.vue
rename to resources/js/vue/Admin/views/NotWorking/Typography.vue
diff --git a/resources/js/vue/views/NotWorking/Upgrade.vue b/resources/js/vue/Admin/views/NotWorking/Upgrade.vue
similarity index 100%
rename from resources/js/vue/views/NotWorking/Upgrade.vue
rename to resources/js/vue/Admin/views/NotWorking/Upgrade.vue
diff --git a/resources/js/vue/views/NotWorking/UserProfile.vue b/resources/js/vue/Admin/views/NotWorking/UserProfile.vue
similarity index 100%
rename from resources/js/vue/views/NotWorking/UserProfile.vue
rename to resources/js/vue/Admin/views/NotWorking/UserProfile.vue
diff --git a/resources/js/vue/views/Package/AddEdit.vue b/resources/js/vue/Admin/views/Package/AddEdit.vue
similarity index 100%
rename from resources/js/vue/views/Package/AddEdit.vue
rename to resources/js/vue/Admin/views/Package/AddEdit.vue
diff --git a/resources/js/vue/views/Package/List.vue b/resources/js/vue/Admin/views/Package/List.vue
similarity index 100%
rename from resources/js/vue/views/Package/List.vue
rename to resources/js/vue/Admin/views/Package/List.vue
diff --git a/resources/js/vue/views/Statistics/Chart.vue b/resources/js/vue/Admin/views/Statistics/Chart.vue
similarity index 100%
rename from resources/js/vue/views/Statistics/Chart.vue
rename to resources/js/vue/Admin/views/Statistics/Chart.vue
diff --git a/resources/js/vue/views/TestResult/AddEdit.vue b/resources/js/vue/Admin/views/TestResult/AddEdit.vue
similarity index 100%
rename from resources/js/vue/views/TestResult/AddEdit.vue
rename to resources/js/vue/Admin/views/TestResult/AddEdit.vue
diff --git a/resources/js/vue/views/TestResult/List.vue b/resources/js/vue/Admin/views/TestResult/List.vue
similarity index 99%
rename from resources/js/vue/views/TestResult/List.vue
rename to resources/js/vue/Admin/views/TestResult/List.vue
index ba9cfcd3..b6970dc0 100644
--- a/resources/js/vue/views/TestResult/List.vue
+++ b/resources/js/vue/Admin/views/TestResult/List.vue
@@ -301,7 +301,7 @@ export default {
             }
         },
         async generateBarcode(id) {
-             const result = await ApiService.post(urls.Barcode(`CSSD-${id}`));
+             const result = await ApiService.post(urls.QRcode(`${id}`));
             if (result && result.status == 200) {
                 this.changeCurrentModal({
                     modal: "modal-barcode-barcode",
diff --git a/resources/js/vue/views/TestType/AddEdit.vue b/resources/js/vue/Admin/views/TestType/AddEdit.vue
similarity index 100%
rename from resources/js/vue/views/TestType/AddEdit.vue
rename to resources/js/vue/Admin/views/TestType/AddEdit.vue
diff --git a/resources/js/vue/views/TestType/List.vue b/resources/js/vue/Admin/views/TestType/List.vue
similarity index 100%
rename from resources/js/vue/views/TestType/List.vue
rename to resources/js/vue/Admin/views/TestType/List.vue
diff --git a/resources/js/vue/views/Tickets/List.vue b/resources/js/vue/Admin/views/Tickets/List.vue
similarity index 100%
rename from resources/js/vue/views/Tickets/List.vue
rename to resources/js/vue/Admin/views/Tickets/List.vue
diff --git a/resources/js/vue/views/User/List.vue b/resources/js/vue/Admin/views/User/List.vue
similarity index 100%
rename from resources/js/vue/views/User/List.vue
rename to resources/js/vue/Admin/views/User/List.vue
diff --git a/resources/js/vue/views/User/MyInfo.vue b/resources/js/vue/Admin/views/User/MyInfo.vue
similarity index 100%
rename from resources/js/vue/views/User/MyInfo.vue
rename to resources/js/vue/Admin/views/User/MyInfo.vue
diff --git a/resources/js/vue/ShowTestResult/App.vue b/resources/js/vue/ShowTestResult/App.vue
new file mode 100644
index 00000000..0193e59f
--- /dev/null
+++ b/resources/js/vue/ShowTestResult/App.vue
@@ -0,0 +1,38 @@
+<template>
+  <v-app>
+    <!-- <core-filter /> -->
+
+    <core-modal />
+
+    <core-toolbar v-if="accessToken" />
+
+    <core-drawer v-if="accessToken" />
+
+    <core-view />
+  </v-app>
+</template>
+
+<script>
+    import { TokenService } from '@/services';
+    import { mapState } from 'vuex';
+
+    export default {
+        data() {
+          return {
+          };
+        },
+        computed: mapState('auth', ['accessToken']),
+
+    }
+</script>
+
+<style lang="scss">
+@import '@/styles/index.scss';
+@import '@/styles/css/Assets/Main.scss';
+@import '@/styles/css/Assets/WM-ModernTheme.scss';
+
+/* Remove in 1.2 */
+.v-datatable thead th.column.sortable i {
+  vertical-align: unset;
+}
+</style>
diff --git a/resources/js/vue/ShowTestResult/main.js b/resources/js/vue/ShowTestResult/main.js
new file mode 100644
index 00000000..6081f563
--- /dev/null
+++ b/resources/js/vue/ShowTestResult/main.js
@@ -0,0 +1,55 @@
+import 'font-awesome/css/font-awesome.min.css'
+import Vue from 'vue'
+// Components
+import './components'
+
+// Plugins
+import './plugins'
+
+// Material FontIcon
+import 'material-design-icons-iconfont/dist/material-design-icons.css'
+// Fortawesome
+import '@fortawesome/fontawesome-free/css/all.css'
+// Sync router with store
+import { sync } from 'vuex-router-sync'
+// Application imports
+import App from './App.vue'
+import i18n from '@/i18n'
+import router from '@/router'
+import store from '@/store'
+
+
+import { ApiService, TokenService } from '@/services'
+// Sync store with router
+sync(store, router)
+
+Vue.config.productionTip = false
+ApiService.setHeader();
+// Set the base URL of the API
+ApiService.init(process.env.MIX_APP_ROOT_API)
+
+require('./services/global/errorHandler.service');
+// If token exists set Authorizion header
+if (TokenService.getToken()) {
+  ApiService.setAuthHeader();
+  
+  // If info exists set info in Store
+  if(TokenService.getInfo()) {
+    let info = TokenService.getInfo();
+    store.commit('setInfo', info);
+  } else {
+    store.dispatch('info');
+  }
+}
+
+import hasRole from '@/services/mixin/hasRole'
+Vue.mixin(hasRole)
+
+/* eslint-disable no-new */
+new Vue({
+  i18n,
+  router,
+  store,
+  render: h => h(App),
+  iconfont: 'fa4'
+}).$mount('#app');
diff --git a/resources/views/ShowTestResult.blade.php b/resources/views/ShowTestResult.blade.php
new file mode 100644
index 00000000..29f87246
--- /dev/null
+++ b/resources/views/ShowTestResult.blade.php
@@ -0,0 +1,66 @@
+<!doctype html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <title>CSSD-DOC</title>
+
+        <style>
+            html, body {
+                background-color: #fff;
+                color: #636b6f;
+                font-family: 'Nunito', sans-serif;
+                font-weight: 200;
+                height: 100vh;
+                margin: 0;
+            }
+
+            .full-height {
+                height: 100vh;
+            }
+
+            .flex-center {
+                align-items: center;
+                display: flex;
+                justify-content: center;
+            }
+
+            .position-ref {
+                position: relative;
+            }
+
+            .top-right {
+                position: absolute;
+                right: 10px;
+                top: 18px;
+            }
+
+            .content {
+                text-align: center;
+            }
+
+            .title {
+                font-size: 84px;
+            }
+
+            .links > a {
+                color: #636b6f;
+                padding: 0 25px;
+                font-size: 13px;
+                font-weight: 600;
+                letter-spacing: .1rem;
+                text-decoration: none;
+                text-transform: uppercase;
+            }
+
+            .m-b-md {
+                margin-bottom: 30px;
+            }
+        </style>
+    </head>
+    <body>
+        <div id="app"></div>
+        <script src="{{ mix('js/vue/showTestResult/app.js') }}"></script>
+    </body>
+</html>
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index ab891346..7e254948 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -65,6 +65,6 @@
     </head>
     <body>
         <div id="app"></div>
-        <script src="{{ mix('js/vue/app.js') }}"></script>
+        <script src="{{ mix('js/vue/admin/app.js') }}"></script>
     </body>
 </html>
diff --git a/webpack.mix.js b/webpack.mix.js
index 7c3008bb..621fedbe 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -15,7 +15,8 @@ const mix = require('laravel-mix');
      resolve: {
          extensions: ['.js', '.vue', '.json'],
          alias: {
-             '@': path.resolve(__dirname, 'resources/js/vue'),
+             '@': path.resolve(__dirname, 'resources/js/vue/Admin'),
+             '@ShowTestResult': path.resolve(__dirname, 'resources/js/vue/ShowTestResult'),
          },
      },
      output: {
@@ -23,6 +24,8 @@ const mix = require('laravel-mix');
     }
  });
 
-mix.js('resources/js/vue/main.js', 'public/js/vue/app.js');
+mix.js('resources/js/vue/Admin/main.js', 'public/js/vue/admin/app.js');
+
+// mix.js('resources/js/vue/showTestResult/main.js', 'public/js/vue/showTestResult/app.js');
 
 mix.version();
\ No newline at end of file