Commit Graph

1234 Commits

Author SHA1 Message Date
dc76d62de7 инструкция 2024-05-12 21:46:15 +03:00
Tamara
bc5d6b781f id вопроса и результата для копирования 2024-05-12 20:10:14 +03:00
nflnkr
8adedcb34b refactor quiz installation layout & components 2024-05-11 21:21:43 +03:00
IlyaDoronin
aafb505d2b feat: gallery 2024-05-08 17:17:06 +03:00
f041498d05 up version publication && отступ в дизайне 2024-05-08 01:27:57 +03:00
Tamara
4de864a06a кавычки и кнопка копирования кода на стр установки квиза 2024-05-07 21:44:11 +03:00
IlyaDoronin
c30966a1ba fix: copy quiz 2024-05-07 16:57:12 +03:00
IlyaDoronin
92eafcfaa3 Merge branch 'dev' of penahub.gitlab.yandexcloud.net:frontend/squiz into dev 2024-05-07 09:37:06 +03:00
8caf1ca91a Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!303
2024-05-06 12:24:46 +00:00
aleksandr-raw
5191282b33 added Vk and Yandex instructions 2024-05-06 16:20:51 +04:00
IlyaDoronin
56e2f34c57 fix: metrics fields 2024-05-06 10:43:52 +03:00
440d964af8 Merge branch 'dev' into 'staging'
убрана кнопка инфо у графика, статистика получает от 0:00 до 23:59 время

See merge request frontend/squiz!300
2024-05-05 23:44:47 +00:00
f40fb26ba9 убрана кнопка инфо у графика, статистика получает от 0:00 до 23:59 время 2024-05-06 02:44:12 +03:00
dc0ef0a928 Merge branch 'dev' into 'staging'
время неработы с 3 ночи до 10 утра

See merge request frontend/squiz!299
2024-05-05 18:30:53 +00:00
559f668112 время неработы с 3 ночи до 10 утра 2024-05-05 21:29:43 +03:00
669a731fbe Merge branch 'dev' into 'staging'
проверка ошибки промокода на пустую строку

See merge request frontend/squiz!298
2024-05-04 21:25:33 +00:00
Tamara
1668cbe36b проверка ошибки промокода на пустую строку 2024-05-04 04:19:46 +03:00
4e457e9294 Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!297
2024-05-04 00:42:40 +00:00
Tamara
1db9e54458 процент линейного графика исправлен 2024-05-04 03:38:17 +03:00
Tamara
38ab273404 скелетон для загрузки видео, убрана возможность настройки у полей в фк, которые в ней не нуждались 2024-05-04 03:12:24 +03:00
IlyaDoronin
a1f0df3a69 fix: handle error 2024-05-02 11:43:10 +03:00
IlyaDoronin
8d455f08cc feat: getDiscounts request 2024-05-02 11:38:57 +03:00
09bab17d66 Merge branch 'dev' into 'staging'
refactor quiz install page

See merge request frontend/squiz!295
2024-05-01 10:40:29 +00:00
aleksandr-raw
7dc2dd1ec1 refactored analytics modal component 2024-05-01 13:50:29 +04:00
aleksandr-raw
93574151bb created new analytics modal design 2024-05-01 13:50:29 +04:00
aleksandr-raw
012169e12b Implemented universal usage for button and modal, added VK pixel 2024-05-01 13:50:29 +04:00
nflnkr
129b7c0c49 refactor quiz install page
extract components
replace png images with svg components
2024-04-30 20:05:44 +03:00
223b8f4856 Merge branch 'dev' into 'staging'
--

See merge request frontend/squiz!293
2024-04-30 01:12:43 +00:00
fdf344fd3d -- 2024-04-30 04:12:08 +03:00
2481d57cec Merge branch 'dev' into 'staging'
в привилегии добавлено поле о последнем дне

