diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 5ea48d3..b21d9b4 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -65,7 +65,7 @@ class RouteServiceProvider extends ServiceProvider */ protected function mapApiRoutes() { - Route::prefix('api') + Route::prefix('api/v1') ->middleware('api') ->namespace($this->namespace) ->group(base_path('routes/api.php')); diff --git a/public/fonts/fontello.eot b/public/fonts/fontello.eot index 69a29ac..58911d0 100644 Binary files a/public/fonts/fontello.eot and b/public/fonts/fontello.eot differ diff --git a/public/fonts/fontello.svg b/public/fonts/fontello.svg index ea702b2..9a636a0 100644 --- a/public/fonts/fontello.svg +++ b/public/fonts/fontello.svg @@ -412,6 +412,8 @@ + + @@ -450,6 +452,8 @@ + + @@ -624,6 +628,8 @@ + + @@ -812,6 +818,20 @@ + + + + + + + + + + + + + + diff --git a/public/fonts/fontello.ttf b/public/fonts/fontello.ttf index 2bf9963..3fe00d9 100644 Binary files a/public/fonts/fontello.ttf and b/public/fonts/fontello.ttf differ diff --git a/public/fonts/fontello.woff b/public/fonts/fontello.woff index 4ed2923..630cf0a 100644 Binary files a/public/fonts/fontello.woff and b/public/fonts/fontello.woff differ diff --git a/public/fonts/fontello.woff2 b/public/fonts/fontello.woff2 index e591412..ed1be89 100644 Binary files a/public/fonts/fontello.woff2 and b/public/fonts/fontello.woff2 differ diff --git a/resources/js/Global/components/Blocks/Hint.vue b/resources/js/Global/components/Blocks/Hint.vue new file mode 100644 index 0000000..e5660eb --- /dev/null +++ b/resources/js/Global/components/Blocks/Hint.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/resources/js/Global/components/Blocks/Icon.vue b/resources/js/Global/components/Blocks/Icon.vue index 0862808..2ffd03a 100644 --- a/resources/js/Global/components/Blocks/Icon.vue +++ b/resources/js/Global/components/Blocks/Icon.vue @@ -1,7 +1,10 @@ @@ -20,7 +23,7 @@ export default { /*---------------------------------------------------------------*/ /* Qunatity :: Begin*/ /*---------------------------------------------------------------*/ - .we-quantity { + .we-icon { transition: 0.2s; border: 1px solid transparent; border-radius: 5px; @@ -31,43 +34,40 @@ export default { text-align: center; } - .we-quantity .number { + .we-icon .number { font-size: 60px; line-height: 45px; } - .we-quantity .icon .v-icon { + .we-icon .icon .v-icon { font-size: 40px; margin-left: -5px; line-height: 45px; } - .we-quantity .label { + .we-icon .label { font-size: 14px; - opacity: 0.7; text-align: right; line-height: 16px; margin-right: 3px; } - .we-quantity.sm .number { + .we-icon.sm .number { font-size: 50px; line-height: 40px; } - .we-quantity.sm .label { + .we-icon.sm .label { font-size: 12px; - opacity: 0.7; text-align: right; line-height: 14px; margin-right: 3px; } - .we-quantity.xl .number { - font-size: 70px; - line-height: 60px; + .we-icon.xl .v-icon { + font-size: 60px; + line-height: 50px; } - .we-quantity.xl .label { + .we-icon.xl .label { font-size: 15px; - opacity: 0.7; text-align: right; line-height: 18px; margin-right: 3px; @@ -75,7 +75,7 @@ export default { } - .we-quantity.variation { + .we-icon.variation { padding: 5px 10px; background-color: #eeeeee; border-radius: 3px; @@ -86,4 +86,15 @@ export default { /*---------------------------------------------------------------*/ /* Qunatity :: End*/ /*---------------------------------------------------------------*/ + + @import "resources/js/Global/scss/_vars.scss"; + @each $color, + $value in $colors { + .we-icon.theme-#{$color} .v-icon { + color: $value; + } + .we-icon.theme-#{$color} .value { + color: $value; + } + } diff --git a/resources/js/Global/components/Blocks/Name.vue b/resources/js/Global/components/Blocks/Name.vue index 5ab62af..4ee7fa9 100644 --- a/resources/js/Global/components/Blocks/Name.vue +++ b/resources/js/Global/components/Blocks/Name.vue @@ -35,13 +35,15 @@ text-align: right; } .name-block .text .Fa { - font-size: 22px; + font-size: 20px; } .name-block .text .En { font-size: 12px; letter-spacing: 5px; text-transform: uppercase; margin-right: -5px; + margin-top: -2px; + color: #b1b1b1; } .name-block .text .date { font-size: 12px; @@ -65,6 +67,25 @@ margin-right: -3px; } + /*----------------------------------------------------*/ + /* Size MD */ + /*----------------------------------------------------*/ + .name-block.xl { + text-align:right; + padding: 0px 2px; + } + .name-block.xl .Fa { + font-size: 28px; + } + .name-block.xl .En { + font-size: 16px; + letter-spacing: 5px; + text-transform: uppercase; + color: #9a9a9a; + margin-right: -3px; + } + + /*----------------------------------------------------*/ /* number-absolute */ /*----------------------------------------------------*/ @@ -77,6 +98,10 @@ line-height: 80px; } + .name-block.number-light-gray .number { + color: var(--color-light-gray); + } + /*----------------------------------------------------*/ diff --git a/resources/js/Global/components/Blocks/Number.vue b/resources/js/Global/components/Blocks/Number.vue index dccc7e6..b805d67 100644 --- a/resources/js/Global/components/Blocks/Number.vue +++ b/resources/js/Global/components/Blocks/Number.vue @@ -71,4 +71,10 @@ background-color: $value; } } + @each $color, + $value in $colors { + .we-number.theme-#{$color} { + color: $value; + } + } diff --git a/resources/js/Global/components/Drawer/SideBar.vue b/resources/js/Global/components/Drawer/SideBar.vue index f7fc842..6c5c24f 100644 --- a/resources/js/Global/components/Drawer/SideBar.vue +++ b/resources/js/Global/components/Drawer/SideBar.vue @@ -7,8 +7,8 @@
{{ getAuthUser.name }}
-
{{ getCurrentTime }}
-
{{ new Date() | moment("dddd jDD jMMMM jYYYY") }}
+
{{ getCurrentTime }}
+
{{ new Date() | moment("dddd jDD jMMMM jYYYY") }}