Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: トップページの整備 #82

Merged
merged 14 commits into from
Apr 14, 2024
Merged

feat: トップページの整備 #82

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
65ded72
画像を挿入して影を付ける
batora9 Apr 12, 2024
e5e6b4e
breadcrumb整備
batora9 Apr 12, 2024
1449c58
format
batora9 Apr 12, 2024
b7344a9
リンク先を指定
batora9 Apr 12, 2024
1d40b50
join追加
batora9 Apr 12, 2024
24d06e8
ふぉｒまｔ
batora9 Apr 12, 2024
313dbc6
Merge branch 'main' into feat/top-page-images
batora9 Apr 13, 2024
892fca8
リサイズする
batora9 Apr 13, 2024
036e0e5
誤字訂正
batora9 Apr 13, 2024
e46bbe0
ヘッダーの分余白を開ける
batora9 Apr 13, 2024
2995c10
下までdivが伸びるように
batora9 Apr 13, 2024
a0727ee
paddingを強制しない
batora9 Apr 14, 2024
fa37f3f
aboutページのスタイル崩れを修正
batora9 Apr 14, 2024
5086702
セミコロンの付け忘れああああああああああ
batora9 Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added public/images/top1.png
View file
Open in desktop
batora9 marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/top2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions src/app/about/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ export default function About() {
<span className={style.highlight}>その他プログラミング</span>
の知識を高める活動を行っています。
</p>
<h2 className={style.title}>競技プログラミング</h2>
<h2 className={style.title} id='kyopro'>
競技プログラミング
</h2>
<h3 className={style.subtitle}>活動内容</h3>
<p className={style.text}>
国際大学対抗プログラミングコンテスト(ICPC)に参加し、良い成績を上げるための活動を行っています。
Expand All @@ -61,7 +63,9 @@ export default function About() {
情報工学科パンフレット（PDF）
</Link>
</p>
<h2 className={style.title}>Web研究会</h2>
<h2 className={style.title} id='webken'>
Web研究会
</h2>
<h3 className={style.subtitle}>講習</h3>
<p className={style.text}>
WebサイトやWebサーバーを制作・構築・運用するための基礎を一通り学びます。講習ではHTML,CSS,JabaScriptを触ります。
Expand Down
20 changes: 9 additions & 11 deletions src/app/news/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import path from 'path';
import { Metadata } from 'next';
import Link from 'next/link';
import { getMarkdowns } from '../../utils/markdown';
import style from './page.module.scss';
import { Breadcrumb } from '@/components/Breadcrumb';
import { HeroImage } from '@/components/HeroImage';
import { NewsPageList } from '@/components/news-page-list';

export const metadata: Metadata = {
Expand All @@ -25,16 +26,13 @@ export default async function News() {
<div className={style.container}>
<main className={style.main}>
<div className={style.hero}>
<img src='/images/hero.png' alt='Hero' className={style.heroImage} />
<div className={style.breadcrumb}>
<Link href='/' className={style.breadcrumbLink}>
Top
</Link>
<p className={style.breadcrumbLink}>&nbsp;&gt;&nbsp;</p>
<Link href='/news' className={style.breadcrumbLink}>
News
</Link>
</div>
<HeroImage type='default' title='新着情報' blur={true} />
<Breadcrumb
items={[
{ title: 'Top', href: '/' },
{ title: '新着情報', href: '/news' },
]}
/>
</div>
<div className={style.contents}>
<h1 className={style.contentTitle}>新着情報</h1>
Expand Down
10 changes: 9 additions & 1 deletion src/app/page.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@
.imgBox1 {
width: 55%;
height: 464px;

right: 0;
}

Expand Down Expand Up @@ -229,6 +228,7 @@
box-sizing: border-box;
position: relative;
z-index: 1;
box-shadow: 2px 2px 4px gray;
}

.activityWeb {
Expand All @@ -237,6 +237,7 @@
box-sizing: border-box;
position: relative;
z-index: 1;
box-shadow: 2px 2px 4px gray;
}

.activityLeftButtonContainer {
Expand Down Expand Up @@ -270,6 +271,7 @@
z-index: 0;
background-color: gray;
position: absolute;
box-shadow: 2px 2px 4px gray;
}

.bold {
Expand All @@ -289,4 +291,10 @@

.newsButton {
margin: 32px;
}

.topImages {
width: 100%;
height: 100%;
object-fit: cover;
}
25 changes: 16 additions & 9 deletions src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import clsx from 'clsx';
import Link from 'next/link';
import { HeroImage } from '../components/HeroImage';
import { LinkButton } from '../components/LinkButton';
import style from './page.module.scss';
Expand All @@ -26,7 +25,11 @@ export default function Home() {
&nbsp;(週1回)の2つの活動を行っています。
</p>
<div className={clsx(style.imgBox1, style.imgBoxCommon)}>
{/* <img src='/images/hero.png' alt='Hero'/> */}
<img
src='/images/top1.png'
alt='TopImage1'
className={style.topImages}
/>
</div>
<div className={style.activityCP}>
<div className={style.activityTitle}>
Expand All @@ -45,19 +48,23 @@ export default function Home() {
</p>
<div className={style.activityLeftButtonContainer}>
<div className={style.navigationForPC}>
<LinkButton href='#' variant='gray' size='medium'>
<LinkButton href='/about#kyopro' variant='gray' size='medium'>
Learn More
</LinkButton>
</div>
<div className={style.navigationForMobile}>
<LinkButton href='#' variant='gray' size='small'>
<LinkButton href='/about#kyopro' variant='gray' size='small'>
Learn More
</LinkButton>
</div>
batora9 marked this conversation as resolved.
Show resolved Hide resolved
</div>
</div>
<div className={clsx(style.imgBox2, style.imgBoxCommon)}>
{/* <img src='/images/hero.png' alt='Hero'/> */}
<img
src='/images/top2.png'
alt='topImage2'
className={style.topImages}
/>
</div>
<div className={style.activityWeb}>
<div className={style.activityTitle}>
Expand All @@ -73,12 +80,12 @@ export default function Home() {
</p>
<div className={style.activityRightButtonContainer}>
<div className={style.navigationForPC}>
<LinkButton href='#' variant='gray' size='medium'>
<LinkButton href='/about#webken' variant='gray' size='medium'>
Learn More
</LinkButton>
</div>
<div className={style.navigationForMobile}>
<LinkButton href='#' variant='gray' size='small'>
<LinkButton href='/about#webken' variant='gray' size='small'>
Learn More
</LinkButton>
</div>
Expand All @@ -97,12 +104,12 @@ export default function Home() {
</p>
<div className={style.activityOtherButtonContainer}>
<div className={style.navigationForPC}>
<LinkButton href='#' variant='green' size='medium'>
<LinkButton href='/join' variant='green' size='medium'>
入会案内はこちら
</LinkButton>
</div>
<div className={style.navigationForMobile}>
<LinkButton href='#' variant='green' size='small'>
<LinkButton href='/join' variant='green' size='small'>
入会案内はこちら
</LinkButton>
</div>
Expand Down