See merge request frontend/squiz!292
2024-04-30 00:25:42 +00:00
b129058f3d в привилегии добавлено поле о последнем дне 2024-04-30 03:21:17 +03:00
f1ed8f608e Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!291
2024-04-28 19:12:45 +00:00
6ef0157afb Merge branch 'new-main-page' into dev 2024-04-28 22:10:29 +03:00
4efadbc628 Merge branch 'dev' into staging 2024-04-28 01:41:21 +03:00
f1f9d13a86 Merge branch 'improve-behavior-yandex-modal' into dev 2024-04-28 01:14:43 +03:00
IlyaDoronin
0362770311 refactor: comments removed 2024-04-26 17:41:36 +03:00
IlyaDoronin
ffba0c8d04 feat: new design 2024-04-25 17:53:43 +03:00
IlyaDoronin
7bd832495b fix 2024-04-25 09:09:35 +03:00
IlyaDoronin
d7df648023 fix: useYandexMetrics 2024-04-22 17:14:45 +03:00
44ee0c1226 Merge branch 'dev' into 'staging'
инструкция о размерах в разделе инсталла

See merge request frontend/squiz!285
2024-04-20 11:07:07 +00:00
Tamara
4aa5f4abf0 увеличен лимит символов на заголовок и описание квиза 2024-04-20 08:22:55 +03:00
5ae83de84f инструкция о размерах в разделе инсталла 2024-04-19 20:12:34 +03:00
aleksandr-raw
2b675e08e0 added logic for resetting the value in the input if yandexNumber is undefined and the new value wasn't saved before closing 2024-04-19 12:32:10 +04:00
aleksandr-raw
62a5b29bea replaced png to svg yandexLogo, improved behavior logic of yandexModal 2024-04-19 12:26:25 +04:00
9a473c5ff7 Merge branch 'dev' into 'staging'
refactored YandexModal, added yandexMetricNumber to quiz config, added logic...

See merge request frontend/squiz!281
2024-04-18 19:23:26 +00:00
5f93f453f5 Merge branch 'yandex-integration-add-logic' into dev 2024-04-18 22:22:35 +03:00
aleksandr-raw
b66cdcaee9 integrated yandex metrica script to publications page 2024-04-18 18:10:19 +04:00
aleksandr-raw
4e9d02efcf refactored YandexModal, added yandexMetricNumber to quiz config, added logic to set\update\delate yaNumber 2024-04-18 16:32:46 +04:00
IlyaDoronin
264dc15173 fix: GeneralItem and GeneralItemTimeConv merged 2024-04-18 14:54:39 +03:00
IlyaDoronin
6a5d46b63b fix: GeneralItemTimeConv logic 2024-04-18 11:49:38 +03:00
Tamara
b03cbef05a интеграция яндекс метрика 2024-04-18 04:32:39 +03:00
9bbc1f6d4c Merge branch 'dev' into staging 2024-04-17 19:47:14 +03:00
1e2b320f79 откат 2 графиков 2024-04-17 19:45:06 +03:00
a6a6bda089 Merge branch 'install-text' into dev 2024-04-17 19:25:19 +03:00
4bb0fcce58 Merge branch 'refactoring' into dev 2024-04-17 19:24:54 +03:00
IlyaDoronin
39ea24310c fix: conflicts 2024-04-17 17:16:49 +03:00
IlyaDoronin
24c3b45a3a fix: analytics date range 2024-04-17 17:15:13 +03:00
aleksandr-raw
d970759e2f Resized design images 2024-04-17 18:14:14 +04:00
IlyaDoronin
784a884002 fix: refactoring 2024-04-17 15:08:18 +03:00
IlyaDoronin
7ff6d4d16e fix: install text 2024-04-17 14:28:10 +03:00
IlyaDoronin
f0f08c4f7c feat: staged 2024-04-17 10:11:02 +03:00
ff93d649db Merge branch 'dev' into 'staging'
нет снекбара при нехватке денег

