From 4e6b72940f6b3ebe8b1b898780f822d296c9f970 Mon Sep 17 00:00:00 2001 From: klmhyeonwoo Date: Thu, 4 Jul 2024 21:08:24 +0900 Subject: [PATCH 1/3] feat: #12 Add Common Layout Definition --- src/app/login/KakaoLoginRedirection.tsx | 2 +- src/layout/default.tsx | 10 ++- src/style/global.css | 112 +----------------------- 3 files changed, 12 insertions(+), 112 deletions(-) diff --git a/src/app/login/KakaoLoginRedirection.tsx b/src/app/login/KakaoLoginRedirection.tsx index 1db0c861..07390ffc 100644 --- a/src/app/login/KakaoLoginRedirection.tsx +++ b/src/app/login/KakaoLoginRedirection.tsx @@ -13,7 +13,7 @@ const KaKaoRedirection = () => { // FIXME: 백엔드 API에 따라 주소 수정 필요 api .post(`kakaoLogin${code}`) - .then((r: Response) => { + .then((_: Response) => { // FIXME: 받은걸 어디에 저장할지 논의 필요 (로그인 저장 방식에 따라 달리짐) // => 로그인 성공 시 로직 추가 // FIXME: 완료 후 이동 (프로세스에 따라 페이지 URL 변경) diff --git a/src/layout/default.tsx b/src/layout/default.tsx index 8cbfe590..7b4b783c 100644 --- a/src/layout/default.tsx +++ b/src/layout/default.tsx @@ -1,8 +1,16 @@ import {Outlet} from "react-router-dom"; +import {css} from "@emotion/react"; export function DefaultLayout() { return ( -
+
) diff --git a/src/style/global.css b/src/style/global.css index d80a7496..03afaff8 100644 --- a/src/style/global.css +++ b/src/style/global.css @@ -1,112 +1,4 @@ -:root { - font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif; - line-height: 1.5; - font-weight: 400; - - color-scheme: light dark; - color: rgba(255, 255, 255, 0.87); - background-color: #242424; - - font-synthesis: none; - text-rendering: optimizeLegibility; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -a { - font-weight: 500; - color: #646cff; - text-decoration: inherit; -} -a:hover { - color: #535bf2; -} - body { margin: 0; - display: flex; - place-items: center; - min-width: 320px; - min-height: 100vh; -} - -h1 { - font-size: 3.2em; - line-height: 1.1; -} - -button { - border-radius: 8px; - border: 1px solid transparent; - padding: 0.6em 1.2em; - font-size: 1em; - font-weight: 500; - font-family: inherit; - background-color: #1a1a1a; - cursor: pointer; - transition: border-color 0.25s; -} -button:hover { - border-color: #646cff; -} -button:focus, -button:focus-visible { - outline: 4px auto -webkit-focus-ring-color; -} - -@media (prefers-color-scheme: light) { - :root { - color: #213547; - background-color: #ffffff; - } - a:hover { - color: #747bff; - } - button { - background-color: #f9f9f9; - } -} - - -#root { - max-width: 1280px; - margin: 0 auto; - padding: 2rem; - text-align: center; -} - -.logo { - height: 6em; - padding: 1.5em; - will-change: filter; - transition: filter 300ms; -} -.logo:hover { - filter: drop-shadow(0 0 2em #646cffaa); -} -.logo.react:hover { - filter: drop-shadow(0 0 2em #61dafbaa); -} - -@keyframes logo-spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} - -@media (prefers-reduced-motion: no-preference) { - a:nth-of-type(2) .logo { - animation: logo-spin infinite 20s linear; - } -} - -.card { - padding: 2em; -} - -.read-the-docs { - color: #888; -} + padding: 0; +} \ No newline at end of file From 807cc93c88ed44e136d467ab043f28e0ddcb277b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=86=E1=85=B5=E1=86=AB=E1=84=92?= =?UTF-8?q?=E1=85=B4?= Date: Fri, 5 Jul 2024 13:42:23 +0900 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20build=20workflow=20develop=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80,=20pull=5Frequest=5Ftarget=20=EC=9B=90?= =?UTF-8?q?=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 4a9ade1d..af84d656 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -4,11 +4,11 @@ on: push: branches: - main - - depromeet/layer:main - pull_request_target: + - develop + pull_request: branches: - main - - depromeet/layer:main + - develop jobs: build: From 3ef0f6a1190cf09a970d2be137b0646c5a489b22 Mon Sep 17 00:00:00 2001 From: klm hyeon woo Date: Fri, 5 Jul 2024 19:57:43 +0900 Subject: [PATCH 3/3] create workflow-dev.yml --- .github/workflows/workflow-dev.yml | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/workflow-dev.yml diff --git a/.github/workflows/workflow-dev.yml b/.github/workflows/workflow-dev.yml new file mode 100644 index 00000000..70b5c2ea --- /dev/null +++ b/.github/workflows/workflow-dev.yml @@ -0,0 +1,32 @@ +name: Synchronize to forked repo +on: + push: + branches: + - develop + +jobs: + sync: + name: Sync forked repo + runs-on: ubuntu-latest + + steps: + - name: Checkout develop + uses: actions/checkout@v4 + with: + token: ${{ secrets.FORKED_REPO_TOKEN_DEV }} + fetch-depth: 0 + ref: develop + + - name: Add remote-url + run: | + git remote add forked-repo https://test0001124:${{ secrets.FORKED_REPO_TOKEN_DEV }}@github.com/test0001124/layer-dev + git config user.name test0001124 + git config user.email klmhyeonwoo@likelion.org + + - name: Push changes to forked-repo + run: | + git push -f forked-repo develop + + - name: Clean up + run: | + git remote remove forked-repo