Skip to content

Commit

Permalink
Merge pull request #34 from KUSITMS-27-chilling/feat/add-Teacher/yeonsu
Browse files Browse the repository at this point in the history
Feat/add teacher/yeonsu
  • Loading branch information
leehyewon0531 committed May 21, 2023
2 parents 59863d9 + ca20cec commit d2c585d
Show file tree
Hide file tree
Showing 30 changed files with 1,239 additions and 62 deletions.
35 changes: 32 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"react-dropdown": "1.11.0",
"react-indiana-drag-scroll": "2.2.0",
"react-router-dom": "6.10.0",
"recoil": "0.7.7",
"styled-components": "5.3.9"
Expand Down
2 changes: 2 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import CommunityPage from './pages/Commu/CommunityPage';
import MainPageDetail from './pages/Main/MainPageDetail';
import RevieDetailPage from './pages/ReviwDetail/RevieDetailPage';
import TogetherDetailPage from './pages/TogetherDetail/TogetherDetailPage';
import TeacherDetailPage from './pages/TeacherDetail/TeacherDetailPage';


function App() {
Expand All @@ -30,6 +31,7 @@ function App() {
<Route path="/:region" element={<MainPageDetail />}/>
<Route path="/commu/review/:reviewIdx" element={<RevieDetailPage />}/>
<Route path="/commu/together/:listenIdx" element={<TogetherDetailPage />}/>
<Route path="/suggest/:lectureIdx" element={<TeacherDetailPage />}/>
</Routes>
</div>
</RecoilRoot>
Expand Down
Binary file added src/assets/left.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/assets/plus.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/assets/right.png
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/Modal/Modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ const Modal =({ region }: Props)=> {
})
try {
const response = await axios.post(
`${import.meta.env.VITE_APP_HOST}/listen/save`,
`${import.meta.env.VITE_APP_HOST}/review/posts`,
{
title: title,
region: region,
Expand Down
38 changes: 19 additions & 19 deletions src/components/ReviewDetail/ReviewDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ import{
CardContent,
} from './ReviewDetail.styled'
//μ„œλ²„ μž„μ˜ 더미데이터 생성
const data = {
reviewIdx: 20,
profile: "test.com",
nickName: "test2",
createdAt: "2023-05-10-11-35",
title: "[1μ£Όμ°¨ ν›„κΈ°] κ°•μ˜ 듀은 ν›„κΈ° μž…λ‹ˆλ‹€",
content: "꽃을 ν‚€μš°λ‹€ λ“œλŠ” 생각.μ–˜λŠ” μ΄λž˜μ„œ μ’‹κ³ μŸ€λŠ” μ €λž˜μ„œ μ’‹κ³ λ˜ μ–˜λŠ” μ΄λž˜μ„œ 예쁘고 또 μŸ€λŠ” μ΄λž˜μ„œ 정말 예뻐...ν•œλ‹€.κ³¨λ“œμ΄νŒŒλ¦¬μ— μ—΄κ΄‘ν•˜λ©° κ³¨λ“œμ‘΄μ„ λ§Œλ“€μ–΄ νλ―“ν•˜λ˜..λΈŒλ£©μ‚¬μ΄λ“œ λ² ν‹°κ°€ κ³¨λ“œ 이파리둜 λ‹€. 5μ›”μ˜ μ‹œμž‘...κ·Όλ‘œμžλ“€μ€ νœ΄λ¬΄λΌλŠ”λ° λ‚˜λŠ” 뭘까?...ν•˜λ©° μΆœκ·Όμ€‘.λ³΅μž‘ν•œ 전철역이 μ˜€λŠ˜μ€ 헐렁이닀. 앉아 ",
favFields: [
"미술",
"μ°½μž‘"
],
week: 1,
image: [],
programName: "μ‹ λ°•ν•œ 정리λ₯Ό μœ„ν•œ λ―Έλ‹ˆλ©€λ¦¬μ¦˜",
tags: [
"μ–‘μ²œκ΅¬",
"μ–‘μ²œκ΅¬μž¬λ°ŒλŠ”λ°°μ›€ν„°"
]
};
// const data = {
// reviewIdx: 20,
// profile: "test.com",
// nickName: "test2",
// createdAt: "2023-05-10-11-35",
// title: "[1μ£Όμ°¨ ν›„κΈ°] κ°•μ˜ 듀은 ν›„κΈ° μž…λ‹ˆλ‹€",
// content: "꽃을 ν‚€μš°λ‹€ λ“œλŠ” 생각.μ–˜λŠ” μ΄λž˜μ„œ μ’‹κ³ μŸ€λŠ” μ €λž˜μ„œ μ’‹κ³ λ˜ μ–˜λŠ” μ΄λž˜μ„œ 예쁘고 또 μŸ€λŠ” μ΄λž˜μ„œ 정말 예뻐...ν•œλ‹€.κ³¨λ“œμ΄νŒŒλ¦¬μ— μ—΄κ΄‘ν•˜λ©° κ³¨λ“œμ‘΄μ„ λ§Œλ“€μ–΄ νλ―“ν•˜λ˜..λΈŒλ£©μ‚¬μ΄λ“œ λ² ν‹°κ°€ κ³¨λ“œ 이파리둜 λ‹€. 5μ›”μ˜ μ‹œμž‘...κ·Όλ‘œμžλ“€μ€ νœ΄λ¬΄λΌλŠ”λ° λ‚˜λŠ” 뭘까?...ν•˜λ©° μΆœκ·Όμ€‘.λ³΅μž‘ν•œ 전철역이 μ˜€λŠ˜μ€ 헐렁이닀. 앉아 ",
// favFields: [
// "미술",
// "μ°½μž‘"
// ],
// week: 1,
// image: [],
// programName: "μ‹ λ°•ν•œ 정리λ₯Ό μœ„ν•œ λ―Έλ‹ˆλ©€λ¦¬μ¦˜",
// tags: [
// "μ–‘μ²œκ΅¬",
// "μ–‘μ²œκ΅¬μž¬λ°ŒλŠ”λ°°μ›€ν„°"
// ]
// };
interface Program {
reviewId:number;
profile:string;
Expand Down
87 changes: 87 additions & 0 deletions src/components/StickyScroll/StickyScroll.styled.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
import styled from "styled-components";
export const ReactstickyBox = styled.div`
width: 327px;
height: 545px;
background-color: #F6F6F6;
border: 1px solid #CBCBCB;
filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25));
position: sticky;
top: 0;
//margin-top: 702px;
button{
margin-top: 12Px;
margin-left: 27px;
width: 273px;
height: 34px;
background-color: #59CACB;
border-radius: 14px;
color: #FFFFFF;
border: none;
}
`
export const Title = styled.div`
margin-left: 34px;
margin-top: 30px;
margin-bottom: 15px;
.phonetitle{
font-weight: 600px;
font-size: 18px;
letter-spacing: -5%;
}
textarea{
margin-top: 15px;
border: none;
background-color: none;
width: 259px;
height: 34px;
font-family:'Pretendard';
font-weight: 500;
font-size: 17px;
}
`
export const Email = styled.div`
margin-left: 34px;
margin-bottom: 16px;
.emailtitle{
font-weight: 600px;
font-size: 18px;
letter-spacing: -5%;
}
textarea{
font-family:'Pretendard';
margin-top: 15px;
border: none;
background-color: none;
width: 259px;
height: 34px;
font-weight: 500;
font-size: 17px;
}
`
export const Message = styled.div`
margin-left: 34px;
.teachertitle{
font-weight: 600px;
font-size: 18px;
letter-spacing: -5%;
}
textarea{
margin-top: 13px;
border: none;
background-color: none;
width: 259px;
height: 165px;
font-weight: 500;
font-size: 17px;
}
`
export const Line = styled.div`
margin-top:63px;
width: 300px;
height: 0px;
border: 1px solid #CBCBCB;
margin-left: 13px;
`
32 changes: 32 additions & 0 deletions src/components/StickyScroll/StickyScroll.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import React from 'react'
import {
ReactstickyBox,
Title,
Email,
Message,
Line
} from './StickyScroll.styled'
function StickyScroll() {
return (
<div>
<ReactstickyBox>
<Title>
<div className='phonetitle'>μ „ν™”λ²ˆν˜Έλ₯Ό μž…λ ₯ν•˜μ„Έμš”</div>
<textarea placeholder='010-XXXX-XXXX'></textarea>
</Title>
<Email>
<div className='emailtitle'>이메일 μ£Όμ†Œλ₯Ό μž…λ ₯ν•˜μ„Έμš”</div>
<textarea placeholder='[email protected]'></textarea>
</Email>
<Message>
<div className='teachertitle'>κ°•μ‚¬μ—κ²Œ 남길 메세지</div>
<textarea placeholder=''></textarea>
</Message>
<Line></Line>
<button>μ‹ μ²­ν•˜κΈ°</button>
</ReactstickyBox>
</div>
)
}

export default StickyScroll
1 change: 1 addition & 0 deletions src/components/SuggestHeader/SuggestHeader.styled.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import styled from "styled-components";
40 changes: 40 additions & 0 deletions src/components/SuggestHeader/SuggestHeader.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import React from 'react'
import { useEffect, useState } from "react";
import ScrollContainer from 'react-indiana-drag-scroll'
import {
Content,
TodayTeacher,
MyTeacher,
TodayTitle,
TodayCard,
MyTeacherTitle,
TeacherCard,
} from '../../pages/Suggest/SuggestPage.styled'
import MyTeacherCard from '../TeacherCard/MyTeacherCard';
import TodayTeacherCard from '../TeacherCard/TodayTeacherCard';
import axios from 'axios';


const SuggestHeader=()=> {
return (
<div>
<Content>
<TodayTeacher>
<TodayTitle>였늘 λ“±λ‘ν•œ 동넀강사</TodayTitle>
<TodayCard>
<TodayTeacherCard/>
</TodayCard>
</TodayTeacher>
<MyTeacher>
<MyTeacherTitle>λ‚΄κ°€ μ‹ μ²­ν•œ 동넀강사</MyTeacherTitle>
<TodayCard>
<MyTeacherCard/>
</TodayCard>

</MyTeacher>
</Content>
</div>
)
}

export default SuggestHeader
47 changes: 47 additions & 0 deletions src/components/SuggestList/SuggestList.syled.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import styled from "styled-components";

export const SuggestContainer = styled.div`
width: 1156px;
height: max-content;
height: 510px;
margin-top: 90px;
//position: absolute;
`
export const ContentTitle = styled.div`
width: 1156px;
//height: max-content;
height: 64px;
position: absolute;
display: flex;
justify-content: space-between;
.maincategory{
font-weight: 700;
font-size: 23px;
}
.subcategory{
margin-top: 7px;
font-weight: 500;
font-size: 18px;
color: #535353;
}
`
export const CardContent = styled.div`
width: 330px;
height: 390px;
margin-top: 84px;
margin-right: 42px;
`
export const SlideButton = styled.div`
width: 83px;
height: 36px;
margin-right: 11px;
display: flex;
.carouselLeft{
margin-right: 12px;
}
img{
width: 35px;
height: 35.7px;
}
`
Loading

0 comments on commit d2c585d

Please sign in to comment.