Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #121

Open
wants to merge 131 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
257f963
feat: add routine slider, fix events in main page, start to make reco…
AnaSerg Jul 24, 2023
217e370
feat: make pie chart
AnaSerg Jul 26, 2023
4f89475
fix: landing page v3 with widescreen support and FAQ
Segodnya Jul 26, 2023
acbe640
Merge pull request #68 from moodbeat/fix/landing-v3-widescreen
Segodnya Jul 26, 2023
51772eb
feat: make periodpicker
AnaSerg Jul 27, 2023
54b2587
refactor: change path for useful
AnaSerg Jul 27, 2023
1b6d672
feat: create Report component
AnaSerg Jul 27, 2023
98b3e14
refactor: add components to main component
AnaSerg Jul 27, 2023
4f39df7
feat: resolve conflicts in main
AnaSerg Jul 27, 2023
687c4e4
fix: resolve conflicts
AnaSerg Jul 27, 2023
8bc18a9
Merge pull request #70 from AnaSerg/develop
AnaSerg Jul 27, 2023
946ebef
styles: change hover and active styles form mood buttons
AnaSerg Jul 27, 2023
0cb1d57
fix: make mood buttons invisible when impossible to use it
AnaSerg Jul 27, 2023
de9e20c
Merge pull request #71 from AnaSerg/develop
AnaSerg Jul 27, 2023
647cf55
fix: notification count update in real-time
Segodnya Jul 27, 2023
2c25251
resolve conflicts in PeriodPicker.module.scss
Segodnya Jul 27, 2023
1b7eea0
resolve conflicts in PeriodPicker.module.scss
Segodnya Jul 27, 2023
2cc6b8b
Merge pull request #72 from moodbeat/fix/notification-count-65
Segodnya Jul 27, 2023
9e759ff
styles: change styles for Test banner
AnaSerg Jul 27, 2023
ea652ce
feat: add tooltip for routine slider
AnaSerg Jul 28, 2023
1a9bd65
feat: notification popup in Header, issue #66
Segodnya Jul 28, 2023
1110bad
Merge pull request #73 from moodbeat/fix/notification-popup-66
Segodnya Jul 28, 2023
8fe4b5e
styles: change image for report component
AnaSerg Jul 28, 2023
33fda6e
make custom messages for tooltip
AnaSerg Jul 28, 2023
d09fea2
fix_bug_err-build
alix1982 Jul 28, 2023
2339538
fix_conflict
alix1982 Jul 28, 2023
b9b859c
fix_bug_build
alix1982 Jul 28, 2023
f480db6
Merge pull request #76 from moodbeat/feat/activity
alix1982 Jul 28, 2023
0ce24c3
remove_Articles_MyTeam
alix1982 Jul 28, 2023
0015a25
fix_bug_build
alix1982 Jul 28, 2023
cff4cc0
fix_bug_build
alix1982 Jul 28, 2023
e3acb67
Merge pull request #78 from moodbeat/feat/activity
alix1982 Jul 28, 2023
eb8b88d
fix: refactor NotificationPopup to remove endless refresh state loop
Segodnya Jul 29, 2023
306cd1f
Merge pull request #79 from moodbeat/fix/notification-popup-loop
Segodnya Jul 29, 2023
df66fdb
feat: landing page feedback form submit
Segodnya Jul 29, 2023
6a59eb1
fix: optimize images, change background layout
Segodnya Jul 29, 2023
e549170
Merge pull request #80 from moodbeat/feat/feedback-form-submit
Segodnya Jul 29, 2023
7ecfe9b
fix: add css module classes LandingPage, FeedbackForm, Accordion
Segodnya Jul 29, 2023
8073ea5
Merge pull request #81 from moodbeat/fix/css-modules-classes-landing
Segodnya Jul 29, 2023
0b1d27d
add_validition_formEvents
alix1982 Jul 29, 2023
28f0e58
Merge pull request #82 from moodbeat/feat/activity
alix1982 Jul 29, 2023
0529590
fix_size_container_MyTeam_Events_and_buttonTelegramm
alix1982 Jul 30, 2023
49b5ebb
Merge pull request #84 from moodbeat/feat/activity
alix1982 Jul 30, 2023
90e87dd
refactor: Использование общих UI-компонентов в форме обратной связи
Segodnya Jul 30, 2023
cef4299
refactor: Удалил лишние неиспользуемые стили в Textarea
Segodnya Jul 30, 2023
f67ab6c
fix: Исправил плейсхолдер для Textarea
Segodnya Jul 30, 2023
cd380be
refactor: Удалил лишние неиспользуемые стили в Input .customInputStyle
Segodnya Jul 30, 2023
6755536
feat: Мобильная версия формы обратной связи и подвала
Segodnya Jul 30, 2023
a03b594
Merge pull request #85 from moodbeat/refactor/landing-common-ui-inputs
Segodnya Jul 30, 2023
589c284
hotfix: Из компонента Button убран излишний проп alignSelf
Segodnya Jul 30, 2023
6ede614
Merge pull request #86 from moodbeat/hotfix/landing-mobile-button-pos…
Segodnya Jul 30, 2023
32d257c
add_ContainerContent
alix1982 Jul 30, 2023
0bdf86d
remove_fix_Main_Profile_graphics
alix1982 Jul 30, 2023
1f1dd4a
remove_fix_Main_Profile
alix1982 Jul 30, 2023
bef64b2
remove_fix_Useful
alix1982 Jul 30, 2023
941631a
fix_bug_validation
alix1982 Jul 30, 2023
db34e5e
Merge pull request #87 from moodbeat/feat/activity
alix1982 Jul 30, 2023
c3adcb6
feat: finish piechart, change some styles to calendar
AnaSerg Jul 30, 2023
c714566
Merge branch 'AnaSerg-feature/main' into develop
AnaSerg Jul 30, 2023
4b9ee12
feat: add mobile Audience, Hero, Header sections
Segodnya Jul 31, 2023
06b4032
fix: merge conflicts in PieChart, PeriodPicker, Api
AnaSerg Jul 31, 2023
047cd43
feat: add mobile layout for Features, Audience
Segodnya Jul 31, 2023
476acf8
refactor: image optimization
Segodnya Jul 31, 2023
10ae669
fix: tests, modaluseful
ArtemKhudiakov Jul 31, 2023
6ba917e
Merge pull request #91 from moodbeat/fix/modaluseful
ArtemKhudiakov Jul 31, 2023
273a6cf
fix: fix Period Picker text while no data is provided
AnaSerg Jul 31, 2023
18cd8ad
Merge branch 'develop' into develop
AnaSerg Jul 31, 2023
1f395ba
Merge pull request #92 from AnaSerg/develop
AnaSerg Jul 31, 2023
23736f0
feat: add swiper for Audience section
Segodnya Jul 31, 2023
a26e027
feat: add burger menu for landing page
Segodnya Jul 31, 2023
ab26348
refactor: update ProtectedRoutes to redirect on landing for n-nauth u…
Segodnya Jul 31, 2023
7587355
fix: update media queries for landing page components
Segodnya Jul 31, 2023
fb4a729
fix: audience cards layout for 1440p in one line
Segodnya Jul 31, 2023
120c9da
fix: footer copyright text in two lines for 320p
Segodnya Jul 31, 2023
729ba93
fix: footer copyright text max-width 100% for 320p
Segodnya Jul 31, 2023
1e2ec74
Merge pull request #93 from moodbeat/feat/landing-mobile
Segodnya Jul 31, 2023
f73c0c9
add Pie Chart to Profile Page
AnaSerg Jul 31, 2023
3f794e2
fix: notification popup with zero morifications
Segodnya Jul 31, 2023
f9c1b37
fix: fix MoodGraph diagram on main
RomanRiyanov Jul 31, 2023
bc3fbfa
Merge branch 'develop' of https://github.com/moodbeat/Frontend into d…
RomanRiyanov Jul 31, 2023
4ec519d
fix: usefulpage layot
ArtemKhudiakov Aug 1, 2023
9dc51f4
fix: records layot
ArtemKhudiakov Aug 1, 2023
6401759
fix: data moodgraph
ArtemKhudiakov Aug 1, 2023
b6be9b2
fix: bookmarks img
ArtemKhudiakov Aug 1, 2023
ba8fb14
fix: text overlay card useful
ArtemKhudiakov Aug 1, 2023
10a823e
Merge pull request #96 from moodbeat/fix/usefulpageexpanded
ArtemKhudiakov Aug 1, 2023
c074fec
add_eventCard_Main
alix1982 Aug 1, 2023
b27fe56
fix_bug_build
alix1982 Aug 1, 2023
710427a
refactor: Изменил роуты для лендинга /, главной /main
Segodnya Aug 1, 2023
4582f83
fix: add isRemovingNotification flag to avoid multiple requests
Segodnya Aug 1, 2023
5de0942
fix_size_EventsCard
alix1982 Aug 1, 2023
79587db
fix_size_day
alix1982 Aug 1, 2023
634e830
fix_shadow_border_EventsCardMain_EventsMainPopup
alix1982 Aug 1, 2023
877e393
Merge pull request #97 from moodbeat/feat/activity
alix1982 Aug 1, 2023
bce7e61
Merge branch 'develop' into refactor/routes-landing-main
Segodnya Aug 1, 2023
cd47a1a
fix: Header logo link to /main route
Segodnya Aug 1, 2023
ff8a072
Merge pull request #94 from moodbeat/fix/notification-popup-3107
Segodnya Aug 1, 2023
9ecf06b
Merge pull request #98 from moodbeat/refactor/routes-landing-main
Segodnya Aug 1, 2023
c51400f
styles: gоправила верстку на странице с тестами
AnaSerg Aug 1, 2023
b3317be
feat: add logic to balance wheel in tests page
AnaSerg Aug 1, 2023
b1a4b15
feat: make articles block in main, add correct code to MoodGraph
AnaSerg Aug 2, 2023
d6d60fa
feat: add links to Logo, change styles fo Psycho banner
AnaSerg Aug 2, 2023
2c38f27
fix: resolve conflict in Records and MoodGraph
AnaSerg Aug 2, 2023
7261e63
fix: fix paths in charts, changr transition in event cards
AnaSerg Aug 2, 2023
faeb2da
fix: change eventpopup transition to display
AnaSerg Aug 2, 2023
4ed4ee0
fix: fix bugs
AnaSerg Aug 2, 2023
6c959c8
fix: add dependency to useEffect in Balance wheel
AnaSerg Aug 2, 2023
fa5cc8b
fix: fix days error moodgraph
RomanRiyanov Aug 2, 2023
3fd6d56
fix: fix error with months moodgraph
RomanRiyanov Aug 2, 2023
b100c13
Merge pull request #105 from AnaSerg/feature/charts_and_main
AnaSerg Aug 2, 2023
2e49e9d
Merge branch 'develop' into fix/juneerror
AnaSerg Aug 2, 2023
e3a4470
feat: Добавил кнопку возврата к началу страницы, правки после тестов …
Segodnya Aug 2, 2023
ecf4860
fix: Обновил цвета кнопки возвращения к началу страницы
Segodnya Aug 2, 2023
829ffca
fix_bug_card_MyTeam
alix1982 Aug 2, 2023
5fbf61a
fix_conflict
alix1982 Aug 2, 2023
38dd5e2
fix_conflict
alix1982 Aug 2, 2023
748e24a
Merge pull request #106 from moodbeat/fix/juneerror
AnaSerg Aug 2, 2023
dbb3c31
Merge pull request #108 from moodbeat/feat/backtotop-button-landing
AnaSerg Aug 2, 2023
dbf5e82
Merge pull request #109 from moodbeat/feat/activity
AnaSerg Aug 2, 2023
06b08c3
fix: fix MoodGraph in profile page. Resolve #51
AnaSerg Aug 2, 2023
894d142
fix: add word-wrap to About Section in profile page. Resolve #50
AnaSerg Aug 2, 2023
4cd5252
fix: change regex for AddMeetingForm. Resolve #44
AnaSerg Aug 2, 2023
dd616c1
Merge pull request #110 from AnaSerg/i_love_to_fix_bugs
AnaSerg Aug 2, 2023
a1d94ee
hotfix: add swiper slides gap (#111)
Segodnya Aug 3, 2023
93db195
fix: textarea char counter for landing page (#113)
Segodnya Aug 3, 2023
2960590
hotfix: feedback form newline (#114)
Segodnya Aug 4, 2023
b176488
fix: fix balance wheel
AnaSerg Aug 4, 2023
3a57359
Merge pull request #115 from AnaSerg/develop
AnaSerg Aug 4, 2023
cd9e098
fix_readme (#118)
alix1982 Oct 10, 2023
55591f7
refactor: apiConfig.js for api endpoint, edit readme, remove extra co…
Segodnya Oct 11, 2023
97ea0c6
Merge pull request #120 from moodbeat/refactor/api-config
AleksandrUsolcev Oct 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
VITE_SOME_KEY = "some value"
API_ENDPOINT = "em-dev.usolcev.com"
40 changes: 39 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,40 @@
# employee_mood_frontend
The frontend part of the "Employee mood" project curated by Yandex Accelerator

## Фронтенд для приложения **Employee_mood_frontend** - профилактика и борьба с выгоранием сотрудников.

## Описание проекта

- Создан проект на базе библиотеки React и языком программирования TypeScript, сборщиком Vite и Redux Toolkit в качестве стейт-менеджера;
- Реализована cемантическая, адаптивная верстка и стилизация с использовнием CSS-модулей и препроцессора SCSS;
- Настроен роутинг с защитой роутов доступных только при авторизации;
- Регистрация и вход пользователей по токену с его по проверкой на бекенд части приложения.

## Приложение

- презентационный лендинг согласно макету с возможностью авторизиции и перехода непосредственно в приложение;
- страница авторизации с валидацией полей ввода и использованием LocalStorage;
- главная страница с основным функционалом пользователя и визуальной частью (графики, слайдеры, кнопка получения обратной связи и визуализации его текущего психологического состояния);
- страница с набором тестов для контроля психологического состояния работника, с возможностью их сортировки по названию, дате и результату;
- страница с полезными статьями и видео для улучшения состояния работника, с возможностью выделения понравившихся материалов и добавления их в сохраненные, а также их сортировки по тегам и поиску по названию;
- страница с мероприятиями, запланироваными в организации, и выделением понравившихся, а также возможностью создавать мероприятия для топ-менеджеров в специальной форме с валидацией вводимых значений;
- страница с сохраненными статьями, видео и поисковой строкой;
- страница "Моя команда", доступная только для топ-менеджеров, с возможностью добавления новых сотрудников, поиска сотрудника через поисковую строку и сортировка работников по имени, должности или психологическому состоянию сотрудника;

## Стек:

- React, TypeScript, Vite, Redux Toolkit, CSS-module, SCSS, axios;
- Пользовательские хуки;
- Взаимодействие с бекенд-частью приложения с применением библитеки axios.

## TODO

Проект дорабатывается с учетом индивидуальных потребностей заказчика.

- [Ссылка на frontend часть проекта в gitHub](https://github.com/moodbeat/Frontend)

## Запуск фронтенд части приложения

- клонировать проект c gitHub,
- установить зависимости (npm i),
- в файле apiConfig.ts указать API_ENDPOINT,
- запустить приложение: `npm run dev`.
180 changes: 169 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading