From ef959af71126cb1304c45402ffe6309f68fc5263 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Tue, 4 Jan 2022 20:35:35 +0700 Subject: [PATCH] refactored css imports --- src/components/flow/FlowSwiperHero/index.tsx | 3 --- src/components/lab/LabImage/index.tsx | 6 ------ src/components/node/NodeImageSwiperBlock/index.tsx | 4 ---- src/containers/dialogs/Modal/index.tsx | 2 +- src/containers/dialogs/PhotoSwipe/index.tsx | 2 -- src/redux/store.ts | 6 ------ src/styles/_global.scss | 10 ++++++++++ 7 files changed, 11 insertions(+), 22 deletions(-) diff --git a/src/components/flow/FlowSwiperHero/index.tsx b/src/components/flow/FlowSwiperHero/index.tsx index 9989f18b..97d62e6a 100644 --- a/src/components/flow/FlowSwiperHero/index.tsx +++ b/src/components/flow/FlowSwiperHero/index.tsx @@ -1,8 +1,5 @@ import React, { FC, useCallback, useMemo, useState } from 'react'; import { Swiper, SwiperSlide } from 'swiper/react'; -import 'swiper/swiper.scss'; -import 'swiper/components/effect-fade/effect-fade.scss'; -import 'swiper/components/lazy/lazy.scss'; import styles from './styles.module.scss'; import SwiperCore, { Autoplay, EffectFade, Lazy, Navigation } from 'swiper'; diff --git a/src/components/lab/LabImage/index.tsx b/src/components/lab/LabImage/index.tsx index 452b3e3a..d0a41e02 100644 --- a/src/components/lab/LabImage/index.tsx +++ b/src/components/lab/LabImage/index.tsx @@ -2,12 +2,6 @@ import React, { FC } from 'react'; import { INodeComponentProps } from '~/constants/node'; import SwiperCore, { A11y, Navigation, Pagination, SwiperOptions } from 'swiper'; -import 'swiper/swiper.scss'; -import 'swiper/components/pagination/pagination.scss'; -import 'swiper/components/scrollbar/scrollbar.scss'; -import 'swiper/components/zoom/zoom.scss'; -import 'swiper/components/navigation/navigation.scss'; - import styles from './styles.module.scss'; import { useNodeImages } from '~/hooks/node/useNodeImages'; import { useGotoNode } from '~/hooks/node/useGotoNode'; diff --git a/src/components/node/NodeImageSwiperBlock/index.tsx b/src/components/node/NodeImageSwiperBlock/index.tsx index 3c169747..2cf0f9c8 100644 --- a/src/components/node/NodeImageSwiperBlock/index.tsx +++ b/src/components/node/NodeImageSwiperBlock/index.tsx @@ -2,10 +2,6 @@ import React, { FC, useCallback, useState } from 'react'; import { INodeComponentProps } from '~/constants/node'; import { Swiper, SwiperSlide } from 'swiper/react'; -import 'swiper/swiper.scss'; -import 'swiper/components/pagination/pagination.scss'; -import 'swiper/components/navigation/navigation.scss'; -import 'swiper/components/lazy/lazy.min.css'; import styles from './styles.module.scss'; import SwiperCore, { Keyboard, Navigation, Pagination, SwiperOptions } from 'swiper'; diff --git a/src/containers/dialogs/Modal/index.tsx b/src/containers/dialogs/Modal/index.tsx index 36b4f213..9398bca7 100644 --- a/src/containers/dialogs/Modal/index.tsx +++ b/src/containers/dialogs/Modal/index.tsx @@ -3,7 +3,7 @@ import { ModalWrapper } from '~/components/dialogs/ModalWrapper'; import { DIALOG_CONTENT } from '~/constants/modal'; import { useModalStore } from '~/store/modal/useModalStore'; import { has } from 'ramda'; -import { observer } from 'mobx-react'; +import { observer } from 'mobx-react-lite'; type IProps = {}; diff --git a/src/containers/dialogs/PhotoSwipe/index.tsx b/src/containers/dialogs/PhotoSwipe/index.tsx index 78242f30..db1b1be4 100644 --- a/src/containers/dialogs/PhotoSwipe/index.tsx +++ b/src/containers/dialogs/PhotoSwipe/index.tsx @@ -2,8 +2,6 @@ import React, { useEffect, useRef, VFC } from 'react'; import PhotoSwipeJs from 'photoswipe/dist/photoswipe.js'; import PhotoSwipeUI_Default from 'photoswipe/dist/photoswipe-ui-default.js'; -import 'photoswipe/dist/photoswipe.css'; -import 'photoswipe/dist/default-skin/default-skin.css'; import { getURL } from '~/utils/dom'; import { PRESETS } from '~/constants/urls'; import styles from './styles.module.scss'; diff --git a/src/redux/store.ts b/src/redux/store.ts index aa963169..6ffd230d 100644 --- a/src/redux/store.ts +++ b/src/redux/store.ts @@ -36,12 +36,6 @@ const authPersistConfig: PersistConfig = { storage, }; -const flowPersistConfig: PersistConfig = { - key: 'flow', - whitelist: ['nodes', 'recent', 'updated'], - storage, -}; - const playerPersistConfig: PersistConfig = { key: 'player', whitelist: ['youtubes'], diff --git a/src/styles/_global.scss b/src/styles/_global.scss index b64f4e08..e2ab3236 100644 --- a/src/styles/_global.scss +++ b/src/styles/_global.scss @@ -1,4 +1,14 @@ @import "src/styles/variables"; +@import 'photoswipe/dist/photoswipe'; +@import 'photoswipe/dist/default-skin/default-skin'; + +@import 'swiper/swiper'; +@import 'swiper/components/effect-fade/effect-fade'; +@import 'swiper/components/lazy/lazy'; +@import 'swiper/components/pagination/pagination'; +@import 'swiper/components/scrollbar/scrollbar'; +@import 'swiper/components/zoom/zoom'; +@import 'swiper/components/navigation/navigation'; html { min-height: 100vh;