See merge request frontend/squiz!272
2024-04-16 21:58:30 +00:00
01f586d445 нет снекбара при нехватке денег 2024-04-17 00:57:59 +03:00
38f1c9b390 Merge branch 'dev' into staging 2024-04-16 23:25:16 +03:00
230bf79513 чистка консольлогов 2024-04-16 23:23:42 +03:00
f849bb84a1 мейк реквест в обёртке 2024-04-16 23:20:46 +03:00
06a462edfc Merge branch 'use-quizanswerer-for-quiz-preview' into dev 2024-04-16 23:00:48 +03:00
nflnkr
ac0ca414ec replace quiz preview with QuizAnswerer 2024-04-16 22:31:51 +03:00
nflnkr
d4d252ce71 remove quiz preview from design page 2024-04-16 22:25:30 +03:00
7dc217db78 Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!270
2024-04-16 16:05:45 +00:00
098fc1aeee Merge branch 'password-validation' into dev 2024-04-16 19:05:09 +03:00
aleksandr-raw
d5eacb0227 Added ascending sorting for questions in statistics 2024-04-16 19:42:55 +04:00
IlyaDoronin
d970049b37 refactor: console errors 2024-04-16 17:54:59 +03:00
IlyaDoronin
dc2a09dd83 fix: password validation 2024-04-16 16:43:22 +03:00
aleksandr-raw
bd0fd2a1fa integration modal finished 2024-04-16 15:22:08 +04:00
aleksandr-raw
28cd507004 step 7 2024-04-16 15:07:58 +04:00
aleksandr-raw
f7bca1ae82 added step6 2024-04-16 15:07:58 +04:00
aleksandr-raw
dce30ad61e WIP Step6 and Step 7 2024-04-16 15:07:58 +04:00
aleksandr-raw
64e701a036 added settings block 2024-04-16 15:07:58 +04:00
aleksandr-raw
d686290df5 WIP settings in integrations modal 2024-04-16 15:07:58 +04:00
aleksandr-raw
3f7bcc011f added 5step, refactored buttons 2024-04-16 15:07:57 +04:00
aleksandr-raw
17a0fd8bc5 WIP step 5 2024-04-16 15:07:57 +04:00
aleksandr-raw
dff10de2d7 added 3 step and refactored 2024-04-16 15:07:57 +04:00
aleksandr-raw
94134bcb46 added custom select to step 2 2024-04-16 15:07:57 +04:00
aleksandr-raw
137fa317da WIP 1step integrations, integrations modal 2024-04-16 15:07:57 +04:00
aleksandr-raw
5434d0cafc added new IntegrationsPage, setuped routing, added modal 2024-04-16 15:07:21 +04:00
IlyaDoronin
3001b87bdf refactor: analytics 2024-04-15 17:32:00 +03:00
86203e1a31 Merge branch 'dev' into 'staging'
реактивность доступных привелегий, описание тарифов из description

See merge request frontend/squiz!263
2024-04-14 22:52:50 +00:00
Tamara
fcf4ce6a4f реактивность доступных привелегий, описание тарифов из description 2024-04-15 01:35:08 +03:00
0758d97297 Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!262
2024-04-14 17:49:08 +00:00
nflnkr
5e19805ae6 fix calcTariffPrice userId param 2024-04-14 20:38:30 +03:00
nflnkr
85357b5973 fix calcTariffPrice params 2024-04-14 20:05:01 +03:00
45cbd55898 Merge branch 'pay-tariff' into dev 2024-04-14 02:50:56 +03:00
Tamara
f08bd29ab8 взятие недлстающей суммы для оплаты на хабе из ответа ошибки 2024-04-14 02:48:51 +03:00
4ff60c5402 Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!261
2024-04-13 22:34:42 +00:00
e5d1630df3 Merge branch 'dev' of penahub.gitlab.yandexcloud.net:frontend/squiz into dev 2024-04-14 01:30:05 +03:00
5146d2fa3d поднятие версии кита + костыль 2024-04-14 01:29:58 +03:00
62169bd9b7 Merge branch 'dev' into 'staging'
замена ключей привилегий в логике отображения

See merge request frontend/squiz!260
2024-04-13 19:07:41 +00:00
Tamara
a40b9ee0c8 замена ключей привилегий в логике отображения 2024-04-13 22:06:34 +03:00
b9a5a4e806 Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!259
2024-04-13 17:18:50 +00:00
804dcb6679 Merge branch 'fast-link' into 'dev'
Fast link

