diff --git a/src/components/styles/header.scss b/src/components/Header.scss similarity index 88% rename from src/components/styles/header.scss rename to src/components/Header.scss index e0c19a5..741745c 100644 --- a/src/components/styles/header.scss +++ b/src/components/Header.scss @@ -1,4 +1,4 @@ -@import '../../colors.scss'; +@import '../colors.scss'; .App-header { background-color: $primary; diff --git a/src/components/Header.tsx b/src/components/Header.tsx index fec4a0c..ce0035e 100644 --- a/src/components/Header.tsx +++ b/src/components/Header.tsx @@ -1,6 +1,5 @@ import { FormattedMessage } from 'react-intl'; -import { LanguagePicker } from './LanguagePicker'; -import "./styles/header.scss" +import "./Header.scss" export const Header = () => { return ( diff --git a/src/components/styles/languagePicker.scss b/src/components/LanguagePicker.scss similarity index 100% rename from src/components/styles/languagePicker.scss rename to src/components/LanguagePicker.scss diff --git a/src/components/LanguagePicker.tsx b/src/components/LanguagePicker.tsx index 61e9d65..94f4b06 100644 --- a/src/components/LanguagePicker.tsx +++ b/src/components/LanguagePicker.tsx @@ -4,7 +4,7 @@ import { Dropdown, Menu } from 'antd'; import { useRecoilState } from 'recoil'; import { currentLanguage } from '../atoms/language'; import { languageItems } from '../constants/languageItems'; -import "./styles/languagePicker.scss" +import "./LanguagePicker.scss" export const LanguagePicker = () => { const [lang, setLang] = useRecoilState(currentLanguage) diff --git a/src/components/styles/menu.scss b/src/components/Menu.scss similarity index 100% rename from src/components/styles/menu.scss rename to src/components/Menu.scss diff --git a/src/components/Menu.tsx b/src/components/Menu.tsx index b530182..1b91901 100644 --- a/src/components/Menu.tsx +++ b/src/components/Menu.tsx @@ -1,4 +1,4 @@ -import "./styles/menu.scss"; +import "./Menu.scss"; export const Menu = () => { return ( diff --git a/src/components/styles/navBar.scss b/src/components/NavBar.scss similarity index 100% rename from src/components/styles/navBar.scss rename to src/components/NavBar.scss diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx index cf6f2e6..04d9fb8 100644 --- a/src/components/NavBar.tsx +++ b/src/components/NavBar.tsx @@ -1,4 +1,4 @@ -import "./styles/navBar.scss"; +import "./NavBar.scss"; import { Link } from 'react-router-dom'; import { LanguagePicker } from './LanguagePicker'; import { Button, Menu } from 'antd'; diff --git a/src/components/styles/notFound.scss b/src/components/NotFound.scss similarity index 100% rename from src/components/styles/notFound.scss rename to src/components/NotFound.scss diff --git a/src/components/NotFound.tsx b/src/components/NotFound.tsx index 5639a13..beab1d3 100644 --- a/src/components/NotFound.tsx +++ b/src/components/NotFound.tsx @@ -1,4 +1,4 @@ -import "./styles/notFound.scss"; +import "./NotFound.scss"; export const NotFound = () => { return ( diff --git a/src/components/styles/program.scss b/src/components/Program.scss similarity index 100% rename from src/components/styles/program.scss rename to src/components/Program.scss diff --git a/src/components/Program.tsx b/src/components/Program.tsx index 1fb65d7..fe88672 100644 --- a/src/components/Program.tsx +++ b/src/components/Program.tsx @@ -1,5 +1,5 @@ import { Link } from 'react-router-dom'; -import './styles/program.scss'; +import './Program.scss'; export const Program = () => { return ( diff --git a/src/components/styles/regForm.scss b/src/components/RegForm.scss similarity index 100% rename from src/components/styles/regForm.scss rename to src/components/RegForm.scss diff --git a/src/components/RegForm.tsx b/src/components/RegForm.tsx index b4752a3..2023689 100644 --- a/src/components/RegForm.tsx +++ b/src/components/RegForm.tsx @@ -2,7 +2,7 @@ import { Button, Checkbox, Col, Form, Input, Row, Select } from 'antd'; import { useParams } from 'react-router'; import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons'; -import "./styles/regForm.scss"; +import "./RegForm.scss"; import { addVisitor } from '../api'; import { arrayToString, capFirstLetter } from './utils'; import { Visitor } from '../model/visitor'; diff --git a/src/pages/styles/main.scss b/src/pages/Main.scss similarity index 100% rename from src/pages/styles/main.scss rename to src/pages/Main.scss diff --git a/src/pages/Main.tsx b/src/pages/Main.tsx index 70d564f..d79869a 100644 --- a/src/pages/Main.tsx +++ b/src/pages/Main.tsx @@ -1,4 +1,4 @@ -import "./styles/main.scss"; +import "./Main.scss"; import { useParams } from "react-router-dom"; import { Menu } from '../components/Menu'; diff --git a/src/pages/styles/registration.scss b/src/pages/Registration.scss similarity index 100% rename from src/pages/styles/registration.scss rename to src/pages/Registration.scss diff --git a/src/pages/Registration.tsx b/src/pages/Registration.tsx index 4e486bb..2d01e4c 100644 --- a/src/pages/Registration.tsx +++ b/src/pages/Registration.tsx @@ -1,6 +1,5 @@ -import "./styles/registration.scss"; +import "./Registration.scss"; -import { Header } from '../components/Header' import { RegForm } from '../components/RegForm' export const Registration = () => {