diff --git a/apps/web/components/organisms/header/header.tsx b/apps/web/components/organisms/header/header.tsx index df9bca6..0ad3924 100644 --- a/apps/web/components/organisms/header/header.tsx +++ b/apps/web/components/organisms/header/header.tsx @@ -7,7 +7,7 @@ import { DropDownBurgerMenu } from 'organisms/dropDownBurgerMenu/dropDownBurgerM import { useHamburgerMenu } from 'organisms/dropDownBurgerMenu/useHamburgerMenu'; import { HeaderUserLoginContent } from 'organisms/header/headerUserLoginContent/headerUserLoginContent'; import { HeaderUserLoggedInContent } from 'organisms/header/headerUserLoggedInContent/headerUserLoggedInContent'; -import { VisuallyHidden, Heading } from 'ui'; +import { VisuallyHidden, Heading, Container } from 'ui'; import Link from 'next/link'; export const Header = () => { @@ -15,41 +15,45 @@ export const Header = () => { const { closeBurgerMenu, isBurgerMenuActive, openBurgerMenu } = useHamburgerMenu(); return ( -
- - - Start-Coding - - +
+ +
+ + + Start-Coding + + - - {isBurgerMenuActive && ( - - - - - - )} -
-
- - - + + {isBurgerMenuActive && ( + + + + + + )} +
+
+ + + +
+ {!isLoading && !user && } + {!isLoading && user && ( + + )} +
- {!isLoading && !user && } - {!isLoading && user && ( - - )} -
+
); }; diff --git a/apps/web/components/templates/challenge/single/singleChallenge.tsx b/apps/web/components/templates/challenge/single/singleChallenge.tsx index e5707c5..627760b 100644 --- a/apps/web/components/templates/challenge/single/singleChallenge.tsx +++ b/apps/web/components/templates/challenge/single/singleChallenge.tsx @@ -1,4 +1,4 @@ -import { Button, CategoryTag, Heading, Text } from 'ui'; +import { Button, CategoryTag, Container, Heading, Text } from 'ui'; import Image from 'next/image'; import type { Challenge } from '../../../../types/types'; import { useState } from 'react'; @@ -22,7 +22,7 @@ export const SingleChallengePage = ({ const { isLoading, user } = useUser(); return ( -
+ -
+ ); }; diff --git a/apps/web/components/templates/challenges/all/allChallenges.tsx b/apps/web/components/templates/challenges/all/allChallenges.tsx index a38bdf8..905af4f 100644 --- a/apps/web/components/templates/challenges/all/allChallenges.tsx +++ b/apps/web/components/templates/challenges/all/allChallenges.tsx @@ -1,4 +1,4 @@ -import { Heading, VisuallyHidden } from 'ui'; +import { Heading, VisuallyHidden, Container } from 'ui'; import { ChallengesList } from 'organisms/challengesList/challengesList'; import { Fragment } from 'react'; import { Dialog, Transition } from '@headlessui/react'; @@ -110,7 +110,7 @@ export const AllChallengesPage = () => { -
+
{
-
+ ); }; diff --git a/apps/web/components/templates/homepage/homepage.tsx b/apps/web/components/templates/homepage/homepage.tsx index 5aa20c5..45e07dc 100644 --- a/apps/web/components/templates/homepage/homepage.tsx +++ b/apps/web/components/templates/homepage/homepage.tsx @@ -1,3 +1,5 @@ +import { Container } from 'ui'; + export const Homepage = () => { - return
Witaj na stronie głównej
; + return Witaj na stronie głównej; }; diff --git a/packages/ui/components/atoms/container/container.stories.tsx b/packages/ui/components/atoms/container/container.stories.tsx new file mode 100644 index 0000000..68de4be --- /dev/null +++ b/packages/ui/components/atoms/container/container.stories.tsx @@ -0,0 +1,16 @@ +import { Container } from './container'; +import type { ComponentMeta, ComponentStory } from '@storybook/react'; + +export default { + title: 'Main Library/atoms/Container', + component: Container, +} as ComponentMeta; + +export const Default: ComponentStory = (props) => { + return ; +}; + +Default.args = { + children: + 'Lorem ipsum dolor sit, amet consectetur adipisicing elit. At, ab nisi cupiditate facilis adipisci dignissimos porro doloremque pariatur iste eveniet quae possimus unde soluta amet velit aperiam fuga aspernatur ut!', +}; diff --git a/packages/ui/components/atoms/container/container.tsx b/packages/ui/components/atoms/container/container.tsx new file mode 100644 index 0000000..534a593 --- /dev/null +++ b/packages/ui/components/atoms/container/container.tsx @@ -0,0 +1,13 @@ +import type { ReactNode } from 'react'; + +type Props = { + children: ReactNode; + as?: 'div' | 'main'; + id?: string; +}; + +export const Container = ({ children, as: Tag = 'div', id }: Props) => ( + + {children} + +); diff --git a/packages/ui/index.ts b/packages/ui/index.ts index 57f250b..3d3c768 100644 --- a/packages/ui/index.ts +++ b/packages/ui/index.ts @@ -13,3 +13,4 @@ export * from './components/organisms/dropdownMenu/dropdownMenu'; export * from './components/molecules/checkbox/checkbox'; export * from './components/atoms/categoryTag/categoryTag'; export * from './components/atoms/heading/heading'; +export * from './components/atoms/container/container';