Merge pull request #75 from smartive-education/feature/container

ost-cas-fee-adv-22-23 · Jan 7, 2023 · 40de755 · 40de755
2 parents b031059 + 0994db3
commit 40de755
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 24 deletions.
diff --git a/packages/design-system-component-library-yeahyeahyeah/components/Container.tsx b/packages/design-system-component-library-yeahyeahyeah/components/Container.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import styled from 'styled-components';
+import tw from 'twin.macro';
+
+export interface IContainerProps {
+  children?: React.ReactNode;
+  layout: 'plain' | 'box';
+}
+
+export const Container: React.FC<IContainerProps> = (props: IContainerProps) => {
+  const { layout = 'colored', children } = props;
+
+  return <SectionWrapper layout={layout}>{children}</SectionWrapper>;
+};
+
+interface ContainerStyles {
+  layout: string;
+}
+
+const SectionWrapper = styled.section(({ layout }: ContainerStyles) => [
+  tw`
+    container
+    mx-4
+    sm:mx-auto
+  `,
+  layout === 'box' && tw`bg-slate-white rounded-lg py-8 mx-4`,
+  layout === 'plain' && tw`bg-none px-4 bg-violet-400`,
+]);
diff --git a/packages/design-system-component-library-yeahyeahyeah/components/Navigation.tsx b/packages/design-system-component-library-yeahyeahyeah/components/Navigation.tsx
@@ -2,7 +2,6 @@ import styled from 'styled-components';
 import tw from 'twin.macro';
 import { MumbleLogo, IMumbleLogoProps } from './branding/MumbleLogo';
 import { NaviButton, INaviButtonProps } from './buttons/NaviButton';
-
 export interface INavigationProps {
   logo: IMumbleLogoProps;
   avatar: INaviButtonProps;
@@ -45,34 +44,40 @@ export const Navigation: React.FC<INavigationProps> = ({
 }) => {
   return (
     <>
-      <NavigationStyles>
-        <Container>
-          <Column>
-            <MumbleLogo
-              title={logo.title}
-              href={logo.href}
-              variant="white"
-              alignment="horizontal"
-              fCallBack={logo.fCallBack}
-              isNavigation={true}
-            />
-            <Row>
-              <NaviButton variant={avatar.variant} label={avatar.label} fCallBack={avatar.fCallBack} src={avatar.src} />
-              <NaviButton
-                icon={settings.icon}
-                label={settings.label}
-                variant={settings.variant}
-                fCallBack={settings.fCallBack}
+      <HeaderStyles>
+        <NavigationStyles>
+          <Container>
+            <Column>
+              <MumbleLogo
+                title={logo.title}
+                href={logo.href}
+                variant="white"
+                alignment="horizontal"
+                fCallBack={logo.fCallBack}
+                isNavigation={true}
               />
-              <NaviButton icon={logout.icon} label={logout.label} variant={logout.variant} fCallBack={logout.fCallBack} />
-            </Row>
-          </Column>
-        </Container>
-      </NavigationStyles>
+              <Row>
+                <NaviButton variant={avatar.variant} label={avatar.label} fCallBack={avatar.fCallBack} src={avatar.src} />
+                <NaviButton
+                  icon={settings.icon}
+                  label={settings.label}
+                  variant={settings.variant}
+                  fCallBack={settings.fCallBack}
+                />
+                <NaviButton icon={logout.icon} label={logout.label} variant={logout.variant} fCallBack={logout.fCallBack} />
+              </Row>
+            </Column>
+          </Container>
+        </NavigationStyles>
+      </HeaderStyles>
     </>
   );
 };
 
+const HeaderStyles = tw.header`
+  w-full
+`;
+
 const Container = tw.div`
   flex
   flex-col

diff --git a/packages/design-system-component-library-yeahyeahyeah/stories/Container.stories.tsx b/packages/design-system-component-library-yeahyeahyeah/stories/Container.stories.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { ComponentStory, ComponentMeta } from '@storybook/react';
+import { Container } from '../components/Container';
+
+export default {
+  title: 'Wireframes/Container',
+  component: Container,
+  argTypes: {
+    layout: {
+      control: 'select',
+      table: {
+        defaultValue: {
+          summary: 'plain',
+        },
+      },
+    },
+  },
+  args: {
+    layout: 'box',
+  },
+} as ComponentMeta<typeof Container>;
+
+const Template: ComponentStory<typeof Container> = (args) => <Container {...args} />;
+
+export const ContainerStory = Template.bind({});
+
+ContainerStory.storyName = 'Container';