From 6772f7aad21af93526016c7e51d568d5bd9b83bb Mon Sep 17 00:00:00 2001
From: "f.shokouhi" <fhshokouhi@gmail.com>
Date: Wed, 15 Jan 2020 11:40:30 +0330
Subject: [PATCH] add fontello and create home page

---
 resources/js/home/App.vue                     |  31 +++
 resources/js/home/main.js                     |  36 ++++
 resources/js/home/router/index.js             |   0
 resources/js/home/router/path.js              |   0
 resources/js/show/router/paths.js             |   2 +-
 resources/js/show/views/Home/Intro.vue        | 203 ++++++++++++++++++
 .../js/vue/components/modal/label/Show.vue    | 122 -----------
 resources/js/vue/router/paths.js              |   5 +
 resources/js/vue/views/Dashboard.vue          |  16 +-
 resources/js/vue/views/Intro/Intro.vue        | 180 ++++++++++++++++
 resources/js/vue/views/Label/List.vue         |   4 -
 routes/web.php                                |   3 +
 12 files changed, 467 insertions(+), 135 deletions(-)
 create mode 100644 resources/js/home/App.vue
 create mode 100644 resources/js/home/main.js
 create mode 100644 resources/js/home/router/index.js
 create mode 100644 resources/js/home/router/path.js
 create mode 100644 resources/js/show/views/Home/Intro.vue
 create mode 100644 resources/js/vue/views/Intro/Intro.vue

