bx-1316-refactoring #14

Merged
ksenia_mikhailova merged 46 commits from bx-1316-refactoring into dev 2024-08-28 15:06:52 +03:00
25 changed files with 86 additions and 16 deletions
Showing only changes of commit 0674726337 - Show all commits

View File

@ -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');

View File

@ -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;

View File

@ -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 {

View File

@ -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()

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

49
front/src/stores/timer.ts Normal file
View File

@ -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)
},
})