Showing
8 changed files
with
100 additions
and
44 deletions
web/public/static/img/apiLicense.png
0 → 100644
30.3 KB
web/src/components/Footer/FooterStyled.tsx
0 → 100644
1 | +import styled from 'styled-components'; | ||
2 | + | ||
3 | +export const Container = styled.div ` | ||
4 | + width : 100%; | ||
5 | + position : relative; | ||
6 | + | ||
7 | + margin : 5px 0; | ||
8 | + padding : 20px 5px; | ||
9 | + | ||
10 | + border-top : 1px solid #ddd; | ||
11 | + | ||
12 | + display : flex; | ||
13 | + flex-direction : column; | ||
14 | +`; | ||
15 | + | ||
16 | +export const InfoWrapper = styled.div ` | ||
17 | + display : flex; | ||
18 | + flex-direction : row; | ||
19 | + | ||
20 | + border : none; | ||
21 | + background-color : transparent; | ||
22 | +`; | ||
23 | + | ||
24 | +export const LicenseWrapper = styled.div ` | ||
25 | + flex : 1; | ||
26 | + display : flex; | ||
27 | + flex-direction : column; | ||
28 | + | ||
29 | + border : none; | ||
30 | + background-color : transparent; | ||
31 | + justify-content : center; | ||
32 | + align-items : flex-start; | ||
33 | + | ||
34 | +`; | ||
35 | + | ||
36 | +export const LicenseExplain = styled.div ` | ||
37 | + color : #a0a0a0; | ||
38 | + font-size : 14px; | ||
39 | + | ||
40 | + font-weight : 400; | ||
41 | + padding : 0 5px; | ||
42 | + | ||
43 | + border : none; | ||
44 | +`; | ||
45 | + | ||
46 | +export const LicenseImg = styled.img ` | ||
47 | + height : 60px; | ||
48 | + width : 150px; | ||
49 | +`; | ||
50 | + | ||
51 | +export const ServiceInfoWrapper = styled.div ` | ||
52 | + flex : 3; | ||
53 | + display : flex; | ||
54 | + flex-direction : column; | ||
55 | + justify-content : center; | ||
56 | + align-items : center; | ||
57 | + | ||
58 | + border : none; | ||
59 | + background-color : transparent; | ||
60 | +`; | ||
61 | + | ||
62 | +export const ServiceInfoEach = styled.div ` | ||
63 | + color : #d0d0d0; | ||
64 | + font-size : 13px; | ||
65 | + | ||
66 | + font-weight : 400 | ||
67 | +`; | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
web/src/components/Footer/index.tsx
0 → 100644
1 | +import React from 'react'; | ||
2 | +import * as styled from './FooterStyled'; | ||
3 | + | ||
4 | +const ApiLicense = '/static/img/apiLicense.png'; | ||
5 | + | ||
6 | + | ||
7 | +const Footer = () => { | ||
8 | + return ( | ||
9 | + <styled.Container> | ||
10 | + <styled.InfoWrapper> | ||
11 | + <styled.LicenseWrapper> | ||
12 | + <styled.LicenseExplain>저작권</styled.LicenseExplain> | ||
13 | + <styled.LicenseImg src = {ApiLicense}/> | ||
14 | + </styled.LicenseWrapper> | ||
15 | + <styled.ServiceInfoWrapper> | ||
16 | + <styled.ServiceInfoEach>서비스명 : Smart Medicine Box (SMB)</styled.ServiceInfoEach> | ||
17 | + <styled.ServiceInfoEach>서비스제공 : IoT 약병 제작회</styled.ServiceInfoEach> | ||
18 | + <styled.ServiceInfoEach>담당자 : 박권수</styled.ServiceInfoEach> | ||
19 | + <styled.ServiceInfoEach>주소 : OOO도 OOO시 OOO구 OOO OOO OOO</styled.ServiceInfoEach> | ||
20 | + <styled.ServiceInfoEach>연락처 : 010 - 0000 - 0000</styled.ServiceInfoEach> | ||
21 | + </styled.ServiceInfoWrapper> | ||
22 | + <styled.LicenseWrapper/> | ||
23 | + </styled.InfoWrapper> | ||
24 | + </styled.Container> | ||
25 | + ) | ||
26 | +}; | ||
27 | + | ||
28 | +export default Footer; | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
... | @@ -10,7 +10,6 @@ import * as styled from './HeaderStyled'; | ... | @@ -10,7 +10,6 @@ import * as styled from './HeaderStyled'; |
10 | import { authApi } from '../../api'; | 10 | import { authApi } from '../../api'; |
11 | 11 | ||
12 | const headerImg = '/static/img/pharmacy.png'; | 12 | const headerImg = '/static/img/pharmacy.png'; |
13 | -const backButtonWhite = '/static/img/backButtonWhite.png'; | ||
14 | const backButtonBlue = '/static/img/backButtonBlue.png'; | 13 | const backButtonBlue = '/static/img/backButtonBlue.png'; |
15 | const logout = '/static/img/logout.png'; | 14 | const logout = '/static/img/logout.png'; |
16 | 15 | ... | ... |
... | @@ -3,6 +3,7 @@ import { BrowserRouter, Route, Switch, Redirect } from 'react-router-dom'; | ... | @@ -3,6 +3,7 @@ import { BrowserRouter, Route, Switch, Redirect } from 'react-router-dom'; |
3 | 3 | ||
4 | import Error from '../components/error'; | 4 | import Error from '../components/error'; |
5 | import Loading from '../components/Loading'; | 5 | import Loading from '../components/Loading'; |
6 | +import Footer from '../components/Footer'; | ||
6 | import { LoginContainer } from "./login"; | 7 | import { LoginContainer } from "./login"; |
7 | import { RegisterContainer } from './register'; | 8 | import { RegisterContainer } from './register'; |
8 | import { MainContainer } from "./main"; | 9 | import { MainContainer } from "./main"; | ... | ... |
... | @@ -9,6 +9,7 @@ import * as Alert from '../../util/alertMessage'; | ... | @@ -9,6 +9,7 @@ import * as Alert from '../../util/alertMessage'; |
9 | import moment from 'moment'; | 9 | import moment from 'moment'; |
10 | 10 | ||
11 | import Header from '../../components/Header'; | 11 | import Header from '../../components/Header'; |
12 | +import Footer from '../../components/Footer'; | ||
12 | import BottleInfoPresenter from './BottleInfoPresenter'; | 13 | import BottleInfoPresenter from './BottleInfoPresenter'; |
13 | 14 | ||
14 | import { doctorApi } from '../../api'; | 15 | import { doctorApi } from '../../api'; |
... | @@ -179,9 +180,8 @@ const BottleInfoContainer = (props : BottleInfoProps) => { | ... | @@ -179,9 +180,8 @@ const BottleInfoContainer = (props : BottleInfoProps) => { |
179 | fdbType = {fdbType} | 180 | fdbType = {fdbType} |
180 | setFdbType = {setFdbType} | 181 | setFdbType = {setFdbType} |
181 | onSubmitFeedback = {onSubmitFeedback} | 182 | onSubmitFeedback = {onSubmitFeedback} |
182 | - | ||
183 | - | ||
184 | /> | 183 | /> |
184 | + <Footer/> | ||
185 | </> | 185 | </> |
186 | ); | 186 | ); |
187 | }; | 187 | }; | ... | ... |
... | @@ -6,6 +6,7 @@ import * as recoilUtil from '../../util/recoilUtil'; | ... | @@ -6,6 +6,7 @@ import * as recoilUtil from '../../util/recoilUtil'; |
6 | 6 | ||
7 | 7 | ||
8 | import Header from '../../components/Header'; | 8 | import Header from '../../components/Header'; |
9 | +import Footer from '../../components/Footer'; | ||
9 | import DoctorMenuContainer from './doctor'; | 10 | import DoctorMenuContainer from './doctor'; |
10 | import ManagerMenuContainer from './manager'; | 11 | import ManagerMenuContainer from './manager'; |
11 | 12 | ||
... | @@ -32,6 +33,7 @@ const MainContainer = (props : MainProps) => { | ... | @@ -32,6 +33,7 @@ const MainContainer = (props : MainProps) => { |
32 | userTypeCd === 'MANAGER' ? | 33 | userTypeCd === 'MANAGER' ? |
33 | <ManagerMenuContainer {...props}/> : null | 34 | <ManagerMenuContainer {...props}/> : null |
34 | } | 35 | } |
36 | + <Footer/> | ||
35 | </> | 37 | </> |
36 | ); | 38 | ); |
37 | }; | 39 | }; | ... | ... |
web/src/views/main/MainPresenter.tsx
deleted
100644 → 0
1 | -import React from 'react'; | ||
2 | - | ||
3 | -import * as styled from './MainStyled'; | ||
4 | - | ||
5 | - | ||
6 | -interface MainProps { | ||
7 | - userTypeCd : string; | ||
8 | -} | ||
9 | - | ||
10 | -const MainPresenter = (props : MainProps) => { | ||
11 | - return ( | ||
12 | - <styled.Container> | ||
13 | - <styled.InfoAndSearchWrapper> | ||
14 | - <styled.InfoWrapper> | ||
15 | - <styled.InfoSquare> | ||
16 | - | ||
17 | - </styled.InfoSquare> | ||
18 | - <styled.NewPatientButton>새 환자 등록</styled.NewPatientButton> | ||
19 | - </styled.InfoWrapper> | ||
20 | - <styled.SearchAndDetailWrapper> | ||
21 | - <styled.SearchBarWrapper> | ||
22 | - <styled.SearchBar | ||
23 | - placeholder = '환자 이름' | ||
24 | - /> | ||
25 | - <styled.SearchButton> | ||
26 | - 검색 | ||
27 | - </styled.SearchButton> | ||
28 | - </styled.SearchBarWrapper> | ||
29 | - <styled.SearchResultWrapper> | ||
30 | - | ||
31 | - </styled.SearchResultWrapper> | ||
32 | - </styled.SearchAndDetailWrapper> | ||
33 | - </styled.InfoAndSearchWrapper> | ||
34 | - <styled.BottleListWrapper> | ||
35 | - bottleListWrapper | ||
36 | - </styled.BottleListWrapper> | ||
37 | - </styled.Container> | ||
38 | - ) | ||
39 | -}; | ||
40 | - | ||
41 | -export default MainPresenter; | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
-
Please register or login to post a comment