Skip to content

Commit

Permalink
Merge pull request #26 from kohta9521/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@kohta9521
kohta9521 authored Nov 21, 2023
2 parents 8c065e0 + f4a0c24 commit 5eb267b
Show file tree
Hide file tree
Showing 9 changed files with 244 additions and 40 deletions.
3 changes: 2 additions & 1 deletion src/components/organisms/Contact.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ const Contact = () => {
<h1 className={styles.enTitle}>CONTACT</h1>
</div>
<p className={styles.mainText}>
以下のボタンよりお問い合わせフォームの入力をお願いします。
以下のボタンよりお問い合わせフォームの入力をお願いします。<br />
また入力フォームは個人の方・法人の方で分かれていますのでご確認お願いします。
</p>
<Link
className={styles.contactButton}
Expand Down
40 changes: 39 additions & 1 deletion src/components/organisms/Footer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React from 'react'

// scss import
import styles from './styles/Footer.module.scss'
import Link from 'next/link'

// components import

Expand All @@ -11,7 +12,44 @@ const Footer = () => {
return (
<div className={styles.footer}>
<div className={styles.container}>
footer area
{/* 採用情報ボタンとか　ダイレクトbuttonの設置 */}
<div className={styles.topBox}>
<Link className={styles.directLinkBox} href={"/"}>
<h3 className={styles.title}>採用情報</h3>
<p className={styles.text}>
一緒に「ここごはん」を作るメンバーを募集中です。<br />
エンジニア・デザイナー・マーケターなどなど常時募集中です。
</p>
</Link>
<Link className={styles.directLinkBox} href={"/"}>
<h3 className={styles.title}>採用情報</h3>
<p className={styles.text}>
一緒に「ここごはん」を作るメンバーを募集中です。<br />
エンジニア・デザイナー・マーケターなどなど常時募集中です。
</p>
</Link>
</div>
{/* サイトの基本情報などを格納　次のpege about pageへ誘導 */}
<div className={styles.centerBox}>
<div className={styles.leftBox}>

</div>
<div className={styles.rightBox}>

</div>
</div>
{/* copyrightやpge top buttonなどを格納 */}
<div className={styles.bottomBox}>
<div className={styles.snsBox}>

</div>
<div className={styles.copyrightBox}>

</div>
<div className={styles.pageTopBox}>

</div>
</div>
</div>
</div>
)
Expand Down
64 changes: 40 additions & 24 deletions src/components/organisms/News.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,36 +19,52 @@ const News = () => {
<div className={styles.newsBox}>
<ul>
<li>
<p className={styles.data}>2022.11.2</p>
<p className={styles.tag}>お知らせ</p>
<h3 className={styles.newsTitle}>サービスの初回リリースが行われました!</h3>
<Link href={"/"} className={styles.arrow}>
<FaArrowRightLong />
</Link>
<div className={styles.newsFlexBox}>
<p className={styles.data}>2022.11.2</p>
<p className={styles.tag}>お知らせ</p>
</div>
<div className={styles.newsFlexBox}>
<h3 className={styles.newsTitle}>サービスの初回リリースが行われました!</h3>
<Link href={"/"} className={styles.arrow}>
<FaArrowRightLong />
</Link>
</div>
</li>
<li>
<p className={styles.data}>2022.11.2</p>
<p className={styles.tag}>お知らせ</p>
<h3 className={styles.newsTitle}>サービスの初回リリースが行われました!</h3>
<Link href={"/"} className={styles.arrow}>
<FaArrowRightLong />
</Link>
<div className={styles.newsFlexBox}>
<p className={styles.data}>2022.11.2</p>
<p className={styles.tag}>お知らせ</p>
</div>
<div className={styles.newsFlexBox}>
<h3 className={styles.newsTitle}>サービスの初回リリースが行われました!</h3>
<Link href={"/"} className={styles.arrow}>
<FaArrowRightLong />
</Link>
</div>
</li>
<li>
<p className={styles.data}>2022.11.2</p>
<p className={styles.tag}>お知らせ</p>
<h3 className={styles.newsTitle}>サービスの初回リリースが行われました!</h3>
<Link href={"/"} className={styles.arrow}>
<FaArrowRightLong />
</Link>
<div className={styles.newsFlexBox}>
<p className={styles.data}>2022.11.2</p>
<p className={styles.tag}>お知らせ</p>
</div>
<div className={styles.newsFlexBox}>
<h3 className={styles.newsTitle}>サービスの初回リリースが行われました!</h3>
<Link href={"/"} className={styles.arrow}>
<FaArrowRightLong />
</Link>
</div>
</li>
<li>
<p className={styles.data}>2022.11.2</p>
<p className={styles.tag}>お知らせ</p>
<h3 className={styles.newsTitle}>サービスの初回リリースが行われました!</h3>
<Link href={"/"} className={styles.arrow}>
<FaArrowRightLong />
</Link>
<div className={styles.newsFlexBox}>
<p className={styles.data}>2022.11.2</p>
<p className={styles.tag}>お知らせ</p>
</div>
<div className={styles.newsFlexBox}>
<h3 className={styles.newsTitle}>サービスの初回リリースが行われました!</h3>
<Link href={"/"} className={styles.arrow}>
<FaArrowRightLong />
</Link>
</div>
</li>
<Link className={styles.moreButton} href={"/pressrelease"}>もっと詳しく見る</Link>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion src/components/organisms/Ranking.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const Ranking = () => {
<div className={styles.box}>
<div className={styles.image}>
</div>
<p className={styles.boxTitle}>会社ないでグルメ大使に？</p>
<p className={styles.boxTitle}>会社内でグルメ大使に？</p>
</div>
<div className={styles.box}>
<div className={styles.image}>
Expand Down
11 changes: 5 additions & 6 deletions src/components/organisms/styles/Contact.module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,21 @@
text-align: center;
.jaTitle {
color: var(--main-red-color);
font-size: 16px;
font-size: 14px;
font-weight: 700;
display: block;
}
.enTitle {
font-size: 70px;
line-height: 46px;
margin-top: 30px;
font-size: 60px;
line-height: 65px;
font-weight: 700;
color: var(--main-black-color);
}
}
.mainText {
display: block;
font-size: 18px;
line-height: 34px;
font-size: 15px;
line-height: 26px;
margin-bottom: 80px;
color: var(--main-black-color);
}
Expand Down
32 changes: 32 additions & 0 deletions src/components/organisms/styles/Footer.module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,37 @@
height: 400px;
background-color: var(--main-gray-color);
.container {
.topBox {
.directLinkBox {
.title {

}
.text {

}
}
}
.centerBox {
.leftBox {

}
.rightBox {

}
}
.bottomBox {
.snsBox {

}
.copyrightBox {

}
.pageTopbox {

}
}
}
}

@media screen and (max-width: 1024px) {
}
19 changes: 14 additions & 5 deletions src/components/organisms/styles/News.module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
width: 100%;
height: 80px;
border-bottom: 0.5px solid white;
.newsFlexBox {
display: flex;
align-items: center;
}
.data {
display: block;
font-size: 14px;
Expand Down Expand Up @@ -114,11 +118,11 @@
.title {
display: block;
color: white;
font-size: 60px;
font-size: 55px;
font-weight: 600;
line-height: 70px;
margin: 0;
margin-bottom: 30px;
margin-bottom: 40px;
font-family: 'Noto Sans', sans-serif;
}
// news
Expand All @@ -131,16 +135,21 @@
border-top: 0.5px solid white;
}
li {
display: flex;
display: block;
align-items: center;
right: 0;
width: 100%;
height: 90px;
height: 100px;
border-bottom: 0.5px solid white;
.newsFlexBox {
display: flex;
align-items: center;
height: 50px;
}
.data {
display: block;
font-size: 12px;
margin: 0 5px 0 10px;
margin: 0 5px 0 0px;
color: white;
}
.tag {
Expand Down
108 changes: 108 additions & 0 deletions src/components/organisms/styles/Ranking.module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,112 @@
}
}
}
}

