Skip to content

Commit

Permalink
Merge pull request #3 from Toy2-Team3/KAN-11--feature/layout
Browse files Browse the repository at this point in the history
레이아웃 1차 병합
  • Loading branch information
JSH99 authored Nov 9, 2023
2 parents 668bbd3 + d438ca0 commit 1251261
Show file tree
Hide file tree
Showing 27 changed files with 709 additions and 12 deletions.
8 changes: 8 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
## 📌 제목
<!— PR에 대한 제목을 적어주세요 —>

## ✨ 작업 내용
<!— 작업한 내용을 모두 적어주세요 —>

## ✅ 확인 사항
<!— 다른 팀원들이 확인해야 하는 내용을 적어주세요 —>
87 changes: 87 additions & 0 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 @@ -9,6 +9,7 @@
"react-dom": "^18.2.0",
"react-router-dom": "^6.18.0",
"react-scripts": "5.0.1",
"styled-components": "^6.1.0",
"typescript": "^4.9.5",
"web-vitals": "^2.1.4"
},
Expand Down
42 changes: 38 additions & 4 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,46 @@
import './App.css';
import { ThemeProvider } from 'styled-components';
import theme from '../src/styles/theme';
import { BrowserRouter, Route, Routes } from "react-router-dom";
import NavigationBar from './components/NavigationBar';
import HomePage from './pages/HomePage';
import CommunityPage from './pages/CommunityPage';
import ChatPage from './pages/chatting/index';
import MyPage from './pages/MyPage';
import styled from 'styled-components';

function App() {
return (
<div className="App">
<button>asdfsdas</button>
<input type="text" />
</div>
<ThemeProvider theme={theme}>
<BrowserRouter>
<div className="App" style={{display: 'flex'}}>
<NavigationBar></NavigationBar>
<PageWrap>
<Routes>
<Route path="/" element={<HomePage/>} />
<Route path="/community" element={<CommunityPage/>} />
<Route path="/chat" element={<ChatPage/>} />
<Route path="/mypage" element={<MyPage/>} />
</Routes>
</PageWrap>
</div>
</BrowserRouter>
</ThemeProvider>
);
}

const PageWrap = styled.div`
flex: 1;
margin-left: 300px;
${props => props.theme.response.tablet} {
margin-left: 100px;
}
${props => props.theme.response.mobile} {
margin-left: 0;
margin-bottom: 120px;
}
`;

export default App;
3 changes: 3 additions & 0 deletions src/assets/activedChattingIcon.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: 3 additions & 0 deletions src/assets/activedCommunityIcon.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: 3 additions & 0 deletions src/assets/activedHomeIcon.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: 3 additions & 0 deletions src/assets/activedMypageIcon.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: 3 additions & 0 deletions src/assets/activedSettingIcon.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: 3 additions & 0 deletions src/assets/chattingIcon.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: 3 additions & 0 deletions src/assets/communityIcon.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: 3 additions & 0 deletions src/assets/homeIcon.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: 3 additions & 0 deletions src/assets/mypageIcon.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: 3 additions & 0 deletions src/assets/settingIcon.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 1251261

Please sign in to comment.