최은석 / ossw-project

Go to a project
Toggle navigation Toggle navigation pinning
채지성
22e78017 1 parent 3dfa0a0a

mainpage_menu

Expand all
Inline Side-by-side
Showing 4 changed files with 46 additions and 2 deletions
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
11 "@testing-library/jest-dom": "^5.16.4", 11 "@testing-library/jest-dom": "^5.16.4",
12 "@testing-library/react": "^13.3.0", 12 "@testing-library/react": "^13.3.0",
13 "@testing-library/user-event": "^13.5.0", 13 "@testing-library/user-event": "^13.5.0",
14 + "axios": "^0.27.2",
14 "bootstrap": "^5.1.3", 15 "bootstrap": "^5.1.3",
15 "react": "^18.1.0", 16 "react": "^18.1.0",
16 "react-bootstrap": "^2.4.0", 17 "react-bootstrap": "^2.4.0",
...@@ -4655,6 +4656,28 @@ ...@@ -4655,6 +4656,28 @@
4655 "node": ">=12" 4656 "node": ">=12"
4656 } 4657 }
4657 }, 4658 },
4659 + "node_modules/axios": {
4660 + "version": "0.27.2",
4661 + "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
4662 + "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
4663 + "dependencies": {
4664 + "follow-redirects": "^1.14.9",
4665 + "form-data": "^4.0.0"
4666 + }
4667 + },
4668 + "node_modules/axios/node_modules/form-data": {
4669 + "version": "4.0.0",
4670 + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
4671 + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
4672 + "dependencies": {
4673 + "asynckit": "^0.4.0",
4674 + "combined-stream": "^1.0.8",
4675 + "mime-types": "^2.1.12"
4676 + },
4677 + "engines": {
4678 + "node": ">= 6"
4679 + }
4680 + },
4658 "node_modules/axobject-query": { 4681 "node_modules/axobject-query": {
4659 "version": "2.2.0", 4682 "version": "2.2.0",
4660 "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", 4683 "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
...@@ -19782,6 +19805,27 @@ ...@@ -19782,6 +19805,27 @@
19782 "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.2.tgz", 19805 "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.2.tgz",
19783 "integrity": "sha512-LVAaGp/wkkgYJcjmHsoKx4juT1aQvJyPcW09MLCjVTh3V2cc6PnyempiLMNH5iMdfIX/zdbjUx2KDjMLCTdPeA==" 19806 "integrity": "sha512-LVAaGp/wkkgYJcjmHsoKx4juT1aQvJyPcW09MLCjVTh3V2cc6PnyempiLMNH5iMdfIX/zdbjUx2KDjMLCTdPeA=="
19784 }, 19807 },
19808 + "axios": {
19809 + "version": "0.27.2",
19810 + "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
19811 + "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
19812 + "requires": {
19813 + "follow-redirects": "^1.14.9",
19814 + "form-data": "^4.0.0"
19815 + },
19816 + "dependencies": {
19817 + "form-data": {
19818 + "version": "4.0.0",
19819 + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
19820 + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
19821 + "requires": {
19822 + "asynckit": "^0.4.0",
19823 + "combined-stream": "^1.0.8",
19824 + "mime-types": "^2.1.12"
19825 + }
19826 + }
19827 + }
19828 + },
19785 "axobject-query": { 19829 "axobject-query": {
19786 "version": "2.2.0", 19830 "version": "2.2.0",
19787 "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", 19831 "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
......
...@@ -14,7 +14,7 @@ root.render( ...@@ -14,7 +14,7 @@ root.render(
14 <TopBanner /> 14 <TopBanner />
15 15
16 <SideChat /> 16 <SideChat />
17 - <div className='bodyContent' style={{width:'100%', height:'100%'}}> 17 + <div className='bodyContent' style={{width:'100%', height:'80%'}}>
18 <MainPage /> 18 <MainPage />
19 </div> 19 </div>
20 20
......
This diff is collapsed. Click to expand it.
1 { 1 {
2 "scripts": { 2 "scripts": {
3 "server": "cd server && nodemon server", 3 "server": "cd server && nodemon server",
4 - "client": "cd client && export PORT=8080 && set PORT=8080 && npm start --port", 4 + "client": "cd client && set PORT=8080 && npm start --port",
5 "start": "concurrently --kill-others-on-fail \"npm run server\" \"npm run client\"" 5 "start": "concurrently --kill-others-on-fail \"npm run server\" \"npm run client\""
6 }, 6 },
7 "dependencies": { 7 "dependencies": {
......