See merge request frontend/squiz!258
2024-04-13 01:13:48 +00:00
Tamara
0e04ad4c8a доступные привилегии 2024-04-13 04:13:16 +03:00
05478ef88b Merge branch 'fast-link' into 'staging'
Fast link

See merge request frontend/squiz!257
2024-04-12 23:37:20 +00:00
Tamara
588efe0cbf фастлинк, ждет теста 2024-04-13 00:05:15 +03:00
b404f8039e Merge branch 'statistic' into 'staging'
math.trunc для карточек тарифов

See merge request frontend/squiz!256
2024-04-12 17:54:48 +00:00
961207ee4a math.trunc для карточек тарифов 2024-04-12 20:54:15 +03:00
ee73f131d5 Merge branch 'dev' into 'staging'
qaz

See merge request frontend/squiz!255
2024-04-12 15:55:02 +00:00
511738aca2 qaz 2024-04-12 18:54:23 +03:00
c5f196c1eb Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!253
2024-04-11 15:59:31 +00:00
e9faf37bdd Merge branch 'statistic' into 'dev'
отсечение будущего у статистики

See merge request frontend/squiz!252
2024-04-11 15:58:56 +00:00
9f6734456f отсечение будущего у статистики 2024-04-11 18:58:23 +03:00
5519140fc8 Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!251
2024-04-11 14:26:30 +00:00
5cf68a9002 Merge branch 'payment-price' into 'dev'
fix: number

See merge request frontend/squiz!250
2024-04-11 14:25:46 +00:00
IlyaDoronin
6d14dbdd50 fix: number 2024-04-11 17:23:05 +03:00
IlyaDoronin
5ed07c758f fix: number 2024-04-11 17:21:43 +03:00
02a73096e8 Merge branch 'dev' into 'staging'
конверсия в графике в %

See merge request frontend/squiz!249
2024-04-11 06:28:58 +00:00
39f49233f0 конверсия в графике в % 2024-04-11 09:28:22 +03:00
4992737e9e Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!248
2024-04-10 23:35:16 +00:00
9f277b047c конверсия и время 2024-04-11 02:34:40 +03:00
Tamara
f0f5b1fe96 вычисление общей конверсии 2024-04-11 01:29:02 +03:00
0e25cd7636 Merge branch 'afterpay-checking' into 'staging'
feat: afterpay userid checking

See merge request frontend/squiz!244
2024-04-09 15:09:43 +00:00
466959cda2 аналитика 2024-04-09 18:08:11 +03:00
IlyaDoronin
81fae9ad4c fix: conflicts resolved 2024-04-09 17:26:51 +03:00
IlyaDoronin
5793830b2d fix: other answers 2024-04-09 17:24:44 +03:00
43237113a0 Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!245
2024-04-09 12:17:41 +00:00
IlyaDoronin
54e5f40780 fix: funnel 2024-04-09 13:56:43 +03:00
IlyaDoronin
8c76b4b801 Merge branch 'afterpay-checking' of penahub.gitlab.yandexcloud.net:frontend/squiz into afterpay-checking 2024-04-09 13:41:48 +03:00
IlyaDoronin
7d6f69396b feat: promoce errors and analytics 2024-04-09 13:41:32 +03:00
Tamara
3c4f80056f вынесение и коррекция функции выхода 2024-04-09 02:11:19 +03:00
Tamara
121eb4036a иконки расположения стартовой страницы 2024-04-08 17:45:28 +03:00
IlyaDoronin
07c9bd06cc feat: calculateTime 2024-04-08 17:22:19 +03:00
IlyaDoronin
4cd7ae14a6 fix: cart payment 2024-04-08 15:56:28 +03:00
d80c7d6c71 Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!243
2024-04-07 23:27:59 +00:00
f188bcee2d корректно выводятся карточки ответов на вопросы 2024-04-08 02:16:52 +03:00
fb223056b9 в from аналитики начало следующего дня 2024-04-08 02:03:44 +03:00
34f7493376 fix: funnel 2024-04-08 01:56:19 +03:00
Tamara
843877c570 сохранение кэша в рублях, копейках и строкой 2024-04-07 19:19:49 +03:00
4deecc2f66 Merge branch 'dev' into 'staging'
fix crop modal