@media screen and (max-width: 1024px) {
.ranking {
width: 100%;
height: 1700px;
.container {
width: 90%;
height: 100%;
max-width: 1400px;
margin: 0 auto;
padding: 200px 0;
box-sizing: border-box;
.titleBox {
width: 100%;
margin: 0 auto;
text-align: center;
.subTitle {
color: var(--main-red-color);
font-size: 14px;
font-weight: 700;
display: block;
}
.title {
font-size: 60px;
font-weight: 700;
color: var(--main-black-color);
margin-bottom: 50px;
}
}
.mainText {
text-align: center;
display: block;
font-size: 14px;
line-height: 20px;
color: var(--main-black-color);
margin-bottom: 40px;
}
.flexBox {
width: 100%;
display: block;
padding-top: 20px;
padding-bottom: 20px;
justify-content: space-between;
.box {
width: 100%;
height: 300px;
text-align: center;
margin-bottom: 20px;
.image {
width: 100%;
height: 250px;
background-color: gray;
margin-bottom: 20px;
}
.boxTitle {
color: var(--main-red-color);
font-size: 16px;
font-weight: 700;
display: block;
}
}
}
.bottomBox {
width: 100%;
text-align: center;
}
.link {
display: block;
margin: 0 auto;
width: 170px;
height: 60px;
text-decoration: none;
font-size: 16px;
font-weight: 700;
display: flex;
align-items: center;
.arrow {
display: block;
width: 40px;
height: 40px;
margin-right: 20px;
border-radius: 30px;
text-align: center;
background-color: var(--main-red-color);
// text
font-size:20px;
line-height: 35px;
font-weight: 700;
color: var(--main-white-color);
font-size: 25px;
height: 40px;
line-height: 35px;
font-weight: 700;
color: var(--main-white-color);
}
&:hover {
transform: all 0.5s ease-in-out;
.arrow{
width: 50px;
height: 50px;
transition: all 0.3s ease-in-out;
line-height: 45px;
}
}
}
}
}
}
5 changes: 3 additions & 2 deletions src/components/templates/styles/SubPageHero.module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
@media screen and (max-width: 1024px) {
.hero {
width: 100%;
height: 400px;
padding: 20px 0px;
height: 350px;
padding: 0px 0px;
box-sizing: border-box;
// background-color: antiquewhite;
.titleBox {
Expand All @@ -88,6 +88,7 @@
font-weight: bold;
line-height: 50px;
margin-top: 180px;
margin-bottom: 10px;
color: var(--main-white-color);
}
.desc {
Expand Down

0 comments on commit 5eb267b

Please sign in to comment.