diff --git a/src/App.scss b/src/App.scss
index 4f9dbf5..d3d329f 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -1,15 +1 @@
@import 'antd/dist/antd.variable.min.css';
-@import './colors.scss';
-
-.App {
- text-align: center;
-}
-
-.App .App-content {
- display: flex;
- justify-content: center;
-}
-
-article {
- margin: 2em;
-}
diff --git a/src/App.tsx b/src/App.tsx
index 5de5137..cbfb43d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,39 +1,32 @@
-import "./App.scss";
-import { BrowserRouter as Router, Switch, Route, Redirect } from "react-router-dom";
+import './App.scss';
+
+import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
import { useRecoilValue } from 'recoil';
import { currentLanguage } from './atoms/language';
import { Main } from './pages/Main';
import { Registration } from './pages/Registration';
import { IntlProvider } from 'react-intl';
import { localization } from './constants/localization';
-import { Header } from './components/Header';
import { ConfigProvider } from 'antd';
-import { LanguagePicker } from './components/LanguagePicker';
export default function App() {
- const language = useRecoilValue(currentLanguage)
+ const language = useRecoilValue(currentLanguage);
ConfigProvider.config({
theme: {
primaryColor: '#a7ab81',
- }
+ },
});
return (
-
-
-
-
-
-
-
-
-
+
+
+
-
+
);
}
diff --git a/src/components/Menu.tsx b/src/components/Menu.tsx
index 1b91901..6f480fd 100644
--- a/src/components/Menu.tsx
+++ b/src/components/Menu.tsx
@@ -1,56 +1,42 @@
-import "./Menu.scss";
+import './Menu.scss';
export const Menu = () => {
- return (
-
- Menu
-
-
- |
- Starters |
- |
-
-
- | Chrumky |
- Very good yummy yummy. Lorem ipsum dolor sit amet. |
- Nuts |
-
-
- | Halusky |
- Fatty fat stuff. |
- Meat, fat |
-
-
- |
- Main dish |
- |
-
-
- | Chrumky |
- Very good yummy yummy. Lorem ipsum dolor sit amet. |
- Nuts |
-
-
- | Halusky |
- Fatty fat stuff. |
- Meat, fat |
-
-
- |
- Dessert |
- |
-
-
- | Chrumky |
- Very good yummy yummy. Lorem ipsum dolor sit amet. |
- Nuts |
-
-
- | Halusky |
- Fatty fat stuff. |
- Meat, fat |
-
-
-
- )
-}
\ No newline at end of file
+ return (
+
+ Menu
+
+ Starters
+
+ Chrumky
+ Very good yummy yummy. Lorem ipsum dolor sit amet.
+ Nuts
+
+ Halusky
+ Fatty fat stuff.
+ Meat, fat
+
+
+ Main dish
+
+ Chrumky
+ Very good yummy yummy. Lorem ipsum dolor sit amet.
+ Nuts
+
+ Halusky
+ Fatty fat stuff.
+ Meat, fat
+
+
+ Dessert
+
+ Chrumky
+ Very good yummy yummy. Lorem ipsum dolor sit amet.
+ Nuts
+
+ Halusky
+ Fatty fat stuff.
+ Meat, fat
+
+
+ );
+};
diff --git a/src/components/NavBar.scss b/src/components/NavBar.scss
index bae5853..8c63476 100644
--- a/src/components/NavBar.scss
+++ b/src/components/NavBar.scss
@@ -1,5 +1,12 @@
.NavBar {
display: flex;
justify-content: space-around;
+ align-items: center;
margin-bottom: 1em;
+ font-size: 2rem;
+
+ .Diamond {
+ margin-right: 1rem;
+ margin-left: 1rem;
+ }
}
diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx
index 04d9fb8..d9c98b3 100644
--- a/src/components/NavBar.tsx
+++ b/src/components/NavBar.tsx
@@ -1,18 +1,17 @@
-import "./NavBar.scss";
+import './NavBar.scss';
import { Link } from 'react-router-dom';
import { LanguagePicker } from './LanguagePicker';
import { Button, Menu } from 'antd';
+import { Diamond } from './Diamond';
export const NavBar = () => {
- return (
-
- )
-}
\ No newline at end of file
+ return (
+
+ Menu
+
+ Program
+
+ Info
+
+ );
+};
diff --git a/src/img/main-bg.png b/src/img/main-bg.png
new file mode 100644
index 0000000..ebb56a3
Binary files /dev/null and b/src/img/main-bg.png differ
diff --git a/src/pages/Main.scss b/src/pages/Main.scss
index ff64676..545453f 100644
--- a/src/pages/Main.scss
+++ b/src/pages/Main.scss
@@ -1,5 +1,46 @@
+@import '../colors.scss';
+
.Main {
+ text-align: center;
display: flex;
- flex-direction: column;
align-items: center;
+ flex-direction: column;
+
+ .Main-container {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ border: 2px solid;
+ border-color: $brown-text;
+ border-radius: 300px;
+ width: 48rem;
+
+ .logo-container {
+ margin-top: 3rem;
+ }
+
+ h1 {
+ line-height: 4rem;
+ font-family: 'Montserrat-Light';
+ color: $green-text !important;
+ font-size: 5rem;
+ text-transform: uppercase;
+ margin-bottom: 0px;
+ }
+
+ h2 {
+ color: $brown-text;
+ font-size: 3rem;
+ margin-top: 0em;
+ margin-bottom: 0em;
+ }
+ }
+
+ .extraText {
+ color: $brown-text;
+ font-size: 1.1rem;
+ text-transform: uppercase;
+ margin-bottom: 8px;
+ letter-spacing: 2px;
+ }
}
diff --git a/src/pages/Main.tsx b/src/pages/Main.tsx
index d79869a..4588ec3 100644
--- a/src/pages/Main.tsx
+++ b/src/pages/Main.tsx
@@ -1,22 +1,59 @@
-import "./Main.scss";
+import './Main.scss';
-import { useParams } from "react-router-dom";
+import { Link, useParams } from 'react-router-dom';
import { Menu } from '../components/Menu';
import { NavBar } from '../components/NavBar';
import { Program } from '../components/Program';
import { NotFound } from '../components/NotFound';
+import { LanguagePicker } from '../components/LanguagePicker';
+import { FormattedMessage } from 'react-intl';
+import { DateAndPlace } from '../components/DateAndPlace';
interface MainParams {
- page: string
+ page: string;
}
export const Main = () => {
- const { page } = useParams()
+ const { page } = useParams();
- return (
-
-
- {page === "menu" ? : page === "program" ? : }
-
- )
-}
\ No newline at end of file
+ return (
+
+
+
Save the link
+
+
+
+
+
+
+
+ &
+
+
+
+
+
+
+
+
+
+ {page ? (
+
+ {page === 'menu' ? (
+
+ ) : page === 'program' ? (
+
+ ) : (
+
+ )}
+
+ ) : (
+
+
+
+ )}
+
+
Attend the party
+
+ );
+};
diff --git a/src/pages/Registration.tsx b/src/pages/Registration.tsx
index 958ed35..697cf75 100644
--- a/src/pages/Registration.tsx
+++ b/src/pages/Registration.tsx
@@ -1,32 +1,44 @@
-import "./Registration.scss";
+import './Registration.scss';
import { FormattedMessage } from 'react-intl';
-import { RegForm } from '../components/RegForm'
+import { RegForm } from '../components/RegForm';
+import { RegistrationHeader } from '../components/RegistrationHeader';
+import { LanguagePicker } from '../components/LanguagePicker';
export const Registration = () => {
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- )
-}
\ No newline at end of file
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ >
+ );
+};