Skip to content

Commit

Permalink
240821 : lej - api, calendar UX ... etc
Browse files Browse the repository at this point in the history
  • Loading branch information
Olrlokr committed Aug 21, 2024
1 parent 6c89e09 commit d3c98e3
Show file tree
Hide file tree
Showing 19 changed files with 605 additions and 143 deletions.
2 changes: 2 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import Intro from "./pages/Intro";
import Redirection from "./pages/Login/Redirection";
import LoginSuccess from "./pages/Login/LoginSuccess";
import { PlaceProvider } from "./contexts/clickedPlaceContexts";
import Review from "./pages/Review";


function App() {
Expand All @@ -38,6 +39,7 @@ function App() {
<Route path = "/main/:id" element = {<PlaceDetail updateClickedPlace={updateClickedPlace} />} />
<Route path = "/travel/:id" element = {<PlaceDetail updateClickedPlace={updateClickedPlace} />}/>
<Route path ="/mypage" element = {<Mypage/>}/>
<Route path ="/review" element = {<Review/>}/>
</Routes>
<Footer/>
</BrowserRouter>
Expand Down
Binary file added src/assets/img/AttachPhoto.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/img/ReviewText.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/img/gray.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/img/orange.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/img/travelAlt.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/SuggestedPlaces.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react'
import { useLocation, useNavigate } from 'react-router-dom';
import styled from 'styled-components'
import sugAlt from '../assets/img/sugAlt.svg'
// import travelAlt from '../assets/img/travelAlt.svg'


const Box = styled.div `
Expand Down
5 changes: 4 additions & 1 deletion src/components/FontAwesome.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ import { faLocationDot } from "@fortawesome/free-solid-svg-icons";
import { faCopy } from "@fortawesome/free-solid-svg-icons";
import { faArrowLeft } from "@fortawesome/free-solid-svg-icons";

import { faThumbsUp } from "@fortawesome/free-solid-svg-icons";
import { faThumbsDown } from "@fortawesome/free-solid-svg-icons";



library.add(faHouse,faLaptop,faSuitcase,faComments,faCalendar,faUser,faMagnifyingGlass,faFile,faMessage,faShareNodes,faBookmarkSolid,faBookmarkRegular);
library.add(faSuitcaseRolling,faAngleRight,faAngleLeft,faPhone,faLocationDot,faCopy,faArrowLeft);
library.add(faSuitcaseRolling,faAngleRight,faAngleLeft,faPhone,faLocationDot,faCopy,faArrowLeft,faThumbsUp,faThumbsDown);
10 changes: 10 additions & 0 deletions src/components/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@ export default function Footer() {

if (window.location.pathname === '/' || window.location.pathname === '/login')
return null;
else if (window.location.pathname === '/review')
return (
<>
<div className = "review-upload-footer">
<div className ="review-upload-button">
리뷰 작성 완료
</div >
</div>
</>
)
return (
<div className ='footer-wrap'>
<Link to="/main" className="nav-link" onClick={() => setActiveNav(1)}>
Expand Down
18 changes: 18 additions & 0 deletions src/components/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ export default function Header({ clickedPlaceId }) {
const isCalendarPath = /^\/calendar(\/.*)?$/.test(location.pathname);
const isMypagePath = /^\/mypage(\/.*)?$/.test(location.pathname);
const isLoginPath = /^\/login(\/.*)?$/.test(location.pathname);
const isReviewPath = /^\/review(\/.*)?$/.test(location.pathname);
const isIntroPath = /^\/(\/.*)?$/.test(location.pathname);





if (location.pathname === '/main'){ //메인 페이지
Expand Down Expand Up @@ -119,6 +121,22 @@ export default function Header({ clickedPlaceId }) {
return (
<></>
)
}else if(isReviewPath){
return (
<>
<Link to="/main" className="main-link">
<FontAwesomeIcon
icon="arrow-left"
size="lg"
className=""
style={{marginRight : "10px"}}
/>리뷰작성
</Link>

<PlaceName>{ placeName && <div>{placeName}</div>}</PlaceName>
</>

)
}
else{
return(
Expand Down
7 changes: 7 additions & 0 deletions src/components/PlaceReview.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import React from 'react'

export default function PlaceReview() {
return (
<div>PlaceReview</div>
)
}
Loading

0 comments on commit d3c98e3

Please sign in to comment.