diff --git a/resources/js/home/App.vue b/resources/js/home/App.vue
new file mode 100644
index 00000000..2a29b250
--- /dev/null
+++ b/resources/js/home/App.vue
@@ -0,0 +1,31 @@
+<template>
+  <v-app>
+    
+  </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';
+@import './fontello/fontello-embedded.css';
+
+/* Remove in 1.2 */
+.v-datatable thead th.column.sortable i {
+    vertical-align: unset;
+}
+</style>
diff --git a/resources/js/home/main.js b/resources/js/home/main.js
new file mode 100644
index 00000000..fc52060c
--- /dev/null
+++ b/resources/js/home/main.js
@@ -0,0 +1,36 @@
+import Vue from 'vue'
+
+// Application imports
+import App from './App.vue'
+import router from './router'
+import '@/plugins/vuetify'
+
+
+// import { ApiService, TokenService } from '@/services'
+//
+// ApiService.setHeader();
+// Set the base URL of the API
+// ApiService.init(process.env.MIX_APP_ROOT_API)
+
+// // 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({
+  router,
+  store,
+  render: h => h(App),
+}).$mount('#app');
diff --git a/resources/js/home/router/index.js b/resources/js/home/router/index.js
new file mode 100644
index 00000000..e69de29b
diff --git a/resources/js/home/router/path.js b/resources/js/home/router/path.js
new file mode 100644
index 00000000..e69de29b
diff --git a/resources/js/show/router/paths.js b/resources/js/show/router/paths.js
index fa247d16..d6c85e7e 100644
--- a/resources/js/show/router/paths.js
+++ b/resources/js/show/router/paths.js
@@ -8,7 +8,7 @@ export default [
   {
     path: '/',
     name: 'home',
-    view: 'Package/ShowPackage'
+    view: 'Home/Intro'
   },
   {
     path: '/Show/Item/:item',
diff --git a/resources/js/show/views/Home/Intro.vue b/resources/js/show/views/Home/Intro.vue
new file mode 100644
index 00000000..471babc7
--- /dev/null
+++ b/resources/js/show/views/Home/Intro.vue
@@ -0,0 +1,203 @@
+<template id="">
+  <div class="">
+    <v-toolbar color="white" class="WM-Intro">
+      <v-toolbar-title >CSSD-DOC</v-toolbar-title>
+      <v-spacer></v-spacer>
+      <div class="my-2">
+        <v-btn color="black">Login</v-btn>
+      </div>
+    </v-toolbar>
+    <v-parallax src="https://www.dixon-resine.it/Immagine/334_industria-chimicadotjpg" height="600">
+      <v-layout
+      column
+      align-center
+      justify-center
+      class="white--text"
+      >
+      <p class="display-4 mb-5">CSSD-DOC</p>
+      <h1 class="white--text mb-2 display-1 text-center">Central Sterile Supply Department App & Software</h1>
+      <div class="subheading mb-4 text-center">Management & Traceability & Documentation solution for CSSD / SPD</div>
+    </v-layout>
+  </v-parallax>
+  <section>
+    <v-layout
+    column
+    wrap
+    class="my-12"
+    style="background-color:#f7f7f7"
+    >
+    <v-flex xs12 sm4 class="my-4 mb-5">
+      <div class="text-center WM-Align-C">
+        <h2 class="display-1">Sterilization process monitoring</h2>
+        <span class="subheading">
+          Sterilizer test records
+        </span>
+      </div>
+    </v-flex>
+    <v-flex xs12>
+      <v-container grid-list-xl>
+        <v-layout row wrap align-left>
+          <v-flex xs12 md2>
+          </v-flex>
+          <v-flex xs12 md3>
+            <v-card flat class="transparent">
+              <v-card-title v-for="(item , i) in items.items1"  :key="i" primary-title class="layout WM-Padding-8">
+                <div class="title">- {{ item }}</div>
+              </v-card-title>
+            </v-card>
+          </v-flex>
+          <v-flex xs12 md3>
+            <v-card flat class="transparent">
+              <v-card-title v-for="(item , i) in items.items2"  :key="i" primary-title class="layout WM-Padding-8">
+                <div class="title">- {{ item }}</div>
+              </v-card-title>
+            </v-card>
+          </v-flex>
+          <v-flex xs12 md3>
+            <v-card flat class="transparent">
+              <v-card-title v-for="(item , i) in items.items3"  :key="i" primary-title class="layout WM-Padding-8">
+                <div class="title">- {{ item }}</div>
+              </v-card-title>
+            </v-card>
+          </v-flex>
+          <v-flex xs12 md1>
+          </v-flex>
+        </v-layout>
+      </v-container>
+    </v-flex>
+  </v-layout>
+</section>
+<section>
+  <v-parallax src="https://intrademagazine.com/wp-content/uploads/2019/07/Barcode-Scanner-SDK-QR-Code-Generator-1600x915-compressor.jpg" height="380">
+    <v-layout column align-center justify-center>
+      <div class="headline white--text mb-4 text-center">MEC of High Level Disinfector</div>
+      <em>Kick-start your application today</em>
+    </v-layout>
+  </v-parallax>
+</section>
+<section>
+  <v-layout
+  column
+  wrap
+  class="my-12"
+  align-center
+  style="background-color:#f7f7f7"
+  >
+  <v-flex xs12 sm4 class="my-4">
+    <div class="text-center WM-Align-C">
+      <h2 class="headline">Product identification and traceability</h2>
+      <span class="subheading">
+        Cras facilisis mi vitae nunc
+      </span>
+    </div>
+  </v-flex>
+  <v-flex xs12>
+    <v-container grid-list-xl>
+      <v-layout row wrap align-center>
+        <v-flex xs12 md4>
+          <v-card flat class="transparent">
+            <v-card-text class="text-center WM-Align-C">
+              <v-icon x-large class="black--text text--lighten-2" style="font-size:40px !important">WMi-sticky-note</v-icon>
+            </v-card-text>
+            <v-card-title primary-title class="layout justify-center">
+              <div class="headline text-center">Item</div>
+            </v-card-title>
+            <v-card-text>
+              Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat tincidunt ornare.
+              Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+              Nullam in aliquet odio. Aliquam eu est vitae tellus bibendum tincidunt. Suspendisse potenti.
+            </v-card-text>
+          </v-card>
+        </v-flex>
+        <v-flex xs12 md4>
+          <v-card flat class="transparent">
+            <v-card-text class="text-center WM-Align-C">
+              <v-icon x-large class="black--text text--lighten-2 fas fa-archive" style="font-size:40px !important"></v-icon>
+            </v-card-text>
+            <v-card-title primary-title class="layout justify-center">
+              <div class="headline">Package</div>
+            </v-card-title>
+            <v-card-text>
+              Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat tincidunt ornare.
+              Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+              Nullam in aliquet odio. Aliquam eu est vitae tellus bibendum tincidunt. Suspendisse potenti.
+            </v-card-text>
+          </v-card>
+        </v-flex>
+        <v-flex xs12 md4>
+          <v-card flat class="transparent">
+            <v-card-text class="text-center WM-Align-C">
+              <v-icon x-large class="black--text text--lighten-2 fas fa-inbox" style="font-size:40px !important"></v-icon>
+            </v-card-text>
+            <v-card-title primary-title class="layout justify-center">
+              <div class="headline text-center">Labels</div>
+            </v-card-title>
+            <v-card-text>
+              Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat tincidunt ornare.
+              Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+              Nullam in aliquet odio. Aliquam eu est vitae tellus bibendum tincidunt. Suspendisse potenti.
+            </v-card-text>
+          </v-card>
+        </v-flex>
+      </v-layout>
+    </v-container>
+  </v-flex>
+</v-layout>
+</section>
+</div>
+</template>
+<style media="screen">
+.v-card__title.WM-Padding-8 {
+  padding: 8px !important;
+}
+.container.grid-list-xl :not(:only-child) .layout:last-child {
+  margin: auto -12px !important;
+}
+.v-toolbar.WM-Intro {
+  box-shadow : unset;
+  margin-bottom: 0;
+}
+.v-toolbar.WM-Intro:not(.v-toolbar--fixed) .v-toolbar__content {
+  margin-left: 0;
+}
+</style>
+<script>
+
+export default {
+  data: () => ({
+    items: {
+      items1 : [
+        'Physical Parameters, STEAM',
+        'BD Green Card Test',
+        'BDS – Test',
+        'Verify Sterilization Cycle, STEAM',
+        'Routine Control (Daily/Weekly), STEAM',
+        'Repair & Calibration, STEAM',
+        'Implant Sterilization, STEAM',
+      ],
+      items2 : [
+        'Physical Parameter, PLASMA',
+        'Verify Sterilization Cycle, PLASMA',
+        'Routine Control (Daily/Weekly), PLASMA',
+        'Repair & Calibration, PLASMA',
+        'Package Checks, PLASMA',
+        'Wash – Checks',
+        'Package Checks, STEAM',
+      ],
+      items3 : [
+        'Physical Parameters, EtO',
+        'Verify Sterilization Cycle, EtO',
+        'Repair & Calibration, Eto',
+        'Package Checks, EtO',
+        'Protein Residue Test',
+        'Seal Check'
+      ],
+    },
+  }),
+  components: {
+
+  },
+  created(){
+  },
+}
+</script>
diff --git a/resources/js/vue/components/modal/label/Show.vue b/resources/js/vue/components/modal/label/Show.vue
index 024799b1..ec6dabd9 100644
--- a/resources/js/vue/components/modal/label/Show.vue
+++ b/resources/js/vue/components/modal/label/Show.vue
@@ -1,114 +1,4 @@
 <template>
-<<<<<<< HEAD
-    <v-container grid-list-xs>
-        <material-card color="black" title="Show Label">
-            <v-layout  align-left justify-left wrap class="px-2 my-3">
-                <h3 class="ml-3">Info</h3>
-                <v-flex xs12>
-                    <hr class="v-divider theme--light">
-                </v-flex>
-                <v-layout id="printMe">
-
-                  <v-flex xs10 md12 sm12>
-                    <v-layout row wrap class="ml-4">
-                    <v-flex xs12 md12 sm12>
-                        <div class="WM-d-flex">
-                            <span class="title">Lot Number :</span>
-                            <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.lot_number }}</span>
-                        </div>
-                    </v-flex>
-                    <v-flex xs6 md7 sm7>
-                        <div class="">
-                            <!-- <v-icon class="WMi-location"></v-icon> -->
-                            <span class="headline ml-1" style="letter-spacing:0 !important">{{ (data.user && data.user.medical_center) ? data.user.medical_center.name : "" }}</span>
-                        </div>
-                    </v-flex>
-                    <v-flex xs6 md5 sm5>
-                        <div class="WM-d-flex">
-                            <v-icon class="WMi-Industry"></v-icon>
-                            <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.sterile_date }}</span>
-                        </div>
-                    </v-flex>
-                    <v-flex xs6 md7 sm7>
-                        <div class="WM-d-flex">
-                            <v-icon class="WMi-user"></v-icon>
-                            <span class="headline ml-2" style="letter-spacing:0 !important">{{ (typeof data.user != 'undefined') ? data.user.name : '' }}</span>
-                        </div>
-                    </v-flex>
-                    <v-flex xs6 md5 sm5>
-                        <div class="WM-d-flex">
-                            <v-icon class="WMi-hourglass"></v-icon>
-                            <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.expire_date }}</span>
-                        </div>
-                    </v-flex>
-                    <v-flex xs6 md7 sm7>
-                        <div class>
-                            <span class="title">Sterilizer ID :</span>
-                            <span class="headline ml-1" style="letter-spacing:0 !important">{{ data.sterilizer_id}}</span>
-                        </div>
-                    </v-flex>
-                    <v-flex xs6 md5 sm5>
-                        <div class>
-                            <span class="title">Cycle No :</span>
-                            <span class="headline ml-2" style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
-                        </div>
-                    </v-flex>
-                    <!-- text-align:center;margin-top:50px ml-4 -->
-                    <v-flex xs6 md7 sm7>
-                        <div class="mt-5">
-                            <v-layout row wrap class="" style="">
-                                <v-flex xs6 md12 sm12 v-if="barcodeimg">
-                                    <img :src="barcodeimg"><br />
-                                    <span>{{data.id}}</span>
-                                </v-flex>
-                            </v-layout>
-                        </div>
-                    </v-flex>
-                    <v-flex xs6 md5 sm5>
-                        <div class="mt-5">
-                            <v-flex xs6 md6 sm6 v-if="QRCodeimg">
-                                <img :src="QRCodeimg">
-                            </v-flex>
-                        </div>
-                    </v-flex>
-                    </v-layout>
-                  </v-flex>
-                </v-layout>
-            </v-layout>
-            <v-layout align-left justify-left wrap class="px-2 my-3">
-                <h3 class="ml-3">Package</h3>
-                <v-flex xs12>
-                    <hr class="v-divider theme--light">
-                </v-flex>
-                <v-layout row wrap class="mx-3">
-                    <template>
-                      <v-expansion-panel class="WM-Panel">
-                        <v-expansion-panel-content>
-                          <template v-slot:header>
-                            <div>{{ data.package.name }}</div>
-                          </template>
-                          <v-card>
-                            <v-card-text>note : {{ data.package.note }}</v-card-text>
-                            <v-card-text> Items :
-                                <v-expansion-panel class="WM-Panel" v-for="item in data.package.items" :key="item.key">
-                                  <v-expansion-panel-content>
-                                    <template v-slot:header>
-                                      <div>{{ item.name }} ({{ item.pivot.count }})</div>
-                                    </template>
-                                    <v-card>
-                                      <v-card-text>note : {{ item.note }}</v-card-text>
-                                    </v-card>
-                                  </v-expansion-panel-content>
-                                </v-expansion-panel>
-                            </v-card-text>
-                          </v-card>
-                      </v-expansion-panel-content>
-
-
-                      </v-expansion-panel>
-                    </template>
-
-=======
   <v-container grid-list-xs>
     <material-card color="black" title="Show Label">
       <v-layout  align-left justify-left wrap class="px-2 my-3">
