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.

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/#93 nayeon qa #116

Merged
merged 17 commits into from
Jul 22, 2022
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
2 changes: 2 additions & 0 deletions src/asset/image/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ export { default as ImgCategoryBanner } from "./categoryBanner.png";
export { default as ImgDefaultProfile } from "./defaultProfile.png";
export { default as ImgBanner1 } from "./mainbanner01.jpg";
export { default as ImgBanner2 } from "./mainbanner02.jpg";
export { default as ImgBanner3 } from "./mainbanner03.png";
export { default as ImgBanner4 } from "./mainbanner04.jpg";
export { default as ImgPiickleLoading } from "./piickleLoading.gif";
Binary file modified src/asset/image/mainbanner01.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/asset/image/mainbanner02.jpg
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 src/asset/image/mainbanner03.png
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 src/asset/image/mainbanner04.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/CardCollection/Card/LastCard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default function LastCard() {
나누셨나요?
</St.ContentTitle>
<St.Content>
오른쪽에서 왼쪽으로 스와이핑 해서
화살표를 터치해서
<br />
새로운 대화 주제를 둘러보세요
</St.Content>
Expand Down
16 changes: 12 additions & 4 deletions src/components/Main/Banner/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "slick-carousel/slick/slick-theme.css";
import { useState } from "react";
import Slider from "react-slick";

import { ImgBanner1, ImgBanner2 } from "../../../asset/image";
import { ImgBanner1, ImgBanner2, ImgBanner3, ImgBanner4 } from "../../../asset/image";
import { St } from "./style";

type BannerImage = {
Expand All @@ -13,11 +13,19 @@ type BannerImage = {
};
const BannerImage: BannerImage[] = [
{
src: "https://piiklebucket11.s3.ap-northeast-2.amazonaws.com/mainbanner01.jpg",
src: ImgBanner1,
alt: "피클 소개 이미지",
},
{
src: "https://piiklebucket11.s3.ap-northeast-2.amazonaws.com/mainbanner02.jpg",
src: ImgBanner2,
alt: "피클 소개 이미지",
},
{
src: ImgBanner3,
alt: "피클 소개 이미지",
},
{
src: ImgBanner4,
alt: "피클 소개 이미지",
},
];
Expand Down Expand Up @@ -45,7 +53,7 @@ export default function Banner() {
</Slider>

<St.ContentsPages>
<St.CurrentPage>{currentSlide + 1} / 2</St.CurrentPage>
<St.CurrentPage>{currentSlide + 1} / 4</St.CurrentPage>
</St.ContentsPages>
</St.BannerSlider>
);
Expand Down
5 changes: 3 additions & 2 deletions src/components/common/Footer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { element, string } from "prop-types";
import React from "react";

import { St } from "./style";
Expand All @@ -8,7 +9,7 @@ export default function Footer() {

type serviceInfo = {
title: string;
detail: string;
detail: any;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ㅎㅎ?

};

const ServiceInfo: serviceInfo[] = [
Expand All @@ -18,7 +19,7 @@ export default function Footer() {
},
{
title: "Info",
detail: "공식 노션 바로가기",
detail: <a href="https://www.notion.so/piickle-a44992440f3b4e808a175f7fc1a4fe25">공식 노션 바로가기</a>,
},
{
title: "Instagram",
Expand Down