Commit Graph

1254 Commits

Author SHA1 Message Date
IlyaDoronin
3001b87bdf refactor: analytics 2024-04-15 17:32:00 +03:00
93822697ae Merge branch 'dev' into 'staging'
экспорт качает файлик

See merge request frontend/squiz!264
2024-04-15 11:46:58 +00:00
4ed6f07a15 экспорт качает файлик 2024-04-15 14:44:48 +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
d15d5fe262 модалка фастлинкера закрывается при успешном применении нового промокода 2024-04-13 02:28:08 +03: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
20d7fbdc4e Merge branch 'dev' into 'staging'
Dev

See merge request frontend/squiz!247
2024-04-10 14:46:24 +00:00
IlyaDoronin
ea2e138f38 feat: new pay time logic 2024-04-10 16:55:08 +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
IlyaDoronin
69a1acddc7 Merge branch 'dev' of penahub.gitlab.yandexcloud.net:frontend/squiz into afterpay-checking 2024-04-09 11:06:05 +03:00
Tamara
3c4f80056f вынесение и коррекция функции выхода 2024-04-09 02:11:19 +03:00
nflnkr
5321d45adc lock crop in crop modal 2024-04-08 18:57:29 +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
d07acf57fd fix: cart payment 2024-04-08 15:56:46 +03:00
IlyaDoronin
4cd7ae14a6 fix: cart payment 2024-04-08 15:56:28 +03:00
IlyaDoronin
31f103c3ab feat: afterpay userid checking 2024-04-08 12:37:42 +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
nflnkr
76b06f12ea fix crop 2024-04-03 23:45:48 +03: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
1b93727d61 Merge branch 'analytics' into dev 2024-03-31 03:12:56 +03:00
Tamara
af70d8b2c6 фильтрация тарифов шильдика от базовых 2024-03-30 21:54:28 +03:00
nflnkr
d2e1e7c00a add emoji ignore list 2024-03-30 12:50:12 +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
IlyaDoronin
3269a0a883 feat: pagination 2024-03-25 18:02:24 +03:00
aleksandr-raw
aea8df01b7 Moved getData to a hook. Implemented error handling. Subtasks #4 and #6 2024-03-25 18:43:57 +04:00
aleksandr-raw
6a326d1fa8 Removed unused elements and files. Subtasks #3 and #5. 2024-03-25 17:06:41 +04:00
aleksandr-raw
8dc047e6bb Refactored layout into smaller components. Added QuizSettingsMenu and AnswerList components 2024-03-25 14:32:09 +04:00
aleksandr-raw
319d321a6a reset data after leaving the page 2024-03-25 11:27:00 +04:00
nflnkr
c303348e2e add promocode field 2024-03-22 22:01:48 +03:00
IlyaDoronin
16f36cf5d9 feat: Funnel and Answers 2024-03-22 17:29:51 +03:00
IlyaDoronin
31a8b613bb feat: Devices and General 2024-03-21 17:24:56 +03:00
IlyaDoronin
35a84f301f fix: Devices statistic 2024-03-20 17:44:51 +03:00
IlyaDoronin
71fb420b94 feat: lazy loading 2024-03-20 15:18:09 +03:00
IlyaDoronin
e5c1285f90 feat: lazy loading 2024-03-20 15:16:21 +03:00
0744aeb7c9 Merge branch 'fix-bag-visual' into dev 2024-03-20 00:19:29 +03:00
bfb7876f3b Merge branch 'design-scroll' into dev 2024-03-20 00:18:58 +03:00
Tamara
881822abbd устранены косяки по визуалу 2024-03-19 18:58:20 +03:00
IlyaDoronin
8709350151 fix: Drag&Drop 2024-03-19 16:52:33 +03:00
Tamara
71853901a6 станица статистики 2024-03-19 09:56:21 +03:00
1a9c26ccf7 не открывается модалка для особенных, не рисуется иконка настройки условий для особенных 2024-03-19 04:38:37 +03:00
IlyaDoronin
a9c912378b fix: scrollbar and drag&drop 2024-03-18 17:24:43 +03:00
248ffe406b у особых вопросов не более 1 потомка 2024-03-18 05:46:04 +03:00
5f42a86e1f направление на стейджинг при покупке тарифа с стейджинга или локалхост 2024-03-16 15:14:25 +03:00
6fb44e9a14 Merge branch 'full-screen' into dev 2024-03-16 15:00:30 +03:00
4c7d3b0351 Merge branch 'adaptiv-install' into dev 2024-03-16 14:59:25 +03:00
IlyaDoronin
c4ad3de036 fix: close on drag start 2024-03-15 17:56:39 +03:00
IlyaDoronin
26e41b6e2a fix: drag&drop 2024-03-15 17:24:13 +03:00