diff --git a/front/src/assets/fonts.scss b/front/src/assets/fonts.scss new file mode 100644 index 0000000..1660c1c --- /dev/null +++ b/front/src/assets/fonts.scss @@ -0,0 +1,28 @@ +@mixin font-face($family, $file, $weight: normal, $style: normal) { + @font-face { + font-family: $family; + src: url($file); + font-weight: $weight; + font-style: $style; + font-display: swap; + } +} + +@include font-face("Montserrat", '../fonts/Montserrat-Black.ttf', 900, 'normal'); +@include font-face("Montserrat", '../fonts/Montserrat-BlackItalic.ttf', 900, 'italic'); +@include font-face("Montserrat", '../fonts/Montserrat-Bold.ttf', 700, 'normal'); +@include font-face("Montserrat", '../fonts/Montserrat-BoldItalic.ttf', 700, 'italic'); +@include font-face("Montserrat", '../fonts/Montserrat-ExtraBold.ttf', 800, 'normal'); +@include font-face("Montserrat", '../fonts/Montserrat-ExtraBoldItalic.ttf', 800, 'italic'); +@include font-face("Montserrat", '../fonts/Montserrat-ExtraLight.ttf', 200, 'normal'); +@include font-face("Montserrat", '../fonts/Montserrat-ExtraLightItalic.ttf', 200, 'italic'); +@include font-face("Montserrat", '../fonts/Montserrat-Italic.ttf', 400, 'italic'); +@include font-face("Montserrat", '../fonts/Montserrat-Light.ttf', 300, 'normal'); +@include font-face("Montserrat", '../fonts/Montserrat-LightItalic.ttf', 300, 'italic'); +@include font-face("Montserrat", '../fonts/Montserrat-Medium.ttf', 500, 'normal'); +@include font-face("Montserrat", '../fonts/Montserrat-MediumItalic.ttf', 500, 'italic'); +@include font-face("Montserrat", '../fonts/Montserrat-Regular.ttf', 400, 'normal'); +@include font-face("Montserrat", '../fonts/Montserrat-SemiBold.ttf', 600, 'normal'); +@include font-face("Montserrat", '../fonts/Montserrat-SemiBoldItalic.ttf', 600, 'italic'); +@include font-face("Montserrat", '../fonts/Montserrat-Thin.ttf', 100, 'normal'); +@include font-face("Montserrat", '../fonts/Montserrat-ThinItalic.ttf', 100, 'italic'); \ No newline at end of file diff --git a/front/src/assets/main.scss b/front/src/assets/main.scss index 7baaa7b..fc0799d 100644 --- a/front/src/assets/main.scss +++ b/front/src/assets/main.scss @@ -1,15 +1,5 @@ @import 'grid.scss'; - -@font-face { - font-family: 'main'; - src: url('../fonts/main.otf'); -} - - -@font-face { - font-family: 'logo'; - src: url('../fonts/logo.ttf'); -} +@import 'fonts.scss'; a[href] { color: #048280; diff --git a/front/src/assets/sidebar.scss b/front/src/assets/sidebar.scss index 75752b1..3090ed7 100644 --- a/front/src/assets/sidebar.scss +++ b/front/src/assets/sidebar.scss @@ -72,13 +72,13 @@ $primary: #E75B12; padding: 1.5rem; color: $textColor; - font-family: 'main'; + font-family: 'Montserrat'; } &-list {} &-list-item { - font-size: 1.875rem; + font-size: 1.5rem; color: $textColor2; display: flex; @@ -93,10 +93,11 @@ $primary: #E75B12; } h2 { - font-family: 'logo'; - font-size: 1.875rem; + font-size: 3rem; text-align: center; margin-bottom: 1rem; + + font-weight: 800; } p { diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue index dfd5378..2a58748 100644 --- a/front/src/components/Promo/load_models.vue +++ b/front/src/components/Promo/load_models.vue @@ -194,7 +194,7 @@ const loadModels = async () => { sidebar_scene.name = raw_data.name; sidebar_scene.setData(sidebar_items) - loading_store.status = 'ищчуы' + loading_store.status = 'boxes' const box = new Box3(); models.value.forEach(element => { if (element.name !== 'ground') { @@ -245,6 +245,8 @@ const passShader = (obj: Mesh | Group) => { } const openSidebar = (id: number) => { sidebar.open(id) + + } loadModels() diff --git a/front/src/fonts/Montserrat-Black.ttf b/front/src/fonts/Montserrat-Black.ttf new file mode 100644 index 0000000..7af9fb4 Binary files /dev/null and b/front/src/fonts/Montserrat-Black.ttf differ diff --git a/front/src/fonts/Montserrat-BlackItalic.ttf b/front/src/fonts/Montserrat-BlackItalic.ttf new file mode 100644 index 0000000..c608366 Binary files /dev/null and b/front/src/fonts/Montserrat-BlackItalic.ttf differ diff --git a/front/src/fonts/Montserrat-Bold.ttf b/front/src/fonts/Montserrat-Bold.ttf new file mode 100644 index 0000000..0927b81 Binary files /dev/null and b/front/src/fonts/Montserrat-Bold.ttf differ diff --git a/front/src/fonts/Montserrat-BoldItalic.ttf b/front/src/fonts/Montserrat-BoldItalic.ttf new file mode 100644 index 0000000..02f5784 Binary files /dev/null and b/front/src/fonts/Montserrat-BoldItalic.ttf differ diff --git a/front/src/fonts/Montserrat-ExtraBold.ttf b/front/src/fonts/Montserrat-ExtraBold.ttf new file mode 100644 index 0000000..e33afd4 Binary files /dev/null and b/front/src/fonts/Montserrat-ExtraBold.ttf differ diff --git a/front/src/fonts/Montserrat-ExtraBoldItalic.ttf b/front/src/fonts/Montserrat-ExtraBoldItalic.ttf new file mode 100644 index 0000000..92fc301 Binary files /dev/null and b/front/src/fonts/Montserrat-ExtraBoldItalic.ttf differ diff --git a/front/src/fonts/Montserrat-ExtraLight.ttf b/front/src/fonts/Montserrat-ExtraLight.ttf new file mode 100644 index 0000000..8aa56c1 Binary files /dev/null and b/front/src/fonts/Montserrat-ExtraLight.ttf differ diff --git a/front/src/fonts/Montserrat-ExtraLightItalic.ttf b/front/src/fonts/Montserrat-ExtraLightItalic.ttf new file mode 100644 index 0000000..98c10f1 Binary files /dev/null and b/front/src/fonts/Montserrat-ExtraLightItalic.ttf differ diff --git a/front/src/fonts/Montserrat-Italic-VariableFont_wght.ttf b/front/src/fonts/Montserrat-Italic-VariableFont_wght.ttf new file mode 100644 index 0000000..81cc326 Binary files /dev/null and b/front/src/fonts/Montserrat-Italic-VariableFont_wght.ttf differ diff --git a/front/src/fonts/Montserrat-Italic.ttf b/front/src/fonts/Montserrat-Italic.ttf new file mode 100644 index 0000000..cff3ceb Binary files /dev/null and b/front/src/fonts/Montserrat-Italic.ttf differ diff --git a/front/src/fonts/Montserrat-Light.ttf b/front/src/fonts/Montserrat-Light.ttf new file mode 100644 index 0000000..fd787a8 Binary files /dev/null and b/front/src/fonts/Montserrat-Light.ttf differ diff --git a/front/src/fonts/Montserrat-LightItalic.ttf b/front/src/fonts/Montserrat-LightItalic.ttf new file mode 100644 index 0000000..6a2c9d4 Binary files /dev/null and b/front/src/fonts/Montserrat-LightItalic.ttf differ diff --git a/front/src/fonts/Montserrat-Medium.ttf b/front/src/fonts/Montserrat-Medium.ttf new file mode 100644 index 0000000..4012225 Binary files /dev/null and b/front/src/fonts/Montserrat-Medium.ttf differ diff --git a/front/src/fonts/Montserrat-MediumItalic.ttf b/front/src/fonts/Montserrat-MediumItalic.ttf new file mode 100644 index 0000000..84b2539 Binary files /dev/null and b/front/src/fonts/Montserrat-MediumItalic.ttf differ diff --git a/front/src/fonts/Montserrat-Regular.ttf b/front/src/fonts/Montserrat-Regular.ttf new file mode 100644 index 0000000..f4a266d Binary files /dev/null and b/front/src/fonts/Montserrat-Regular.ttf differ diff --git a/front/src/fonts/Montserrat-SemiBold.ttf b/front/src/fonts/Montserrat-SemiBold.ttf new file mode 100644 index 0000000..189ce9d Binary files /dev/null and b/front/src/fonts/Montserrat-SemiBold.ttf differ diff --git a/front/src/fonts/Montserrat-SemiBoldItalic.ttf b/front/src/fonts/Montserrat-SemiBoldItalic.ttf new file mode 100644 index 0000000..4c59d86 Binary files /dev/null and b/front/src/fonts/Montserrat-SemiBoldItalic.ttf differ diff --git a/front/src/fonts/Montserrat-Thin.ttf b/front/src/fonts/Montserrat-Thin.ttf new file mode 100644 index 0000000..7d085bb Binary files /dev/null and b/front/src/fonts/Montserrat-Thin.ttf differ diff --git a/front/src/fonts/Montserrat-ThinItalic.ttf b/front/src/fonts/Montserrat-ThinItalic.ttf new file mode 100644 index 0000000..6fbfad1 Binary files /dev/null and b/front/src/fonts/Montserrat-ThinItalic.ttf differ diff --git a/front/src/fonts/Montserrat-VariableFont_wght.ttf b/front/src/fonts/Montserrat-VariableFont_wght.ttf new file mode 100644 index 0000000..797c4a5 Binary files /dev/null and b/front/src/fonts/Montserrat-VariableFont_wght.ttf differ diff --git a/front/src/stores/timer.ts b/front/src/stores/timer.ts new file mode 100644 index 0000000..b1535ff --- /dev/null +++ b/front/src/stores/timer.ts @@ -0,0 +1,49 @@ +import { defineStore } from 'pinia' +const BASE_TIMER = 10 +interface state { + timer_el: any, + timer_func: any, + is_enabled: boolean, + seconds_left: number +} +export const useLoading = defineStore('loading', { + state: () => { + return { + timer_el: undefined, + timer_func: undefined, + is_enabled: false, + seconds_left: BASE_TIMER + } as state + }, + actions: { + startTimer() { + this.is_enabled = true + this.resetTimer() + this.countdownTimer() + }, + stopTimer() { + this.is_enabled = false + clearInterval(this.timer_el) + if (this.timer_func) { + this.timer_func() + this.startTimer() + } + }, + resetTimer() { + this.seconds_left = BASE_TIMER + }, + setTimer(time: number) { + this.seconds_left = time + }, + countdownTimer() { + this.timer_el = setInterval(() => { + if (this.is_enabled && this.seconds_left > 0) { + this.seconds_left -= 1 + // this.countdownTimer() + } + if (this.is_enabled && this.seconds_left == 0) { + this.stopTimer() + } + }, 1000) + }, +})