From 20b18826d309290694d467a3e762cbbad6b246be Mon Sep 17 00:00:00 2001
From: sayyyho <323psh@naver.com>
Date: Wed, 14 Aug 2024 00:47:31 +0900
Subject: [PATCH 1/5] =?UTF-8?q?Test:=20yaml=20=ED=8C=8C=EC=9D=BC=20?=
=?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/deploy.yaml | 2 +-
vite | 0
vite-project@0.0.0 | 0
3 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 vite
delete mode 100644 vite-project@0.0.0
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index a826791d..8715dd6d 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -59,4 +59,4 @@ jobs:
fi
sudo docker pull ${{ env.DOCKER_IMAGE_NAME }}:latest
- sudo docker run --name kaboo-connection-container -d -p 80:8080 -e TZ=Asia/Seoul ${{ env.DOCKER_IMAGE_NAME }}:latest
+ sudo docker run --name kaboo-connection-container -d -p 80:80 -e TZ=Asia/Seoul ${{ env.DOCKER_IMAGE_NAME }}:latest
diff --git a/vite b/vite
deleted file mode 100644
index e69de29b..00000000
diff --git a/vite-project@0.0.0 b/vite-project@0.0.0
deleted file mode 100644
index e69de29b..00000000
From 392d23036ec716a68c5a591f7f249f1da186b279 Mon Sep 17 00:00:00 2001
From: sayyyho <323psh@naver.com>
Date: Mon, 19 Aug 2024 13:45:04 +0900
Subject: [PATCH 2/5] =?UTF-8?q?Fix:=20=EB=82=B4=EB=B3=B4=EB=82=B4=EA=B8=B0?=
=?UTF-8?q?=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Common/Background.styled.js | 6 +++---
src/components/Common/Layout.styled.js | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/Common/Background.styled.js b/src/components/Common/Background.styled.js
index 69d899eb..1acc9fcf 100644
--- a/src/components/Common/Background.styled.js
+++ b/src/components/Common/Background.styled.js
@@ -2,12 +2,12 @@
import styled from "@emotion/styled";
import { keyframes } from "@emotion/react";
-const float = keyframes`
+export const float = keyframes`
0%, 100% { transform: translateY(0) translateX(0); }
50% { transform: translateY(-300px) translateX(300px); }
`;
-const Circle = styled.div`
+export const Circle = styled.div`
position: absolute;
width: 1800px;
height: 1300px;
@@ -22,7 +22,7 @@ const Circle = styled.div`
top: ${(props) => props.y}%;
`;
-const BackgroundContainer = styled.div`
+export const BackgroundContainer = styled.div`
position: fixed; // 화면에 고정
top: 0;
left: 0;
diff --git a/src/components/Common/Layout.styled.js b/src/components/Common/Layout.styled.js
index 71fad7ce..156987de 100644
--- a/src/components/Common/Layout.styled.js
+++ b/src/components/Common/Layout.styled.js
@@ -1,7 +1,7 @@
/** @jsxImportSource @emotion/react */
import styled from "@emotion/styled";
-const LayoutContainer = styled.div`
+export const LayoutContainer = styled.div`
position: relative;
width: 100vw;
display: flex;
@@ -11,7 +11,7 @@ const LayoutContainer = styled.div`
min-height: 100vh;
`;
-const MainContent = styled.main`
+export const MainContent = styled.main`
flex: 1;
padding: 0px; /* 콘텐츠 패딩 */
From a2844abed0c66e657d02df4dc779f81f0ca5cc60 Mon Sep 17 00:00:00 2001
From: sayyyho <323psh@naver.com>
Date: Mon, 19 Aug 2024 15:34:59 +0900
Subject: [PATCH 3/5] =?UTF-8?q?=EB=A1=9C=EC=BB=AC=20=EB=B3=80=EA=B2=BD=20?=
=?UTF-8?q?=EC=82=AC=ED=95=AD=EC=9D=84=20=EC=BB=A4=EB=B0=8B=ED=95=A9?=
=?UTF-8?q?=EB=8B=88=EB=8B=A4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/.gitignore | 5 +++++
.idea/Kaboo-Connection-Front.iml | 12 ++++++++++++
.idea/inspectionProfiles/Project_Default.xml | 6 ++++++
.idea/modules.xml | 8 ++++++++
.idea/vcs.xml | 6 ++++++
src/App.jsx | 6 ++++--
src/components/Common/Layout.styled.js | 1 -
src/pages/{ => ChatPage}/ChatPage.js | 0
src/pages/ChatPage/ChatPage.styled.js | 2 ++
.../HomeMain.jsx => Homepage/HomePage.jsx} | 4 ++--
.../HomePage.styled.js} | 0
src/pages/VideoPage.js | 0
src/pages/VideoPage.jsx | 12 ++++++++++++
13 files changed, 57 insertions(+), 5 deletions(-)
create mode 100644 .idea/.gitignore
create mode 100644 .idea/Kaboo-Connection-Front.iml
create mode 100644 .idea/inspectionProfiles/Project_Default.xml
create mode 100644 .idea/modules.xml
create mode 100644 .idea/vcs.xml
rename src/pages/{ => ChatPage}/ChatPage.js (100%)
create mode 100644 src/pages/ChatPage/ChatPage.styled.js
rename src/pages/{homepages/HomeMain.jsx => Homepage/HomePage.jsx} (82%)
rename src/pages/{homepages/HomeMain_styled.js => Homepage/HomePage.styled.js} (100%)
delete mode 100644 src/pages/VideoPage.js
create mode 100644 src/pages/VideoPage.jsx
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..b58b603f
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/Kaboo-Connection-Front.iml b/.idea/Kaboo-Connection-Front.iml
new file mode 100644
index 00000000..24643cc3
--- /dev/null
+++ b/.idea/Kaboo-Connection-Front.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 00000000..03d9549e
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..e398c8f6
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/App.jsx b/src/App.jsx
index 9d1f2bb2..20ddf03d 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -10,13 +10,15 @@ import {
} from "react-router-dom";
import Header from "./components/Common/Header";
-import HomeMain from "./pages/homepages/HomeMain";
+import HomePage from "./pages/Homepage/HomePage.jsx";
+import {VideoPage} from "./pages/VideoPage.jsx";
function App() {
return (
- }>
+ }>
+ }>
);
diff --git a/src/components/Common/Layout.styled.js b/src/components/Common/Layout.styled.js
index 156987de..a34cdc21 100644
--- a/src/components/Common/Layout.styled.js
+++ b/src/components/Common/Layout.styled.js
@@ -14,7 +14,6 @@ export const LayoutContainer = styled.div`
export const MainContent = styled.main`
flex: 1;
padding: 0px; /* 콘텐츠 패딩 */
-
display: flex;
justify-content: center;
align-items: center;
diff --git a/src/pages/ChatPage.js b/src/pages/ChatPage/ChatPage.js
similarity index 100%
rename from src/pages/ChatPage.js
rename to src/pages/ChatPage/ChatPage.js
diff --git a/src/pages/ChatPage/ChatPage.styled.js b/src/pages/ChatPage/ChatPage.styled.js
new file mode 100644
index 00000000..eef3b3ac
--- /dev/null
+++ b/src/pages/ChatPage/ChatPage.styled.js
@@ -0,0 +1,2 @@
+import styled from "@emotion/styled";
+
diff --git a/src/pages/homepages/HomeMain.jsx b/src/pages/Homepage/HomePage.jsx
similarity index 82%
rename from src/pages/homepages/HomeMain.jsx
rename to src/pages/Homepage/HomePage.jsx
index 394a8b17..f83d028d 100644
--- a/src/pages/homepages/HomeMain.jsx
+++ b/src/pages/Homepage/HomePage.jsx
@@ -1,7 +1,7 @@
import React from "react";
import Layout from "../../components/Common/Layout";
-function HomeMain() {
+function HomePage() {
return (
햄스터
@@ -12,4 +12,4 @@ function HomeMain() {
);
}
-export default HomeMain;
+export default HomePage;
diff --git a/src/pages/homepages/HomeMain_styled.js b/src/pages/Homepage/HomePage.styled.js
similarity index 100%
rename from src/pages/homepages/HomeMain_styled.js
rename to src/pages/Homepage/HomePage.styled.js
diff --git a/src/pages/VideoPage.js b/src/pages/VideoPage.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/pages/VideoPage.jsx b/src/pages/VideoPage.jsx
new file mode 100644
index 00000000..fd3d6381
--- /dev/null
+++ b/src/pages/VideoPage.jsx
@@ -0,0 +1,12 @@
+import React from 'react';
+
+export const VideoPage = () => {
+ React.useEffect(() => {
+ console.log('VideoPage');
+ })
+ return (
+
+ hi hi
+
+ )
+}
From 90e98321810542758de48b93926a5adc82fa6c24 Mon Sep 17 00:00:00 2001
From: sayyyho <323psh@naver.com>
Date: Mon, 19 Aug 2024 15:37:20 +0900
Subject: [PATCH 4/5] =?UTF-8?q?Fix:=20=EC=97=90=EB=9F=AC=20=EC=88=98?=
=?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.jsx | 1 -
src/pages/PeopleListPage.js | 0
2 files changed, 1 deletion(-)
delete mode 100644 src/pages/PeopleListPage.js
diff --git a/src/App.jsx b/src/App.jsx
index 7bf7694b..3c288a70 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,6 +1,5 @@
import GlobalStyle from "./components/Common/GlobalStyle";
import { PeopleListPage } from "./pages/PeopleListPage";
-
function App() {
return (
<>
diff --git a/src/pages/PeopleListPage.js b/src/pages/PeopleListPage.js
deleted file mode 100644
index e69de29b..00000000
From 6796a2dc2775d43e9328393aa18c308e5efe424f Mon Sep 17 00:00:00 2001
From: sayyyho <323psh@naver.com>
Date: Mon, 19 Aug 2024 15:48:53 +0900
Subject: [PATCH 5/5] =?UTF-8?q?Fix:=20miniLayout=20=ED=8E=98=EC=9D=B4?=
=?UTF-8?q?=EC=A7=80=20=EC=B0=BE=EA=B8=B0=20=EC=97=90=EB=9F=AC=20=EC=88=98?=
=?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/PeopleListPage.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/PeopleListPage.jsx b/src/pages/PeopleListPage.jsx
index dc25370f..e5efd77a 100644
--- a/src/pages/PeopleListPage.jsx
+++ b/src/pages/PeopleListPage.jsx
@@ -1,6 +1,6 @@
import React from "react";
import Layout from "../components/Common/Layout";
-import MiniLayout from "../components/Common/MiniLayout";
+import MiniLayout from "../components/Common/miniLayout.jsx";
import PeopleCard from "../components//PeopleListComponents/peopleCard";
export const PeopleListPage = () => {