Skip to content

Commit

Permalink
Merge pull request #9 from gdsc-ssu/feat/changeLanguage
Browse files Browse the repository at this point in the history
강아지, 고양이 선택화면 추가 및 영어로 글자 변경
  • Loading branch information
ChoiSangwon authored Feb 13, 2024
2 parents 62599bf + 494589e commit c04613d
Show file tree
Hide file tree
Showing 19 changed files with 475 additions and 35 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@
"last 1 safari version"
]
},
"homepage": "https://findog.buttercrab.net/"
"homepage": "https://pathtopet.web.app/"
}
2 changes: 2 additions & 0 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from "react";
import { Route, Routes } from "react-router-dom";
import { Main, Research, Intro, MIntro, Similarity } from "./pages";
import Select from "./pages/Select";

const isMobile = window.innerWidth <= 393;

Expand All @@ -15,6 +16,7 @@ const App = () => {
<Route path="/inputImage" element={<Main />} />
<Route path="/research" element={<Research />} />
<Route path="/similarity" element={<Similarity />} />
<Route path="/select" element={<Select />} />
</Routes>
);
};
Expand Down
23 changes: 9 additions & 14 deletions src/components/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ const Header = () => {
style={{ marginLeft: "120px", cursor: "pointer" }}
onClick={() => {
window.location.href = "/";
}}
>
}}>
<img src={Logo} alt="logo" />
</div>
</S.logoBox>
Expand All @@ -40,17 +39,15 @@ const Header = () => {
style={{ marginRight: "56px", cursor: "pointer" }}
onClick={() => {
handleNavImg();
}}
>
<S.LinkText1>이미지로 찾기</S.LinkText1>
}}>
<S.LinkText1>find by image</S.LinkText1>
</div>
<div
style={{ marginRight: "120px", cursor: "pointer" }}
onClick={() => {
handleNavResearch();
}}
>
<S.LinkText2>필터로 찾기</S.LinkText2>
}}>
<S.LinkText2>find by filter</S.LinkText2>
</div>
</>
) : (
Expand All @@ -59,17 +56,15 @@ const Header = () => {
style={{ marginRight: "56px", cursor: "pointer" }}
onClick={() => {
handleNavImg();
}}
>
<S.LinkText2>이미지로 찾기</S.LinkText2>
}}>
<S.LinkText2>find by image</S.LinkText2>
</div>
<div
style={{ marginRight: "120px", cursor: "pointer" }}
onClick={() => {
handleNavResearch();
}}
>
<S.LinkText1>필터로 찾기</S.LinkText1>
}}>
<S.LinkText1>find by filter</S.LinkText1>
</div>
</>
)}
Expand Down
6 changes: 4 additions & 2 deletions src/components/Loading.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ const Loading = () => {
<S.Container>
<S.SubArea>
<S.Row>
<S.InnerText>사진과 유사한 강아지들을 찾는 중이에요...</S.InnerText>
<S.InnerText>
Looking for pet that look similar to the picture •••
</S.InnerText>
<S.img src={loading} alt="loading" />
</S.Row>
</S.SubArea>
Expand Down Expand Up @@ -51,7 +53,7 @@ const S = {
margin: 0;
padding-top: 24px;
font-weight: bold;
font-size: 24px;
font-size: 16px;
@media screen and (max-width: 393px) {
padding-top: 50px;
font-size: 24px;
Expand Down
65 changes: 65 additions & 0 deletions src/images/DropPet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/images/FoundCat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/images/FoundDog.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/images/ListCat.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/images/ListDog.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/images/LostCat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit c04613d

Please sign in to comment.