Skip to content

Commit

Permalink
Merge pull request #92 from teamViNO/feature-071
Browse files Browse the repository at this point in the history
Feature 071 : 가이드 페이지 이미지 넣기 완성
  • Loading branch information
whistleJs authored Feb 17, 2024
2 parents d800813 + 05bccea commit bdeb651
Show file tree
Hide file tree
Showing 17 changed files with 458 additions and 16 deletions.
26 changes: 26 additions & 0 deletions src/assets/guideprogress1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions src/assets/guideprogress2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/assets/guideprogress3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
172 changes: 172 additions & 0 deletions src/assets/guidesummary.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions src/assets/servicelist1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions src/assets/servicelist2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions src/assets/servicelist3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions src/assets/servicelist4.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/stepA.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/stepB.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/stepC.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/stepD.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions src/pages/Guide/GuideCategoryPage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import ErrorIcon from '@/assets/icons/error.svg?react';
import InfoIcon from '@/assets/icons/info-icon.svg?react';

import { QuestionTip } from '@/components/Guide';

import { CategoryGuide, QuestionSection, Section } from '@/styles/GuidePage';
Expand All @@ -21,8 +20,6 @@ const GuideCategoryPage = () => {

<div className="feature-list">
<div className="feature-item">
<img src="/assets/category-feature1.png" alt="feature" />

<h1>상위 카테고리</h1>

<span className="description">
Expand Down
13 changes: 8 additions & 5 deletions src/pages/Guide/GuideHomePage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import ErrorIcon from '@/assets/icons/error.svg?react';

import { QuestionTip } from '@/components/Guide';

import {
Expand All @@ -9,6 +8,10 @@ import {
Section,
} from '@/styles/GuidePage';

import GuideProgress1 from '@/assets/guideprogress1.svg?react';
import GuideProgress2 from '@/assets/guideprogress2.svg?react';
import GuideProgress3 from '@/assets/guideprogress3.svg?react';

const GuideHomePage = () => {
return (
<>
Expand All @@ -22,7 +25,7 @@ const GuideHomePage = () => {
<span>영상을 텍스트로 변환</span>할 수 있어요
</h1>
</div>

<GuideHome>
<div className="item">
<img src="/assets/home-guide1.png" alt="guide-image" width={446} />
Expand Down Expand Up @@ -97,17 +100,17 @@ const GuideHomePage = () => {

<QuestionHome>
<div className="item">
<img src="" alt="question-tip" />
<GuideProgress1 width={205}/>
<span>진행중</span>
</div>

<div className="item">
<img src="" alt="question-tip" />
<GuideProgress2 width={205}/>
<span>진행 완료</span>
</div>

<div className="item">
<img src="" alt="question-tip" />
<GuideProgress3 width={205}/>
<span>진행 오류</span>
</div>
</QuestionHome>
Expand Down
15 changes: 9 additions & 6 deletions src/pages/Guide/GuidePage.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { Section } from '@/styles/GuidePage';

import ServiceList1 from '@/assets/servicelist1.svg?react'
import ServiceList2 from '@/assets/servicelist2.svg?react'
import ServiceList3 from '@/assets/servicelist3.svg?react'
import ServiceList4 from '@/assets/servicelist4.svg?react'
const GuidePage = () => {
const serviceList = [
{
id: 'SIMPLE',
image: '',
image: ServiceList1,
title: '한 눈에 읽는 영상',
description: (
<>
Expand All @@ -15,7 +18,7 @@ const GuidePage = () => {
},
{
id: 'INSIGHT',
image: '',
image: ServiceList2,
title: '쉽게 남기는 인사이트',
description: (
<>
Expand All @@ -27,7 +30,7 @@ const GuidePage = () => {
},
{
id: 'SEARCH',
image: '',
image: ServiceList3,
title: '다시 읽고 싶다면 간단하게 검색',
description: (
<>
Expand All @@ -39,7 +42,7 @@ const GuidePage = () => {
},
{
id: 'CATEGORY',
image: '',
image: ServiceList4,
title: '내용별 카테고리 정리',
description: (
<>
Expand Down Expand Up @@ -68,7 +71,7 @@ const GuidePage = () => {
<div className="service-content">
{serviceList.map((service) => (
<div key={service.id} className="service-item">
<img src="" alt="service-item" />
<service.image/>

<h1>{service.title}</h1>

Expand Down
Loading

0 comments on commit bdeb651

Please sign in to comment.