diff --git a/resources/js/show/App.vue b/resources/js/show/App.vue index 13ec1d83..719d2aea 100644 --- a/resources/js/show/App.vue +++ b/resources/js/show/App.vue @@ -10,7 +10,7 @@ \ No newline at end of file diff --git a/resources/js/vue/main.js b/resources/js/vue/main.js index 7e558094..d64418a2 100644 --- a/resources/js/vue/main.js +++ b/resources/js/vue/main.js @@ -11,6 +11,9 @@ import './plugins' import 'material-design-icons-iconfont/dist/material-design-icons.css' // Fortawesome import '@fortawesome/fontawesome-free/css/all.css' +// Styles +import '@/styles/css/Assets/Main.scss'; + // Sync router with store import { sync } from 'vuex-router-sync' // Application imports diff --git a/resources/js/vue/styles/css/Assets/Main.scss b/resources/js/vue/styles/css/Assets/Main.scss index 496ca139..b6674642 100644 --- a/resources/js/vue/styles/css/Assets/Main.scss +++ b/resources/js/vue/styles/css/Assets/Main.scss @@ -1,3 +1,28 @@ +@font-face { + font-family: 'Montserrat-Medium'; + font-style: normal; + font-weight: bold; + src: url('../../fonts/Montserrat-Medium.ttf') format('truetype'); +} +@font-face { + font-family: 'Montserrat-Bold'; + font-style: normal; + font-weight: bold; + src: url('../../fonts/Montserrat-Bold.ttf') format('truetype'); +} +// @font-face { +// font-family: 'Montserrat-Regular'; +// font-style: normal; +// font-weight: 400; +// src: url('../fonts/Montserrat-Regular.ttf') format('truetype'); +// } + +// @font-face { +// font-family: 'Montserrat-Thin'; +// font-style: normal; +// font-weight: 200; +// src: url('../fonts/Montserrat-Thin.ttf') format('truetype'); +// } .theme--light.v-card.WM-TransparentCard { background-color: transparent !important; border-color: transparent !important; @@ -63,6 +88,12 @@ .WM-YellowPinkGradient-BG { background : linear-gradient(111.36820033167237deg, rgba(249, 231, 148,1) 4.927083333333334%,rgba(246, 190, 212,1) 97.84374999999999%) } +.WM-YellowGradient-BG { + background : linear-gradient(111.36820033167237deg, #f8c369 4.927083333333334%,#ffe8c1 97.84374999999999%) +} +.WM-LightGreenGradient-BG { + background : linear-gradient(111.36820033167237deg, #90f7ec 4.927083333333334%,#32ccbc 97.84374999999999%) +} .WM-PinkGradient-BG { background: linear-gradient(to right, #ee9ca7, #ffdde1); } diff --git a/resources/js/vue/styles/fonts/Montserrat-Bold.ttf b/resources/js/vue/styles/fonts/Montserrat-Bold.ttf new file mode 100644 index 00000000..9a425b9a Binary files /dev/null and b/resources/js/vue/styles/fonts/Montserrat-Bold.ttf differ diff --git a/resources/js/vue/styles/fonts/Montserrat-Medium.ttf b/resources/js/vue/styles/fonts/Montserrat-Medium.ttf new file mode 100644 index 00000000..db5b1af8 Binary files /dev/null and b/resources/js/vue/styles/fonts/Montserrat-Medium.ttf differ diff --git a/resources/js/vue/views/Dashboard.vue b/resources/js/vue/views/Dashboard.vue index 02b4330e..c02e6f95 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/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 Users', text:'You can Manage the users information',icon:'/img/Static/Dashboard/manageusers.png',color:'WM-LightGreenGradient-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/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 Users', text:'You can Manage the users information',icon:'/img/Static/Dashboard/manageusers.png',color:'WM-LightGreenGradient-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/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'}, + {title:'Add a Test Result', text:'You can add the test result',icon:'/img/Static/Dashboard/addtest.png',color:'WM-YellowGradient-BG',route:{name: 'SubmitTestResult'},aligntext:'text-md-center',alignimg:'text-md-left',column:'xs12 md12 sm12'}, ], } }