@@ -177,24 +67,12 @@
                       <span class="headline ml-2 mb-1" style="letter-spacing:0 !important">{{ data.cycle_number }}</span>
                     </div>
                   </v-flex>
->>>>>>> 86a3479c9adec43de28cf80cee1fa1522b2bdd01
                 </v-layout>
               </v-flex>
               <!-- ________ Column2::End ________ -->
             </v-layout>
             <!-- ________ row1::Begin ________ -->
 
-<<<<<<< HEAD
-            <v-layout row wrap align-center justify-center style="margin-left: -15%;">
-                <v-flex class xs12 md2 sm2 @click="print" >
-                    <v-btn class="WM-CyanBlueGradient-BG" style="padding:10px 60px">
-                        <v-icon class="white--text mr-2 caption">fas fa-print</v-icon>
-                        <span class="white--text">Print</span>
-                    </v-btn>
-                </v-flex>
-            </v-layout>
-=======
->>>>>>> 86a3479c9adec43de28cf80cee1fa1522b2bdd01
 
             <!-- ________ row2::Begin ________ -->
             <v-layout row wrap>
diff --git a/resources/js/vue/router/paths.js b/resources/js/vue/router/paths.js
index d41debd5..1c87ddc0 100644
--- a/resources/js/vue/router/paths.js
+++ b/resources/js/vue/router/paths.js
@@ -214,4 +214,9 @@ export default [
     name: 'ShowPackage',
     view: 'Package/ShowPackage'
   },
