Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sujin #2

Open
wants to merge 4 commits into
base: Develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,129 changes: 870 additions & 259 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,19 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@material-ui/core": "^4.12.4",
"@mui/icons-material": "^5.14.3",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"axios": "^1.4.0",
"bootstrap": "^5.3.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.14.2",
"react-scripts": "5.0.1",
"react-speech-recognition": "^3.10.0",
"reactstrap": "^9.2.0",
"web-vitals": "^2.1.4"
},
"scripts": {
Expand Down
Binary file added public/assets/kb_logo.jpg
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 public/assets/logo.jpg
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 public/img/kb_logo.jpg
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 public/img/logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 11 additions & 6 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import React from 'react';
import Header from './components/header';
import Dictaphone from './components/Speech';
import {BrowserRouter, Routes, Route} from 'react-router-dom';
import Main from './pages/Main';



const App = () =>{
return(
<>
<Header />
<Dictaphone />
</>
<BrowserRouter>

<Routes>
<Route path='/' element={<Main />}></Route>
</Routes>
</BrowserRouter>
)
}
export default App
Empty file added src/components/Dash.js
Empty file.
59 changes: 59 additions & 0 deletions src/components/Nav.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import React from "react";



const Nav = () => {

return(

<nav className="navbar">
<ul className="navmenu">
<li>
<span>펀드</span>
<ul>
<li className="submenu">
<span>세부</span>
<span>세부</span>
<span>세부</span>
</li>
</ul>
</li>
<li>
<span>신탁</span>
<ul>
<li className="submenu">
<span>세부</span>
<span>세부</span>
<span>세부</span>
</li>
</ul>
</li>
<li>
<span>예/적금</span>
<ul>
<li className="submenu">
<span>세부</span>
<span>세부</span>
<span>세부</span>
</li>
</ul>
</li>
<li>
<span>대출</span>
<ul>
<li className="submenu">
<span>세부</span>
<span>세부</span>
<span>세부</span>
</li>
</ul>
</li>
</ul>
</nav>

)
}



export default Nav
32 changes: 0 additions & 32 deletions src/components/Speech.js

This file was deleted.

73 changes: 73 additions & 0 deletions src/components/css/component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
.head {
width: 100%;
background-color: blanchedalmond;
padding: 15px 0px;
text-align: right;
}

.headMenu {
color: white;
margin: 9px;
text-decoration: none;
}

.navbar {
background-color: yellow;
display: flex;
position: relative;
width: 200px;
height: 600px;
padding: 15px 0px;
display: flex;

}

.navmenu {
position: absolute;
right: 0;
height: calc(100% - 16px);
width: 25vw;
max-width: 300px;
background-color: yellow;
z-index: 999;
float: right;
display: flex;
flex-direction: column;
align-items: center;
gap: 16px;
padding-top: 16px;
}


li {
list-style: none;
margin-right: auto;
margin-left: auto;
}

nav > ul > li {
border-left: 2px solid #606060;
width: 100;
cursor: pointer;
justify-content:space-between;

}

ul > li > span {
display: flex;
margin: 8px;
font-size: 13px;
}

nav > ul > li > span {
display: flex;
margin: 8px;
font-size: 15px;
}

ul > li > span:hover {
padding-bottom: 5px;
background-color: #fbfed3;
border: none;
font-weight: 600;
}
10 changes: 7 additions & 3 deletions src/components/header.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import React from "react";
const Header = () => {

return(
<>
헤더
</>
<div>
<div className="head">
<div className="headMenu" alt="logo" src="img/logo.jpg"></div>
<div className="headMenu" alt="kb_logo" src="img/kb_logo.jpg"></div>
</div>
</div>
)
}
export default Header
4 changes: 2 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import ReactDOM from 'react-dom/client';
import './index.css';
import App from './App';
import reportWebVitals from './reportWebVitals';
// import reportWebVitals from './reportWebVitals';

const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
Expand All @@ -14,4 +14,4 @@ root.render(
// If you want to start measuring performance in your app, pass a function
// to log results (for example: reportWebVitals(console.log))
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
reportWebVitals();
// reportWebVitals();
15 changes: 15 additions & 0 deletions src/pages/Main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from "react";
import '../components/css/component.css'
import Nav from "../components/Nav";
import Header from "../components/Header";


const Main = () => {
return (
<>
<Header />
<Nav />
</>
)
}
export default Main
29 changes: 29 additions & 0 deletions src/styles/Header.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
.head {
width: 100%;
height: 20%;
background-color: white;
padding: 15px 0px;
text-align: right;
}

.headMenu {
color: white;
margin: 9px;
text-decoration: none;
}

.logo {

width: 10%;
height: 5%;
}

.img {

display: flex;
justify-content:space-between;
width: 100%;
height: 5%;
}


47 changes: 47 additions & 0 deletions src/styles/Nav.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@


.navmenu {
background-color: rgb(242, 222, 121);
position: absolute;
height: 90%;
width: 25%;
float: left;
display: flex;
flex-direction: column;
align-items: left;
gap: 20px;
padding-top: 20px;
}


li {
list-style: none;
}

nav > ul > li {

justify-content:space-between;
border-left: 2px solid #606060;

}

ul > li > span {
display: flex;
margin: 8px;
font-size: 17px;
}

nav > ul > li > span {
display: flex;
margin: 8px;
font-size: 20px;
}

ul > li > span:hover {
padding-bottom: 5px;
background-color: #fbfed3;
border: none;
font-weight: 600;
}


1 change: 1 addition & 0 deletions web-front
Submodule web-front added at 58f22d