Commit Graph

168 Commits

Author SHA1 Message Date
1d16b00fb8 Merge branch 'dev' into 'staging'
use func

See merge request frontend/squzanswerer!56
2024-02-11 19:19:09 +00:00
f64b9e3f91 use func 2024-02-11 22:18:46 +03:00
1ef93715f3 Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squzanswerer!55
2024-02-11 18:09:12 +00:00
9128b3e358 Merge branch 'points' into dev 2024-02-11 21:08:45 +03:00
1da332567e линейный сбор баллов, анализ баллового результа 2024-02-11 21:04:30 +03:00
9731a4b78e Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squzanswerer!54
2024-02-11 15:46:50 +00:00
beb73eb762 Merge branch 'fix-visual' into 'dev'
ограничения и перенос для заголовков и юр информации

See merge request frontend/squzanswerer!53
2024-02-11 15:46:28 +00:00
Tamara
92ec43c651 ограничения и перенос для заголовков и юр информации 2024-02-11 18:35:45 +03:00
3e8bf766aa fix: если есть сессия, то получать новые настройки надо в рамках неё 2024-02-11 01:50:27 +03:00
a1c82b68ad Merge branch 'dev' into 'staging'
refactor component hierarchy

See merge request frontend/squzanswerer!52
2024-02-10 16:47:56 +00:00
5106fab97d Merge branch 'staging' into dev 2024-02-10 19:47:21 +03:00
nflnkr
fa63e9c5da build widget file 2024-02-10 19:27:18 +03:00
nflnkr
fd1dd8624a refactor branching logic
remove result question calculation
2024-02-10 19:25:06 +03:00
nflnkr
c1ccc5d7c5 remove console logs 2024-02-10 15:41:20 +03:00
nflnkr
b61e8c6571 refactor logic hook 2024-02-10 13:46:13 +03:00
nflnkr
e4d9018962 refactor component hierarchy
move logic to dedicated hook
use quizId from context, not from settings
add ErrorBoundaryFallback component
2024-02-08 16:42:31 +03:00
9fe0c2fb09 fix get settiongs content type 2024-02-07 00:52:30 +03:00
00323a1c6c Merge branch 'dev' into 'staging'
split widget and default App components

See merge request frontend/squzanswerer!50
2024-02-06 21:04:40 +00:00
nflnkr
ba547dcb55 add hook for retreiving root container width 2024-02-05 13:10:02 +03:00
nflnkr
f6d4dfe826 refator datafetching
minor fixes
2024-02-02 17:35:02 +03:00
nflnkr
1bb1fd0fa2 replace png image with svg 2024-02-02 15:46:38 +03:00
nflnkr
e6f87db908 fix autoimport 2024-02-02 01:34:10 +03:00
nflnkr
203a532d0a fix imports 2024-02-01 22:14:27 +03:00
8d56fce524 Merge branch 'tomain' into 'staging'
add App widget prop to determine if app is running as widget

See merge request frontend/squzanswerer!49
2024-02-01 19:10:04 +00:00
nflnkr
fb3d46110f split widget and default App components
use router in default App for retrieving quizId from url
add QuizIdContext
2024-02-01 16:18:16 +03:00
nflnkr
db541d97ef rename component file to component's name 2024-01-31 18:08:01 +03:00
nflnkr
a8b32e6aad build widget js file 2024-01-31 17:58:16 +03:00
nflnkr
3f43b1bfaa add quizId as App prop and widget param 2024-01-31 17:39:50 +03:00
nflnkr
1e3fc3ae26 Merge branch 'dev' into refactor 2024-01-31 15:57:07 +03:00
nflnkr
b6e5e45e20 Merge remote-tracking branch 'origin/main' into dev 2024-01-31 15:08:22 +03:00
nflnkr
096977b57c Revert "set build output dir to "build" instead of "dist""
This reverts commit 8809ea77090bb47b68e513c4892b9b27e5796242.
2024-01-31 15:06:32 +03:00
a9c69d7aba ci: production preparations 2024-01-31 00:48:18 +03:00
nflnkr
af1264a170 fix some types
remove some ts-ignore's
refactor stores
2024-01-30 19:49:33 +03:00
nflnkr
606472d182 remove console logs 2024-01-29 14:37:04 +03:00
nflnkr
bbeaa37691 temporary fix ts(2590) 2024-01-29 14:26:10 +03:00
nflnkr
7675aed2cd add @utils import alias 2024-01-29 14:17:38 +03:00
nflnkr
1bb3cdae2f disable eslint no-unused-vars for function args 2024-01-29 14:17:11 +03:00
nflnkr
9367a2178f mirror changes from main 2024-01-29 14:16:21 +03:00
nflnkr
f56b9a967e add App widget prop to determine if app is running as widget
remove react-router-dom
2024-01-29 14:16:02 +03:00
nflnkr
66eea16109 fix jsx attribute names 2024-01-29 14:13:07 +03:00
nflnkr
138cc34133 add content.id field to question interfaces 2024-01-29 14:12:48 +03:00
nflnkr
ffb3d0ea56 remove unused files 2024-01-29 14:10:22 +03:00
08dbffd121 Merge branch 'slider' into 'staging'
правка дизайна в типе вопроса файл

See merge request frontend/squzanswerer!48
2024-01-29 00:25:58 +00:00
Tamara
81f2380689 правка дизайна в типе вопроса файл 2024-01-29 03:03:47 +03:00
90393d6245 Merge branch 'slider' into 'staging'
фикс типов, максимальный размер загружаемого файла

See merge request frontend/squzanswerer!47
2024-01-28 01:50:03 +00:00
deb93963f3 фикс типов, максимальный размер загружаемого файла 2024-01-28 04:42:19 +03:00
46270c1d8e Merge branch 'slider' into 'staging'
выбираемые типы через перечисление

See merge request frontend/squzanswerer!46
2024-01-28 01:09:52 +00:00
2cfa72d57d выбираемые типы через перечисление 2024-01-28 04:07:48 +03:00
5ecf9e50f4 Merge branch 'slider' into 'staging'
доступ всему

See merge request frontend/squzanswerer!45
2024-01-28 00:32:15 +00:00
f1780991da доступ всему 2024-01-28 03:31:45 +03:00