Merge branch 'master' into fix/fsd

src/app/routing/content-layout/hooks/use-content-layout.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect } from 'react'
 
+<<<<<<<< HEAD:src/app/routing/content-layout/hooks/use-content-layout.tsx
 import useIsShowWhatsNew from '@app/routing/content-layout/hooks/use-is-whats-new'
 
 import WhatsNew from '@widgets/whats-new'
@@ -8,6 +9,15 @@ import useLkNotifications from '@entities/lk-notifications/hooks/use-lk-notifica
 
 import useCurrentExactPage from '@shared/routing/hooks/use-current-exact-page'
 import { useModal } from '@shared/ui/modal'
+========
+import { WhatsNew } from 'widgets'
+import useModal from 'widgets/modal'
+>>>>>>>> master:src/widgets/content-layout/hooks/use-content-layout.tsx
+
+import useLkNotifications from '@entities/lk-notifications/hooks/use-lk-notifications'
+
+import useCurrentExactPage from '@shared/lib/hooks/use-current-exact-page'
+import useIsShowWhatsNew from '@shared/lib/hooks/use-is-whats-new'
 
 const useContentLayout = () => {
     const currentPage = useCurrentExactPage()

src/app/routing/content-layout/hooks/use-is-whats-new.ts

@@ -2,9 +2,16 @@ import { useEffect, useState } from 'react'
 
 import { useUnit } from 'effector-react'
 
+<<<<<<<< HEAD:src/app/routing/content-layout/hooks/use-is-whats-new.ts
 import { LastUpdateWhatsNew } from '@shared/consts'
 import { userModel } from '@shared/session'
 import { tutorialModel } from '@shared/tutorial'
+========
+import { tutorialModel } from '@entities/tutorial'
+import { userModel } from '@entities/user'
+
+import { LastUpdateWhatsNew } from '@shared/constants'
+>>>>>>>> master:src/shared/lib/hooks/use-is-whats-new.ts
 
 const useIsShowWhatsNew = () => {
     const {

src/app/routing/content-layout/index.tsx

@@ -1,5 +1,6 @@
 import React, { Suspense, useRef, useState } from 'react'
 
+<<<<<<<< HEAD:src/app/routing/content-layout/index.tsx
 import { useScrollToTop } from '@app/routing/hooks/use-scroll-to-top'
 import PrivateRouter from '@app/routing/private-router'
 
@@ -22,6 +23,26 @@ import { Modal } from '@shared/ui/modal'
 
 import InitialLoader from '../../../shared/ui/initial-loader'
 import Story from '../../../widgets/story'
+========
+import { Confirm, HintModal, MobileBottomMenu, PopUpMessage } from 'widgets'
+import ContextMenu from 'widgets/context-menu'
+import Header from 'widgets/header'
+import { Modal } from 'widgets/modal'
+import PopUpNotifications from 'widgets/pop-up-notifications'
+import { TutorialHero } from 'widgets/tutorial'
+import { LeftSideBarTutorial } from 'widgets/tutorial/tutorials/left-sidebar-tutorial'
+
+import PrivateRouter from '@app/routers/private-router'
+
+import { menuModel } from '@entities/menu'
+import { userModel } from '@entities/user'
+
+import { useScrollToTop } from '@shared/lib/hooks/use-scroll-to-top'
+import ErrorBoundary from '@shared/ui/error-boundary'
+
+import InitialLoader from '../../shared/ui/initial-loader'
+import Story from '../../shared/ui/story'
+>>>>>>>> master:src/widgets/content-layout/index.tsx
 import useContentLayout from './hooks/use-content-layout'
 import { ContentWrapper, PageContent } from './styled'
 

src/app/routing/routes/pages/student.ts

@@ -3,6 +3,7 @@ import { lazy } from 'react'
 export const ApplicationForSuperiorRoom = lazy(() => import('@pages/application-for-superior-room'))
 export const AcadPerformance = lazy(() => import('@pages/acad-performance'))
 export const DormitoryPage = lazy(() => import('@pages/dormitory'))
+export const StudentEmploymentPage = lazy(() => import('@pages/student-employment'))
 export const ClarificationOfPassportDataApplication = lazy(
     () => import('@pages/applications/pages/multifunctional-center/clarification-of-passport-data'),
 )
@@ -123,7 +124,10 @@ export const AccommodationCorrespondenceFormPage = lazy(
 export const FamilyRoomPage = lazy(() => import('@pages/applications/pages/campus-management/family-room'))
 
 export const ArbitraryRequestPage = lazy(() => import('@pages/applications/pages/other/arbitrary-request'))
+<<<<<<<< HEAD:src/app/routing/routes/pages/student.ts
 export const StudentEmploymentPage = lazy(() => import('@pages/student-employment'))
+========
+>>>>>>>> master:src/app/routes/other-routes/pages.ts
 export const StudentEmploymentApplicationPage = lazy(() => import('@pages/applications/pages/other/student-employment'))
 
 export const TaxCertificatesPage = lazy(() => import('@pages/payments/tax-certificate'))

src/entities/applications/lib/create-form-store.ts

@@ -3,9 +3,15 @@ import { Effect, EventCallable, createEffect, createEvent, createStore, sample }
 import { useStore } from 'effector-react'
 
 import { applicationsModel } from '@entities/applications'
+<<<<<<<< HEAD:src/entities/applications/lib/create-form-store.ts
 
 import { MessageType } from '@shared/consts'
 import { popUpMessageModel } from '@shared/ui/pop-up-message'
+========
+import { popUpMessageModel } from '@entities/pop-up-message'
+
+import { MessageType } from '@shared/ui/types'
+>>>>>>>> master:src/shared/effector/create-form-store.ts
 
 export interface TemplateFormStore<DataType> {
     data: DataType | null

src/entities/applications/lib/get-method-obstaing.ts

@@ -1,5 +1,11 @@
+<<<<<<<< HEAD:src/entities/applications/lib/get-method-obstaing.ts
 import { IInputAreaData } from '@shared/ui/input-area/model'
 import { SpecialFieldsName, SpecialFieldsNameConfig } from '@shared/ui/input-area/types'
+========
+import { SpecialFieldsName, SpecialFieldsNameConfig } from '@entities/applications/consts'
+
+import { IInputAreaData } from '@ui/input-area/model'
+>>>>>>>> master:src/features/applications/lib/get-method-obstaing.ts
 
 type radioType = { id: number; title: string }
 

src/features/all-staff/staff-modal.tsx

@@ -1,6 +1,7 @@
 import React from 'react'
 
 import { useUnit } from 'effector-react'
+<<<<<<<< HEAD:src/features/all-staff/staff-modal.tsx
 
 import { TeacherModal } from '@features/user/ui'
 
@@ -12,6 +13,17 @@ import { UserProps } from '@shared/ui/user-header/types'
 import { findEmployeeByFio } from './lib/find-employee-by-fio'
 import { getEmployeeInfo } from './lib/get-employee-info'
 import { PhonebookModal } from './ui/phonebook-modal'
+========
+import { UserProps } from 'widgets/user/types'
+import { TeacherModal } from 'widgets/user/ui'
+
+import { phonebookModel } from '@entities/phonebook'
+import { userModel } from '@entities/user'
+
+import { findEmployeeByFio } from '../lib/find-employee-by-fio'
+import { getEmployeeInfo } from '../lib/get-employee-info'
+import { PhonebookModal } from './phonebook-modal'
+>>>>>>>> master:src/pages/all-staff/ui/staff-modal.tsx
 
 type Props = Pick<UserProps, 'name' | 'division' | 'avatar' | 'id'>
 

src/features/all-staff/styled/index.ts

@@ -1,6 +1,12 @@
 import { Link } from 'react-router-dom'
 
 import styled from 'styled-components'
+<<<<<<<< HEAD:src/features/all-staff/styled/index.ts
+========
+
+import { MEDIA_QUERIES } from '@shared/constants'
+import Flex from '@shared/ui/flex'
+>>>>>>>> master:src/pages/all-staff/styled/index.ts
 
 import { MEDIA_QUERIES } from '@shared/ui/consts'
 import Flex from '@shared/ui/flex'

src/features/all-staff/ui/phonebook-modal.tsx

@@ -4,12 +4,23 @@ import { Link } from 'react-router-dom'
 
 import { useUnit } from 'effector-react'
 import styled from 'styled-components'
+<<<<<<<< HEAD:src/features/all-staff/ui/phonebook-modal.tsx
 
+========
+import { useModal } from 'widgets'
+
+import { ALL_TEACHERS_ROUTE, SCHEDULE_FILTER_ROUTE } from '@app/routes/general-routes'
+
+import { SiteName } from '@pages/teachers-applications/pages/contact-details/lib/get-form'
+
+import Avatar from '@features/home/ui/molecules/avatar'
+>>>>>>>> master:src/pages/all-staff/ui/phonebook-modal.tsx
 import { SendMessage } from '@features/send-first-message'
 
 import { getEnrichedTemplatePath } from '@entities/menu/lib/get-enriched-template-path'
 import { phonebookModel } from '@entities/phonebook'
 
+<<<<<<<< HEAD:src/features/all-staff/ui/phonebook-modal.tsx
 import { SiteName } from '@shared/lib'
 import { ALL_TEACHERS_ROUTE, SCHEDULE_FILTER_ROUTE } from '@shared/routing'
 import Avatar from '@shared/ui/avatar'
@@ -20,12 +31,24 @@ import List from '@shared/ui/list'
 import { useModal } from '@shared/ui/modal'
 import UserHeaderBackground from '@shared/ui/user-header/user-header-background'
 
+========
+import useCurrentDevice from '@shared/lib/hooks/use-current-device'
+import { Button } from '@shared/ui/button'
+import Flex from '@shared/ui/flex'
+import List from '@shared/ui/list'
+import UserHeaderBackground from '@shared/ui/user-header/user-header-background'
+
+import { InfoItem } from '../info-item'
+>>>>>>>> master:src/pages/all-staff/ui/phonebook-modal.tsx
 import { findEmployeeByFio } from '../lib/find-employee-by-fio'
 import { findSubdivisionByName } from '../lib/find-subdivision-by-name'
 import { getEmployeeInfo } from '../lib/get-employee-info'
 import { getSubdivisionInfo } from '../lib/get-subdivision-info'
 import { AvatarWrapper, Buttons, Content, Header, LinkStyled, Subtitle, Title, Wrapper } from '../styled'
+<<<<<<<< HEAD:src/features/all-staff/ui/phonebook-modal.tsx
 import { InfoItem } from './info-item'
+========
+>>>>>>>> master:src/pages/all-staff/ui/phonebook-modal.tsx
 import { PlaceModal } from './place-modal'
 
 export type PhonebookInfo = {

src/features/all-staff/ui/place-modal.tsx

@@ -2,8 +2,14 @@ import React from 'react'
 
 import styled from 'styled-components'
 
+<<<<<<<< HEAD:src/features/all-staff/ui/place-modal.tsx
 import { SiteName } from '@shared/lib'
 import { MEDIA_QUERIES } from '@shared/ui/consts'
+========
+import { SiteName } from '@pages/teachers-applications/pages/contact-details/lib/get-form'
+
+import { MEDIA_QUERIES } from '@shared/constants'
+>>>>>>>> master:src/pages/all-staff/ui/place-modal.tsx
 
 export const PlaceModal = ({ place }: { place: SiteName }) => {
     return (

src/features/context-menu/index.tsx

@@ -1,11 +1,19 @@
 import React, { useRef } from 'react'
 
 import styled from 'styled-components'
+<<<<<<<< HEAD:src/features/context-menu/index.tsx
 
 import { contextMenuModel } from '@entities/context-menu'
 
 import useOnClickOutside from '@shared/ui/hooks/use-on-click-outside'
 import ModalWrapper from '@shared/ui/modal/ui/atoms/modal-wrapper'
+========
+import ModalWrapper from 'widgets/modal/ui/atoms/modal-wrapper'
+
+import useOnClickOutside from '@utils/hooks/use-on-click-outside'
+
+import { contextMenuModel } from '../../entities/context-menu'
+>>>>>>>> master:src/widgets/context-menu/index.tsx
 
 const ContextMenuWrapper = styled.div<{
     isVisible: boolean

src/features/helpful-information/config/pages-config.ts

@@ -1,8 +1,16 @@
+<<<<<<<< HEAD:src/features/helpful-information/config/pages-config.ts
 import instructionsTeacherData from '@features/helpful-information/instructions/data/teacher-data'
 
 import { HelpfulInfoEnum, helpfulInfoName } from '@entities/useful-information'
 
 import { HelpfulPages, Link } from '../types'
+========
+import instructionsTeacherData from '@pages/instructions/data/teacher-data'
+
+import { HelpfulInfoEnum, helpfulInfoName } from '@entities/useful-information'
+
+import { HelpfulPages, Link } from '../types/helpful-pages'
+>>>>>>>> master:src/pages/helpful-information/config/pages-config.ts
 
 const pages: HelpfulPages = [
     {

src/features/helpful-information/instructions/data/student-data.ts

@@ -1,7 +1,11 @@
 import { IconType } from 'react-icons'
 import { HiOutlineDocumentText } from 'react-icons/hi'
 
+<<<<<<<< HEAD:src/features/helpful-information/instructions/data/student-data.ts
 import { OLD_LK_URL } from '@shared/consts'
+========
+import { OLD_LK_URL } from '@shared/constants'
+>>>>>>>> master:src/pages/instructions/data/student-data.ts
 
 type LinksType = {
     link: string

src/features/helpful-information/instructions/data/teacher-data.ts

@@ -1,6 +1,10 @@
 import { HiOutlineDocumentText } from 'react-icons/hi'
 
+<<<<<<<< HEAD:src/features/helpful-information/instructions/data/teacher-data.ts
 import { OLD_LK_URL } from '@shared/consts'
+========
+import { OLD_LK_URL } from '@shared/constants'
+>>>>>>>> master:src/pages/instructions/data/teacher-data.ts
 
 import { InstructionsType } from './student-data'
 

src/features/helpful-information/instructions/index.tsx

@@ -2,10 +2,18 @@ import React, { useState } from 'react'
 
 import styled from 'styled-components'
 
+<<<<<<<< HEAD:src/features/helpful-information/instructions/index.tsx
 import { userModel } from '@shared/session'
 import { CenterPage, Divider, Error, Message, Title } from '@shared/ui/atoms'
 import BlockWrapper from '@shared/ui/block/styles'
 import { LocalSearch } from '@shared/ui/molecules'
+========
+import { userModel } from '@entities/user'
+
+import { CenterPage, Divider, Error, Message, Title } from '@ui/atoms'
+import BlockWrapper from '@ui/block/styles'
+import { LocalSearch } from '@ui/molecules'
+>>>>>>>> master:src/pages/instructions/index.tsx
 
 import instructionsStudentData, { InstructionsType } from './data/student-data'
 import instructionsTeacherData from './data/teacher-data'

src/features/helpful-information/instructions/lib/search.ts

@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:src/features/helpful-information/instructions/lib/search.ts
 import normalizeString from '@shared/lib/normalize-string'
+========
+import normalizeString from '@utils/normalize-string'
+>>>>>>>> master:src/pages/instructions/lib/search.ts
 
 import { InstructionsType } from '../data/student-data'
 

src/features/helpful-information/lib/search.ts

@@ -1,6 +1,12 @@
+<<<<<<<< HEAD:src/features/helpful-information/lib/search.ts
 import normalizeString from '@shared/lib/normalize-string'
 
 import { HelpfulPage } from '../types'
+========
+import normalizeString from '@utils/normalize-string'
+
+import { HelpfulPage } from '../types/helpful-pages'
+>>>>>>>> master:src/pages/helpful-information/lib/search.ts
 
 const search = (value: string, pages: HelpfulPage[]) => {
     return pages.reduce((acc, page) => {

src/features/helpful-information/ui/blocks-list.tsx

@@ -2,7 +2,11 @@ import React from 'react'
 
 import styled from 'styled-components'
 
+<<<<<<<< HEAD:src/features/helpful-information/ui/blocks-list.tsx
 import { HelpfulPage } from '@features/helpful-information'
+========
+import { HelpfulPage } from '@pages/helpful-information/types/helpful-pages'
+>>>>>>>> master:src/pages/helpful-information/ui/molecules/blocks-list.tsx
 
 import List from '@shared/ui/list'
 import { Title } from '@shared/ui/title'

src/features/list-of-people/index.tsx

@@ -4,10 +4,18 @@ import { AxiosResponse } from 'axios'
 import { EventCallable, Store } from 'effector'
 import styled from 'styled-components'
 
+<<<<<<<< HEAD:src/features/list-of-people/index.tsx
 import GlobalSearch from '@shared/ui/global-search'
 import { Hint } from '@shared/ui/search'
 import SearchWithHints from '@shared/ui/search-with-hints'
 import { SelectPage } from '@shared/ui/select'
+========
+import SearchWithHints from '@features/search-with-hints'
+import { SelectPage } from '@features/select'
+
+import GlobalSearch from '@shared/ui/global-search'
+import { Hint } from '@shared/ui/search'
+>>>>>>>> master:src/widgets/list-of-people/index.tsx
 import Subtext from '@shared/ui/subtext'
 import { Title } from '@shared/ui/title'
 

src/features/list-of-people/people-pagination-list.tsx

@@ -2,12 +2,21 @@ import React from 'react'
 
 import { EventCallable, Store } from 'effector'
 import { useStore } from 'effector-react'
+<<<<<<<< HEAD:src/features/list-of-people/people-pagination-list.tsx
 
 import User from '@features/user'
 
 import PagintaionList from '@shared/ui/pagination-list'
 import { Hint } from '@shared/ui/search'
 import { SelectPage } from '@shared/ui/select'
+========
+import User from 'widgets/user'
+>>>>>>>> master:src/widgets/list-of-people/people-pagination-list.tsx
+
+import { SelectPage } from '@features/select'
+
+import PagintaionList from '@shared/ui/pagination-list'
+import { Hint } from '@shared/ui/search'
 
 type TUser = {
     id: string