Merge pull request #1003 from shawnrivers/dev

Dev

src/client/components/templates/Page/components/Sidebar/index.stories.tsx

@@ -0,0 +1,35 @@
+/**@jsx jsx */
+import { jsx } from '@emotion/core';
+import * as React from 'react';
+import { Meta, Story } from '@storybook/react/types-6-0';
+import { Sidebar, SidebarProps } from '.';
+import { ThemeDecorator } from 'storybook/ThemeDecorator';
+import { BaseButton } from 'client/components/atoms/BaseButton';
+import { Typography } from 'client/components/atoms/Typography';
+
+export default {
+  title: 'Common/SideBar',
+  decorators: [ThemeDecorator()],
+  component: Sidebar,
+} as Meta<SidebarProps>;
+
+const Template: Story<SidebarProps> = () => {
+  const [isSidebarOpen, toggleSidebar] = React.useState(false);
+
+  return (
+    <div>
+      <BaseButton
+        onClick={() => toggleSidebar(true)}
+        horizontalPadding="l"
+        verticalPadding="l"
+      >
+        <Typography variant="h4" element="span">
+          Toggle Sidebar
+        </Typography>
+      </BaseButton>
+      <Sidebar open={isSidebarOpen} onClose={() => toggleSidebar(false)} />
+    </div>
+  );
+};
+
+export const Default = Template.bind({});

src/client/components/templates/Page/components/Sidebar/index.tsx

@@ -55,11 +55,13 @@ const NavigationItem: React.FC<Omit<SidebarItemProps, 'element'>> = props => {
 
 const transition = { duration: 0.2 };
 
-export const Sidebar: React.FC<{
+export type SidebarProps = {
   open: boolean;
   onClose: () => void;
   className?: string;
-}> = props => {
+};
+
+export const Sidebar: React.FC<SidebarProps> = props => {
   const theme = useAppTheme();
   const { getTranslation } = useTranslations();
   const { open, onClose } = props;

src/client/features/Member/components/PositionBadge/index.stories.tsx

@@ -6,7 +6,7 @@ import { ThemeDecorator } from 'storybook/ThemeDecorator';
 import { PositionType } from 'server/actors/Members/constants/position';
 
 export default {
-  title: 'Position/badge',
+  title: 'Position/PositionBadge',
   decorators: [ThemeDecorator()],
   component: PositionBadge,
 } as Meta<PositionBadgeProps>;

src/client/features/Member/components/PositionCounter/index.stories.tsx

@@ -8,7 +8,7 @@ import {
 } from 'client/features/Member/components/PositionCounter';
 
 export default {
-  title: 'Position/counter',
+  title: 'Position/PositionCounter',
   component: PositionCounter,
   decorators: [ThemeDecorator()],
 } as Meta<PositionCounterProps>;

src/data/members.json

@@ -175,6 +175,10 @@
     "bloodType": "b",
     "origin": "埼玉県",
     "sites": [
+      {
+        "title": "Instagram",
+        "url": "https://www.instagram.com/manatsu.akimoto_official/"
+      },
       {
         "title": "blog",
         "url": "https://blog.nogizaka46.com/manatsu.akimoto/"

src/server/actors/Members/raw/editor/firstGen.ts

@@ -19,6 +19,10 @@ export const FIRST_GEN_MEMBERS: MemberRaw[] = [
     bloodType: BloodType.B,
     origin: Birthplace.Saitama,
     sites: [
+      {
+        title: SocialMedia.Instagram,
+        url: 'https://www.instagram.com/manatsu.akimoto_official/',
+      },
       {
         title: SocialMedia.Blog,
         url: 'https://blog.nogizaka46.com/manatsu.akimoto/',