+  {
+    path: '/Intro',
+    name: 'Intro',
+    view: 'Intro/Intro'
+  },
 ]
diff --git a/resources/js/vue/views/Dashboard.vue b/resources/js/vue/views/Dashboard.vue
index b9a8e5a2..02b4330e 100644
--- a/resources/js/vue/views/Dashboard.vue
+++ b/resources/js/vue/views/Dashboard.vue
@@ -83,18 +83,18 @@ export default {
  data() {
      return {
          AdminCards :[
-             {title:'Manage Users', text:'You can Manage the users information',icon:'/img/Static/Dashboard/ipad.png',color:'WM-YellowPinkGradient-BG',route:{name: 'ManageUsers'},aligntext:'text-md-center',alignimg:'text-md-left',column:'xs12 md12 sm12', role: 'Admin|Supervisor'},
-             {title:'Manage Medical Center', text:'You can edit the medical center information',icon:'/img/Static/Dashboard/Macbook.png',color:'WM-MuskGradient-BG',route:{name: 'ManageMedicalCenter'},aligntext:'text-md-left',alignimg:'text-md-right',column:'xs12 md7 sm7', role: 'Admin'},
-             {title:'List Test Type', text:'You can simply add your test type',icon:'/img/Static/Dashboard/Book-and-Pen.png',color:'WM-GreyGradient-BG',route:{name: 'ListTestType'},aligntext:'text-md-left',alignimg:'text-md-right',column:'xs12 md5 sm5', role: 'Admin'}
+             {title:'Manage Users', text:'You can Manage the users information',icon:'/img/Static/Dashboard/manageusers.png',color:'WM-YellowPinkGradient-BG',route:{name: 'ManageUsers'},aligntext:'text-md-center',alignimg:'text-md-left',column:'xs12 md12 sm12', role: 'Admin|Supervisor'},
+             {title:'Manage Medical Center', text:'You can edit the medical center information',icon:'/img/Static/Dashboard/settings.png',color:'WM-MuskGradient-BG',route:{name: 'ManageMedicalCenter'},aligntext:'text-md-left',alignimg:'text-md-right',column:'xs12 md7 sm7', role: 'Admin'},
+             {title:'List Test Type', text:'You can simply add your test type',icon:'/img/Static/Dashboard/result.png',color:'WM-GreyGradient-BG',route:{name: 'ListTestType'},aligntext:'text-md-left',alignimg:'text-md-right',column:'xs12 md5 sm5', role: 'Admin'}
          ],
          SupervisorCards :[
-             {title:'Manage Users', text:'You can Manage the users information',icon:'/img/Static/Dashboard/ipad.png',color:'WM-YellowPinkGradient-BG',route:{name: 'ManageUsers'},aligntext:'text-md-center',alignimg:'text-md-left',column:'xs12 md12 sm12', role: 'Admin|Supervisor'},
-             {title:'Test to Verify', text:'You can simply verify your own medical center test result in this section of website',icon:'/img/Static/Dashboard/notepad-colorful.png',color:'WM-PinkGradient-BG',route:{name: 'NotVerifyTestResult'},aligntext:'text-md-center',alignimg:'text-md-left',column:'xs12 md12 sm12', role: 'Admin|Supervisor'},
+             {title:'Manage Users', text:'You can Manage the users information',icon:'/img/Static/Dashboard/manageusers.png',color:'WM-YellowPinkGradient-BG',route:{name: 'ManageUsers'},aligntext:'text-md-center',alignimg:'text-md-left',column:'xs12 md12 sm12', role: 'Admin|Supervisor'},
+             {title:'Test to Verify', text:'You can simply verify your own medical center test result in this section of website',icon:'/img/Static/Dashboard/verify.png',color:'WM-PinkGradient-BG',route:{name: 'NotVerifyTestResult'},aligntext:'text-md-center',alignimg:'text-md-left',column:'xs12 md12 sm12', role: 'Admin|Supervisor'},
          ],
          UsersCards :[
-             {title:'My Info', text:'You can easily edit your registration information',icon:'/img/Static/Dashboard/darkmug.png',color:'WM-OrangeGradient-BG',route:{name: 'MyInfo'},aligntext:'text-md-left',alignimg:'text-md-right', column:'xs12 md6 sm6'},
-             {title:'All Test Result', text:'You can see all user tests and own tests',icon:'/img/Static/Dashboard/pad.png',color:'WM-GreenGradient-BG',route:{name: 'AllResultTest'},aligntext:'text-md-left',alignimg:'text-md-right',column:'xs12 md6 sm6'},
-             {title:'Add a Test Result', text:'You can add the test result',icon:'/img/Static/Dashboard/ipad.png',color:'WM-YellowPinkGradient-BG',route:{name: 'SubmitTestResult'},aligntext:'text-md-center',alignimg:'text-md-left',column:'xs12 md12 sm12'},
+             {title:'My Info', text:'You can easily edit your registration information',icon:'/img/Static/Dashboard/info.png',color:'WM-OrangeGradient-BG',route:{name: 'MyInfo'},aligntext:'text-md-left',alignimg:'text-md-right', column:'xs12 md6 sm6'},
+             {title:'All Test Result', text:'You can see all user tests and own tests',icon:'/img/Static/Dashboard/alltest.png',color:'WM-GreenGradient-BG',route:{name: 'AllResultTest'},aligntext:'text-md-left',alignimg:'text-md-right',column:'xs12 md6 sm6'},
+             {title:'Add a Test Result', text:'You can add the test result',icon:'/img/Static/Dashboard/addtest.png',color:'WM-YellowPinkGradient-BG',route:{name: 'SubmitTestResult'},aligntext:'text-md-center',alignimg:'text-md-left',column:'xs12 md12 sm12'},
          ],
      }
  }
diff --git a/resources/js/vue/views/Intro/Intro.vue b/resources/js/vue/views/Intro/Intro.vue
new file mode 100644
index 00000000..e9dc2d8b
--- /dev/null
+++ b/resources/js/vue/views/Intro/Intro.vue
@@ -0,0 +1,180 @@
+<template id="">
+  <div class="">
+    <v-toolbar color="white">
+      <v-toolbar-title v-text="title"></v-toolbar-title>
+    </v-toolbar>
+    <!-- _______________ Section 2::Begin _______________ -->
+    <section>
+      <v-parallax src="https://images.squarespace-cdn.com/content/v1/5bf5d5da506fbea76ffa4abe/1547249524951-CQ5U440SQYT23ODKL23G/ke17ZwdGBToddI8pDm48kKAwwdAfKsTlKsCcElEApLR7gQa3H78H3Y0txjaiv_0fDoOvxcdMmMKkDsyUqMSsMWxHk725yiiHCCLfrh8O1z5QPOohDIaIeljMHgDF5CVlOqpeNLcJ80NK65_fV7S1UegTYNQkRo-Jk4EWsyBNhwKrKLo5CceA1-Tdpfgyxoog5ck0MD3_q0rY3jFJjjoLbQ/yenyi.jpg" height="600">
+        <v-layout
+        column
+        align-center
+        justify-center
+        class="white--text"
+        >
+        <!-- <img src="assets/vuetify.png" alt="Vuetify.js" height="200"> -->
+        <p class="display-4 mb-5">CSSD-DOC</p>
+        <h1 class="white--text mb-2 mt-5 display-1 text-center">Central Sterile Supply Department App & Software</h1>
+        <div class="subheading mb-4 text-center">Management & Traceability & Documentation solution for CSSD / SPD</div>
+      </v-layout>
+    </v-parallax>
+  </section>
+  <section>
+    <v-layout
+    column
+    wrap
+    class="my-12"
+    align-center
+    >
+    <v-flex xs12 sm4 class="my-4">
+      <div class="text-center">
+        <h2 class="headline">-Sterilization process monitoring</h2>
+        <span class="subheading">
+          - Sterilizer test records
+        </span>
+      </div>
+    </v-flex>
+    <v-flex xs12>
+      <v-container grid-list-xl>
+        <v-layout row wrap align-left>
+          <v-flex xs12 md4>
+            <v-card flat class="transparent">
+              <p v-for="(item , i) in items.items1"  :key="i" class="headline text-left">item</p>
+            </v-card>
+          </v-flex>
+          <v-flex xs12 md4>
+            <v-card flat class="transparent">
+              <p v-for="(item , i) in items.items2"  :key="i" class="headline text-left">item</p>
+            </v-card>
+          </v-flex>
+          <v-flex xs12 md4>
+            <v-card flat class="transparent">
+              <p v-for="(item , i) in items.items3"  :key="i" class="headline text-left" v-text="item"></p>
+            </v-card>
+          </v-flex>
+        </v-layout>
+      </v-container>
+    </v-flex>
+  </v-layout>
+</section>
+<!-- _______________ Section 2::End _______________ -->
+
+<!-- _______________ Section 7::Begin _______________ -->
+<section>
+  <v-layout
+  column
+  wrap
+  class="my-12"
+  align-center
+  >
+  <v-flex xs12 sm4 class="my-4">
+    <div class="text-center">
+      <h2 class="headline">Product identification and traceability</h2>
+      <span class="subheading">
+        Cras facilisis mi vitae nunc
+      </span>
+    </div>
+  </v-flex>
+  <v-flex xs12>
+    <v-container grid-list-xl>
+      <v-layout row wrap align-center>
+        <v-flex xs12 md4>
+          <v-card flat class="transparent">
+            <v-card-text class="text-center">
+              <v-icon x-large class="blue--text text--lighten-2">mdi-palette</v-icon>
+            </v-card-text>
+            <v-card-title primary-title class="layout justify-center">
+              <div class="headline text-center">Item</div>
+            </v-card-title>
+            <v-card-text>
+              Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat tincidunt ornare.
+              Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+              Nullam in aliquet odio. Aliquam eu est vitae tellus bibendum tincidunt. Suspendisse potenti.
+            </v-card-text>
+          </v-card>
+        </v-flex>
+        <v-flex xs12 md4>
+          <v-card flat class="transparent">
+            <v-card-text class="text-center">
+              <v-icon x-large class="blue--text text--lighten-2">mdi-flash</v-icon>
+            </v-card-text>
+            <v-card-title primary-title class="layout justify-center">
+              <div class="headline">Fast development</div>
+            </v-card-title>
+            <v-card-text>
+              Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat tincidunt ornare.
+              Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+              Nullam in aliquet odio. Aliquam eu est vitae tellus bibendum tincidunt. Suspendisse potenti.
+            </v-card-text>
+          </v-card>
+        </v-flex>
+        <v-flex xs12 md4>
+          <v-card flat class="transparent">
+            <v-card-text class="text-center">
+              <v-icon x-large class="blue--text text--lighten-2">mdi-wrench</v-icon>
+            </v-card-text>
+            <v-card-title primary-title class="layout justify-center">
+              <div class="headline text-center">Completely Open Sourced</div>
+            </v-card-title>
+            <v-card-text>
+              Cras facilisis mi vitae nunc lobortis pharetra. Nulla volutpat tincidunt ornare.
+              Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+              Nullam in aliquet odio. Aliquam eu est vitae tellus bibendum tincidunt. Suspendisse potenti.
+            </v-card-text>
+          </v-card>
+        </v-flex>
+      </v-layout>
+    </v-container>
+  </v-flex>
+</v-layout>
+</section>
+
+</div>
+</template>
+<script>
+
+export default {
+  data: () => ({
+    items: [
+      {
+        items1 : [
+          'aaaaa',
+          'aaaaa',
+          'aaaaaa'
+        ],
+      },
+      {
+        items2 : [
+          'aaaaa',
+          'aaaaa',
+          'aaaaaa'
+        ],
+      },
+      {
+        items3 : [
+          'aaaaa',
+          'aaaaa',
+          'aaaaaa'
+        ],
+      },
+    ],
+    disabled: false,
+    dense: false,
+    twoLine: false,
+    threeLine: false,
+    shaped: false,
+    flat: false,
+    subheader: false,
+    inactive: false,
+    subGroup: false,
+    nav: false,
+    avatar: false,
+    rounded: false,
+  }),
+  components: {
+
+  },
+  created(){
+  },
+}
+</script>
diff --git a/resources/js/vue/views/Label/List.vue b/resources/js/vue/views/Label/List.vue
index ed467706..416326c9 100644
--- a/resources/js/vue/views/Label/List.vue
+++ b/resources/js/vue/views/Label/List.vue
@@ -204,11 +204,7 @@ export default {
 			if (result && result.status == 200) {
 				this.changeCurrentModal({
 					modal: "modal-label-show",
-<<<<<<< HEAD
-					properties: { result, width: 40 }
-=======
 					properties: { result, width :40 }
->>>>>>> 86a3479c9adec43de28cf80cee1fa1522b2bdd01
 				});
 			}
 		},
diff --git a/routes/web.php b/routes/web.php
index a084e16e..e8f9db62 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -57,6 +57,9 @@ Route::get('/test',function(){
 
 });
 // Route::get('Show/Package/{Package}', 'PackageController@show');
+Route::get('/',function(){
+    return view('showMaster');
+});
 Route::get('/Show/{any?}/{any2?}',function(){
     return view('showMaster');
 });