-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #34 from KUSITMS-27-chilling/feat/add-Teacher/yeonsu
Feat/add teacher/yeonsu
- Loading branch information
Showing
30 changed files
with
1,239 additions
and
62 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
import styled from "styled-components"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
} | ||
` |
Oops, something went wrong.