See merge request frontend/squiz!242
2024-04-06 17:53:44 +00:00
nflnkr
e77e83d5d4 fix crop modal 2024-04-06 20:23:01 +03:00
60c88764af Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!241
2024-04-06 09:08:29 +00:00
859987445b общиий кеш 2024-04-06 12:07:30 +03:00
3578603293 Merge branch 'dev' into 'staging'
-

See merge request frontend/squiz!240
2024-04-05 23:03:27 +00:00
fa588d77a4 - 2024-04-06 02:02:58 +03:00
03db893403 Merge branch 'dev' into 'staging'
--

See merge request frontend/squiz!239
2024-04-05 22:48:12 +00:00
7e14ebdeeb -- 2024-04-06 01:47:40 +03:00
6033cf6084 Merge branch 'dev' into 'staging'
fix: запрос деняк на хабе

See merge request frontend/squiz!238
2024-04-05 21:42:55 +00:00
0f7e134411 fix: запрос деняк на хабе 2024-04-06 00:42:02 +03:00
5098b682e9 Merge branch 'dev' into 'staging'
-cart

See merge request frontend/squiz!237
2024-04-05 21:06:29 +00:00
ec8ce9c46d -cart 2024-04-06 00:05:51 +03:00
3149250dae Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!236
2024-04-05 18:24:26 +00:00
ada81a6360 не выводить время если нет, заглушки пустых полей, имя вопроса в аналитике 2024-04-05 21:23:08 +03:00
4b87ca20fa Merge branch 'empty-analytics' into dev 2024-04-05 20:16:00 +03:00
Tamara
dc102ea323 правка верстки тарифов, порядок тарифов 2024-04-05 19:29:20 +03:00
IlyaDoronin
2c167faa29 fix: pagination 2024-04-05 17:09:17 +03:00
IlyaDoronin
591914fdb9 fix: analytics pagination 2024-04-05 17:08:29 +03:00
IlyaDoronin
b0c15ff98f fix: empty analytics 2024-04-05 14:27:52 +03:00
a331d14445 даты в статистике 2024-04-05 13:47:16 +03:00
fb0647060c Merge branch 'dev' into 'staging'
include cart tariffs in tariff price calculation

See merge request frontend/squiz!232
2024-04-04 08:44:37 +00:00
nflnkr
53aa64e9ea include cart tariffs in tariff price calculation 2024-04-04 11:27:06 +03:00
e841fd798e Merge branch 'dev' into 'staging'
новый запрос скидок

See merge request frontend/squiz!231
2024-04-04 00:11:21 +00:00
5384455f85 новый запрос скидок 2024-04-04 03:10:08 +03:00
f1640a0bd1 Merge branch 'dev' into 'staging'
Implemented data reset on account switch, fixed jumping after reload between...

See merge request frontend/squiz!230
2024-04-03 23:43:30 +00:00
ffda341e4b Merge branch 'fix-account-logout-data-cleanup' into dev 2024-04-04 02:42:41 +03:00
c5eeec3a08 Merge branch 'image-edit-fixed-aspect-ratio' into dev 2024-04-04 02:40:36 +03:00
1ea33d4e0d возможность обновить стр аналитики, округление данных 2024-04-04 02:35:36 +03:00
3beaeedf4b Merge branch 'analytics' into dev 2024-04-04 01:09:45 +03:00
4fcd7babe5 Merge branch 'dev' into 'staging'
fix: afterpay

