diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33677c4..855c64e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,7 +66,6 @@ jobs: NEXT_PUBLIC_SUPABASE_URL: "https://dummy.supabase.co" NEXT_PUBLIC_SUPABASE_ANON_KEY: "dummy-key-for-build-test" - # 9. 성공 시 체크마크 출력 - name: All checks passed - run: echo "모든 코드 품질 검사를 통과했습니다!" \ No newline at end of file + run: echo "모든 코드 품질 검사를 통과했습니다!" diff --git a/.github/workflows/devlop.yml b/.github/workflows/devlop.yml deleted file mode 100644 index 6d37717..0000000 --- a/.github/workflows/devlop.yml +++ /dev/null @@ -1,83 +0,0 @@ -name: Develop - Integration Test - -on: - push: - branches: - - develop - pull_request: - branches: - - develop - -# 동시 실행 제한 -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - # Develop 환경 변수 (GitHub Secrets 사용) - NEXT_PUBLIC_SUPABASE_URL: ${{ secrets.NEXT_PUBLIC_SUPABASE_URL }} - NEXT_PUBLIC_SUPABASE_ANON_KEY: ${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }} - -jobs: - integration-test: - name: Integration Test - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [20.x] - - steps: - # 1. 코드 체크아웃 - - name: Checkout repository - uses: actions/checkout@v4 - - # 2. pnpm 설정 - - name: Setup pnpm - uses: pnpm/action-setup@v4 - - # 3. Node.js 설정 - - name: Setup Node.js ${{ matrix.node-version}} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - cache: 'pnpm' - - # 4. 의존성 설치 - - name: Install dependencies - run: pnpm install --frozen-lockfile - - # 5. 코드 품질 검사 - - name: Code formatting check - run: pnpm run format:check - - - name: Lint check - run: pnpm run lint - - - name: Type check - run: pnpm run type-check - - # 6. 실제 환경변수로 빌드 테스트 - - name: Build for develop - run: pnpm run build - - # # 7. Jest 테스트 (나중에 활성화) - # - name: Run Tests - # run: pnpm run test - - # 8. E2E 테스트 (Playwright - 나중에 활성화) - # - name: E2E Tests - # run: pnpm exec playwright test - - # 9. 빌드 결과물 업로드 (디버깅용) - - name: Upload build artifacts - uses: actions/upload-artifact@v4 - if: failure() - with: - name: build-output - path: .next/ - retention-days: 1 - - # 10. 성공 알림 - - name: Integration test passed - run: echo "Develop 브랜치 통합 테스트 완료!" diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index e98084b..07ac25a 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -106,10 +106,9 @@ jobs: vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID }} # TODO: 나중에 배포 후 입력 vercel-args: "--prod" - # 배포 성공 알림 (선택사항) - name: Deployment success notification run: | echo "프로덕션 배포 완료!" echo "배포 시간: ${date}" - echo "커밋: ${{ github.sha}}" \ No newline at end of file + echo "커밋: ${{ github.sha}}" diff --git a/src/app/auth/signup/page.tsx b/src/app/auth/signup/page.tsx index b8c4a4a..c3f48f9 100644 --- a/src/app/auth/signup/page.tsx +++ b/src/app/auth/signup/page.tsx @@ -316,21 +316,19 @@ export default function SignupPage() { -
+
- 계정이 없으신가요? 회원가입 + 회원이신가요? 로그인 + + + 메인 화면으로 돌아가기 -
- - 메인 화면으로 돌아가기 - -
diff --git a/src/components/auth/LoginPageContent.tsx b/src/components/auth/LoginPageContent.tsx index 988549f..0350d75 100644 --- a/src/components/auth/LoginPageContent.tsx +++ b/src/components/auth/LoginPageContent.tsx @@ -68,7 +68,7 @@ export default function LoginPageContent() { htmlFor="email" className="block text-sm font-medium text-gray-700" > - 이메일 * + 이메일 - 비밀번호 * + 비밀번호 {isLoggingIn ? "로그인 중..." : "로그인"} -
+
계정이 없으신가요? 회원가입 + + 메인 화면으로 돌아가기 +
diff --git a/src/hooks/auth/useAuth.ts b/src/hooks/auth/useAuth.ts index 15d5256..aad935d 100644 --- a/src/hooks/auth/useAuth.ts +++ b/src/hooks/auth/useAuth.ts @@ -201,7 +201,7 @@ export const useAuth = () => { user: session?.user || null, profile, session, - isLoading: (isSessionLoading || isProfileLoading) && !isInitialized, + isLoading: isSessionLoading || (!isInitialized && session === undefined), isAuthenticated: !!session?.user, emailCheckResult: checkEmailMutation.data, nicknameCheckResult: checkNicknameMutation.data,