Merge branch 'main' of https://github.com/2023WISCOM/WISCOM-FE into f…

…eature/#11-project

WISCOM/package.json

@@ -11,8 +11,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "axios": "^1.6.0",
     "framer-motion": "^10.16.4",
     "gsap": "^3.12.2",
+    "http-proxy-middleware": "^2.0.6",
     "matter": "^0.2.0",
     "react": "^18.2.0",
     "react-chatbot-kit": "^2.1.2",

WISCOM/src/Router.jsx

@@ -37,6 +37,7 @@ function AppNavigation() {
           <Route path="/chatbot" element={<Chatbot />} />
         </Routes>
       </GlobalWrapper>
+      <Footer />
     </>
   );
 }

WISCOM/src/components/Developer/Devs.jsx

@@ -5,6 +5,8 @@ import { DeveloperContainer } from '../Project/ProjectStyle';
 import BackBlue from '../../img/Developer/BackgroundBlue.svg';
 import BackGreen from '../../img/Developer/BackgroundGreen.svg';
 import BackYellow from '../../img/Developer/BackgroundYellow.svg';
+import { useEffect, useState } from 'react';
+import axios from 'axios';
 
 const backgroundImages2 = [BackGreen, BackBlue, BackYellow];
 
@@ -25,6 +27,15 @@ function getRandomBackgroundImage() {
 }
 
 const Developer = () => {
+  const [data, setData] = useState(null)
+
+  useEffect(()=>{
+    axios.get('/developers')
+      .then(response => {
+        setData(response.data);
+      });
+  },data);
+
   const images = [];
   for (let i = 0; i < 4; i++) {
     if (i === 3) {
@@ -34,6 +45,9 @@ const Developer = () => {
     }
   }
 
+  console.log("확인");
+  console.log(data);
+
   return (
     <D.DevWrapper>
       <D.Box>

WISCOM/src/components/common/Footer/Footer.jsx

@@ -0,0 +1,38 @@
+import * as F from './FooterStyle';
+
+const developers = ['강현정','고민정','김다희','김서영','김수민', '김수빈','김수현','김지현', '김하연','김현지', '노윤하', '문서연','박고은', '박소연','박지혜', '박지호','박효정','배은빈','서채은','손가영', '신지현','우주','윤소연','윤소원','윤이솔','이동희','이민영','이소현','이수민','이슬영','이예원','이재현','이지선','이혜림','임다희','임예진','장다은','장지수','정윤현','정해인','조다은','조선아','조수인','조예진','채현영','최지영','한성현','한유진','홍정민'];
+
+
+
+  function NameList() {
+    return (
+      <div>
+        {developers.map((developer, index) => (
+          <div key={index}>{developer}</div>
+        ))}
+      </div>
+    );
+  }
+
+const Footer = () => {
+    return (
+        <F.FooterWrapper>
+            <F.FooterTitle>2023 덕성여자대학교 컴퓨터공학 전공 제33회 졸업전시회 WISCOM</F.FooterTitle>
+            <F.Box>
+                <F.Category>지도교수</F.Category>
+                <F.Names>박우창 이주영 최승훈 유견아 이경미</F.Names>
+            </F.Box>
+            <F.Box>
+                <F.Category>개발자</F.Category>
+                <F.Names>{NameList()}</F.Names>
+            </F.Box>
+            <F.Box>
+                <F.Category>졸업전시준비위원회</F.Category>
+                <F.Names></F.Names>
+            </F.Box>
+
+        </F.FooterWrapper>
+    )
+}
+
+export default Footer;

WISCOM/src/components/common/Footer/FooterStyle.jsx

@@ -0,0 +1,53 @@
+import styled from 'styled-components';
+
+export const FooterWrapper = styled.div`
+  background-color: black;
+  /* display: flex;
+  flex-direction: column;
+  justify-content: center; */
+  padding: 3em;
+  padding-bottom: 8em;
+`;
+
+export const FooterTitle = styled.div`
+text-align: center;
+color: white;
+font-size: 30px;
+font-weight: bold;
+margin-top: 2em;
+margin-bottom: 3em;
+`;
+
+export const Box = styled.div`
+display: flex;
+flex-direction: row;
+//flex-wrap: wrap;
+`;
+
+export const Category = styled.div`
+text-align: left;
+color: white;
+font-size: 20px;
+font-weight: bold;
+padding: 1em;
+padding-left: 3em;
+`;
+
+export const Names = styled.div`
+display: flex;
+flex-direction: row;
+//justify-content: center;
+color: white;
+font-size: 20px;
+font-weight: bold;
+flex-wrap: wrap;
+//padding: 1em;
+`;
+
+export const Name = styled.div`
+
+`
+
+export const Info = styled.div`
+  
+`;

WISCOM/src/components/common/Nav/Nav.jsx

@@ -28,6 +28,28 @@ const Nav = () => {
     'AFORE',
   ];
 
+  const pathToTitleMapping = {
+    '/': 'MAIN',
+    '/map': 'PROJECT',
+    '/guestbook': 'GUESTBOOK',
+    '/chatbot': 'CHATBOT',
+    '/developer': 'DEVELOPER',
+  };
+
+  const TeamList = [
+    'HATCH',
+    'DRAKE',
+    'HIGHFIVE',
+    '딱꼼',
+    'IDEAL',
+    '내마음을UNLOCK',
+    '클래스메이트',
+    '한울',
+    '한소리',
+    '사현희있어요',
+    'AFORE',
+  ];
+
   useEffect(() => {
     if (location.pathname.includes('/project/')) {
       setTitle('PROJECT');

WISCOM/src/setProxy.js

@@ -0,0 +1,10 @@
+const { createProxyMiddleware } = require('http-proxy-middleware');
+
+module.exports = function (app) {
+  app.use(
+    createProxyMiddleware('/developers', {
+      target: 'https://dswuwis.store',
+      changeOrigin: true,
+    }),
+  );
+};

WISCOM/yarn.lock

@@ -53,7 +53,7 @@
     "@babel/highlight" "^7.22.13"
     chalk "^2.4.2"
 
-"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.20", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
+"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
   version "7.22.20"
   resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz"
   integrity sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==
@@ -742,7 +742,7 @@
     "@babel/helper-module-transforms" "^7.23.0"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.22.15", "@babel/plugin-transform-modules-commonjs@^7.23.0":
+"@babel/plugin-transform-modules-commonjs@^7.23.0":
   version "7.23.0"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz"
   integrity sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==
@@ -2995,6 +2995,15 @@ axe-core@^4.6.2:
   resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.8.2.tgz"
   integrity sha512-/dlp0fxyM3R8YW7MFzaHWXrf4zzbr0vaYb23VBFCl83R7nWNPg/yaQw2Dc8jzCMmDVLhSdzH8MjrsuIUuvX+6g==
 
+axios@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
+  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
+  dependencies:
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 axobject-query@^3.1.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz"
@@ -4863,7 +4872,7 @@ flatted@^3.2.7:
   resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz"
   integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
 
-follow-redirects@^1.0.0:
+follow-redirects@^1.0.0, follow-redirects@^1.15.0:
   version "1.15.3"
   resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz"
   integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
@@ -4903,6 +4912,15 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 [email protected]:
   version "0.2.0"
   resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
@@ -7811,6 +7829,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"