Skip to content

Commit

Permalink
워크플로우 추가를 위한 메인 병합
Browse files Browse the repository at this point in the history
워크플로우 추가를 위한 메인 병합
  • Loading branch information
klmhyeonwoo committed Jul 5, 2024
2 parents 0e3519b + 09875cf commit be04c21
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 115 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/workflow-dev.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/app/login/KakaoLoginRedirection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const KaKaoRedirection = () => {
// FIXME: 백엔드 API에 따라 주소 수정 필요
api
.post(`kakaoLogin${code}`)
.then((r: Response) => {
.then((_: Response) => {
// FIXME: 받은걸 어디에 저장할지 논의 필요 (로그인 저장 방식에 따라 달리짐)
// => 로그인 성공 시 로직 추가
// FIXME: 완료 후 이동 (프로세스에 따라 페이지 URL 변경)
Expand Down
10 changes: 9 additions & 1 deletion src/layout/default.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
import {Outlet} from "react-router-dom";
import {css} from "@emotion/react";

export function DefaultLayout() {
return (
<main>
<main css={css`
width: 100vw;
max-width: 480px;
min-height: 100dvh;
box-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
margin: 0 auto;
padding: 0 16px;
`}>
<Outlet/>
</main>
)
Expand Down
112 changes: 2 additions & 110 deletions src/style/global.css
Original file line number Diff line number Diff line change
@@ -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;
}

0 comments on commit be04c21

Please sign in to comment.