Skip to content

Commit

Permalink
v091.1
Browse files Browse the repository at this point in the history
  • Loading branch information
shenghuolaji committed Sep 11, 2023
1 parent a109eb1 commit ce8a87e
Show file tree
Hide file tree
Showing 13 changed files with 23,000 additions and 29,346 deletions.
43,589 changes: 14,275 additions & 29,314 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
"generate-contentful-schema": "cf-content-types-generator --spaceId $CONTENTFUL_SPACE_ID --token $CONTENTFUL_ACCESS_TOKEN --v10 --out src/models/contentful"
},
"dependencies": {
"@babel/plugin-transform-class-properties": "^7.22.5",
"@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
"@types/node": "18.15.11",
"@types/react": "18.0.33",
"@types/react-dom": "18.0.11",
Expand Down
6 changes: 3 additions & 3 deletions src/components/feature/wrapImage/WrapImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ const constructSizesSrcSet = (
mediaQuery: string = "min-width"
) => {
return [
{ minWidth: 1280, size: xl },
{ minWidth: 1024, size: lg },
{ minWidth: 768, size: md },
{ minWidth: 1280, size: lg },
{ minWidth: 1024, size: md },
{ minWidth: 768, size: sm },
{ minWidth: 640, size: sm },
]
.filter(({ size }) => size !== undefined)
Expand Down
6 changes: 5 additions & 1 deletion src/components/page/layout/Layout.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ type Story = StoryObj<typeof Layout>;

export const Primary: Story = {
args: {
children: <div>なかみ</div>,
children: <div>



</div>,
currentTopPath: "/about",
copyrightText: "2023 Miyashita Lab",
},
Expand Down
10 changes: 4 additions & 6 deletions src/components/page/top/Top.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,14 @@ export const Primary = {
width: 1280,
height: 360,
},
title: "宮下研究室",
description:
"宮下研究室では、音楽・映像・3DCGアニメーション、3Dプリンタ、ゲームやVR、プログラミングも味覚も全て「表現」であると捉え、人間の表現能力を拡張する「インストゥルメント」として、コンピュータのあり方を考えています。",
title: "Miyashita Laboratory",
},
newsList: faker.helpers.multiple(() => newsModelMock(faker), { count: 8 }),
newsList: faker.helpers.multiple(() => newsModelMock(faker), { count: 4 }),
researchList: faker.helpers.multiple(() => paperModelMock(faker), {
count: 8,
count: 4,
}),
projectList: faker.helpers.multiple(() => projectModelMock(faker), {
count: 8,
count: 4,
}),
memberList: faker.helpers.multiple(() => memberModelMock(faker), {
count: 12,
Expand Down
9 changes: 3 additions & 6 deletions src/components/page/top/Top.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,12 @@ export const Top: FC<TopProps> = ({
<div className={"m-4 my-8 flex flex-col gap-y-16 xl:mx-0"}>
<section className={"mx-auto max-w-screen-lg text-center"}>
<h1 className={"my-2 break-keep text-2xl"}>
明治大学 <wbr />
総合数理学部 <wbr />
先端メディアサイエンス学科 <wbr />
宮下研究室
Miyashita Laboratory
</h1>
<p className={"my-2"}>
<BeautifulBreak>{top.description}</BeautifulBreak>
</p>
<PageLink href={ROUTES.ABOUT}>研究室について</PageLink>
<PageLink href={ROUTES.ABOUT}>About</PageLink>
</section>
<NewsSection newsList={newsList} />
<ResearchSection researchList={researchList} />
Expand Down Expand Up @@ -110,7 +107,7 @@ const ResearchSection: FC<{
<ArticleCardsSection
href={ROUTES.RESEARCHES}
headingIcon={<Icon fontStyle="solid" name={"book"} />}
headingText={"研究"}
headingText={"論文データベース"}
>
{researchList.map((research) => (
<ArticleCard
Expand Down
10 changes: 5 additions & 5 deletions src/components/ui/memberCard/MemberCard.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ export const Primary: Story = {
<Image
src="./member-default.png"
alt={"dummy image"}
width={400}
height={400}
width={300}
height={300}
/>
),
},
Expand All @@ -41,7 +41,7 @@ export const Homei: Story = {
role: "教員",
name: "宮下芳明",
children: (
<Image src="./member-default.png" alt={""} width={400} height={400} />
<Image src="./member-default.png" alt={""} width={300} height={300} />
),
},
};
Expand All @@ -55,8 +55,8 @@ export const OB: Story = {
<Image
src="./member-default.png"
alt={"dummy image"}
width={400}
height={400}
width={300}
height={300}
/>
),
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/pageFooter/PageFooter.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type Story = StoryObj<typeof PageFooter>;

export const Primary: Story = {
args: {
copyright: "© 2023 Miyashita Lab",
copyright: "© 2023 Miyashita Laboratory",
links: [
{
text: "Copyright Notice",
Expand Down
2 changes: 1 addition & 1 deletion src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type AppPropsWithLayout = AppProps & {
//normal: 400
//bold: 700
const notoSansJp = Noto_Sans_JP({
weight: ["400", "700"],
weight: ["400", "400"],
subsets: ["latin"],
variable: "--noto-sans-jp",
display: "swap",
Expand Down
6 changes: 3 additions & 3 deletions src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ export const getStaticProps: GetStaticProps<TopProps> = async () => {
return {
props: {
top: await fetchTopPage(),
newsList: await fetchLatestPartialNews(12),
researchList: await fetchLatestPartialPaperList(12),
projectList: await fetchLatestPartialProjectList(12),
newsList: await fetchLatestPartialNews(4),
researchList: await fetchLatestPartialPaperList(4),
projectList: await fetchLatestPartialProjectList(4),
memberList: activeMemberList,
},
};
Expand Down
1,921 changes: 1,920 additions & 1 deletion src/styles/fontawesome/css/brands.min.css

Large diffs are not rendered by default.

6,780 changes: 6,777 additions & 3 deletions src/styles/fontawesome/css/fontawesome.min.css

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions src/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ html {
width: 100%;
height: 100%;

/* PageFooterコンポーネントのbg-gray-100と同じ macでのバウンススクロールで見える部分の対策 */
background-color: rgb(243, 244, 246);
background-color: rgb(255);
}

body {
Expand Down

0 comments on commit ce8a87e

Please sign in to comment.