See merge request frontend/squiz!229
2024-04-03 22:05:52 +00:00
IlyaDoronin
6f081b0b85 fix: analytics 2024-04-03 17:22:51 +03:00
IlyaDoronin
dbd271a20a Merge branch 'dev' of penahub.gitlab.yandexcloud.net:frontend/squiz into analytics 2024-04-03 13:50:44 +03:00
IlyaDoronin
9df4e9f0d2 feat: dayjs to analytics 2024-04-03 13:50:17 +03:00
aleksandr-raw
47d199ab0b refactored analytics page, fixed ts 2024-04-01 22:09:26 +04:00
nflnkr
257b027bac force aspect ratio on image editing 2024-04-01 20:09:54 +03:00
nflnkr
724e7bca32 remove unused files 2024-04-01 19:59:23 +03:00
IlyaDoronin
6c18b4cd99 fix: afterpay 2024-04-01 17:49:00 +03:00
aleksandr-raw
a8e80d88e1 Fixed logic of cleaning quiz data on logout account 2024-04-01 10:34:06 +04:00
aleksandr-raw
e8a3ca6e84 Implemented data reset on account switch, fixed jumping after reload between quiz list and create new quiz, and resolved type error. 2024-04-01 10:17:53 +04:00
18272be5ad Merge branch 'dev' into 'staging'
realized videofile component, added logic to delete uploaded video, refactored...

See merge request frontend/squiz!224
2024-03-31 00:13:42 +00:00
fe39bc1b32 Merge branch 'add-content-removal-buttons' into dev 2024-03-31 03:13:08 +03:00
Tamara
af70d8b2c6 фильтрация тарифов шильдика от базовых 2024-03-30 21:54:28 +03:00
93ddfb8570 бек статистики 2024-03-29 09:10:33 +03:00
aleksandr-raw
dc78c2d490 Fixed video size on startPage and refactored videoElement component 2024-03-28 14:52:24 +04:00
aleksandr-raw
41655b2dcb Refactored StartPageSetting component with switching condition: upload video input or videofile 2024-03-28 14:14:09 +04:00
aleksandr-raw
2c5c53ba57 realized videofile component, added logic to delete uploaded video, refactored mediaSelectionAndDisplay component with switching condition: uploader or file 2024-03-28 13:20:40 +04:00
dd58065255 получение данных 2024-03-28 12:18:24 +03:00
b0b6352cc0 иконка статистики на карточке 2024-03-28 11:47:51 +03:00
a6987adc0a Merge branch 'dev' into 'staging'
upgrade @frontend/kitui

See merge request frontend/squiz!220
2024-03-27 22:41:07 +00:00
30e97416fa Merge branch 'refactoring-applications-page' into dev 2024-03-28 01:36:23 +03:00
292cd0e5fa Merge branch 'dev' of penahub.gitlab.yandexcloud.net:frontend/squiz into dev 2024-03-28 01:36:01 +03:00
e41dc330bd фикс первого безтипового вопроса в списке из юзэффект и возможность удаления картинки из результата 2024-03-28 01:35:54 +03:00
Tamara
af39e627da фон стартовой страницы по-умолчанию изображение 2024-03-28 00:46:12 +03:00
0831da8403 Merge branch 'add-quiz-copy-functionality' into dev 2024-03-28 00:07:04 +03:00
c87e190706 реактивность 2024-03-28 00:03:46 +03:00
nflnkr
3d7a518208 upgrade @frontend/kitui
use cart calc functions from kitui
2024-03-27 13:53:47 +03:00
a980fe5fe4 Merge branch 'analytics' into dev 2024-03-27 09:36:43 +03:00
aleksandr-raw
4dbf8e7594 subtask #8. fixing TS 2024-03-26 22:32:28 +04:00
aleksandr-raw
68e47f26e0 Realized copying and refetch of quizzes by clicking the copy button 2024-03-26 16:52:07 +04:00
aleksandr-raw
00dde35812 added copy btn to quiz card 2024-03-26 13:03:11 +04:00
aec10b2745 remove before merge 2024-03-26 00:12:52 +03:00
aleksandr-raw
484e5336b5 WIP subtask #8 . TypeScript 2024-03-25 21:21:01 +04:00
aleksandr-raw
cfcd5bbb8e Added stopPropagation to the delete button. Moved modal outside box. subtask #7 2024-03-25 19:56:01 +04:00