Skip to content

Commit

Permalink
chore: 코드 포매터 적용 (#70)
Browse files Browse the repository at this point in the history
* chore: 코드 포매터 적용

* conf: ci 고치는 중

* conf: ci 파일 수정: repo checkout 이후 .properties 생성

* conf: ci 수정, echo 명령어 따옴표 수정

* conf: ci 수정

* conf: ci 수정

* conf: ci 수정

* conf: ci 수정

* conf: ci 수정, 테스트를 위해 더미 데이터로 변경

* conf: ci 수정
  • Loading branch information
hatchling13 authored Dec 18, 2023
1 parent 293e8ac commit 0ae0230
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 19 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
name: Java CI with Gradle

on:
push:
pull_request:
branches: [ "develop" ]

Expand All @@ -21,17 +22,8 @@ defaults:
jobs:
build:
runs-on: ubuntu-latest
env:
JASYPT_SECRET_KEY: ${{ secrets.JASYPT_SECRET_KEY }}
KAKAO_TOKEN_INFO_URL: ${{ secrets.KAKAO_TOKEN_INFO_URL }}

steps:
- name: make properties files

run: |
echo "Jasypt-Secret-Key=$JASYPT_SECRET_KEY" > ./src/main/resources/config.properties
echo "kakao.token.info.url=$KAKAO_TOKEN_INFO_URL" > ./src/main/resources/url.properties
## jdk setting
- uses: actions/checkout@v3
- name: Set up JDK 21
Expand All @@ -41,6 +33,15 @@ jobs:
distribution: 'temurin'
## application.yml 생성 후 secret 값 복붙

- name: make properties files
shell: bash
env:
JASYPT_SECRET_KEY: ${{ secrets.JASYPT_SECRET_KEY }}
KAKAO_TOKEN_INFO_URL: ${{ secrets.KAKAO_TOKEN_INFO_URL }}
run: |
echo "Jasypt-Secret-Key=$JASYPT_SECRET_KEY" > ./src/main/resources/config.properties
echo "kakao.token.info.url=$KAKAO_TOKEN_INFO_URL" > ./src/main/resources/url.properties
# Gradle Build를 위한 권한 부여
- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down
20 changes: 10 additions & 10 deletions frontend/src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
'use client'
'use client';

import { useEffect } from 'react'
import LandingPage from './_components/landing/LandingPage'
import { useEffect } from 'react';
import LandingPage from './_components/landing/LandingPage';

import { useRouter } from 'next/navigation'
import { useRouter } from 'next/navigation';

export default function Home() {
const router = useRouter()
const router = useRouter();
// 세션 확인 후 로그인으로 보낼지 메인페이지로 보낼지.
useEffect(() => {
const timer = setTimeout(() => {
router.push('/login')
}, 1500)
return () => clearTimeout(timer)
}, [])
return <LandingPage />
router.push('/login');
}, 1500);
return () => clearTimeout(timer);
}, []);
return <LandingPage />;
}

0 comments on commit 0ae0230

Please sign in to comment.