Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d4b92b357 | ||
|
|
8e7c6e6c21 | ||
|
|
6960b17c41 |
@@ -1,16 +1,7 @@
|
|||||||
{
|
{
|
||||||
"permissions": {
|
"permissions": {
|
||||||
"allow": [
|
"allow": [
|
||||||
"Bash(npx nx run-many:*)",
|
"Bash(npm run typecheck:*)"
|
||||||
"Bash(npm install:*)",
|
|
||||||
"Bash(npm view:*)",
|
|
||||||
"Bash(npx nx build landing)",
|
|
||||||
"Bash(npm uninstall:*)",
|
|
||||||
"Bash(dir:*)",
|
|
||||||
"Bash(ren page.tsx page-original.tsx)",
|
|
||||||
"Bash(ren:*)",
|
|
||||||
"Bash(npx supabase:*)",
|
|
||||||
"Bash(libs/service/src/types/supabase.ts)"
|
|
||||||
],
|
],
|
||||||
"deny": [],
|
"deny": [],
|
||||||
"ask": []
|
"ask": []
|
||||||
|
|||||||
@@ -1,55 +0,0 @@
|
|||||||
# Dependencies
|
|
||||||
node_modules
|
|
||||||
npm-debug.log*
|
|
||||||
yarn-debug.log*
|
|
||||||
yarn-error.log*
|
|
||||||
|
|
||||||
# Build outputs
|
|
||||||
dist
|
|
||||||
.next
|
|
||||||
out
|
|
||||||
build
|
|
||||||
coverage
|
|
||||||
|
|
||||||
# IDE
|
|
||||||
.vscode
|
|
||||||
.idea
|
|
||||||
*.swp
|
|
||||||
*.swo
|
|
||||||
*~
|
|
||||||
|
|
||||||
# OS
|
|
||||||
.DS_Store
|
|
||||||
Thumbs.db
|
|
||||||
|
|
||||||
# Git
|
|
||||||
.git
|
|
||||||
.gitignore
|
|
||||||
|
|
||||||
# Environment
|
|
||||||
.env
|
|
||||||
.env.local
|
|
||||||
.env.*.local
|
|
||||||
|
|
||||||
# Testing
|
|
||||||
coverage
|
|
||||||
.nyc_output
|
|
||||||
|
|
||||||
# Logs
|
|
||||||
logs
|
|
||||||
*.log
|
|
||||||
|
|
||||||
# Nx
|
|
||||||
.nx
|
|
||||||
|
|
||||||
# Docker
|
|
||||||
Dockerfile
|
|
||||||
docker-compose*.yml
|
|
||||||
.dockerignore
|
|
||||||
|
|
||||||
# Misc
|
|
||||||
*.md
|
|
||||||
!README.md
|
|
||||||
.editorconfig
|
|
||||||
.prettierrc
|
|
||||||
.eslintrc
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
|
|
||||||
VITE_SUPABASE_URL=https://your-project-id.supabase.co
|
|
||||||
VITE_SUPABASE_ANON_KEY=your-anon-key-here
|
|
||||||
@@ -26,13 +26,9 @@ jobs:
|
|||||||
if [ ! -d ~/imphnen-frontend-service-backoffice ]; then
|
if [ ! -d ~/imphnen-frontend-service-backoffice ]; then
|
||||||
git clone https://github.com/IMPHNEN/imphnen-frontend-service.git ~/imphnen-frontend-service-backoffice
|
git clone https://github.com/IMPHNEN/imphnen-frontend-service.git ~/imphnen-frontend-service-backoffice
|
||||||
else
|
else
|
||||||
cd ~/imphnen-frontend-service-backoffice && git fetch origin && git reset --hard origin/develop && git pull
|
cd ~/imphnen-frontend-service-backoffice && git pull
|
||||||
fi
|
fi
|
||||||
cat > ~/imphnen-frontend-service-backoffice/apps/backoffice/.env << EOF
|
echo "VITE_API_URL=${{ secrets.VITE_API_URL }}" > ~/imphnen-frontend-service-backoffice/apps/backoffice/.env
|
||||||
VITE_API_URL=${{ secrets.VITE_API_URL }}
|
|
||||||
VITE_SUPABASE_URL=${{ secrets.VITE_SUPABASE_URL }}
|
|
||||||
VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }}
|
|
||||||
EOF
|
|
||||||
docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml down || true
|
docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml down || true
|
||||||
docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml build
|
docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml build
|
||||||
docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml up -d
|
docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml up -d
|
||||||
|
|||||||
@@ -26,13 +26,9 @@ jobs:
|
|||||||
if [ ! -d ~/imphnen-frontend-service-dimentorin ]; then
|
if [ ! -d ~/imphnen-frontend-service-dimentorin ]; then
|
||||||
git clone https://github.com/IMPHNEN/imphnen-frontend-service.git ~/imphnen-frontend-service-dimentorin
|
git clone https://github.com/IMPHNEN/imphnen-frontend-service.git ~/imphnen-frontend-service-dimentorin
|
||||||
else
|
else
|
||||||
cd ~/imphnen-frontend-service-dimentorin && git fetch origin && git reset --hard origin/develop && git pull
|
cd ~/imphnen-frontend-service-dimentorin && git pull
|
||||||
fi
|
fi
|
||||||
cat > ~/imphnen-frontend-service-dimentorin/apps/dimentorin/.env << EOF
|
echo "VITE_API_URL=${{ secrets.VITE_API_URL }}" > ~/imphnen-frontend-service-dimentorin/apps/dimentorin/.env
|
||||||
VITE_API_URL=${{ secrets.VITE_API_URL }}
|
|
||||||
VITE_SUPABASE_URL=${{ secrets.VITE_SUPABASE_URL }}
|
|
||||||
VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }}
|
|
||||||
EOF
|
|
||||||
docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml down || true
|
docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml down || true
|
||||||
docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml build
|
docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml build
|
||||||
docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml up -d
|
docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml up -d
|
||||||
|
|||||||
@@ -26,13 +26,9 @@ jobs:
|
|||||||
if [ ! -d ~/imphnen-frontend-service-gacha ]; then
|
if [ ! -d ~/imphnen-frontend-service-gacha ]; then
|
||||||
git clone https://github.com/IMPHNEN/imphnen-frontend-service.git ~/imphnen-frontend-service-gacha
|
git clone https://github.com/IMPHNEN/imphnen-frontend-service.git ~/imphnen-frontend-service-gacha
|
||||||
else
|
else
|
||||||
cd ~/imphnen-frontend-service-gacha && git fetch origin && git reset --hard origin/develop && git pull
|
cd ~/imphnen-frontend-service-gacha && git pull
|
||||||
fi
|
fi
|
||||||
cat > ~/imphnen-frontend-service-gacha/apps/gacha/.env << EOF
|
echo "VITE_API_URL=${{ secrets.VITE_API_URL }}" > ~/imphnen-frontend-service-gacha/apps/gacha/.env
|
||||||
VITE_API_URL=${{ secrets.VITE_API_URL }}
|
|
||||||
VITE_SUPABASE_URL=${{ secrets.VITE_SUPABASE_URL }}
|
|
||||||
VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }}
|
|
||||||
EOF
|
|
||||||
docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml down || true
|
docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml down || true
|
||||||
docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml build
|
docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml build
|
||||||
docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml up -d
|
docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml up -d
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
name: Deploy Hackathon
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- develop
|
|
||||||
paths:
|
|
||||||
- 'apps/hackathon/**' # Auto deploy when changes pushed to apps/hackathon
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
deploy:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout repo
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Deploy via SSH
|
|
||||||
uses: appleboy/ssh-action@v1.0.3
|
|
||||||
with:
|
|
||||||
host: ${{ secrets.SSH_HOST }}
|
|
||||||
username: ${{ secrets.SSH_USER }}
|
|
||||||
key: ${{ secrets.SSH_KEY }}
|
|
||||||
port: ${{ secrets.SSH_PORT }}
|
|
||||||
script: |
|
|
||||||
set -e
|
|
||||||
if [ ! -d ~/imphnen-frontend-service-hackathon ]; then
|
|
||||||
git clone https://github.com/IMPHNEN/imphnen-frontend-service.git ~/imphnen-frontend-service-hackathon
|
|
||||||
else
|
|
||||||
cd ~/imphnen-frontend-service-hackathon && git fetch origin && git reset --hard origin/develop && git pull
|
|
||||||
fi
|
|
||||||
cat > ~/imphnen-frontend-service-hackathon/apps/hackathon/.env << EOF
|
|
||||||
VITE_API_URL=${{ secrets.VITE_API_URL }}
|
|
||||||
VITE_SUPABASE_URL=${{ secrets.VITE_SUPABASE_URL }}
|
|
||||||
VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }}
|
|
||||||
EOF
|
|
||||||
docker compose -f ~/imphnen-frontend-service-hackathon/docker-compose-hackathon.yml down || true
|
|
||||||
docker compose -f ~/imphnen-frontend-service-hackathon/docker-compose-hackathon.yml build
|
|
||||||
docker compose -f ~/imphnen-frontend-service-hackathon/docker-compose-hackathon.yml up -d
|
|
||||||
docker image prune -af
|
|
||||||
@@ -26,13 +26,9 @@ jobs:
|
|||||||
if [ ! -d ~/imphnen-frontend-service ]; then
|
if [ ! -d ~/imphnen-frontend-service ]; then
|
||||||
git clone https://github.com/IMPHNEN/imphnen-frontend-service.git ~/imphnen-frontend-service
|
git clone https://github.com/IMPHNEN/imphnen-frontend-service.git ~/imphnen-frontend-service
|
||||||
else
|
else
|
||||||
cd ~/imphnen-frontend-service && git fetch origin && git reset --hard origin/develop && git pull
|
cd ~/imphnen-frontend-service && git pull
|
||||||
fi
|
fi
|
||||||
cat > ~/imphnen-frontend-service/apps/landing/.env << EOF
|
echo "NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL }}" > ~/imphnen-frontend-service/apps/landing/.env
|
||||||
NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL }}
|
|
||||||
NEXT_PUBLIC_SUPABASE_URL=${{ secrets.NEXT_PUBLIC_SUPABASE_URL }}
|
|
||||||
NEXT_PUBLIC_SUPABASE_ANON_KEY=${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}
|
|
||||||
EOF
|
|
||||||
docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml down || true
|
docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml down || true
|
||||||
docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml build
|
docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml build
|
||||||
docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml up -d
|
docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml up -d
|
||||||
|
|||||||
@@ -62,7 +62,3 @@ storybook-static
|
|||||||
# Next.js
|
# Next.js
|
||||||
.next
|
.next
|
||||||
out
|
out
|
||||||
.cursor/rules/nx-rules.mdc
|
|
||||||
.github/instructions/nx.instructions.md
|
|
||||||
|
|
||||||
.env.local
|
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
# Deployment trigger
|
|
||||||
# Updated to deploy circular dependency fixes and auth hooks
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# Deployment trigger
|
|
||||||
# Updated to deploy circular dependency fixes and auth hooks
|
|
||||||
@@ -3,8 +3,9 @@
|
|||||||
import React, { createContext, useContext, useMemo, useCallback } from 'react';
|
import React, { createContext, useContext, useMemo, useCallback } from 'react';
|
||||||
import { useParams } from 'react-router-dom';
|
import { useParams } from 'react-router-dom';
|
||||||
import { useQueryClient } from '@tanstack/react-query';
|
import { useQueryClient } from '@tanstack/react-query';
|
||||||
|
import { useAuthStore } from '@imphnen-frontend-service/utils';
|
||||||
import {
|
import {
|
||||||
useAuthStore,
|
|
||||||
useUserMe,
|
useUserMe,
|
||||||
useUserById,
|
useUserById,
|
||||||
useUpdateUserMe,
|
useUpdateUserMe,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { useCallback } from 'react';
|
import { useCallback } from 'react';
|
||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
import { useNavigate } from 'react-router-dom';
|
import { useNavigate } from 'react-router-dom';
|
||||||
import { useAuthStore } from '@imphnen-frontend-service/service';
|
import { useAuthStore } from '@imphnen-frontend-service/utils';
|
||||||
|
|
||||||
export interface GoogleLoginResponse {
|
export interface GoogleLoginResponse {
|
||||||
access_token?: string;
|
access_token?: string;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { FC, ReactElement, useEffect } from 'react';
|
import { FC, ReactElement, useEffect } from 'react';
|
||||||
import { useSearchParams, useNavigate } from 'react-router-dom';
|
import { useSearchParams, useNavigate } from 'react-router-dom';
|
||||||
import { useGoogleCallback, useAuthStore } from '@imphnen-frontend-service/service';
|
import { useAuthStore } from '@imphnen-frontend-service/utils';
|
||||||
|
import { useGoogleCallback } from '@imphnen-frontend-service/service';
|
||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
|
|
||||||
export const GoogleCallbackPage: FC = (): ReactElement => {
|
export const GoogleCallbackPage: FC = (): ReactElement => {
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
# Deployment trigger
|
|
||||||
# Updated to deploy circular dependency fixes and auth hooks
|
|
||||||
@@ -3,9 +3,9 @@ import {
|
|||||||
authLoginSchema,
|
authLoginSchema,
|
||||||
TLoginRequest,
|
TLoginRequest,
|
||||||
usePostLogin,
|
usePostLogin,
|
||||||
useAuthStore,
|
|
||||||
} from '@imphnen-frontend-service/service';
|
} from '@imphnen-frontend-service/service';
|
||||||
import { zodResolver } from '@hookform/resolvers/zod';
|
import { zodResolver } from '@hookform/resolvers/zod';
|
||||||
|
import { useAuthStore } from '@imphnen-frontend-service/utils';
|
||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
import { useNavigate } from 'react-router';
|
import { useNavigate } from 'react-router';
|
||||||
import { useVerifyEmail } from './use-verify-email';
|
import { useVerifyEmail } from './use-verify-email';
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
# Deployment trigger
|
|
||||||
# Updated to deploy circular dependency fixes and auth hooks
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import nx from '@nx/eslint-plugin';
|
|
||||||
import baseConfig from '../../eslint.config.mjs';
|
|
||||||
|
|
||||||
export default [
|
|
||||||
...baseConfig,
|
|
||||||
...nx.configs['flat/react'],
|
|
||||||
{
|
|
||||||
files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
|
|
||||||
// Override or add rules here
|
|
||||||
rules: {
|
|
||||||
'jsx-a11y/accessible-emoji': 'off',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
];
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8" />
|
|
||||||
<title>Hackathon</title>
|
|
||||||
<base href="/" />
|
|
||||||
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
|
||||||
<link rel="icon" type="image/x-icon" href="/logos/simple.svg" />
|
|
||||||
<link rel="stylesheet" href="/src/index.css" />
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="root"></div>
|
|
||||||
<script type="module" src="/src/main.tsx"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
import { join } from 'path';
|
|
||||||
|
|
||||||
export default {
|
|
||||||
plugins: {
|
|
||||||
'@tailwindcss/postcss': {
|
|
||||||
base: join(import.meta.dirname, '../../'),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
import { Link } from 'react-router-dom';
|
|
||||||
|
|
||||||
export default function NotFoundPage() {
|
|
||||||
return (
|
|
||||||
<div className="min-h-screen flex items-center justify-center bg-gray-50">
|
|
||||||
<div className="text-center">
|
|
||||||
<h1 className="text-9xl font-bold text-gray-200 mb-4">404</h1>
|
|
||||||
<h2 className="text-3xl font-semibold text-gray-900 mb-4">
|
|
||||||
Page Not Found
|
|
||||||
</h2>
|
|
||||||
<p className="text-gray-600 mb-8">
|
|
||||||
The page you are looking for doesn't exist or has been moved.
|
|
||||||
</p>
|
|
||||||
<Link
|
|
||||||
to="/"
|
|
||||||
className="inline-block px-6 py-3 bg-primary-600 text-white rounded-lg hover:bg-primary-700 transition-colors"
|
|
||||||
>
|
|
||||||
Go Back Home
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,179 +0,0 @@
|
|||||||
import { FC, ReactElement, useEffect, useState, useRef } from 'react';
|
|
||||||
import { useNavigate } from 'react-router';
|
|
||||||
import { useAuthStore, supabase } from '@imphnen-frontend-service/service';
|
|
||||||
import { toast } from 'sonner';
|
|
||||||
|
|
||||||
const CallbackPage: FC = (): ReactElement => {
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const { setSession } = useAuthStore();
|
|
||||||
const [isProcessing, setIsProcessing] = useState(true);
|
|
||||||
const [error, setError] = useState<string | null>(null);
|
|
||||||
const hasRunRef = useRef(false);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const handleCallback = async () => {
|
|
||||||
if (hasRunRef.current) {
|
|
||||||
console.log('[Callback] Already processed, skipping...');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
hasRunRef.current = true;
|
|
||||||
try {
|
|
||||||
console.log('[Callback] Processing OAuth callback...');
|
|
||||||
console.log('[Callback] Current URL:', globalThis.location.href);
|
|
||||||
|
|
||||||
// Supabase client is configured with detectSessionInUrl: true
|
|
||||||
// This means Supabase automatically detects and processes OAuth tokens from the URL hash
|
|
||||||
// We just need to wait a moment for it to complete, then check for the session
|
|
||||||
|
|
||||||
console.log('[Callback] Waiting for Supabase to process OAuth callback...');
|
|
||||||
await new Promise(resolve => setTimeout(resolve, 1000));
|
|
||||||
|
|
||||||
// Get the session that Supabase automatically created from the URL hash
|
|
||||||
const { data: { session: sessionData }, error: sessionError } = await supabase.auth.getSession();
|
|
||||||
|
|
||||||
if (sessionError) {
|
|
||||||
console.error('[Callback] Session error:', sessionError);
|
|
||||||
throw new Error(sessionError.message || 'Failed to get session');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!sessionData || !sessionData.user) {
|
|
||||||
throw new Error('No session found after OAuth callback. Please try logging in again.');
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log('[Callback] Supabase session established:', {
|
|
||||||
userId: sessionData.user.id,
|
|
||||||
email: sessionData.user.email,
|
|
||||||
});
|
|
||||||
|
|
||||||
// Create/update user in the users table (for foreign key constraints)
|
|
||||||
console.log('[Callback] Creating/updating user record...');
|
|
||||||
const { data: userData, error: upsertError } = await supabase
|
|
||||||
.from('users')
|
|
||||||
.upsert({
|
|
||||||
id: sessionData.user.id,
|
|
||||||
email: sessionData.user.email || '',
|
|
||||||
fullname: sessionData.user.user_metadata?.full_name ||
|
|
||||||
sessionData.user.user_metadata?.name ||
|
|
||||||
sessionData.user.email?.split('@')[0] || '',
|
|
||||||
avatar: sessionData.user.user_metadata?.avatar_url || '',
|
|
||||||
is_active: true,
|
|
||||||
updated_at: new Date().toISOString(),
|
|
||||||
}, {
|
|
||||||
onConflict: 'id',
|
|
||||||
})
|
|
||||||
.select()
|
|
||||||
.single();
|
|
||||||
|
|
||||||
if (upsertError) {
|
|
||||||
console.warn('[Callback] Failed to create user record:', upsertError);
|
|
||||||
// Don't throw - continue with login even if user record creation fails
|
|
||||||
} else {
|
|
||||||
console.log('[Callback] User record created/updated successfully');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store user-friendly data in Zustand for UI purposes
|
|
||||||
// Supabase now manages the actual auth session
|
|
||||||
// Use data from database if available, otherwise use OAuth metadata
|
|
||||||
const userRecord = userData || {
|
|
||||||
id: sessionData.user.id,
|
|
||||||
email: sessionData.user.email || '',
|
|
||||||
fullname: sessionData.user.user_metadata?.full_name ||
|
|
||||||
sessionData.user.user_metadata?.name ||
|
|
||||||
sessionData.user.email?.split('@')[0] || '',
|
|
||||||
avatar: sessionData.user.user_metadata?.avatar_url || '',
|
|
||||||
phone_number: '',
|
|
||||||
birthdate: '',
|
|
||||||
gender: '',
|
|
||||||
is_active: true,
|
|
||||||
};
|
|
||||||
|
|
||||||
setSession({
|
|
||||||
token: {
|
|
||||||
access_token: sessionData.access_token,
|
|
||||||
refresh_token: sessionData.refresh_token || '',
|
|
||||||
},
|
|
||||||
user: {
|
|
||||||
id: userRecord.id,
|
|
||||||
email: userRecord.email,
|
|
||||||
fullname: userRecord.fullname,
|
|
||||||
phone_number: userRecord.phone_number || '',
|
|
||||||
avatar: userRecord.avatar || '',
|
|
||||||
birthdate: userRecord.birthdate || '',
|
|
||||||
gender: userRecord.gender || '',
|
|
||||||
is_active: userRecord.is_active,
|
|
||||||
location: userRecord.location,
|
|
||||||
bio: userRecord.bio,
|
|
||||||
skills: userRecord.skills,
|
|
||||||
role: {
|
|
||||||
id: '',
|
|
||||||
name: 'user',
|
|
||||||
permissions: [],
|
|
||||||
created_at: '',
|
|
||||||
updated_at: '',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log('[Callback] Session stored successfully');
|
|
||||||
toast.success('Login successful!');
|
|
||||||
setIsProcessing(false);
|
|
||||||
|
|
||||||
// Check if user has completed onboarding (has location)
|
|
||||||
// Use globalThis.location.replace for hard redirect to prevent history issues
|
|
||||||
if (userRecord.location) {
|
|
||||||
console.log('[Callback] User has completed onboarding, redirecting to dashboard...');
|
|
||||||
globalThis.location.replace('/dashboard');
|
|
||||||
} else {
|
|
||||||
console.log('[Callback] User needs onboarding, redirecting...');
|
|
||||||
globalThis.location.replace('/onboarding/user');
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.error('[Callback] Error:', err);
|
|
||||||
setError((err as Error).message);
|
|
||||||
setIsProcessing(false);
|
|
||||||
toast.error('An error occurred during login');
|
|
||||||
|
|
||||||
setTimeout(() => {
|
|
||||||
navigate('/auth/login');
|
|
||||||
}, 3000);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
handleCallback();
|
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
||||||
}, []); // Run only once on mount
|
|
||||||
|
|
||||||
if (error) {
|
|
||||||
return (
|
|
||||||
<div className="flex justify-center items-center min-h-screen bg-gray-50 px-4">
|
|
||||||
<div className="bg-white w-full max-w-2xl p-8 rounded-2xl shadow-lg border border-red-200">
|
|
||||||
<div className="text-center mb-6">
|
|
||||||
<div className="text-red-500 text-5xl mb-4">⚠️</div>
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900 mb-2">
|
|
||||||
GitHub Login Failed
|
|
||||||
</h2>
|
|
||||||
<p className="text-red-600 mb-4 whitespace-pre-line">{error}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<p className="text-gray-600 text-sm mt-6 text-center">
|
|
||||||
Redirecting to login page in 3 seconds...
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="flex justify-center items-center min-h-screen bg-gray-50">
|
|
||||||
<div className="text-center">
|
|
||||||
<div className="inline-block animate-spin rounded-full h-12 w-12 border-b-2 border-primary-600 mb-4"></div>
|
|
||||||
<h2 className="text-xl font-semibold text-gray-900 mb-2">
|
|
||||||
Completing login...
|
|
||||||
</h2>
|
|
||||||
<p className="text-gray-600">Please wait</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default CallbackPage;
|
|
||||||
@@ -1,125 +0,0 @@
|
|||||||
import { useState } from 'react';
|
|
||||||
import { supabase } from '@imphnen-frontend-service/service';
|
|
||||||
import { Link } from 'react-router';
|
|
||||||
import { toast } from 'sonner';
|
|
||||||
|
|
||||||
export default function ForgotPasswordPage() {
|
|
||||||
const [email, setEmail] = useState('');
|
|
||||||
const [isLoading, setIsLoading] = useState(false);
|
|
||||||
const [emailSent, setEmailSent] = useState(false);
|
|
||||||
|
|
||||||
const handleSubmit = async (e: React.FormEvent) => {
|
|
||||||
e.preventDefault();
|
|
||||||
|
|
||||||
if (!email) {
|
|
||||||
toast.error('Please enter your email');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
setIsLoading(true);
|
|
||||||
|
|
||||||
const { error } = await supabase.auth.resetPasswordForEmail(email, {
|
|
||||||
redirectTo: `${window.location.origin}/auth/reset-password`,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (error) {
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
|
|
||||||
setEmailSent(true);
|
|
||||||
toast.success('Password reset email sent! Check your inbox.');
|
|
||||||
} catch (err) {
|
|
||||||
console.error('Failed to send reset email:', err);
|
|
||||||
toast.error((err as Error).message || 'Failed to send reset email');
|
|
||||||
} finally {
|
|
||||||
setIsLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if (emailSent) {
|
|
||||||
return (
|
|
||||||
<div className="flex justify-center items-center min-h-screen bg-gray-50 p-4">
|
|
||||||
<div className="bg-white w-full max-w-md p-8 rounded-2xl shadow-lg border border-gray-200 text-center">
|
|
||||||
<div className="mb-6">
|
|
||||||
<div className="mx-auto w-16 h-16 bg-green-100 rounded-full flex items-center justify-center mb-4">
|
|
||||||
<span className="text-3xl">✓</span>
|
|
||||||
</div>
|
|
||||||
<h2 className="text-3xl font-bold text-gray-900 mb-2">
|
|
||||||
Check Your Email
|
|
||||||
</h2>
|
|
||||||
<p className="text-gray-600">
|
|
||||||
We've sent a password reset link to <strong>{email}</strong>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="space-y-4">
|
|
||||||
<p className="text-sm text-gray-600">
|
|
||||||
Click the link in the email to reset your password. The link will expire in 1 hour.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<Link to="/auth/login">
|
|
||||||
<button className="w-full py-3 bg-primary-600 text-white rounded-lg font-semibold hover:bg-primary-700 transition-colors">
|
|
||||||
Back to Login
|
|
||||||
</button>
|
|
||||||
</Link>
|
|
||||||
|
|
||||||
<button
|
|
||||||
onClick={() => setEmailSent(false)}
|
|
||||||
className="w-full py-3 text-gray-600 hover:text-gray-900 transition-colors"
|
|
||||||
>
|
|
||||||
Send another email
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="flex justify-center items-center min-h-screen bg-gray-50 p-4">
|
|
||||||
<div className="bg-white w-full max-w-md p-8 rounded-2xl shadow-lg border border-gray-200">
|
|
||||||
<div className="text-center mb-8">
|
|
||||||
<h2 className="text-3xl font-bold text-gray-900 mb-2">
|
|
||||||
Forgot Password?
|
|
||||||
</h2>
|
|
||||||
<p className="text-gray-600">
|
|
||||||
No worries, we'll send you reset instructions
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<form onSubmit={handleSubmit} className="space-y-4">
|
|
||||||
<div>
|
|
||||||
<label htmlFor="email" className="block text-sm font-medium text-gray-700 mb-1">
|
|
||||||
Email Address
|
|
||||||
</label>
|
|
||||||
<input
|
|
||||||
id="email"
|
|
||||||
type="email"
|
|
||||||
value={email}
|
|
||||||
onChange={(e) => setEmail(e.target.value)}
|
|
||||||
placeholder="your@email.com"
|
|
||||||
disabled={isLoading}
|
|
||||||
className="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent disabled:bg-gray-100 disabled:cursor-not-allowed"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button
|
|
||||||
type="submit"
|
|
||||||
disabled={isLoading}
|
|
||||||
className="w-full py-3 bg-primary-600 text-white rounded-lg font-semibold hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 disabled:bg-gray-400 disabled:cursor-not-allowed transition-colors"
|
|
||||||
>
|
|
||||||
{isLoading ? 'Sending...' : 'Send Reset Link'}
|
|
||||||
</button>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<div className="mt-6 text-center">
|
|
||||||
<Link to="/auth/login" className="text-primary-600 hover:text-primary-700 font-semibold">
|
|
||||||
← Back to Login
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,89 +0,0 @@
|
|||||||
import { FC, ReactElement, useEffect, useState } from 'react';
|
|
||||||
import { Button } from '@imphnen-frontend-service/ui/atoms';
|
|
||||||
import { useNavigate } from 'react-router';
|
|
||||||
import { useGitHubAuth } from '@imphnen-frontend-service/service';
|
|
||||||
import { useSession } from '@imphnen-frontend-service/utils';
|
|
||||||
import { GithubOutlined } from '@ant-design/icons';
|
|
||||||
|
|
||||||
const LoginPage: FC = (): ReactElement => {
|
|
||||||
console.log('[LoginPage] Rendering...');
|
|
||||||
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const { signInWithGitHub } = useGitHubAuth();
|
|
||||||
const [isGithubLoading, setIsGithubLoading] = useState(false);
|
|
||||||
const { isAuthenticated } = useSession();
|
|
||||||
|
|
||||||
console.log('[LoginPage] isAuthenticated:', isAuthenticated);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
console.log('[LoginPage] useEffect - isAuthenticated:', isAuthenticated);
|
|
||||||
if (isAuthenticated) {
|
|
||||||
console.log('[LoginPage] Redirecting to dashboard...');
|
|
||||||
navigate('/dashboard');
|
|
||||||
}
|
|
||||||
}, [isAuthenticated, navigate]);
|
|
||||||
|
|
||||||
const handleGithubLogin = async () => {
|
|
||||||
try {
|
|
||||||
setIsGithubLoading(true);
|
|
||||||
console.log('[Login] Initiating GitHub OAuth...');
|
|
||||||
|
|
||||||
const result = await signInWithGitHub();
|
|
||||||
console.log('[Login] OAuth result:', result);
|
|
||||||
|
|
||||||
// Check if we got a redirect URL
|
|
||||||
if (result?.url) {
|
|
||||||
console.log('[Login] Redirecting to GitHub OAuth:', result.url);
|
|
||||||
// Supabase should handle the redirect automatically
|
|
||||||
// If we're still here after 2 seconds, manually redirect
|
|
||||||
setTimeout(() => {
|
|
||||||
if (result.url) {
|
|
||||||
globalThis.location.href = result.url;
|
|
||||||
}
|
|
||||||
}, 2000);
|
|
||||||
} else {
|
|
||||||
console.error('[Login] No OAuth URL returned');
|
|
||||||
setIsGithubLoading(false);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('[Login] GitHub login failed:', error);
|
|
||||||
setIsGithubLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="flex justify-center items-center min-h-screen bg-gray-50 px-4">
|
|
||||||
<div className="bg-white w-full max-w-md p-8 rounded-2xl shadow-lg border border-gray-100">
|
|
||||||
<div className="text-center mb-8">
|
|
||||||
<h2 className="text-3xl font-bold text-gray-900 mb-2">
|
|
||||||
Welcome to Hackathon
|
|
||||||
</h2>
|
|
||||||
<p className="text-gray-600">
|
|
||||||
Sign in with your GitHub account to join or create your hackathon team
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<Button
|
|
||||||
className="w-full gap-2 py-3"
|
|
||||||
variant="secondary"
|
|
||||||
onClick={handleGithubLogin}
|
|
||||||
disabled={isGithubLoading}
|
|
||||||
type="button"
|
|
||||||
>
|
|
||||||
<GithubOutlined className="text-xl" />
|
|
||||||
<span className="font-semibold">
|
|
||||||
{isGithubLoading ? 'Connecting...' : 'Sign in with GitHub'}
|
|
||||||
</span>
|
|
||||||
</Button>
|
|
||||||
|
|
||||||
<div className="mt-6 text-center">
|
|
||||||
<p className="text-gray-500 text-sm">
|
|
||||||
By signing in, you agree to our Terms of Service and Privacy Policy
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default LoginPage;
|
|
||||||
@@ -1,209 +0,0 @@
|
|||||||
import { useState } from 'react';
|
|
||||||
import { useGitHubAuth, useEmailAuth, supabase, useAuthStore } from '@imphnen-frontend-service/service';
|
|
||||||
import { GithubOutlined } from '@ant-design/icons';
|
|
||||||
import { useNavigate, Link } from 'react-router';
|
|
||||||
import { toast } from 'sonner';
|
|
||||||
|
|
||||||
export default function LoginPage() {
|
|
||||||
console.log('[LoginPage] Rendering...');
|
|
||||||
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const { setSession } = useAuthStore();
|
|
||||||
const { signInWithGitHub } = useGitHubAuth();
|
|
||||||
const { signInWithEmail } = useEmailAuth();
|
|
||||||
const [isGithubLoading, setIsGithubLoading] = useState(false);
|
|
||||||
const [isEmailLoading, setIsEmailLoading] = useState(false);
|
|
||||||
const [email, setEmail] = useState('');
|
|
||||||
const [password, setPassword] = useState('');
|
|
||||||
const [error, setError] = useState<string | null>(null);
|
|
||||||
|
|
||||||
const handleEmailLogin = async (e: React.FormEvent) => {
|
|
||||||
e.preventDefault();
|
|
||||||
setError(null);
|
|
||||||
|
|
||||||
if (!email || !password) {
|
|
||||||
setError('Please enter both email and password');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
setIsEmailLoading(true);
|
|
||||||
console.log('[Login] Attempting email login...');
|
|
||||||
|
|
||||||
const result = await signInWithEmail(email, password);
|
|
||||||
console.log('[Login] Email login successful:', result);
|
|
||||||
|
|
||||||
// Get user data from database
|
|
||||||
const { data: userData } = await supabase
|
|
||||||
.from('users')
|
|
||||||
.select('*')
|
|
||||||
.eq('id', result.user.id)
|
|
||||||
.single();
|
|
||||||
|
|
||||||
// Store session in Zustand
|
|
||||||
setSession({
|
|
||||||
token: {
|
|
||||||
access_token: result.session.access_token,
|
|
||||||
refresh_token: result.session.refresh_token || '',
|
|
||||||
},
|
|
||||||
user: {
|
|
||||||
id: result.user.id,
|
|
||||||
email: result.user.email || '',
|
|
||||||
fullname: userData?.fullname || result.user.user_metadata?.full_name || '',
|
|
||||||
phone_number: userData?.phone_number || '',
|
|
||||||
avatar: userData?.avatar || '',
|
|
||||||
birthdate: userData?.birthdate || '',
|
|
||||||
gender: userData?.gender || '',
|
|
||||||
is_active: userData?.is_active || true,
|
|
||||||
location: userData?.location,
|
|
||||||
bio: userData?.bio,
|
|
||||||
skills: userData?.skills,
|
|
||||||
role: {
|
|
||||||
id: '',
|
|
||||||
name: 'user',
|
|
||||||
permissions: [],
|
|
||||||
created_at: '',
|
|
||||||
updated_at: '',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
toast.success('Login successful!');
|
|
||||||
|
|
||||||
// Redirect based on onboarding status
|
|
||||||
if (userData?.location) {
|
|
||||||
navigate('/dashboard');
|
|
||||||
} else {
|
|
||||||
navigate('/onboarding/user');
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.error('[Login] Email login failed:', err);
|
|
||||||
setError((err as Error).message || 'Login failed');
|
|
||||||
setIsEmailLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleGithubLogin = async () => {
|
|
||||||
try {
|
|
||||||
setIsGithubLoading(true);
|
|
||||||
console.log('[Login] Initiating GitHub OAuth...');
|
|
||||||
|
|
||||||
const result = await signInWithGitHub();
|
|
||||||
console.log('[Login] OAuth result:', result);
|
|
||||||
|
|
||||||
// Check if we got a redirect URL
|
|
||||||
if (result?.url) {
|
|
||||||
console.log('[Login] Redirecting to GitHub OAuth:', result.url);
|
|
||||||
// Manually redirect immediately
|
|
||||||
globalThis.location.href = result.url;
|
|
||||||
} else {
|
|
||||||
console.error('[Login] No OAuth URL returned');
|
|
||||||
setIsGithubLoading(false);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('[Login] GitHub login failed:', error);
|
|
||||||
setIsGithubLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="flex justify-center items-center min-h-screen bg-gray-50 p-4">
|
|
||||||
<div className="bg-white w-full max-w-md p-8 rounded-2xl shadow-lg border border-gray-200">
|
|
||||||
<div className="text-center mb-8">
|
|
||||||
<h2 className="text-3xl font-bold text-gray-900 mb-2">
|
|
||||||
Welcome Back
|
|
||||||
</h2>
|
|
||||||
<p className="text-gray-600">
|
|
||||||
Sign in to join or create your hackathon team
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{error && (
|
|
||||||
<div className="mb-6 p-3 bg-red-50 border border-red-200 rounded-lg">
|
|
||||||
<p className="text-red-600 text-sm">{error}</p>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<form onSubmit={handleEmailLogin} className="space-y-4">
|
|
||||||
<div>
|
|
||||||
<label htmlFor="email" className="block text-sm font-medium text-gray-700 mb-1">
|
|
||||||
Email
|
|
||||||
</label>
|
|
||||||
<input
|
|
||||||
id="email"
|
|
||||||
type="email"
|
|
||||||
value={email}
|
|
||||||
onChange={(e) => setEmail(e.target.value)}
|
|
||||||
placeholder="your@email.com"
|
|
||||||
disabled={isEmailLoading}
|
|
||||||
className="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent disabled:bg-gray-100 disabled:cursor-not-allowed"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<div className="flex items-center justify-between mb-1">
|
|
||||||
<label htmlFor="password" className="block text-sm font-medium text-gray-700">
|
|
||||||
Password
|
|
||||||
</label>
|
|
||||||
<Link to="/auth/forgot-password" className="text-sm text-primary-600 hover:text-primary-700">
|
|
||||||
Forgot password?
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
<input
|
|
||||||
id="password"
|
|
||||||
type="password"
|
|
||||||
value={password}
|
|
||||||
onChange={(e) => setPassword(e.target.value)}
|
|
||||||
placeholder="••••••••"
|
|
||||||
disabled={isEmailLoading}
|
|
||||||
className="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent disabled:bg-gray-100 disabled:cursor-not-allowed"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button
|
|
||||||
type="submit"
|
|
||||||
disabled={isEmailLoading}
|
|
||||||
className="w-full py-3 bg-primary-600 text-white rounded-lg font-semibold hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 disabled:bg-gray-400 disabled:cursor-not-allowed transition-colors"
|
|
||||||
>
|
|
||||||
{isEmailLoading ? 'Signing in...' : 'Sign in with Email'}
|
|
||||||
</button>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<div className="my-6 flex items-center">
|
|
||||||
<div className="flex-1 border-t border-gray-300"></div>
|
|
||||||
<span className="px-4 text-sm text-gray-500">OR</span>
|
|
||||||
<div className="flex-1 border-t border-gray-300"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button
|
|
||||||
onClick={handleGithubLogin}
|
|
||||||
disabled={isGithubLoading}
|
|
||||||
type="button"
|
|
||||||
className="w-full py-3 flex items-center justify-center gap-2 bg-gray-100 border border-gray-300 rounded-lg font-semibold hover:bg-gray-200 focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 disabled:bg-gray-100 disabled:cursor-not-allowed transition-colors"
|
|
||||||
>
|
|
||||||
<GithubOutlined className="text-xl" />
|
|
||||||
<span>
|
|
||||||
{isGithubLoading ? 'Connecting...' : 'Sign in with GitHub'}
|
|
||||||
</span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<div className="mt-6 text-center">
|
|
||||||
<p className="text-gray-600 text-sm">
|
|
||||||
Don't have an account?{' '}
|
|
||||||
<a href="/auth/signup" className="text-primary-600 hover:text-primary-700 font-semibold">
|
|
||||||
Sign up
|
|
||||||
</a>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="mt-6 text-center">
|
|
||||||
<p className="text-gray-500 text-xs">
|
|
||||||
By signing in, you agree to our Terms of Service and Privacy Policy
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,131 +0,0 @@
|
|||||||
import { useState, useEffect } from 'react';
|
|
||||||
import { supabase } from '@imphnen-frontend-service/service';
|
|
||||||
import { useNavigate } from 'react-router';
|
|
||||||
import { toast } from 'sonner';
|
|
||||||
|
|
||||||
export default function ResetPasswordPage() {
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const [password, setPassword] = useState('');
|
|
||||||
const [confirmPassword, setConfirmPassword] = useState('');
|
|
||||||
const [isLoading, setIsLoading] = useState(false);
|
|
||||||
const [isValidToken, setIsValidToken] = useState(false);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
// Check if we have a valid session (from the reset link)
|
|
||||||
supabase.auth.getSession().then(({ data: { session } }) => {
|
|
||||||
if (session) {
|
|
||||||
setIsValidToken(true);
|
|
||||||
} else {
|
|
||||||
toast.error('Invalid or expired reset link');
|
|
||||||
setTimeout(() => navigate('/auth/forgot-password'), 2000);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}, [navigate]);
|
|
||||||
|
|
||||||
const handleSubmit = async (e: React.FormEvent) => {
|
|
||||||
e.preventDefault();
|
|
||||||
|
|
||||||
if (password !== confirmPassword) {
|
|
||||||
toast.error('Passwords do not match');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (password.length < 6) {
|
|
||||||
toast.error('Password must be at least 6 characters');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
setIsLoading(true);
|
|
||||||
|
|
||||||
const { error } = await supabase.auth.updateUser({
|
|
||||||
password: password
|
|
||||||
});
|
|
||||||
|
|
||||||
if (error) {
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
|
|
||||||
toast.success('Password updated successfully!');
|
|
||||||
|
|
||||||
// Sign out and redirect to login
|
|
||||||
await supabase.auth.signOut();
|
|
||||||
navigate('/auth/login');
|
|
||||||
} catch (err) {
|
|
||||||
console.error('Failed to reset password:', err);
|
|
||||||
toast.error((err as Error).message || 'Failed to reset password');
|
|
||||||
} finally {
|
|
||||||
setIsLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!isValidToken) {
|
|
||||||
return (
|
|
||||||
<div className="flex justify-center items-center min-h-screen bg-gray-50">
|
|
||||||
<div className="text-center">
|
|
||||||
<div className="inline-block animate-spin rounded-full h-12 w-12 border-b-2 border-primary-600 mb-4"></div>
|
|
||||||
<p className="text-gray-600">Verifying reset link...</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="flex justify-center items-center min-h-screen bg-gray-50 p-4">
|
|
||||||
<div className="bg-white w-full max-w-md p-8 rounded-2xl shadow-lg border border-gray-200">
|
|
||||||
<div className="text-center mb-8">
|
|
||||||
<h2 className="text-3xl font-bold text-gray-900 mb-2">
|
|
||||||
Set New Password
|
|
||||||
</h2>
|
|
||||||
<p className="text-gray-600">
|
|
||||||
Enter your new password below
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<form onSubmit={handleSubmit} className="space-y-4">
|
|
||||||
<div>
|
|
||||||
<label htmlFor="password" className="block text-sm font-medium text-gray-700 mb-1">
|
|
||||||
New Password
|
|
||||||
</label>
|
|
||||||
<input
|
|
||||||
id="password"
|
|
||||||
type="password"
|
|
||||||
value={password}
|
|
||||||
onChange={(e) => setPassword(e.target.value)}
|
|
||||||
placeholder="••••••••"
|
|
||||||
disabled={isLoading}
|
|
||||||
className="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent disabled:bg-gray-100 disabled:cursor-not-allowed"
|
|
||||||
required
|
|
||||||
minLength={6}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label htmlFor="confirmPassword" className="block text-sm font-medium text-gray-700 mb-1">
|
|
||||||
Confirm New Password
|
|
||||||
</label>
|
|
||||||
<input
|
|
||||||
id="confirmPassword"
|
|
||||||
type="password"
|
|
||||||
value={confirmPassword}
|
|
||||||
onChange={(e) => setConfirmPassword(e.target.value)}
|
|
||||||
placeholder="••••••••"
|
|
||||||
disabled={isLoading}
|
|
||||||
className="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent disabled:bg-gray-100 disabled:cursor-not-allowed"
|
|
||||||
required
|
|
||||||
minLength={6}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button
|
|
||||||
type="submit"
|
|
||||||
disabled={isLoading}
|
|
||||||
className="w-full py-3 bg-primary-600 text-white rounded-lg font-semibold hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 disabled:bg-gray-400 disabled:cursor-not-allowed transition-colors"
|
|
||||||
>
|
|
||||||
{isLoading ? 'Updating...' : 'Update Password'}
|
|
||||||
</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,257 +0,0 @@
|
|||||||
import { useState } from 'react';
|
|
||||||
import { useGitHubAuth, useEmailAuth, supabase, useAuthStore } from '@imphnen-frontend-service/service';
|
|
||||||
import { GithubOutlined } from '@ant-design/icons';
|
|
||||||
import { useNavigate } from 'react-router';
|
|
||||||
import { toast } from 'sonner';
|
|
||||||
|
|
||||||
export default function SignupPage() {
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const { setSession } = useAuthStore();
|
|
||||||
const { signInWithGitHub } = useGitHubAuth();
|
|
||||||
const { signUpWithEmail } = useEmailAuth();
|
|
||||||
const [isGithubLoading, setIsGithubLoading] = useState(false);
|
|
||||||
const [isEmailLoading, setIsEmailLoading] = useState(false);
|
|
||||||
const [fullname, setFullname] = useState('');
|
|
||||||
const [email, setEmail] = useState('');
|
|
||||||
const [password, setPassword] = useState('');
|
|
||||||
const [confirmPassword, setConfirmPassword] = useState('');
|
|
||||||
const [error, setError] = useState<string | null>(null);
|
|
||||||
|
|
||||||
const handleEmailSignup = async (e: React.FormEvent) => {
|
|
||||||
e.preventDefault();
|
|
||||||
setError(null);
|
|
||||||
|
|
||||||
if (!fullname || !email || !password || !confirmPassword) {
|
|
||||||
setError('Please fill in all fields');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (password !== confirmPassword) {
|
|
||||||
setError('Passwords do not match');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (password.length < 6) {
|
|
||||||
setError('Password must be at least 6 characters long');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
setIsEmailLoading(true);
|
|
||||||
console.log('[Signup] Attempting email signup...');
|
|
||||||
|
|
||||||
const result = await signUpWithEmail(email, password, fullname);
|
|
||||||
console.log('[Signup] Email signup successful:', result);
|
|
||||||
|
|
||||||
if (!result.user) {
|
|
||||||
throw new Error('Signup failed - no user returned');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create user record in database
|
|
||||||
const { error: upsertError } = await supabase
|
|
||||||
.from('users')
|
|
||||||
.upsert({
|
|
||||||
id: result.user.id,
|
|
||||||
email: result.user.email || '',
|
|
||||||
fullname: fullname,
|
|
||||||
is_active: true,
|
|
||||||
updated_at: new Date().toISOString(),
|
|
||||||
}, {
|
|
||||||
onConflict: 'id',
|
|
||||||
});
|
|
||||||
|
|
||||||
if (upsertError) {
|
|
||||||
console.warn('[Signup] Failed to create user record:', upsertError);
|
|
||||||
}
|
|
||||||
|
|
||||||
// If session is available (email confirmation disabled), store it
|
|
||||||
if (result.session) {
|
|
||||||
setSession({
|
|
||||||
token: {
|
|
||||||
access_token: result.session.access_token,
|
|
||||||
refresh_token: result.session.refresh_token || '',
|
|
||||||
},
|
|
||||||
user: {
|
|
||||||
id: result.user.id,
|
|
||||||
email: result.user.email || '',
|
|
||||||
fullname: fullname,
|
|
||||||
phone_number: '',
|
|
||||||
avatar: '',
|
|
||||||
birthdate: '',
|
|
||||||
gender: '',
|
|
||||||
is_active: true,
|
|
||||||
role: {
|
|
||||||
id: '',
|
|
||||||
name: 'user',
|
|
||||||
permissions: [],
|
|
||||||
created_at: '',
|
|
||||||
updated_at: '',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
toast.success('Account created successfully!');
|
|
||||||
navigate('/onboarding/user');
|
|
||||||
} else {
|
|
||||||
// Email confirmation is enabled
|
|
||||||
toast.success('Account created! Please check your email to verify your account.');
|
|
||||||
setTimeout(() => {
|
|
||||||
navigate('/auth/login');
|
|
||||||
}, 2000);
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.error('[Signup] Email signup failed:', err);
|
|
||||||
setError((err as Error).message || 'Signup failed');
|
|
||||||
setIsEmailLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleGithubLogin = async () => {
|
|
||||||
try {
|
|
||||||
setIsGithubLoading(true);
|
|
||||||
console.log('[Signup] Initiating GitHub OAuth...');
|
|
||||||
|
|
||||||
const result = await signInWithGitHub();
|
|
||||||
console.log('[Signup] OAuth result:', result);
|
|
||||||
|
|
||||||
if (result?.url) {
|
|
||||||
console.log('[Signup] Redirecting to GitHub OAuth:', result.url);
|
|
||||||
globalThis.location.href = result.url;
|
|
||||||
} else {
|
|
||||||
console.error('[Signup] No OAuth URL returned');
|
|
||||||
setIsGithubLoading(false);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('[Signup] GitHub login failed:', error);
|
|
||||||
setIsGithubLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="flex justify-center items-center min-h-screen bg-gray-50 p-4">
|
|
||||||
<div className="bg-white w-full max-w-md p-8 rounded-2xl shadow-lg border border-gray-200">
|
|
||||||
<div className="text-center mb-8">
|
|
||||||
<h2 className="text-3xl font-bold text-gray-900 mb-2">
|
|
||||||
Create Account
|
|
||||||
</h2>
|
|
||||||
<p className="text-gray-600">
|
|
||||||
Join the hackathon community
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{error && (
|
|
||||||
<div className="mb-6 p-3 bg-red-50 border border-red-200 rounded-lg">
|
|
||||||
<p className="text-red-600 text-sm">{error}</p>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<form onSubmit={handleEmailSignup} className="space-y-4">
|
|
||||||
<div>
|
|
||||||
<label htmlFor="fullname" className="block text-sm font-medium text-gray-700 mb-1">
|
|
||||||
Full Name
|
|
||||||
</label>
|
|
||||||
<input
|
|
||||||
id="fullname"
|
|
||||||
type="text"
|
|
||||||
value={fullname}
|
|
||||||
onChange={(e) => setFullname(e.target.value)}
|
|
||||||
placeholder="John Doe"
|
|
||||||
disabled={isEmailLoading}
|
|
||||||
className="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent disabled:bg-gray-100 disabled:cursor-not-allowed"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label htmlFor="email" className="block text-sm font-medium text-gray-700 mb-1">
|
|
||||||
Email
|
|
||||||
</label>
|
|
||||||
<input
|
|
||||||
id="email"
|
|
||||||
type="email"
|
|
||||||
value={email}
|
|
||||||
onChange={(e) => setEmail(e.target.value)}
|
|
||||||
placeholder="your@email.com"
|
|
||||||
disabled={isEmailLoading}
|
|
||||||
className="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent disabled:bg-gray-100 disabled:cursor-not-allowed"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label htmlFor="password" className="block text-sm font-medium text-gray-700 mb-1">
|
|
||||||
Password
|
|
||||||
</label>
|
|
||||||
<input
|
|
||||||
id="password"
|
|
||||||
type="password"
|
|
||||||
value={password}
|
|
||||||
onChange={(e) => setPassword(e.target.value)}
|
|
||||||
placeholder="••••••••"
|
|
||||||
disabled={isEmailLoading}
|
|
||||||
className="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent disabled:bg-gray-100 disabled:cursor-not-allowed"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<label htmlFor="confirmPassword" className="block text-sm font-medium text-gray-700 mb-1">
|
|
||||||
Confirm Password
|
|
||||||
</label>
|
|
||||||
<input
|
|
||||||
id="confirmPassword"
|
|
||||||
type="password"
|
|
||||||
value={confirmPassword}
|
|
||||||
onChange={(e) => setConfirmPassword(e.target.value)}
|
|
||||||
placeholder="••••••••"
|
|
||||||
disabled={isEmailLoading}
|
|
||||||
className="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-transparent disabled:bg-gray-100 disabled:cursor-not-allowed"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button
|
|
||||||
type="submit"
|
|
||||||
disabled={isEmailLoading}
|
|
||||||
className="w-full py-3 bg-primary-600 text-white rounded-lg font-semibold hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 disabled:bg-gray-400 disabled:cursor-not-allowed transition-colors"
|
|
||||||
>
|
|
||||||
{isEmailLoading ? 'Creating account...' : 'Create Account'}
|
|
||||||
</button>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<div className="my-6 flex items-center">
|
|
||||||
<div className="flex-1 border-t border-gray-300"></div>
|
|
||||||
<span className="px-4 text-sm text-gray-500">OR</span>
|
|
||||||
<div className="flex-1 border-t border-gray-300"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button
|
|
||||||
onClick={handleGithubLogin}
|
|
||||||
disabled={isGithubLoading}
|
|
||||||
type="button"
|
|
||||||
className="w-full py-3 flex items-center justify-center gap-2 bg-gray-100 border border-gray-300 rounded-lg font-semibold hover:bg-gray-200 focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 disabled:bg-gray-100 disabled:cursor-not-allowed transition-colors"
|
|
||||||
>
|
|
||||||
<GithubOutlined className="text-xl" />
|
|
||||||
<span>
|
|
||||||
{isGithubLoading ? 'Connecting...' : 'Sign up with GitHub'}
|
|
||||||
</span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<div className="mt-6 text-center">
|
|
||||||
<p className="text-gray-600 text-sm">
|
|
||||||
Already have an account?{' '}
|
|
||||||
<a href="/auth/login" className="text-primary-600 hover:text-primary-700 font-semibold">
|
|
||||||
Sign in
|
|
||||||
</a>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="mt-6 text-center">
|
|
||||||
<p className="text-gray-500 text-xs">
|
|
||||||
By signing up, you agree to our Terms of Service and Privacy Policy
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,282 +0,0 @@
|
|||||||
import { FC, ReactElement } from 'react';
|
|
||||||
import { Button } from '@imphnen-frontend-service/ui/atoms';
|
|
||||||
import { Link, useNavigate } from 'react-router';
|
|
||||||
import { useMyTeams, useMyInvitations, useRespondToInvitation, supabase, useAuthStore } from '@imphnen-frontend-service/service';
|
|
||||||
import { toast } from 'sonner';
|
|
||||||
|
|
||||||
const DashboardPage: FC = (): ReactElement => {
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const { session, clearSession } = useAuthStore();
|
|
||||||
const { data: teamsData } = useMyTeams();
|
|
||||||
const { data: invitationsData } = useMyInvitations();
|
|
||||||
const { mutateAsync: respondToInvitation } = useRespondToInvitation();
|
|
||||||
|
|
||||||
const user = session?.user;
|
|
||||||
const myTeams = teamsData?.data || [];
|
|
||||||
const invitations = invitationsData?.data || [];
|
|
||||||
|
|
||||||
const handleAcceptInvitation = async (invitationId: string) => {
|
|
||||||
try {
|
|
||||||
await respondToInvitation({ invitationId, action: 'accept' });
|
|
||||||
toast.success('Invitation accepted! You are now a team member.');
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to accept invitation:', error);
|
|
||||||
toast.error('Failed to accept invitation');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleRejectInvitation = async (invitationId: string) => {
|
|
||||||
try {
|
|
||||||
await respondToInvitation({ invitationId, action: 'reject' });
|
|
||||||
toast.success('Invitation declined');
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to reject invitation:', error);
|
|
||||||
toast.error('Failed to decline invitation');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleLogout = async () => {
|
|
||||||
try {
|
|
||||||
// Clear Supabase session
|
|
||||||
await supabase.auth.signOut();
|
|
||||||
|
|
||||||
// Clear Zustand store
|
|
||||||
clearSession();
|
|
||||||
|
|
||||||
// Clear localStorage
|
|
||||||
localStorage.clear();
|
|
||||||
|
|
||||||
toast.success('Logged out successfully');
|
|
||||||
|
|
||||||
// Redirect to login
|
|
||||||
navigate('/auth/login');
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Logout error:', error);
|
|
||||||
// Even if there's an error, clear everything and redirect
|
|
||||||
clearSession();
|
|
||||||
localStorage.clear();
|
|
||||||
navigate('/auth/login');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="min-h-screen bg-gray-50">
|
|
||||||
{/* Header */}
|
|
||||||
<div className="bg-white border-b">
|
|
||||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<div>
|
|
||||||
<h1 className="text-3xl font-bold text-gray-900">
|
|
||||||
Welcome, {user?.fullname || 'User'}!
|
|
||||||
</h1>
|
|
||||||
<p className="text-gray-600 mt-1">
|
|
||||||
{user?.location && `📍 ${user.location}`}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div className="flex items-center space-x-3">
|
|
||||||
{user?.avatar && (
|
|
||||||
<img
|
|
||||||
src={user.avatar}
|
|
||||||
alt="Profile"
|
|
||||||
className="w-16 h-16 rounded-full object-cover border-2 border-gray-200"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<Button
|
|
||||||
onClick={handleLogout}
|
|
||||||
variant="secondary"
|
|
||||||
className="bg-red-500 hover:bg-red-600 text-white"
|
|
||||||
>
|
|
||||||
Logout
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
|
|
||||||
{/* Team Invitations */}
|
|
||||||
{invitations.length > 0 && (
|
|
||||||
<div className="mb-8 bg-blue-50 border border-blue-200 rounded-lg p-6">
|
|
||||||
<h2 className="text-xl font-bold text-gray-900 mb-4">
|
|
||||||
Team Invitations ({invitations.length})
|
|
||||||
</h2>
|
|
||||||
<div className="space-y-3">
|
|
||||||
{invitations.map((invitation) => (
|
|
||||||
<div key={invitation.id} className="bg-white p-4 rounded-lg shadow-sm flex items-center justify-between">
|
|
||||||
<div>
|
|
||||||
<p className="font-medium text-gray-900">{invitation.team.name}</p>
|
|
||||||
<p className="text-sm text-gray-600">
|
|
||||||
Invited by {invitation.inviter.fullname}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div className="flex space-x-2">
|
|
||||||
<Button
|
|
||||||
size="sm"
|
|
||||||
onClick={() => handleAcceptInvitation(invitation.id)}
|
|
||||||
>
|
|
||||||
Accept
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
size="sm"
|
|
||||||
variant="secondary"
|
|
||||||
onClick={() => handleRejectInvitation(invitation.id)}
|
|
||||||
>
|
|
||||||
Decline
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* My Teams */}
|
|
||||||
{myTeams.length > 0 ? (
|
|
||||||
<div className="mb-8">
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900 mb-4">My Team</h2>
|
|
||||||
<div className="grid gap-6 md:grid-cols-2 lg:grid-cols-3">
|
|
||||||
{myTeams.map((team) => (
|
|
||||||
<Link
|
|
||||||
key={team.id}
|
|
||||||
to={`/teams/${team.id}`}
|
|
||||||
className="bg-white rounded-lg shadow-md overflow-hidden hover:shadow-lg transition-shadow"
|
|
||||||
>
|
|
||||||
{team.banner && (
|
|
||||||
<img
|
|
||||||
src={team.banner}
|
|
||||||
alt={team.name}
|
|
||||||
className="w-full h-32 object-cover"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<div className="p-6">
|
|
||||||
<div className="flex items-center space-x-3 mb-3">
|
|
||||||
{team.logo && (
|
|
||||||
<img
|
|
||||||
src={team.logo}
|
|
||||||
alt={team.name}
|
|
||||||
className="w-12 h-12 rounded-full object-cover"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<div>
|
|
||||||
<h3 className="text-lg font-bold text-gray-900">{team.name}</h3>
|
|
||||||
<p className="text-sm text-gray-600">📍 {team.city}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<p className="text-gray-600 text-sm line-clamp-2">
|
|
||||||
{team.description}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</Link>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
/* No Team - Show CTAs */
|
|
||||||
<div className="bg-white rounded-lg shadow-md p-8">
|
|
||||||
<div className="text-center mb-8">
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900 mb-2">
|
|
||||||
You're not in a team yet
|
|
||||||
</h2>
|
|
||||||
<p className="text-gray-600">
|
|
||||||
Join an existing team or create your own to get started
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="grid gap-6 md:grid-cols-2 max-w-2xl mx-auto">
|
|
||||||
<Link
|
|
||||||
to="/teams/browse"
|
|
||||||
className="bg-blue-600 text-white rounded-lg p-6 hover:bg-blue-700 transition-colors text-center"
|
|
||||||
>
|
|
||||||
<div className="text-4xl mb-3">🔍</div>
|
|
||||||
<h3 className="text-xl font-bold mb-2">Browse Teams</h3>
|
|
||||||
<p className="text-blue-100">
|
|
||||||
Find and join existing teams looking for members
|
|
||||||
</p>
|
|
||||||
</Link>
|
|
||||||
|
|
||||||
<Link
|
|
||||||
to="/teams/create"
|
|
||||||
className="bg-green-600 text-white rounded-lg p-6 hover:bg-green-700 transition-colors text-center"
|
|
||||||
>
|
|
||||||
<div className="text-4xl mb-3">➕</div>
|
|
||||||
<h3 className="text-xl font-bold mb-2">Create Team</h3>
|
|
||||||
<p className="text-green-100">
|
|
||||||
Start your own team and invite members
|
|
||||||
</p>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* User Profile Card */}
|
|
||||||
<div className="mt-8 bg-gradient-to-br from-blue-50 to-indigo-50 rounded-xl shadow-lg overflow-hidden">
|
|
||||||
<div className="bg-gradient-to-r from-blue-600 to-indigo-600 h-24"></div>
|
|
||||||
<div className="px-8 pb-8">
|
|
||||||
<div className="flex items-start -mt-12 mb-6">
|
|
||||||
{user?.avatar && (
|
|
||||||
<img
|
|
||||||
src={user.avatar}
|
|
||||||
alt={user.fullname}
|
|
||||||
className="w-24 h-24 rounded-full border-4 border-white shadow-lg object-cover"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<div className="ml-6 mt-14">
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900">{user?.fullname}</h2>
|
|
||||||
{user?.location ? (
|
|
||||||
<p className="text-gray-600 flex items-center mt-1">
|
|
||||||
<svg className="w-4 h-4 mr-1" fill="currentColor" viewBox="0 0 20 20">
|
|
||||||
<path fillRule="evenodd" d="M5.05 4.05a7 7 0 119.9 9.9L10 18.9l-4.95-4.95a7 7 0 010-9.9zM10 11a2 2 0 100-4 2 2 0 000 4z" clipRule="evenodd" />
|
|
||||||
</svg>
|
|
||||||
{user.location}
|
|
||||||
</p>
|
|
||||||
) : (
|
|
||||||
<Link to="/onboarding/user" className="text-blue-600 hover:text-blue-700 text-sm mt-1 inline-block">
|
|
||||||
Complete your profile →
|
|
||||||
</Link>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="space-y-6">
|
|
||||||
{user?.bio && (
|
|
||||||
<div className="bg-white rounded-lg p-4 shadow-sm">
|
|
||||||
<h3 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-2">About</h3>
|
|
||||||
<p className="text-gray-800 leading-relaxed">{user.bio}</p>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<div className="bg-white rounded-lg p-4 shadow-sm">
|
|
||||||
<h3 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-3">Contact</h3>
|
|
||||||
<div className="flex items-center text-gray-700">
|
|
||||||
<svg className="w-5 h-5 mr-3 text-gray-400" fill="currentColor" viewBox="0 0 20 20">
|
|
||||||
<path d="M2.003 5.884L10 9.882l7.997-3.998A2 2 0 0016 4H4a2 2 0 00-1.997 1.884z" />
|
|
||||||
<path d="M18 8.118l-8 4-8-4V14a2 2 0 002 2h12a2 2 0 002-2V8.118z" />
|
|
||||||
</svg>
|
|
||||||
<span className="text-gray-900">{user?.email}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{user?.skills && user.skills.length > 0 && (
|
|
||||||
<div className="bg-white rounded-lg p-4 shadow-sm">
|
|
||||||
<h3 className="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-3">Skills</h3>
|
|
||||||
<div className="flex flex-wrap gap-3">
|
|
||||||
{user.skills.map((skill: string) => (
|
|
||||||
<span
|
|
||||||
key={skill}
|
|
||||||
className="inline-flex items-center px-4 py-2 bg-blue-600 text-white rounded-lg text-sm font-medium shadow-sm hover:bg-blue-700 transition-colors"
|
|
||||||
>
|
|
||||||
{skill}
|
|
||||||
</span>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default DashboardPage;
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
import { useRouteError, isRouteErrorResponse } from 'react-router-dom';
|
|
||||||
|
|
||||||
export default function ErrorPage() {
|
|
||||||
const error = useRouteError();
|
|
||||||
let errorMessage: string;
|
|
||||||
|
|
||||||
if (isRouteErrorResponse(error)) {
|
|
||||||
errorMessage = error.statusText;
|
|
||||||
} else if (error instanceof Error) {
|
|
||||||
errorMessage = error.message;
|
|
||||||
} else if (typeof error === 'string') {
|
|
||||||
errorMessage = error;
|
|
||||||
} else {
|
|
||||||
console.error(error);
|
|
||||||
errorMessage = 'Unknown error';
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="min-h-screen flex items-center justify-center bg-gray-50">
|
|
||||||
<div className="text-center">
|
|
||||||
<h1 className="text-6xl font-bold text-red-600 mb-4">Oops!</h1>
|
|
||||||
<p className="text-xl text-gray-700 mb-2">
|
|
||||||
Sorry, an unexpected error has occurred.
|
|
||||||
</p>
|
|
||||||
<p className="text-gray-500 italic">{errorMessage}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,125 +0,0 @@
|
|||||||
import { Outlet, ScrollRestoration, useLocation, useNavigate } from 'react-router-dom';
|
|
||||||
import { useEffect, useState } from 'react';
|
|
||||||
import { supabase } from '@imphnen-frontend-service/service';
|
|
||||||
|
|
||||||
// Define onboarding routes
|
|
||||||
const ONBOARDING_ROUTES = new Set(['/onboarding/user']);
|
|
||||||
|
|
||||||
export default function RootLayout() {
|
|
||||||
const location = useLocation();
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const [isChecking, setIsChecking] = useState(true);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const checkAuth = async () => {
|
|
||||||
const pathname = location.pathname;
|
|
||||||
|
|
||||||
console.log('[Layout] Checking auth for route:', pathname);
|
|
||||||
|
|
||||||
// Allow hackathon pages without checks
|
|
||||||
if (pathname.startsWith('/hackathons')) {
|
|
||||||
console.log('[Layout] Public route, allowing access');
|
|
||||||
setIsChecking(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Allow auth callback without checks
|
|
||||||
if (pathname === '/auth/callback') {
|
|
||||||
console.log('[Layout] Auth callback, allowing access');
|
|
||||||
setIsChecking(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check Supabase session
|
|
||||||
const { data: { session }, error } = await supabase.auth.getSession();
|
|
||||||
|
|
||||||
if (error) {
|
|
||||||
console.error('[Layout] Session error:', error);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Public auth pages (login, signup, forgot-password, reset-password) - allow unauthenticated access
|
|
||||||
const isPublicAuthPage = pathname === '/auth/login' || pathname === '/auth/signup' || pathname === '/auth/forgot-password' || pathname === '/auth/reset-password';
|
|
||||||
|
|
||||||
if (isPublicAuthPage) {
|
|
||||||
// If already authenticated and not on password reset pages, redirect to dashboard
|
|
||||||
if (session && pathname !== '/auth/reset-password') {
|
|
||||||
console.log('[Layout] Already authenticated, redirecting to dashboard');
|
|
||||||
navigate('/dashboard', { replace: true });
|
|
||||||
setIsChecking(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// Allow unauthenticated access
|
|
||||||
console.log('[Layout] Public auth page, allowing access');
|
|
||||||
setIsChecking(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Home page - allow everyone to view the landing page
|
|
||||||
if (pathname === '/') {
|
|
||||||
console.log('[Layout] Landing page, allowing access');
|
|
||||||
setIsChecking(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Require authentication for all other routes
|
|
||||||
if (!session) {
|
|
||||||
console.log('[Layout] No session, redirecting to login');
|
|
||||||
navigate('/auth/login', { replace: true });
|
|
||||||
setIsChecking(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if user has completed onboarding (skip for onboarding routes)
|
|
||||||
if (!ONBOARDING_ROUTES.has(pathname)) {
|
|
||||||
try {
|
|
||||||
const { data: userData, error: userError } = await supabase
|
|
||||||
.from('users')
|
|
||||||
.select('location')
|
|
||||||
.eq('id', session.user.id)
|
|
||||||
.single();
|
|
||||||
|
|
||||||
if (userError) {
|
|
||||||
console.error('[Layout] Failed to fetch user data:', userError);
|
|
||||||
setIsChecking(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const hasLocation = !!userData?.location;
|
|
||||||
|
|
||||||
if (!hasLocation) {
|
|
||||||
console.log('[Layout] User needs onboarding, redirecting');
|
|
||||||
navigate('/onboarding/user', { replace: true });
|
|
||||||
setIsChecking(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('[Layout] Unexpected error checking onboarding:', error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log('[Layout] Auth check passed');
|
|
||||||
setIsChecking(false);
|
|
||||||
};
|
|
||||||
|
|
||||||
checkAuth();
|
|
||||||
}, [location.pathname, navigate]);
|
|
||||||
|
|
||||||
// Show loading state while checking auth
|
|
||||||
if (isChecking) {
|
|
||||||
return (
|
|
||||||
<div className="flex justify-center items-center min-h-screen bg-gray-50">
|
|
||||||
<div className="text-center">
|
|
||||||
<div className="inline-block animate-spin rounded-full h-12 w-12 border-b-2 border-primary-600 mb-4"></div>
|
|
||||||
<p className="text-gray-600">Loading...</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<Outlet />
|
|
||||||
<ScrollRestoration />
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,272 +0,0 @@
|
|||||||
import { FC, ReactElement, useState, useEffect } from 'react';
|
|
||||||
import { ControlledInputField } from '@imphnen-frontend-service/ui/organisms';
|
|
||||||
import { Button, Textarea } from '@imphnen-frontend-service/ui/atoms';
|
|
||||||
import { useNavigate } from 'react-router';
|
|
||||||
import { useForm, Controller } from 'react-hook-form';
|
|
||||||
import {
|
|
||||||
userOnboardingSchema,
|
|
||||||
TUserOnboardingForm,
|
|
||||||
useUpdateUserMe,
|
|
||||||
useUploadAvatar,
|
|
||||||
useUserMe,
|
|
||||||
useAuthStore,
|
|
||||||
} from '@imphnen-frontend-service/service';
|
|
||||||
import { zodResolver } from '@hookform/resolvers/zod';
|
|
||||||
|
|
||||||
import INDONESIAN_CITIES from '../../../constants/cities';
|
|
||||||
|
|
||||||
const ROLE_OPTIONS = [
|
|
||||||
'Frontend Developer',
|
|
||||||
'Backend Developer',
|
|
||||||
'Full Stack Developer',
|
|
||||||
'DevOps Engineer',
|
|
||||||
'UI/UX Designer',
|
|
||||||
'Product Manager',
|
|
||||||
'Data Scientist',
|
|
||||||
'Mobile Developer',
|
|
||||||
];
|
|
||||||
|
|
||||||
const UserOnboardingPage: FC = (): ReactElement => {
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const [avatarFile, setAvatarFile] = useState<File | null>(null);
|
|
||||||
const [avatarPreview, setAvatarPreview] = useState<string>('');
|
|
||||||
|
|
||||||
const { data: userData } = useUserMe();
|
|
||||||
const { mutateAsync: updateUser, isPending: isUpdating } = useUpdateUserMe();
|
|
||||||
const { mutateAsync: uploadAvatar, isPending: isUploading } =
|
|
||||||
useUploadAvatar();
|
|
||||||
const { session } = useAuthStore();
|
|
||||||
|
|
||||||
const form = useForm<TUserOnboardingForm>({
|
|
||||||
resolver: zodResolver(userOnboardingSchema),
|
|
||||||
mode: 'all',
|
|
||||||
defaultValues: {
|
|
||||||
fullname: session?.user?.fullname || userData?.data?.fullname || '',
|
|
||||||
location: session?.user?.location || '',
|
|
||||||
bio: session?.user?.bio || '',
|
|
||||||
skills: session?.user?.skills || [],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
// Set initial avatar preview from GitHub avatar if available
|
|
||||||
useEffect(() => {
|
|
||||||
if (session?.user?.avatar && !avatarPreview) {
|
|
||||||
setAvatarPreview(session.user.avatar);
|
|
||||||
}
|
|
||||||
}, [session?.user?.avatar, avatarPreview]);
|
|
||||||
|
|
||||||
const handleAvatarChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
||||||
const file = e.target.files?.[0];
|
|
||||||
if (file) {
|
|
||||||
setAvatarFile(file);
|
|
||||||
const reader = new FileReader();
|
|
||||||
reader.onloadend = () => {
|
|
||||||
setAvatarPreview(reader.result as string);
|
|
||||||
};
|
|
||||||
reader.readAsDataURL(file);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const onSubmit = form.handleSubmit(async (data) => {
|
|
||||||
try {
|
|
||||||
console.log('[Onboarding] Starting submission...', data);
|
|
||||||
let avatarUrl = session?.user?.avatar || null;
|
|
||||||
|
|
||||||
// Upload avatar if a new file was selected
|
|
||||||
if (avatarFile) {
|
|
||||||
console.log('[Onboarding] Uploading avatar...');
|
|
||||||
const uploadResult = await uploadAvatar(avatarFile);
|
|
||||||
avatarUrl = uploadResult.data.url;
|
|
||||||
console.log('[Onboarding] Avatar uploaded:', avatarUrl);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update user in Supabase
|
|
||||||
console.log('[Onboarding] Updating user in Supabase...');
|
|
||||||
const result = await updateUser({
|
|
||||||
fullname: data.fullname,
|
|
||||||
avatar: avatarUrl,
|
|
||||||
location: data.location,
|
|
||||||
bio: data.bio,
|
|
||||||
skills: data.skills,
|
|
||||||
});
|
|
||||||
console.log('[Onboarding] User updated successfully:', result);
|
|
||||||
|
|
||||||
// Wait a bit for the onSuccess handler to update localStorage
|
|
||||||
// The updateUser mutation's onSuccess handler updates the Zustand store and localStorage
|
|
||||||
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
||||||
|
|
||||||
console.log('[Onboarding] Navigating to dashboard...');
|
|
||||||
// Use window.location for a full page reload to ensure middleware sees updated localStorage
|
|
||||||
globalThis.location.href = '/dashboard';
|
|
||||||
} catch (error) {
|
|
||||||
console.error('[Onboarding] Onboarding failed:', error);
|
|
||||||
alert(
|
|
||||||
`Onboarding failed: ${
|
|
||||||
error instanceof Error ? error.message : 'Unknown error'
|
|
||||||
}`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="flex flex-col justify-center items-center min-h-screen bg-gray-50 px-4 py-8">
|
|
||||||
<div className="bg-white w-full max-w-2xl p-8 rounded-xl shadow-lg">
|
|
||||||
<div className="mb-6">
|
|
||||||
<h1 className="text-3xl font-bold text-gray-900 mb-2">
|
|
||||||
Complete Your Profile
|
|
||||||
</h1>
|
|
||||||
<p className="text-gray-600">
|
|
||||||
Tell us more about yourself to get started
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<form onSubmit={onSubmit} className="space-y-6">
|
|
||||||
{/* Avatar Upload */}
|
|
||||||
<div className="flex flex-col items-center space-y-4">
|
|
||||||
<div className="relative">
|
|
||||||
{avatarPreview ? (
|
|
||||||
<img
|
|
||||||
src={avatarPreview}
|
|
||||||
alt="Avatar preview"
|
|
||||||
className="w-32 h-32 rounded-full object-cover border-4 border-gray-200"
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<div className="w-32 h-32 rounded-full bg-gray-200 flex items-center justify-center">
|
|
||||||
<span className="text-gray-400 text-4xl">👤</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label htmlFor="avatar" className="cursor-pointer">
|
|
||||||
<span className="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 inline-block">
|
|
||||||
{avatarPreview ? 'Change Photo' : 'Upload Photo'}
|
|
||||||
</span>
|
|
||||||
<input
|
|
||||||
id="avatar"
|
|
||||||
type="file"
|
|
||||||
accept="image/*"
|
|
||||||
className="hidden"
|
|
||||||
onChange={handleAvatarChange}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
<p className="text-xs text-gray-500 mt-2 text-center">
|
|
||||||
Optional, but highly recommended
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Full Name */}
|
|
||||||
<ControlledInputField
|
|
||||||
control={form.control}
|
|
||||||
label="Full Name"
|
|
||||||
placeholder="Enter your full name"
|
|
||||||
name="fullname"
|
|
||||||
/>
|
|
||||||
|
|
||||||
{/* City */}
|
|
||||||
<div className="space-y-2">
|
|
||||||
<label className="block text-sm font-medium text-gray-700">
|
|
||||||
City <span className="text-red-500">*</span>
|
|
||||||
</label>
|
|
||||||
<Controller
|
|
||||||
control={form.control}
|
|
||||||
name="location"
|
|
||||||
render={({ field, fieldState }) => (
|
|
||||||
<div>
|
|
||||||
<select
|
|
||||||
{...field}
|
|
||||||
className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent"
|
|
||||||
>
|
|
||||||
<option value="">Select your city</option>
|
|
||||||
{INDONESIAN_CITIES.map((city) => (
|
|
||||||
<option key={city} value={city}>
|
|
||||||
{city}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
{fieldState.error && (
|
|
||||||
<p className="text-sm text-red-500 mt-1">
|
|
||||||
{fieldState.error.message}
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Role/Skills */}
|
|
||||||
<div className="space-y-2">
|
|
||||||
<label className="block text-sm font-medium text-gray-700">
|
|
||||||
Role / Skills
|
|
||||||
</label>
|
|
||||||
<Controller
|
|
||||||
control={form.control}
|
|
||||||
name="skills"
|
|
||||||
render={({ field }) => (
|
|
||||||
<div className="space-y-2">
|
|
||||||
<div className="grid grid-cols-2 gap-2">
|
|
||||||
{ROLE_OPTIONS.map((role) => (
|
|
||||||
<label
|
|
||||||
key={role}
|
|
||||||
className="flex items-center space-x-2 cursor-pointer"
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
checked={field.value?.includes(role)}
|
|
||||||
onChange={(e) => {
|
|
||||||
const newValue = e.target.checked
|
|
||||||
? [...(field.value || []), role]
|
|
||||||
: (field.value || []).filter((v) => v !== role);
|
|
||||||
field.onChange(newValue);
|
|
||||||
}}
|
|
||||||
className="rounded border-gray-300 text-blue-600 focus:ring-blue-500"
|
|
||||||
/>
|
|
||||||
<span className="text-sm">{role}</span>
|
|
||||||
</label>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Bio */}
|
|
||||||
<div className="space-y-2">
|
|
||||||
<label className="block text-sm font-medium text-gray-700">
|
|
||||||
Bio <span className="text-gray-400">(Optional)</span>
|
|
||||||
</label>
|
|
||||||
<Controller
|
|
||||||
control={form.control}
|
|
||||||
name="bio"
|
|
||||||
render={({ field, fieldState }) => (
|
|
||||||
<div>
|
|
||||||
<Textarea
|
|
||||||
{...field}
|
|
||||||
placeholder="Tell us about yourself..."
|
|
||||||
rows={4}
|
|
||||||
className="w-full"
|
|
||||||
/>
|
|
||||||
{fieldState.error && (
|
|
||||||
<p className="text-sm text-red-500 mt-1">
|
|
||||||
{fieldState.error.message}
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<Button
|
|
||||||
className="w-full"
|
|
||||||
type="submit"
|
|
||||||
disabled={!form.formState.isValid || isUpdating || isUploading}
|
|
||||||
>
|
|
||||||
{isUpdating || isUploading ? 'Saving...' : 'Complete Setup'}
|
|
||||||
</Button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default UserOnboardingPage;
|
|
||||||
File diff suppressed because one or more lines are too long
@@ -1,210 +0,0 @@
|
|||||||
import { FC, ReactElement, useState, useRef, useEffect } from 'react';
|
|
||||||
import { Button } from '@imphnen-frontend-service/ui/atoms';
|
|
||||||
import { useNavigate, useParams } from 'react-router';
|
|
||||||
import { useTeamById, useTeamMessages, useSendMessage, useDeleteMessage, useAuthStore } from '@imphnen-frontend-service/service';
|
|
||||||
import { toast } from 'sonner';
|
|
||||||
|
|
||||||
const TeamChatPage: FC = (): ReactElement => {
|
|
||||||
const { teamId } = useParams<{ teamId: string }>();
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const { session } = useAuthStore();
|
|
||||||
const [message, setMessage] = useState('');
|
|
||||||
const messagesEndRef = useRef<HTMLDivElement>(null);
|
|
||||||
|
|
||||||
const { data: teamData } = useTeamById(teamId || '');
|
|
||||||
const { data: messages, isLoading } = useTeamMessages(teamId || '');
|
|
||||||
const { mutateAsync: sendMessage, isPending: isSending } = useSendMessage(teamId || '');
|
|
||||||
const { mutateAsync: deleteMessage } = useDeleteMessage(teamId || '');
|
|
||||||
|
|
||||||
const team = teamData?.data;
|
|
||||||
const currentUserId = session?.user?.id;
|
|
||||||
|
|
||||||
// Auto-scroll to bottom when new messages arrive
|
|
||||||
useEffect(() => {
|
|
||||||
messagesEndRef.current?.scrollIntoView({ behavior: 'smooth' });
|
|
||||||
}, [messages]);
|
|
||||||
|
|
||||||
const handleSendMessage = async (e: React.FormEvent) => {
|
|
||||||
e.preventDefault();
|
|
||||||
if (!message.trim() || isSending) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await sendMessage(message.trim());
|
|
||||||
setMessage('');
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to send message:', error);
|
|
||||||
toast.error('Failed to send message');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleDeleteMessage = async (messageId: string) => {
|
|
||||||
if (!confirm('Are you sure you want to delete this message?')) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await deleteMessage(messageId);
|
|
||||||
toast.success('Message deleted');
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to delete message:', error);
|
|
||||||
toast.error('Failed to delete message');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const formatTime = (timestamp: string) => {
|
|
||||||
const date = new Date(timestamp);
|
|
||||||
const now = new Date();
|
|
||||||
const diffInMs = now.getTime() - date.getTime();
|
|
||||||
const diffInMins = Math.floor(diffInMs / 60000);
|
|
||||||
|
|
||||||
if (diffInMins < 1) return 'Just now';
|
|
||||||
if (diffInMins < 60) return `${diffInMins}m ago`;
|
|
||||||
if (diffInMins < 1440) return `${Math.floor(diffInMins / 60)}h ago`;
|
|
||||||
|
|
||||||
return date.toLocaleDateString('en-US', { month: 'short', day: 'numeric' });
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="flex flex-col h-screen bg-gray-50">
|
|
||||||
{/* Header */}
|
|
||||||
<div className="bg-white border-b shadow-sm">
|
|
||||||
<div className="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-4">
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<div>
|
|
||||||
<h1 className="text-2xl font-bold text-gray-900">Team Chat</h1>
|
|
||||||
<p className="text-gray-600 text-sm mt-0.5">{team?.name}</p>
|
|
||||||
</div>
|
|
||||||
<Button variant="secondary" onClick={() => navigate(`/teams/${teamId}`)}>
|
|
||||||
Back to Team
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Messages Container */}
|
|
||||||
<div className="flex-1 overflow-y-auto">
|
|
||||||
<div className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
|
|
||||||
{isLoading ? (
|
|
||||||
<div className="flex items-center justify-center h-64">
|
|
||||||
<div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600"></div>
|
|
||||||
</div>
|
|
||||||
) : messages && messages.length > 0 ? (
|
|
||||||
<div className="space-y-4">
|
|
||||||
{messages.map((msg) => {
|
|
||||||
const isOwnMessage = msg.user_id === currentUserId;
|
|
||||||
const isLeader = team?.leader_id === currentUserId;
|
|
||||||
const canDelete = isOwnMessage || isLeader;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
key={msg.id}
|
|
||||||
className={`flex ${isOwnMessage ? 'justify-end' : 'justify-start'}`}
|
|
||||||
>
|
|
||||||
<div className={`flex gap-3 max-w-lg ${isOwnMessage ? 'flex-row-reverse' : 'flex-row'}`}>
|
|
||||||
{/* Avatar */}
|
|
||||||
<div className="flex-shrink-0">
|
|
||||||
{msg.user?.avatar ? (
|
|
||||||
<img
|
|
||||||
src={msg.user.avatar}
|
|
||||||
alt={msg.user.fullname}
|
|
||||||
className="w-10 h-10 rounded-full object-cover"
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<div className="w-10 h-10 rounded-full bg-blue-600 flex items-center justify-center text-white font-semibold">
|
|
||||||
{msg.user?.fullname?.charAt(0) || '?'}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Message Bubble */}
|
|
||||||
<div className={`flex-1 ${isOwnMessage ? 'text-right' : 'text-left'}`}>
|
|
||||||
<div className={`inline-block ${isOwnMessage ? 'items-end' : 'items-start'}`}>
|
|
||||||
<div className="flex items-baseline gap-2 mb-1">
|
|
||||||
<span className="font-semibold text-sm text-gray-900">
|
|
||||||
{isOwnMessage ? 'You' : msg.user?.fullname}
|
|
||||||
</span>
|
|
||||||
<span className="text-xs text-gray-500">
|
|
||||||
{formatTime(msg.created_at)}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
className={`relative group rounded-2xl px-4 py-2.5 ${
|
|
||||||
isOwnMessage
|
|
||||||
? 'bg-blue-600 text-white'
|
|
||||||
: 'bg-white text-gray-900 border border-gray-200'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<p className="text-sm whitespace-pre-wrap break-words">{msg.message}</p>
|
|
||||||
|
|
||||||
{/* Delete button */}
|
|
||||||
{canDelete && (
|
|
||||||
<button
|
|
||||||
onClick={() => handleDeleteMessage(msg.id)}
|
|
||||||
className={`absolute top-1 ${isOwnMessage ? 'left-1' : 'right-1'} opacity-0 group-hover:opacity-100 transition-opacity p-1 rounded hover:bg-gray-200 ${isOwnMessage ? 'hover:bg-blue-700' : ''}`}
|
|
||||||
title="Delete message"
|
|
||||||
>
|
|
||||||
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
<div ref={messagesEndRef} />
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="flex flex-col items-center justify-center h-64 text-center">
|
|
||||||
<div className="text-6xl mb-4">💬</div>
|
|
||||||
<h3 className="text-xl font-semibold text-gray-900 mb-2">
|
|
||||||
No messages yet
|
|
||||||
</h3>
|
|
||||||
<p className="text-gray-600">
|
|
||||||
Be the first to start the conversation!
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Message Input */}
|
|
||||||
<div className="bg-white border-t shadow-lg">
|
|
||||||
<div className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-4">
|
|
||||||
<form onSubmit={handleSendMessage} className="flex gap-3">
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={message}
|
|
||||||
onChange={(e) => setMessage(e.target.value)}
|
|
||||||
placeholder="Type your message..."
|
|
||||||
className="flex-1 px-4 py-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
|
|
||||||
disabled={isSending}
|
|
||||||
/>
|
|
||||||
<Button
|
|
||||||
type="submit"
|
|
||||||
disabled={!message.trim() || isSending}
|
|
||||||
className="px-6 py-3"
|
|
||||||
>
|
|
||||||
{isSending ? (
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<div className="animate-spin rounded-full h-4 w-4 border-b-2 border-white"></div>
|
|
||||||
Sending...
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 19l9 2-9-18-9 18 9-2zm0 0v-8" />
|
|
||||||
</svg>
|
|
||||||
Send
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</Button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default TeamChatPage;
|
|
||||||
@@ -1,347 +0,0 @@
|
|||||||
import { FC, ReactElement, useState, useEffect } from 'react';
|
|
||||||
import { ControlledInputField } from '@imphnen-frontend-service/ui/organisms';
|
|
||||||
import { Button, Textarea } from '@imphnen-frontend-service/ui/atoms';
|
|
||||||
import { useNavigate, useParams } from 'react-router';
|
|
||||||
import { useForm, Controller } from 'react-hook-form';
|
|
||||||
import { teamUpdateSchema, TTeamUpdateForm, useUpdateTeam, useTeamById, ETeamVisibility, useUploadFile, useAuthStore } from '@imphnen-frontend-service/service';
|
|
||||||
import { zodResolver } from '@hookform/resolvers/zod';
|
|
||||||
import INDONESIAN_CITIES from '../../../../constants/cities';
|
|
||||||
|
|
||||||
const EditTeamPage: FC = (): ReactElement => {
|
|
||||||
const { teamId } = useParams<{ teamId: string }>();
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const { session } = useAuthStore();
|
|
||||||
const [logoFile, setLogoFile] = useState<File | null>(null);
|
|
||||||
const [logoPreview, setLogoPreview] = useState<string>('');
|
|
||||||
const [bannerFile, setBannerFile] = useState<File | null>(null);
|
|
||||||
const [bannerPreview, setBannerPreview] = useState<string>('');
|
|
||||||
|
|
||||||
const { data: teamData, isLoading: isLoadingTeam } = useTeamById(teamId || '');
|
|
||||||
const { mutateAsync: updateTeam, isPending: isUpdating } = useUpdateTeam(teamId || '');
|
|
||||||
const { mutateAsync: uploadFile, isPending: isUploading } = useUploadFile();
|
|
||||||
|
|
||||||
const team = teamData?.data;
|
|
||||||
const currentUserId = session?.user?.id;
|
|
||||||
const isLeader = currentUserId === team?.leader_id;
|
|
||||||
|
|
||||||
const form = useForm<TTeamUpdateForm>({
|
|
||||||
resolver: zodResolver(teamUpdateSchema),
|
|
||||||
mode: 'all',
|
|
||||||
});
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (team) {
|
|
||||||
form.reset({
|
|
||||||
name: team.name,
|
|
||||||
description: team.description,
|
|
||||||
city: team.city,
|
|
||||||
visibility: team.visibility,
|
|
||||||
logo: team.logo,
|
|
||||||
banner: team.banner,
|
|
||||||
});
|
|
||||||
if (team.logo) setLogoPreview(team.logo);
|
|
||||||
if (team.banner) setBannerPreview(team.banner);
|
|
||||||
}
|
|
||||||
}, [team, form]);
|
|
||||||
|
|
||||||
if (isLoadingTeam) {
|
|
||||||
return (
|
|
||||||
<div className="flex items-center justify-center min-h-screen">
|
|
||||||
<div className="text-gray-600">Loading team...</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isLeader) {
|
|
||||||
return (
|
|
||||||
<div className="flex flex-col items-center justify-center min-h-screen">
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900 mb-4">Access Denied</h2>
|
|
||||||
<p className="text-gray-600 mb-4">Only the team leader can edit team information</p>
|
|
||||||
<Button onClick={() => navigate(`/teams/${teamId}`)}>Back to Team</Button>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleLogoChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
||||||
const file = e.target.files?.[0];
|
|
||||||
if (file) {
|
|
||||||
setLogoFile(file);
|
|
||||||
const reader = new FileReader();
|
|
||||||
reader.onloadend = () => {
|
|
||||||
setLogoPreview(reader.result as string);
|
|
||||||
};
|
|
||||||
reader.readAsDataURL(file);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleBannerChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
||||||
const file = e.target.files?.[0];
|
|
||||||
if (file) {
|
|
||||||
setBannerFile(file);
|
|
||||||
const reader = new FileReader();
|
|
||||||
reader.onloadend = () => {
|
|
||||||
setBannerPreview(reader.result as string);
|
|
||||||
};
|
|
||||||
reader.readAsDataURL(file);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const onSubmit = form.handleSubmit(async (data) => {
|
|
||||||
try {
|
|
||||||
let logoUrl = data.logo;
|
|
||||||
let bannerUrl = data.banner;
|
|
||||||
|
|
||||||
if (logoFile) {
|
|
||||||
const logoResult = await uploadFile(logoFile);
|
|
||||||
logoUrl = logoResult.data.url;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bannerFile) {
|
|
||||||
const bannerResult = await uploadFile(bannerFile);
|
|
||||||
bannerUrl = bannerResult.data.url;
|
|
||||||
}
|
|
||||||
|
|
||||||
await updateTeam({
|
|
||||||
...data,
|
|
||||||
logo: logoUrl,
|
|
||||||
banner: bannerUrl,
|
|
||||||
});
|
|
||||||
|
|
||||||
navigate(`/teams/${teamId}`);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to update team:', error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="min-h-screen bg-gray-50">
|
|
||||||
<div className="bg-white border-b">
|
|
||||||
<div className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
|
|
||||||
<h1 className="text-3xl font-bold text-gray-900">Edit Team Info</h1>
|
|
||||||
<p className="text-gray-600 mt-1">Update your team details</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
|
|
||||||
<div className="bg-white rounded-lg shadow-md p-8">
|
|
||||||
<form onSubmit={onSubmit} className="space-y-6">
|
|
||||||
{/* Banner Upload */}
|
|
||||||
<div>
|
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-2">
|
|
||||||
Team Banner
|
|
||||||
</label>
|
|
||||||
{bannerPreview ? (
|
|
||||||
<div className="relative">
|
|
||||||
<img
|
|
||||||
src={bannerPreview}
|
|
||||||
alt="Banner preview"
|
|
||||||
className="w-full h-48 object-cover rounded-lg border-2 border-gray-200"
|
|
||||||
/>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => {
|
|
||||||
setBannerFile(null);
|
|
||||||
setBannerPreview('');
|
|
||||||
form.setValue('banner', null);
|
|
||||||
}}
|
|
||||||
className="absolute top-2 right-2 bg-red-500 text-white px-3 py-1 rounded-lg text-sm hover:bg-red-600"
|
|
||||||
>
|
|
||||||
Remove
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<label className="flex flex-col items-center justify-center w-full h-48 border-2 border-dashed border-gray-300 rounded-lg cursor-pointer hover:bg-gray-50">
|
|
||||||
<div className="text-center">
|
|
||||||
<p className="text-gray-500">Click to upload banner</p>
|
|
||||||
<p className="text-xs text-gray-400 mt-1">1200x400 recommended</p>
|
|
||||||
</div>
|
|
||||||
<input
|
|
||||||
type="file"
|
|
||||||
accept="image/*"
|
|
||||||
className="hidden"
|
|
||||||
onChange={handleBannerChange}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Logo Upload */}
|
|
||||||
<div>
|
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-2">
|
|
||||||
Team Logo
|
|
||||||
</label>
|
|
||||||
<div className="flex items-center space-x-4">
|
|
||||||
{logoPreview ? (
|
|
||||||
<img
|
|
||||||
src={logoPreview}
|
|
||||||
alt="Logo preview"
|
|
||||||
className="w-24 h-24 rounded-full object-cover border-2 border-gray-200"
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<div className="w-24 h-24 rounded-full bg-gray-200 flex items-center justify-center">
|
|
||||||
<span className="text-gray-400 text-3xl">👥</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div>
|
|
||||||
<label htmlFor="logo" className="cursor-pointer">
|
|
||||||
<span className="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 inline-block">
|
|
||||||
{logoPreview ? 'Change Logo' : 'Upload Logo'}
|
|
||||||
</span>
|
|
||||||
<input
|
|
||||||
id="logo"
|
|
||||||
type="file"
|
|
||||||
accept="image/*"
|
|
||||||
className="hidden"
|
|
||||||
onChange={handleLogoChange}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
{logoPreview && (
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => {
|
|
||||||
setLogoFile(null);
|
|
||||||
setLogoPreview('');
|
|
||||||
form.setValue('logo', null);
|
|
||||||
}}
|
|
||||||
className="ml-3 px-4 py-2 bg-red-500 text-white rounded-lg hover:bg-red-600"
|
|
||||||
>
|
|
||||||
Remove
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Team Name */}
|
|
||||||
<ControlledInputField
|
|
||||||
control={form.control}
|
|
||||||
label="Team Name"
|
|
||||||
placeholder="Enter team name"
|
|
||||||
name="name"
|
|
||||||
/>
|
|
||||||
|
|
||||||
{/* City */}
|
|
||||||
<div className="space-y-2">
|
|
||||||
<label className="block text-sm font-medium text-gray-700">
|
|
||||||
City
|
|
||||||
</label>
|
|
||||||
<Controller
|
|
||||||
control={form.control}
|
|
||||||
name="city"
|
|
||||||
render={({ field, fieldState }) => (
|
|
||||||
<div>
|
|
||||||
<select
|
|
||||||
{...field}
|
|
||||||
className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent"
|
|
||||||
>
|
|
||||||
<option value="">Select city</option>
|
|
||||||
{INDONESIAN_CITIES.map((city) => (
|
|
||||||
<option key={city} value={city}>
|
|
||||||
{city}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
{fieldState.error && (
|
|
||||||
<p className="text-sm text-red-500 mt-1">{fieldState.error.message}</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Description */}
|
|
||||||
<div className="space-y-2">
|
|
||||||
<label className="block text-sm font-medium text-gray-700">
|
|
||||||
Description
|
|
||||||
</label>
|
|
||||||
<Controller
|
|
||||||
control={form.control}
|
|
||||||
name="description"
|
|
||||||
render={({ field, fieldState }) => (
|
|
||||||
<div>
|
|
||||||
<Textarea
|
|
||||||
{...field}
|
|
||||||
value={field.value || ''}
|
|
||||||
placeholder="Tell others about your team..."
|
|
||||||
rows={4}
|
|
||||||
className="w-full"
|
|
||||||
/>
|
|
||||||
{fieldState.error && (
|
|
||||||
<p className="text-sm text-red-500 mt-1">{fieldState.error.message}</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Visibility */}
|
|
||||||
<div className="space-y-2">
|
|
||||||
<label className="block text-sm font-medium text-gray-700">
|
|
||||||
Team Visibility
|
|
||||||
</label>
|
|
||||||
<Controller
|
|
||||||
control={form.control}
|
|
||||||
name="visibility"
|
|
||||||
render={({ field }) => (
|
|
||||||
<div className="space-y-3">
|
|
||||||
<label className="flex items-start space-x-3 cursor-pointer border rounded-lg p-4 hover:bg-gray-50">
|
|
||||||
<input
|
|
||||||
type="radio"
|
|
||||||
{...field}
|
|
||||||
value={ETeamVisibility.PUBLIC}
|
|
||||||
checked={field.value === ETeamVisibility.PUBLIC}
|
|
||||||
className="mt-1"
|
|
||||||
/>
|
|
||||||
<div>
|
|
||||||
<p className="font-medium text-gray-900">Public</p>
|
|
||||||
<p className="text-sm text-gray-600">
|
|
||||||
Team will be visible in Browse Teams
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</label>
|
|
||||||
<label className="flex items-start space-x-3 cursor-pointer border rounded-lg p-4 hover:bg-gray-50">
|
|
||||||
<input
|
|
||||||
type="radio"
|
|
||||||
{...field}
|
|
||||||
value={ETeamVisibility.PRIVATE}
|
|
||||||
checked={field.value === ETeamVisibility.PRIVATE}
|
|
||||||
className="mt-1"
|
|
||||||
/>
|
|
||||||
<div>
|
|
||||||
<p className="font-medium text-gray-900">Private</p>
|
|
||||||
<p className="text-sm text-gray-600">
|
|
||||||
Team hidden, invite-only
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Submit Button */}
|
|
||||||
<div className="flex space-x-3 pt-4">
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="secondary"
|
|
||||||
className="flex-1"
|
|
||||||
onClick={() => navigate(`/teams/${teamId}`)}
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
type="submit"
|
|
||||||
className="flex-1"
|
|
||||||
disabled={isUpdating || isUploading}
|
|
||||||
>
|
|
||||||
{isUpdating || isUploading ? 'Saving...' : 'Save Changes'}
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default EditTeamPage;
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
import { FC, ReactNode } from 'react';
|
|
||||||
import { Outlet } from 'react-router';
|
|
||||||
import { Navigation } from '../../../components/navigation';
|
|
||||||
|
|
||||||
interface TeamLayoutProps {
|
|
||||||
children?: ReactNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const TeamLayout: FC<TeamLayoutProps> = () => {
|
|
||||||
return (
|
|
||||||
<div className="min-h-screen bg-gray-50">
|
|
||||||
<Navigation />
|
|
||||||
<Outlet />
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default TeamLayout;
|
|
||||||
@@ -1,294 +0,0 @@
|
|||||||
import { FC, ReactElement, useState } from 'react';
|
|
||||||
import { Button, Input } from '@imphnen-frontend-service/ui/atoms';
|
|
||||||
import { useNavigate, useParams } from 'react-router';
|
|
||||||
import {
|
|
||||||
useTeamById,
|
|
||||||
useTeamMembers,
|
|
||||||
useTeamJoinRequests,
|
|
||||||
useInviteMember,
|
|
||||||
useRemoveMember,
|
|
||||||
useRespondToJoinRequest,
|
|
||||||
ETeamMemberStatus,
|
|
||||||
inviteMemberSchema,
|
|
||||||
TInviteMemberForm,
|
|
||||||
useAuthStore,
|
|
||||||
} from '@imphnen-frontend-service/service';
|
|
||||||
import { useForm } from 'react-hook-form';
|
|
||||||
import { zodResolver } from '@hookform/resolvers/zod';
|
|
||||||
|
|
||||||
const ManageMembersPage: FC = (): ReactElement => {
|
|
||||||
const { teamId } = useParams<{ teamId: string }>();
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const { session } = useAuthStore();
|
|
||||||
const [showInviteModal, setShowInviteModal] = useState(false);
|
|
||||||
|
|
||||||
const { data: teamData } = useTeamById(teamId || '');
|
|
||||||
const { data: membersData, isLoading: isLoadingMembers } = useTeamMembers(teamId || '');
|
|
||||||
const { data: joinRequestsData } = useTeamJoinRequests(teamId || '');
|
|
||||||
|
|
||||||
const { mutateAsync: inviteMember, isPending: isInviting } = useInviteMember(teamId || '');
|
|
||||||
const { mutateAsync: removeMember, isPending: isRemoving } = useRemoveMember(teamId || '');
|
|
||||||
const { mutateAsync: respondToRequest, isPending: isResponding } = useRespondToJoinRequest(teamId || '');
|
|
||||||
|
|
||||||
const team = teamData?.data;
|
|
||||||
const members = membersData?.data || [];
|
|
||||||
const joinRequests = Array.isArray(joinRequestsData?.data) ? joinRequestsData.data : [];
|
|
||||||
const currentUserId = session?.user?.id;
|
|
||||||
const isLeader = currentUserId === team?.leader_id;
|
|
||||||
|
|
||||||
const form = useForm<TInviteMemberForm>({
|
|
||||||
resolver: zodResolver(inviteMemberSchema),
|
|
||||||
mode: 'all',
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!isLeader) {
|
|
||||||
return (
|
|
||||||
<div className="flex flex-col items-center justify-center min-h-screen">
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900 mb-4">Access Denied</h2>
|
|
||||||
<p className="text-gray-600 mb-4">Only the team leader can manage members</p>
|
|
||||||
<Button onClick={() => navigate(`/teams/${teamId}`)}>Back to Team</Button>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleInvite = form.handleSubmit(async (data) => {
|
|
||||||
try {
|
|
||||||
await inviteMember(data);
|
|
||||||
setShowInviteModal(false);
|
|
||||||
form.reset();
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to invite member:', error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const handleRemove = async (userId: string) => {
|
|
||||||
// eslint-disable-next-line no-restricted-globals
|
|
||||||
if (confirm('Are you sure you want to remove this member?')) {
|
|
||||||
try {
|
|
||||||
await removeMember(userId);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to remove member:', error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleApproveRequest = async (requestId: string) => {
|
|
||||||
try {
|
|
||||||
await respondToRequest({ requestId, action: 'approve' });
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to approve request:', error);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleRejectRequest = async (requestId: string) => {
|
|
||||||
try {
|
|
||||||
await respondToRequest({ requestId, action: 'reject' });
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to reject request:', error);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="min-h-screen bg-gray-50">
|
|
||||||
<div className="bg-white border-b">
|
|
||||||
<div className="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<div>
|
|
||||||
<h1 className="text-3xl font-bold text-gray-900">Manage Members</h1>
|
|
||||||
<p className="text-gray-600 mt-1">{team?.name}</p>
|
|
||||||
</div>
|
|
||||||
<div className="flex space-x-3">
|
|
||||||
<Button onClick={() => setShowInviteModal(true)}>
|
|
||||||
Invite Member
|
|
||||||
</Button>
|
|
||||||
<Button variant="secondary" onClick={() => navigate(`/teams/${teamId}`)}>
|
|
||||||
Back to Team
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-8 space-y-6">
|
|
||||||
{/* Join Requests */}
|
|
||||||
{joinRequests.length > 0 && (
|
|
||||||
<div className="bg-white rounded-lg shadow-md p-6">
|
|
||||||
<h2 className="text-xl font-bold text-gray-900 mb-4">
|
|
||||||
Join Requests ({joinRequests.length})
|
|
||||||
</h2>
|
|
||||||
<div className="space-y-3">
|
|
||||||
{joinRequests.map((request) => (
|
|
||||||
<div key={request.id} className="border rounded-lg p-4">
|
|
||||||
<div className="flex items-start justify-between">
|
|
||||||
<div className="flex items-center space-x-3 flex-1">
|
|
||||||
{request.user.avatar ? (
|
|
||||||
<img
|
|
||||||
src={request.user.avatar}
|
|
||||||
alt={request.user.fullname}
|
|
||||||
className="w-12 h-12 rounded-full object-cover"
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<div className="w-12 h-12 rounded-full bg-gray-200 flex items-center justify-center">
|
|
||||||
<span className="text-gray-500">👤</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div className="flex-1">
|
|
||||||
<p className="font-medium text-gray-900">{request.user.fullname}</p>
|
|
||||||
<p className="text-sm text-gray-600">{request.user.email}</p>
|
|
||||||
{request.user.location && (
|
|
||||||
<p className="text-sm text-gray-500">📍 {request.user.location}</p>
|
|
||||||
)}
|
|
||||||
<p className="text-sm text-gray-700 mt-2 italic">"{request.message}"</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="flex space-x-2 ml-4">
|
|
||||||
<Button
|
|
||||||
size="sm"
|
|
||||||
onClick={() => handleApproveRequest(request.id)}
|
|
||||||
disabled={isResponding}
|
|
||||||
>
|
|
||||||
Approve
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
size="sm"
|
|
||||||
variant="secondary"
|
|
||||||
onClick={() => handleRejectRequest(request.id)}
|
|
||||||
disabled={isResponding}
|
|
||||||
>
|
|
||||||
Reject
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Current Members */}
|
|
||||||
<div className="bg-white rounded-lg shadow-md p-6">
|
|
||||||
<h2 className="text-xl font-bold text-gray-900 mb-4">
|
|
||||||
Current Members ({members.length})
|
|
||||||
</h2>
|
|
||||||
{isLoadingMembers ? (
|
|
||||||
<p className="text-gray-600">Loading members...</p>
|
|
||||||
) : (
|
|
||||||
<div className="space-y-3">
|
|
||||||
{members.map((member) => (
|
|
||||||
<div key={member.id} className="border rounded-lg p-4 flex items-center justify-between">
|
|
||||||
<div className="flex items-center space-x-3">
|
|
||||||
{member.user.avatar ? (
|
|
||||||
<img
|
|
||||||
src={member.user.avatar}
|
|
||||||
alt={member.user.fullname}
|
|
||||||
className="w-12 h-12 rounded-full object-cover"
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<div className="w-12 h-12 rounded-full bg-gray-200 flex items-center justify-center">
|
|
||||||
<span className="text-gray-500">👤</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div>
|
|
||||||
<p className="font-medium text-gray-900">{member.user.fullname}</p>
|
|
||||||
<p className="text-sm text-gray-600">{member.user.email}</p>
|
|
||||||
{member.user.location && (
|
|
||||||
<p className="text-sm text-gray-500">📍 {member.user.location}</p>
|
|
||||||
)}
|
|
||||||
<div className="flex items-center space-x-2 mt-1">
|
|
||||||
{member.role === 'leader' && (
|
|
||||||
<span className="px-2 py-1 bg-blue-100 text-blue-800 rounded text-xs font-medium">
|
|
||||||
Leader
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
{member.status === ETeamMemberStatus.PENDING && (
|
|
||||||
<span className="px-2 py-1 bg-yellow-100 text-yellow-800 rounded text-xs font-medium">
|
|
||||||
Pending Invitation
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{member.role !== 'leader' && (
|
|
||||||
<Button
|
|
||||||
size="sm"
|
|
||||||
variant="secondary"
|
|
||||||
onClick={() => handleRemove(member.user_id)}
|
|
||||||
disabled={isRemoving}
|
|
||||||
>
|
|
||||||
Remove
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Warning */}
|
|
||||||
<div className="bg-yellow-50 border border-yellow-200 rounded-lg p-4">
|
|
||||||
<p className="text-sm text-yellow-800">
|
|
||||||
<strong>Note:</strong> Members cannot leave the team without your approval. Only you can remove members from the team.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Invite Member Modal */}
|
|
||||||
{showInviteModal && (
|
|
||||||
<div className="fixed inset-0 bg-black/20 backdrop-blur-sm flex items-center justify-center z-50 p-4">
|
|
||||||
<div className="bg-white rounded-lg shadow-xl max-w-md w-full p-6">
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900 mb-4">
|
|
||||||
Invite Member
|
|
||||||
</h2>
|
|
||||||
<p className="text-gray-600 mb-4">
|
|
||||||
Send an invitation to join your team. The invited member will see the invitation on their dashboard after logging in.
|
|
||||||
</p>
|
|
||||||
<div className="bg-yellow-50 border border-yellow-200 rounded-lg p-3 mb-6">
|
|
||||||
<p className="text-sm text-yellow-800">
|
|
||||||
<strong>Important:</strong> The email you enter must match the GitHub email address the member uses to sign in.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<form onSubmit={handleInvite} className="space-y-4">
|
|
||||||
<div>
|
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-2">
|
|
||||||
Email Address
|
|
||||||
</label>
|
|
||||||
<Input
|
|
||||||
{...form.register('email')}
|
|
||||||
type="email"
|
|
||||||
placeholder="member@example.com"
|
|
||||||
/>
|
|
||||||
{form.formState.errors.email && (
|
|
||||||
<p className="text-sm text-red-500 mt-1">
|
|
||||||
{form.formState.errors.email.message}
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className="flex space-x-3">
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="secondary"
|
|
||||||
className="flex-1"
|
|
||||||
onClick={() => {
|
|
||||||
setShowInviteModal(false);
|
|
||||||
form.reset();
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
type="submit"
|
|
||||||
className="flex-1"
|
|
||||||
disabled={!form.formState.isValid || isInviting}
|
|
||||||
>
|
|
||||||
{isInviting ? 'Sending...' : 'Send Invitation'}
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default ManageMembersPage;
|
|
||||||
@@ -1,444 +0,0 @@
|
|||||||
import { FC, ReactElement, useState } from 'react';
|
|
||||||
import { Button } from '@imphnen-frontend-service/ui/atoms';
|
|
||||||
import { Link, useParams, useNavigate } from 'react-router';
|
|
||||||
import { useTeamById, useTeamMembers, useInviteMember, useTeamJoinRequests, useRespondToJoinRequest, ETeamMemberRole, useAuthStore } from '@imphnen-frontend-service/service';
|
|
||||||
import { toast } from 'sonner';
|
|
||||||
|
|
||||||
const MAX_TEAM_MEMBERS = 5;
|
|
||||||
|
|
||||||
const TeamDashboardPage: FC = (): ReactElement => {
|
|
||||||
const { teamId } = useParams<{ teamId: string }>();
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const { session } = useAuthStore();
|
|
||||||
const [showInviteModal, setShowInviteModal] = useState(false);
|
|
||||||
const [showJoinRequestsModal, setShowJoinRequestsModal] = useState(false);
|
|
||||||
const [inviteEmail, setInviteEmail] = useState('');
|
|
||||||
|
|
||||||
const { data: teamData, isLoading: isLoadingTeam } = useTeamById(teamId || '');
|
|
||||||
const { data: membersData, isLoading: isLoadingMembers } = useTeamMembers(teamId || '');
|
|
||||||
const { data: joinRequestsData } = useTeamJoinRequests(teamId || '', !!teamId);
|
|
||||||
const { mutateAsync: inviteMember, isPending: isInviting } = useInviteMember(teamId || '');
|
|
||||||
const { mutateAsync: respondToJoinRequest, isPending: isResponding } = useRespondToJoinRequest(teamId || '');
|
|
||||||
|
|
||||||
const team = teamData?.data;
|
|
||||||
const members = membersData?.data || [];
|
|
||||||
const joinRequests = joinRequestsData?.data || [];
|
|
||||||
const pendingJoinRequests = joinRequests.filter((req: any) => req.status === 'pending');
|
|
||||||
const currentUserId = session?.user?.id;
|
|
||||||
|
|
||||||
const isLeader = currentUserId === team?.leader_id;
|
|
||||||
const canInvite = isLeader && members.length < MAX_TEAM_MEMBERS;
|
|
||||||
|
|
||||||
console.log('Leader check:', { currentUserId, leaderId: team?.leader_id, isLeader });
|
|
||||||
|
|
||||||
const handleInviteMember = async (e: React.FormEvent) => {
|
|
||||||
e.preventDefault();
|
|
||||||
if (!inviteEmail.trim() || isInviting) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await inviteMember({ email: inviteEmail.trim() });
|
|
||||||
toast.success('Invitation sent successfully!');
|
|
||||||
setInviteEmail('');
|
|
||||||
setShowInviteModal(false);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to invite member:', error);
|
|
||||||
toast.error('Failed to send invitation');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleRespondToJoinRequest = async (requestId: string, action: 'approve' | 'reject') => {
|
|
||||||
try {
|
|
||||||
await respondToJoinRequest({ requestId, action });
|
|
||||||
toast.success(action === 'approve' ? 'Request approved!' : 'Request rejected');
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to respond to join request:', error);
|
|
||||||
toast.error('Failed to process request');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if (isLoadingTeam || isLoadingMembers) {
|
|
||||||
return (
|
|
||||||
<div className="flex items-center justify-center min-h-screen">
|
|
||||||
<div className="text-gray-600">Loading team...</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!team) {
|
|
||||||
return (
|
|
||||||
<div className="flex flex-col items-center justify-center min-h-screen">
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900 mb-4">Team not found</h2>
|
|
||||||
<Button onClick={() => navigate('/dashboard')}>Back to Dashboard</Button>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="min-h-screen bg-gray-50">
|
|
||||||
{/* Header with Banner */}
|
|
||||||
<div className="bg-white border-b">
|
|
||||||
{team.banner && (
|
|
||||||
<div className="w-full h-48 overflow-hidden">
|
|
||||||
<img
|
|
||||||
src={team.banner}
|
|
||||||
alt={team.name}
|
|
||||||
className="w-full h-full object-cover"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
|
|
||||||
<div className="flex items-start justify-between">
|
|
||||||
<div className="flex items-center space-x-4">
|
|
||||||
{team.logo && (
|
|
||||||
<img
|
|
||||||
src={team.logo}
|
|
||||||
alt={team.name}
|
|
||||||
className="w-20 h-20 rounded-full object-cover border-4 border-white shadow-lg -mt-10"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<div>
|
|
||||||
<h1 className="text-3xl font-bold text-gray-900">{team.name}</h1>
|
|
||||||
<p className="text-gray-600 mt-1">📍 {team.city}</p>
|
|
||||||
<div className="flex items-center space-x-4 mt-2">
|
|
||||||
<span className="text-sm text-gray-500">
|
|
||||||
{members.length} {members.length === 1 ? 'Member' : 'Members'}
|
|
||||||
</span>
|
|
||||||
<span className="text-sm text-gray-500">
|
|
||||||
{team.visibility === 'public' ? '🌐 Public' : '🔒 Private'}
|
|
||||||
</span>
|
|
||||||
{isLeader && (
|
|
||||||
<span className="px-3 py-1 bg-blue-600 text-white rounded-md text-sm font-semibold shadow-sm">
|
|
||||||
👑 Team Leader
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<Link to="/dashboard">
|
|
||||||
<Button variant="secondary">Back to Dashboard</Button>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
|
|
||||||
<div className="grid gap-6 lg:grid-cols-3">
|
|
||||||
{/* Main Content */}
|
|
||||||
<div className="lg:col-span-2 space-y-6">
|
|
||||||
{/* Team Description */}
|
|
||||||
<div className="bg-white rounded-lg shadow-md p-6">
|
|
||||||
<h2 className="text-xl font-bold text-gray-900 mb-4">About Team</h2>
|
|
||||||
<p className="text-gray-700 whitespace-pre-wrap">{team.description}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Team Actions - Only for Leader */}
|
|
||||||
{isLeader && (
|
|
||||||
<div className="bg-white rounded-lg shadow-md p-6">
|
|
||||||
<h2 className="text-xl font-bold text-gray-900 mb-4">Team Management</h2>
|
|
||||||
<div className="grid gap-3 sm:grid-cols-2">
|
|
||||||
<Button
|
|
||||||
className="w-full"
|
|
||||||
variant="secondary"
|
|
||||||
onClick={() => setShowInviteModal(true)}
|
|
||||||
disabled={!canInvite}
|
|
||||||
>
|
|
||||||
➕ Invite Member {!canInvite && `(${members.length}/${MAX_TEAM_MEMBERS})`}
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
className="w-full relative"
|
|
||||||
variant="secondary"
|
|
||||||
onClick={() => setShowJoinRequestsModal(true)}
|
|
||||||
>
|
|
||||||
📩 Join Requests
|
|
||||||
{pendingJoinRequests.length > 0 && (
|
|
||||||
<span className="absolute -top-2 -right-2 bg-red-500 text-white text-xs font-bold rounded-full w-6 h-6 flex items-center justify-center">
|
|
||||||
{pendingJoinRequests.length}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</Button>
|
|
||||||
<Link to={`/teams/${teamId}/edit`}>
|
|
||||||
<Button className="w-full" variant="secondary">
|
|
||||||
✏️ Edit Team Info
|
|
||||||
</Button>
|
|
||||||
</Link>
|
|
||||||
<Link to={`/teams/${teamId}/members`}>
|
|
||||||
<Button className="w-full" variant="secondary">
|
|
||||||
👥 Manage Members
|
|
||||||
</Button>
|
|
||||||
</Link>
|
|
||||||
<Link to={`/teams/${teamId}/chat`}>
|
|
||||||
<Button className="w-full" variant="secondary">
|
|
||||||
💬 Team Chat
|
|
||||||
</Button>
|
|
||||||
</Link>
|
|
||||||
<Link to={`/teams/${teamId}/submit`}>
|
|
||||||
<Button className="w-full">
|
|
||||||
🚀 Submit Project
|
|
||||||
</Button>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
{!canInvite && members.length >= MAX_TEAM_MEMBERS && (
|
|
||||||
<p className="text-sm text-gray-600 mt-3 text-center">
|
|
||||||
Maximum team size reached ({MAX_TEAM_MEMBERS} members)
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Quick Actions for Members */}
|
|
||||||
{!isLeader && (
|
|
||||||
<div className="bg-white rounded-lg shadow-md p-6">
|
|
||||||
<h2 className="text-xl font-bold text-gray-900 mb-4">Quick Actions</h2>
|
|
||||||
<div className="grid gap-3 sm:grid-cols-2">
|
|
||||||
<Link to={`/teams/${teamId}/chat`}>
|
|
||||||
<Button className="w-full" variant="secondary">
|
|
||||||
💬 Team Chat
|
|
||||||
</Button>
|
|
||||||
</Link>
|
|
||||||
{team.has_submission && (
|
|
||||||
<Link to={`/teams/${teamId}/submission`}>
|
|
||||||
<Button className="w-full" variant="secondary">
|
|
||||||
📄 View Submission
|
|
||||||
</Button>
|
|
||||||
</Link>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Submission Status */}
|
|
||||||
{team.has_submission && (
|
|
||||||
<div className="bg-green-50 border border-green-200 rounded-lg p-6">
|
|
||||||
<div className="flex items-center space-x-3">
|
|
||||||
<span className="text-3xl">✅</span>
|
|
||||||
<div>
|
|
||||||
<h3 className="font-bold text-green-900">Project Submitted</h3>
|
|
||||||
<p className="text-green-700 text-sm">
|
|
||||||
Your team has successfully submitted a project
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<Link to={`/teams/${teamId}/submission`}>
|
|
||||||
<Button className="mt-4 w-full" variant="secondary">
|
|
||||||
View Submission Details
|
|
||||||
</Button>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Sidebar */}
|
|
||||||
<div className="space-y-6">
|
|
||||||
{/* Team Leader */}
|
|
||||||
<div className="bg-white rounded-lg shadow-md p-6">
|
|
||||||
<h3 className="font-bold text-gray-900 mb-4">Team Leader</h3>
|
|
||||||
{team.leader && (
|
|
||||||
<div className="flex items-center space-x-3">
|
|
||||||
{team.leader.avatar ? (
|
|
||||||
<img
|
|
||||||
src={team.leader.avatar}
|
|
||||||
alt={team.leader.fullname}
|
|
||||||
className="w-12 h-12 rounded-full object-cover"
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<div className="w-12 h-12 rounded-full bg-gray-200 flex items-center justify-center">
|
|
||||||
<span className="text-gray-500">👤</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div>
|
|
||||||
<p className="font-medium text-gray-900">{team.leader.fullname}</p>
|
|
||||||
<p className="text-sm text-gray-600">{team.leader.email}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Team Members */}
|
|
||||||
<div className="bg-white rounded-lg shadow-md p-6">
|
|
||||||
<h3 className="font-bold text-gray-900 mb-4">
|
|
||||||
Members ({members.length})
|
|
||||||
</h3>
|
|
||||||
<div className="space-y-3">
|
|
||||||
{members.map((member) => (
|
|
||||||
<div key={member.id} className="flex items-center space-x-3">
|
|
||||||
{member.user.avatar ? (
|
|
||||||
<img
|
|
||||||
src={member.user.avatar}
|
|
||||||
alt={member.user.fullname}
|
|
||||||
className="w-10 h-10 rounded-full object-cover"
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<div className="w-10 h-10 rounded-full bg-gray-200 flex items-center justify-center">
|
|
||||||
<span className="text-gray-500 text-sm">👤</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div className="flex-1 min-w-0">
|
|
||||||
<p className="font-medium text-gray-900 truncate">
|
|
||||||
{member.user.fullname}
|
|
||||||
</p>
|
|
||||||
<p className="text-xs text-gray-500">
|
|
||||||
{member.role === ETeamMemberRole.LEADER ? 'Leader' : 'Member'}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Invite Member Modal */}
|
|
||||||
{showInviteModal && (
|
|
||||||
<div className="fixed inset-0 bg-black/20 backdrop-blur-sm flex items-center justify-center z-50 p-4">
|
|
||||||
<div className="bg-white rounded-lg shadow-xl max-w-md w-full p-6">
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900 mb-4">
|
|
||||||
Invite Team Member
|
|
||||||
</h2>
|
|
||||||
<p className="text-gray-600 mb-4">
|
|
||||||
Send an invitation to join your team. The invited member will see the invitation on their dashboard after logging in.
|
|
||||||
</p>
|
|
||||||
<div className="bg-yellow-50 border border-yellow-200 rounded-lg p-3 mb-6">
|
|
||||||
<p className="text-sm text-yellow-800">
|
|
||||||
<strong>Important:</strong> The email you enter must match the GitHub email address the member uses to sign in.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<form onSubmit={handleInviteMember} className="space-y-4">
|
|
||||||
<div>
|
|
||||||
<label htmlFor="invite-email" className="block text-sm font-medium text-gray-700 mb-2">
|
|
||||||
Email Address
|
|
||||||
</label>
|
|
||||||
<input
|
|
||||||
id="invite-email"
|
|
||||||
type="email"
|
|
||||||
value={inviteEmail}
|
|
||||||
onChange={(e) => setInviteEmail(e.target.value)}
|
|
||||||
placeholder="Enter email address..."
|
|
||||||
className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
<p className="text-sm text-gray-500 mt-1">
|
|
||||||
Current members: {members.length}/{MAX_TEAM_MEMBERS}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div className="flex space-x-3">
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="secondary"
|
|
||||||
className="flex-1"
|
|
||||||
onClick={() => {
|
|
||||||
setShowInviteModal(false);
|
|
||||||
setInviteEmail('');
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
type="submit"
|
|
||||||
className="flex-1"
|
|
||||||
disabled={!inviteEmail.trim() || isInviting}
|
|
||||||
>
|
|
||||||
{isInviting ? 'Sending...' : 'Send Invitation'}
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Join Requests Modal */}
|
|
||||||
{showJoinRequestsModal && (
|
|
||||||
<div className="fixed inset-0 bg-black/30 backdrop-blur-sm flex items-center justify-center z-50 p-4">
|
|
||||||
<div className="bg-white rounded-lg shadow-xl max-w-2xl w-full p-6 max-h-[80vh] overflow-y-auto">
|
|
||||||
<div className="flex items-center justify-between mb-6">
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900">
|
|
||||||
Join Requests ({pendingJoinRequests.length})
|
|
||||||
</h2>
|
|
||||||
<button
|
|
||||||
onClick={() => setShowJoinRequestsModal(false)}
|
|
||||||
className="text-gray-400 hover:text-gray-600 text-2xl"
|
|
||||||
>
|
|
||||||
✕
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{pendingJoinRequests.length === 0 ? (
|
|
||||||
<div className="text-center py-12">
|
|
||||||
<p className="text-gray-600 text-lg">No pending join requests</p>
|
|
||||||
<p className="text-gray-500 text-sm mt-2">
|
|
||||||
When users request to join your team, they'll appear here
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="space-y-4">
|
|
||||||
{pendingJoinRequests.map((request: any) => (
|
|
||||||
<div key={request.id} className="border border-gray-200 rounded-lg p-4 hover:shadow-md transition-shadow">
|
|
||||||
<div className="flex items-start justify-between">
|
|
||||||
<div className="flex items-start space-x-3 flex-1">
|
|
||||||
{request.user?.avatar ? (
|
|
||||||
<img
|
|
||||||
src={request.user.avatar}
|
|
||||||
alt={request.user.fullname}
|
|
||||||
className="w-12 h-12 rounded-full object-cover"
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<div className="w-12 h-12 rounded-full bg-gray-200 flex items-center justify-center shrink-0">
|
|
||||||
<span className="text-gray-500 text-xl">👤</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div className="flex-1">
|
|
||||||
<p className="font-semibold text-gray-900">
|
|
||||||
{request.user?.fullname || 'Unknown User'}
|
|
||||||
</p>
|
|
||||||
<p className="text-sm text-gray-600">
|
|
||||||
{request.user?.email}
|
|
||||||
</p>
|
|
||||||
{request.message && (
|
|
||||||
<div className="mt-2 bg-gray-50 rounded-lg p-3">
|
|
||||||
<p className="text-sm text-gray-700">
|
|
||||||
<strong>Message:</strong> {request.message}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<p className="text-xs text-gray-500 mt-2">
|
|
||||||
Requested {new Date(request.created_at).toLocaleDateString()}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="flex space-x-2 ml-4">
|
|
||||||
<Button
|
|
||||||
onClick={() => handleRespondToJoinRequest(request.id, 'approve')}
|
|
||||||
disabled={isResponding || members.length >= MAX_TEAM_MEMBERS}
|
|
||||||
className="px-4 py-2 text-sm"
|
|
||||||
>
|
|
||||||
✓ Accept
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
onClick={() => handleRespondToJoinRequest(request.id, 'reject')}
|
|
||||||
disabled={isResponding}
|
|
||||||
variant="secondary"
|
|
||||||
className="px-4 py-2 text-sm"
|
|
||||||
>
|
|
||||||
✕ Reject
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{members.length >= MAX_TEAM_MEMBERS && (
|
|
||||||
<div className="mt-3 bg-yellow-50 border border-yellow-200 rounded-lg p-2">
|
|
||||||
<p className="text-xs text-yellow-800">
|
|
||||||
Team is full ({MAX_TEAM_MEMBERS}/{MAX_TEAM_MEMBERS} members). Remove a member before accepting new requests.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default TeamDashboardPage;
|
|
||||||
@@ -1,207 +0,0 @@
|
|||||||
import { FC, ReactElement } from 'react';
|
|
||||||
import { Button } from '@imphnen-frontend-service/ui/atoms';
|
|
||||||
import { useNavigate, useParams } from 'react-router';
|
|
||||||
import { useTeamById, useTeamSubmission } from '@imphnen-frontend-service/service';
|
|
||||||
|
|
||||||
const SubmissionViewPage: FC = (): ReactElement => {
|
|
||||||
const { teamId } = useParams<{ teamId: string }>();
|
|
||||||
const navigate = useNavigate();
|
|
||||||
|
|
||||||
const { data: teamData } = useTeamById(teamId || '');
|
|
||||||
const { data: submissionData, isLoading } = useTeamSubmission(teamId || '', !!teamId);
|
|
||||||
|
|
||||||
const team = teamData?.data;
|
|
||||||
const submission = submissionData?.data;
|
|
||||||
|
|
||||||
if (isLoading) {
|
|
||||||
return (
|
|
||||||
<div className="flex items-center justify-center min-h-screen">
|
|
||||||
<div className="text-gray-600">Loading submission...</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!submission) {
|
|
||||||
return (
|
|
||||||
<div className="flex flex-col items-center justify-center min-h-screen">
|
|
||||||
<div className="text-6xl mb-4">📄</div>
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900 mb-4">No Submission Yet</h2>
|
|
||||||
<p className="text-gray-600 mb-4">Your team hasn't submitted a project</p>
|
|
||||||
<Button onClick={() => navigate(`/teams/${teamId}`)}>Back to Team</Button>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const submittedDate = submission.submitted_at
|
|
||||||
? new Date(submission.submitted_at).toLocaleString('id-ID', {
|
|
||||||
day: 'numeric',
|
|
||||||
month: 'long',
|
|
||||||
year: 'numeric',
|
|
||||||
hour: '2-digit',
|
|
||||||
minute: '2-digit',
|
|
||||||
})
|
|
||||||
: 'Not submitted';
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="min-h-screen bg-gray-50">
|
|
||||||
<div className="bg-white border-b">
|
|
||||||
<div className="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<div>
|
|
||||||
<h1 className="text-3xl font-bold text-gray-900">Project Submission</h1>
|
|
||||||
<p className="text-gray-600 mt-1">{team?.name}</p>
|
|
||||||
</div>
|
|
||||||
<Button variant="secondary" onClick={() => navigate(`/teams/${teamId}`)}>
|
|
||||||
Back to Team
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="max-w-6xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
|
|
||||||
{/* Status Banner */}
|
|
||||||
<div className="bg-green-50 border border-green-500 rounded-lg p-6 mb-6">
|
|
||||||
<div className="flex items-center space-x-3">
|
|
||||||
<span className="text-4xl">✅</span>
|
|
||||||
<div>
|
|
||||||
<h3 className="font-bold text-green-900 text-lg">Project Submitted Successfully</h3>
|
|
||||||
<p className="text-green-700 text-sm">
|
|
||||||
Submitted on {submittedDate}
|
|
||||||
</p>
|
|
||||||
<p className="text-green-600 text-xs mt-1">
|
|
||||||
This submission is now read-only and cannot be edited
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="bg-white rounded-lg shadow-md overflow-hidden">
|
|
||||||
{/* Project Header */}
|
|
||||||
<div className="bg-gradient-to-r from-blue-600 to-blue-800 text-white p-8">
|
|
||||||
<h2 className="text-3xl font-bold mb-2">{submission.project_name}</h2>
|
|
||||||
<p className="text-blue-100">Team: {team?.name}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Project Details */}
|
|
||||||
<div className="p-8 space-y-6">
|
|
||||||
{/* Description */}
|
|
||||||
<div>
|
|
||||||
<h3 className="text-lg font-bold text-gray-900 mb-3">Project Description</h3>
|
|
||||||
<div className="bg-gray-50 rounded-lg p-4">
|
|
||||||
<p className="text-gray-700 whitespace-pre-wrap">{submission.description}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Links */}
|
|
||||||
<div className="grid gap-6 md:grid-cols-2">
|
|
||||||
{/* Repository */}
|
|
||||||
<div>
|
|
||||||
<h3 className="text-lg font-bold text-gray-900 mb-3">Repository</h3>
|
|
||||||
<a
|
|
||||||
href={submission.repository_url}
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
className="flex items-center space-x-2 text-blue-600 hover:text-blue-800"
|
|
||||||
>
|
|
||||||
<span>🔗</span>
|
|
||||||
<span className="break-all">{submission.repository_url}</span>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Demo URL */}
|
|
||||||
{submission.demo_url && (
|
|
||||||
<div>
|
|
||||||
<h3 className="text-lg font-bold text-gray-900 mb-3">Live Demo</h3>
|
|
||||||
<a
|
|
||||||
href={submission.demo_url}
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
className="flex items-center space-x-2 text-blue-600 hover:text-blue-800"
|
|
||||||
>
|
|
||||||
<span>🌐</span>
|
|
||||||
<span className="break-all">{submission.demo_url}</span>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Presentation URL */}
|
|
||||||
{submission.presentation_url && (
|
|
||||||
<div>
|
|
||||||
<h3 className="text-lg font-bold text-gray-900 mb-3">Presentation</h3>
|
|
||||||
<a
|
|
||||||
href={submission.presentation_url}
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
className="flex items-center space-x-2 text-blue-600 hover:text-blue-800"
|
|
||||||
>
|
|
||||||
<span>📊</span>
|
|
||||||
<span className="break-all">{submission.presentation_url}</span>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Screenshots */}
|
|
||||||
{submission.screenshots && submission.screenshots.length > 0 && (
|
|
||||||
<div>
|
|
||||||
<h3 className="text-lg font-bold text-gray-900 mb-3">
|
|
||||||
Screenshots ({submission.screenshots.length})
|
|
||||||
</h3>
|
|
||||||
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
|
|
||||||
{submission.screenshots.map((url, index) => (
|
|
||||||
<a
|
|
||||||
key={index}
|
|
||||||
href={url}
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
className="block"
|
|
||||||
>
|
|
||||||
<img
|
|
||||||
src={url}
|
|
||||||
alt={`Screenshot ${index + 1}`}
|
|
||||||
className="w-full h-48 object-cover rounded-lg border-2 border-gray-200 hover:border-blue-500 transition-colors cursor-pointer"
|
|
||||||
/>
|
|
||||||
</a>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Submission Info */}
|
|
||||||
<div className="bg-gray-50 rounded-lg p-4 border-t-4 border-blue-600">
|
|
||||||
<h3 className="text-sm font-bold text-gray-900 mb-2">Submission Information</h3>
|
|
||||||
<div className="grid gap-2 text-sm">
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span className="text-gray-600">Status:</span>
|
|
||||||
<span className="font-medium text-green-600">
|
|
||||||
{submission.status === 'submitted' ? '✓ Submitted' : 'Draft'}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span className="text-gray-600">Submitted:</span>
|
|
||||||
<span className="font-medium text-gray-900">{submittedDate}</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-between">
|
|
||||||
<span className="text-gray-600">Submission ID:</span>
|
|
||||||
<span className="font-medium text-gray-900 font-mono text-xs">
|
|
||||||
{submission.id}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Read-only Notice */}
|
|
||||||
<div className="bg-yellow-50 border border-yellow-200 rounded-lg p-4">
|
|
||||||
<p className="text-sm text-yellow-800">
|
|
||||||
<strong>Note:</strong> This submission is now locked and cannot be edited or deleted.
|
|
||||||
If you need to make changes, please contact the hackathon organizers.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default SubmissionViewPage;
|
|
||||||
@@ -1,296 +0,0 @@
|
|||||||
import { FC, ReactElement, useState } from 'react';
|
|
||||||
import { ControlledInputField } from '@imphnen-frontend-service/ui/organisms';
|
|
||||||
import { Button, Textarea } from '@imphnen-frontend-service/ui/atoms';
|
|
||||||
import { useNavigate, useParams } from 'react-router';
|
|
||||||
import { useForm, Controller } from 'react-hook-form';
|
|
||||||
import {
|
|
||||||
projectSubmissionSchema,
|
|
||||||
TProjectSubmissionForm,
|
|
||||||
useSubmitProject,
|
|
||||||
useTeamById,
|
|
||||||
useTeamSubmission,
|
|
||||||
useUploadFile,
|
|
||||||
useAuthStore,
|
|
||||||
} from '@imphnen-frontend-service/service';
|
|
||||||
import { zodResolver } from '@hookform/resolvers/zod';
|
|
||||||
|
|
||||||
const SubmitProjectPage: FC = (): ReactElement => {
|
|
||||||
const { teamId } = useParams<{ teamId: string }>();
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const { session } = useAuthStore();
|
|
||||||
const [showConfirmModal, setShowConfirmModal] = useState(false);
|
|
||||||
const [screenshots, setScreenshots] = useState<string[]>([]);
|
|
||||||
|
|
||||||
const { data: teamData } = useTeamById(teamId || '');
|
|
||||||
const { data: submissionData } = useTeamSubmission(teamId || '', !!teamId);
|
|
||||||
const { mutateAsync: submitProject, isPending: isSubmitting } = useSubmitProject(teamId || '');
|
|
||||||
const { mutateAsync: uploadFile, isPending: isUploading } = useUploadFile();
|
|
||||||
|
|
||||||
const team = teamData?.data;
|
|
||||||
const currentUserId = session?.user?.id;
|
|
||||||
const isLeader = currentUserId === team?.leader_id;
|
|
||||||
const hasSubmission = !!submissionData?.data;
|
|
||||||
|
|
||||||
const form = useForm<TProjectSubmissionForm>({
|
|
||||||
resolver: zodResolver(projectSubmissionSchema),
|
|
||||||
mode: 'all',
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!isLeader) {
|
|
||||||
return (
|
|
||||||
<div className="flex flex-col items-center justify-center min-h-screen">
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900 mb-4">Access Denied</h2>
|
|
||||||
<p className="text-gray-600 mb-4">Only the team leader can submit projects</p>
|
|
||||||
<Button onClick={() => navigate(`/teams/${teamId}`)}>Back to Team</Button>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hasSubmission) {
|
|
||||||
return (
|
|
||||||
<div className="flex flex-col items-center justify-center min-h-screen">
|
|
||||||
<div className="text-6xl mb-4">✅</div>
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900 mb-4">Project Already Submitted</h2>
|
|
||||||
<p className="text-gray-600 mb-4">Your team has already submitted a project</p>
|
|
||||||
<div className="flex space-x-3">
|
|
||||||
<Button onClick={() => navigate(`/teams/${teamId}/submission`)}>
|
|
||||||
View Submission
|
|
||||||
</Button>
|
|
||||||
<Button variant="secondary" onClick={() => navigate(`/teams/${teamId}`)}>
|
|
||||||
Back to Team
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleScreenshotUpload = async (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
||||||
const files = e.target.files;
|
|
||||||
if (!files) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const uploadPromises = Array.from(files).map(file => uploadFile(file));
|
|
||||||
const results = await Promise.all(uploadPromises);
|
|
||||||
const urls = results.map(r => r.data.url);
|
|
||||||
setScreenshots([...screenshots, ...urls]);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to upload screenshots:', error);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const removeScreenshot = (index: number) => {
|
|
||||||
setScreenshots(screenshots.filter((_, i) => i !== index));
|
|
||||||
};
|
|
||||||
|
|
||||||
const onSubmit = form.handleSubmit(async (data) => {
|
|
||||||
try {
|
|
||||||
await submitProject({
|
|
||||||
...data,
|
|
||||||
screenshots,
|
|
||||||
});
|
|
||||||
navigate(`/teams/${teamId}/submission`);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to submit project:', error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="min-h-screen bg-gray-50">
|
|
||||||
<div className="bg-white border-b">
|
|
||||||
<div className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
|
|
||||||
<h1 className="text-3xl font-bold text-gray-900">Submit Project</h1>
|
|
||||||
<p className="text-gray-600 mt-1">{team?.name}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
|
|
||||||
{/* Warning Banner */}
|
|
||||||
<div className="bg-red-50 border-2 border-red-500 rounded-lg p-6 mb-6">
|
|
||||||
<div className="flex items-start space-x-3">
|
|
||||||
<span className="text-3xl">⚠️</span>
|
|
||||||
<div>
|
|
||||||
<h3 className="font-bold text-red-900 text-lg">IMPORTANT WARNING</h3>
|
|
||||||
<ul className="text-red-800 mt-2 space-y-1 text-sm">
|
|
||||||
<li>• You can only submit your project ONCE</li>
|
|
||||||
<li>• After submission, you CANNOT edit or change anything</li>
|
|
||||||
<li>• Make sure all information is correct before submitting</li>
|
|
||||||
<li>• Review your project details carefully</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="bg-white rounded-lg shadow-md p-8">
|
|
||||||
<form onSubmit={(e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
setShowConfirmModal(true);
|
|
||||||
}} className="space-y-6">
|
|
||||||
{/* Project Name */}
|
|
||||||
<ControlledInputField
|
|
||||||
control={form.control}
|
|
||||||
label="Project Name"
|
|
||||||
placeholder="Enter your project name"
|
|
||||||
name="project_name"
|
|
||||||
/>
|
|
||||||
|
|
||||||
{/* Description */}
|
|
||||||
<div className="space-y-2">
|
|
||||||
<label className="block text-sm font-medium text-gray-700">
|
|
||||||
Project Description <span className="text-red-500">*</span>
|
|
||||||
</label>
|
|
||||||
<Controller
|
|
||||||
control={form.control}
|
|
||||||
name="description"
|
|
||||||
render={({ field, fieldState }) => (
|
|
||||||
<div>
|
|
||||||
<Textarea
|
|
||||||
{...field}
|
|
||||||
placeholder="Describe your project, its features, and what problem it solves..."
|
|
||||||
rows={6}
|
|
||||||
className="w-full"
|
|
||||||
/>
|
|
||||||
{fieldState.error && (
|
|
||||||
<p className="text-sm text-red-500 mt-1">{fieldState.error.message}</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Repository URL */}
|
|
||||||
<ControlledInputField
|
|
||||||
control={form.control}
|
|
||||||
label="Repository URL (GitHub, GitLab, etc.)"
|
|
||||||
placeholder="https://github.com/username/project"
|
|
||||||
name="repository_url"
|
|
||||||
type="url"
|
|
||||||
/>
|
|
||||||
|
|
||||||
{/* Demo URL */}
|
|
||||||
<ControlledInputField
|
|
||||||
control={form.control}
|
|
||||||
label="Demo URL (Optional)"
|
|
||||||
placeholder="https://your-project-demo.com"
|
|
||||||
name="demo_url"
|
|
||||||
type="url"
|
|
||||||
/>
|
|
||||||
|
|
||||||
{/* Presentation URL */}
|
|
||||||
<ControlledInputField
|
|
||||||
control={form.control}
|
|
||||||
label="Presentation URL (Optional)"
|
|
||||||
placeholder="https://slides.com/your-presentation or Google Drive link"
|
|
||||||
name="presentation_url"
|
|
||||||
type="url"
|
|
||||||
/>
|
|
||||||
|
|
||||||
{/* Screenshots */}
|
|
||||||
<div className="space-y-2">
|
|
||||||
<label className="block text-sm font-medium text-gray-700">
|
|
||||||
Project Screenshots <span className="text-gray-400">(Optional)</span>
|
|
||||||
</label>
|
|
||||||
<div className="grid grid-cols-2 md:grid-cols-3 gap-4 mb-4">
|
|
||||||
{screenshots.map((url, index) => (
|
|
||||||
<div key={index} className="relative">
|
|
||||||
<img
|
|
||||||
src={url}
|
|
||||||
alt={`Screenshot ${index + 1}`}
|
|
||||||
className="w-full h-32 object-cover rounded-lg border-2 border-gray-200"
|
|
||||||
/>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => removeScreenshot(index)}
|
|
||||||
className="absolute top-1 right-1 bg-red-500 text-white rounded-full w-6 h-6 flex items-center justify-center text-sm hover:bg-red-600"
|
|
||||||
>
|
|
||||||
×
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
<label className="flex flex-col items-center justify-center w-full h-32 border-2 border-dashed border-gray-300 rounded-lg cursor-pointer hover:bg-gray-50">
|
|
||||||
<div className="text-center">
|
|
||||||
<p className="text-gray-500">Click to upload screenshots</p>
|
|
||||||
<p className="text-xs text-gray-400 mt-1">PNG, JPG up to 5MB each</p>
|
|
||||||
</div>
|
|
||||||
<input
|
|
||||||
type="file"
|
|
||||||
accept="image/*"
|
|
||||||
multiple
|
|
||||||
className="hidden"
|
|
||||||
onChange={handleScreenshotUpload}
|
|
||||||
disabled={isUploading}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Submit Button */}
|
|
||||||
<div className="flex space-x-3 pt-4">
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="secondary"
|
|
||||||
className="flex-1"
|
|
||||||
onClick={() => navigate(`/teams/${teamId}`)}
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
type="submit"
|
|
||||||
className="flex-1"
|
|
||||||
disabled={!form.formState.isValid || isUploading}
|
|
||||||
>
|
|
||||||
Review & Submit
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Confirmation Modal */}
|
|
||||||
{showConfirmModal && (
|
|
||||||
<div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50 p-4">
|
|
||||||
<div className="bg-white rounded-lg shadow-xl max-w-md w-full p-6">
|
|
||||||
<div className="text-center mb-6">
|
|
||||||
<div className="text-5xl mb-4">⚠️</div>
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900 mb-2">
|
|
||||||
Final Confirmation
|
|
||||||
</h2>
|
|
||||||
<p className="text-red-600 font-medium">
|
|
||||||
This action is IRREVERSIBLE!
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div className="bg-gray-50 rounded-lg p-4 mb-6">
|
|
||||||
<p className="text-sm text-gray-700 mb-3">
|
|
||||||
By clicking "Submit Project", you confirm that:
|
|
||||||
</p>
|
|
||||||
<ul className="text-sm text-gray-600 space-y-2">
|
|
||||||
<li>✓ All information is correct and complete</li>
|
|
||||||
<li>✓ You understand this can only be done once</li>
|
|
||||||
<li>✓ You cannot edit after submission</li>
|
|
||||||
<li>✓ Your team agrees with this submission</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<div className="flex space-x-3">
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="secondary"
|
|
||||||
className="flex-1"
|
|
||||||
onClick={() => setShowConfirmModal(false)}
|
|
||||||
>
|
|
||||||
Go Back
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
onClick={onSubmit}
|
|
||||||
className="flex-1 bg-red-600 hover:bg-red-700"
|
|
||||||
disabled={isSubmitting}
|
|
||||||
>
|
|
||||||
{isSubmitting ? 'Submitting...' : 'Submit Project'}
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default SubmitProjectPage;
|
|
||||||
@@ -1,230 +0,0 @@
|
|||||||
import { FC, ReactElement, useState } from 'react';
|
|
||||||
import { Button, Input } from '@imphnen-frontend-service/ui/atoms';
|
|
||||||
import { Link, useNavigate } from 'react-router';
|
|
||||||
import { useTeams, useJoinTeam, useMyTeams, ETeamVisibility, joinTeamSchema, TJoinTeamForm } from '@imphnen-frontend-service/service';
|
|
||||||
import { useForm } from 'react-hook-form';
|
|
||||||
import { zodResolver } from '@hookform/resolvers/zod';
|
|
||||||
import INDONESIAN_CITIES_DATA from '../../../constants/cities';
|
|
||||||
|
|
||||||
const INDONESIAN_CITIES = ['All Cities', ...INDONESIAN_CITIES_DATA];
|
|
||||||
|
|
||||||
const BrowseTeamsPage: FC = (): ReactElement => {
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const [search, setSearch] = useState('');
|
|
||||||
const [selectedCity, setSelectedCity] = useState('All Cities');
|
|
||||||
const [selectedTeamId, setSelectedTeamId] = useState<string | null>(null);
|
|
||||||
const [showJoinModal, setShowJoinModal] = useState(false);
|
|
||||||
|
|
||||||
const { data: teamsData, isLoading } = useTeams({
|
|
||||||
search,
|
|
||||||
city: selectedCity === 'All Cities' ? undefined : selectedCity,
|
|
||||||
visibility: ETeamVisibility.PUBLIC,
|
|
||||||
});
|
|
||||||
|
|
||||||
const { data: myTeamsData } = useMyTeams();
|
|
||||||
const { mutateAsync: joinTeam, isPending: isJoining } = useJoinTeam();
|
|
||||||
|
|
||||||
const form = useForm<TJoinTeamForm>({
|
|
||||||
resolver: zodResolver(joinTeamSchema),
|
|
||||||
mode: 'all',
|
|
||||||
});
|
|
||||||
|
|
||||||
const teams = teamsData?.data || [];
|
|
||||||
const myTeams = myTeamsData?.data || [];
|
|
||||||
|
|
||||||
// Helper function to check if user is a member of a team
|
|
||||||
const isMyTeam = (teamId: string) => {
|
|
||||||
return myTeams.some((team: any) => team.id === teamId);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleJoinRequest = (teamId: string) => {
|
|
||||||
setSelectedTeamId(teamId);
|
|
||||||
setShowJoinModal(true);
|
|
||||||
};
|
|
||||||
|
|
||||||
const onSubmit = form.handleSubmit(async (data) => {
|
|
||||||
if (!selectedTeamId) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
await joinTeam({ teamId: selectedTeamId, data });
|
|
||||||
setShowJoinModal(false);
|
|
||||||
form.reset();
|
|
||||||
setSelectedTeamId(null);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to send join request:', error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="min-h-screen bg-gray-50">
|
|
||||||
{/* Header */}
|
|
||||||
<div className="bg-white border-b">
|
|
||||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<div>
|
|
||||||
<h1 className="text-3xl font-bold text-gray-900">Browse Teams</h1>
|
|
||||||
<p className="text-gray-600 mt-1">Find and join teams looking for members</p>
|
|
||||||
</div>
|
|
||||||
<Link to="/dashboard">
|
|
||||||
<Button variant="secondary">Back to Dashboard</Button>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Filters */}
|
|
||||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
|
|
||||||
<div className="bg-white p-6 rounded-lg shadow-sm mb-6">
|
|
||||||
<div className="grid gap-4 md:grid-cols-2">
|
|
||||||
<div>
|
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-2">
|
|
||||||
Search Teams
|
|
||||||
</label>
|
|
||||||
<Input
|
|
||||||
type="text"
|
|
||||||
placeholder="Search by team name..."
|
|
||||||
value={search}
|
|
||||||
onChange={(e) => setSearch(e.target.value)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-2">
|
|
||||||
Filter by City
|
|
||||||
</label>
|
|
||||||
<select
|
|
||||||
value={selectedCity}
|
|
||||||
onChange={(e) => setSelectedCity(e.target.value)}
|
|
||||||
className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent"
|
|
||||||
>
|
|
||||||
{INDONESIAN_CITIES.map((city) => (
|
|
||||||
<option key={city} value={city}>
|
|
||||||
{city}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Teams List */}
|
|
||||||
{isLoading ? (
|
|
||||||
<div className="text-center py-12">
|
|
||||||
<p className="text-gray-600">Loading teams...</p>
|
|
||||||
</div>
|
|
||||||
) : teams.length === 0 ? (
|
|
||||||
<div className="bg-white rounded-lg shadow-sm p-12 text-center">
|
|
||||||
<p className="text-gray-600 text-lg">No teams found</p>
|
|
||||||
<p className="text-gray-500 mt-2">Try adjusting your filters</p>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="grid gap-6 md:grid-cols-2 lg:grid-cols-3">
|
|
||||||
{teams.map((team) => (
|
|
||||||
<div key={team.id} className="bg-white rounded-lg shadow-md overflow-hidden hover:shadow-lg transition-shadow">
|
|
||||||
{team.banner && (
|
|
||||||
<img
|
|
||||||
src={team.banner}
|
|
||||||
alt={team.name}
|
|
||||||
className="w-full h-32 object-cover"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<div className="p-6">
|
|
||||||
<div className="flex items-center space-x-3 mb-3">
|
|
||||||
{team.logo ? (
|
|
||||||
<img
|
|
||||||
src={team.logo}
|
|
||||||
alt={team.name}
|
|
||||||
className="w-12 h-12 rounded-full object-cover"
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<div className="w-12 h-12 rounded-full bg-gray-200 flex items-center justify-center">
|
|
||||||
<span className="text-gray-500 text-xl">👥</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div className="flex-1">
|
|
||||||
<h3 className="text-lg font-bold text-gray-900">{team.name}</h3>
|
|
||||||
<p className="text-sm text-gray-600">📍 {team.city}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<p className="text-gray-600 text-sm mb-4 line-clamp-3">
|
|
||||||
{team.description}
|
|
||||||
</p>
|
|
||||||
{isMyTeam(team.id) ? (
|
|
||||||
<Button
|
|
||||||
className="w-full"
|
|
||||||
variant="secondary"
|
|
||||||
onClick={() => navigate(`/teams/${team.id}`)}
|
|
||||||
>
|
|
||||||
Your Team
|
|
||||||
</Button>
|
|
||||||
) : (
|
|
||||||
<Button
|
|
||||||
className="w-full"
|
|
||||||
onClick={() => handleJoinRequest(team.id)}
|
|
||||||
>
|
|
||||||
Request to Join
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Join Request Modal */}
|
|
||||||
{showJoinModal && (
|
|
||||||
<div className="fixed inset-0 bg-black/30 backdrop-blur-sm flex items-center justify-center z-50 p-4">
|
|
||||||
<div className="bg-white rounded-lg shadow-xl max-w-md w-full p-6">
|
|
||||||
<h2 className="text-2xl font-bold text-gray-900 mb-4">
|
|
||||||
Request to Join Team
|
|
||||||
</h2>
|
|
||||||
<p className="text-gray-600 mb-6">
|
|
||||||
Send a message to the team leader explaining why you want to join
|
|
||||||
</p>
|
|
||||||
<form onSubmit={onSubmit} className="space-y-4">
|
|
||||||
<div>
|
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-2">
|
|
||||||
Your Message
|
|
||||||
</label>
|
|
||||||
<textarea
|
|
||||||
{...form.register('message')}
|
|
||||||
rows={4}
|
|
||||||
className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent"
|
|
||||||
placeholder="Tell the team leader why you want to join their team..."
|
|
||||||
/>
|
|
||||||
{form.formState.errors.message && (
|
|
||||||
<p className="text-sm text-red-500 mt-1">
|
|
||||||
{form.formState.errors.message.message}
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className="flex space-x-3">
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="secondary"
|
|
||||||
className="flex-1"
|
|
||||||
onClick={() => {
|
|
||||||
setShowJoinModal(false);
|
|
||||||
form.reset();
|
|
||||||
setSelectedTeamId(null);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
type="submit"
|
|
||||||
className="flex-1"
|
|
||||||
disabled={!form.formState.isValid || isJoining}
|
|
||||||
>
|
|
||||||
{isJoining ? 'Sending...' : 'Send Request'}
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default BrowseTeamsPage;
|
|
||||||
@@ -1,317 +0,0 @@
|
|||||||
import { FC, ReactElement, useState } from 'react';
|
|
||||||
import { ControlledInputField } from '@imphnen-frontend-service/ui/organisms';
|
|
||||||
import { Button, Textarea } from '@imphnen-frontend-service/ui/atoms';
|
|
||||||
import { useNavigate } from 'react-router';
|
|
||||||
import { useForm, Controller } from 'react-hook-form';
|
|
||||||
import { teamCreateSchema, TTeamCreateForm, useCreateTeam, ETeamVisibility, useUploadFile } from '@imphnen-frontend-service/service';
|
|
||||||
import { zodResolver } from '@hookform/resolvers/zod';
|
|
||||||
import INDONESIAN_CITIES from '../../../constants/cities';
|
|
||||||
|
|
||||||
const CreateTeamPage: FC = (): ReactElement => {
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const [logoFile, setLogoFile] = useState<File | null>(null);
|
|
||||||
const [logoPreview, setLogoPreview] = useState<string>('');
|
|
||||||
const [bannerFile, setBannerFile] = useState<File | null>(null);
|
|
||||||
const [bannerPreview, setBannerPreview] = useState<string>('');
|
|
||||||
|
|
||||||
const form = useForm<TTeamCreateForm>({
|
|
||||||
resolver: zodResolver(teamCreateSchema),
|
|
||||||
mode: 'all',
|
|
||||||
defaultValues: {
|
|
||||||
visibility: ETeamVisibility.PUBLIC,
|
|
||||||
logo: null,
|
|
||||||
banner: null,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const { mutateAsync: createTeam, isPending: isCreating } = useCreateTeam();
|
|
||||||
const { mutateAsync: uploadFile, isPending: isUploading } = useUploadFile();
|
|
||||||
|
|
||||||
const handleLogoChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
||||||
const file = e.target.files?.[0];
|
|
||||||
if (file) {
|
|
||||||
setLogoFile(file);
|
|
||||||
const reader = new FileReader();
|
|
||||||
reader.onloadend = () => {
|
|
||||||
setLogoPreview(reader.result as string);
|
|
||||||
};
|
|
||||||
reader.readAsDataURL(file);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleBannerChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
||||||
const file = e.target.files?.[0];
|
|
||||||
if (file) {
|
|
||||||
setBannerFile(file);
|
|
||||||
const reader = new FileReader();
|
|
||||||
reader.onloadend = () => {
|
|
||||||
setBannerPreview(reader.result as string);
|
|
||||||
};
|
|
||||||
reader.readAsDataURL(file);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const onSubmit = form.handleSubmit(async (data) => {
|
|
||||||
try {
|
|
||||||
let logoUrl = null;
|
|
||||||
let bannerUrl = null;
|
|
||||||
|
|
||||||
if (logoFile) {
|
|
||||||
const logoResult = await uploadFile(logoFile);
|
|
||||||
logoUrl = logoResult.data.url;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bannerFile) {
|
|
||||||
const bannerResult = await uploadFile(bannerFile);
|
|
||||||
bannerUrl = bannerResult.data.url;
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = await createTeam({
|
|
||||||
...data,
|
|
||||||
logo: logoUrl,
|
|
||||||
banner: bannerUrl,
|
|
||||||
});
|
|
||||||
|
|
||||||
navigate(`/teams/${result.data.id}`);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to create team:', error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="min-h-screen bg-gray-50">
|
|
||||||
{/* Header */}
|
|
||||||
<div className="bg-white border-b">
|
|
||||||
<div className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
|
|
||||||
<h1 className="text-3xl font-bold text-gray-900">Create Your Team</h1>
|
|
||||||
<p className="text-gray-600 mt-1">Build your hackathon dream team</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
|
|
||||||
<div className="bg-white rounded-lg shadow-md p-8">
|
|
||||||
<form onSubmit={onSubmit} className="space-y-6">
|
|
||||||
{/* Banner Upload */}
|
|
||||||
<div>
|
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-2">
|
|
||||||
Team Banner <span className="text-gray-400">(Optional)</span>
|
|
||||||
</label>
|
|
||||||
{bannerPreview ? (
|
|
||||||
<div className="relative">
|
|
||||||
<img
|
|
||||||
src={bannerPreview}
|
|
||||||
alt="Banner preview"
|
|
||||||
className="w-full h-48 object-cover rounded-lg border-2 border-gray-200"
|
|
||||||
/>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => {
|
|
||||||
setBannerFile(null);
|
|
||||||
setBannerPreview('');
|
|
||||||
}}
|
|
||||||
className="absolute top-2 right-2 bg-red-500 text-white px-3 py-1 rounded-lg text-sm hover:bg-red-600"
|
|
||||||
>
|
|
||||||
Remove
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<label className="flex flex-col items-center justify-center w-full h-48 border-2 border-dashed border-gray-300 rounded-lg cursor-pointer hover:bg-gray-50">
|
|
||||||
<div className="text-center">
|
|
||||||
<p className="text-gray-500">Click to upload banner</p>
|
|
||||||
<p className="text-xs text-gray-400 mt-1">1200x400 recommended</p>
|
|
||||||
</div>
|
|
||||||
<input
|
|
||||||
type="file"
|
|
||||||
accept="image/*"
|
|
||||||
className="hidden"
|
|
||||||
onChange={handleBannerChange}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Logo Upload */}
|
|
||||||
<div>
|
|
||||||
<label className="block text-sm font-medium text-gray-700 mb-2">
|
|
||||||
Team Logo <span className="text-gray-400">(Optional, but highly recommended)</span>
|
|
||||||
</label>
|
|
||||||
<div className="flex items-center space-x-4">
|
|
||||||
{logoPreview ? (
|
|
||||||
<img
|
|
||||||
src={logoPreview}
|
|
||||||
alt="Logo preview"
|
|
||||||
className="w-24 h-24 rounded-full object-cover border-2 border-gray-200"
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<div className="w-24 h-24 rounded-full bg-gray-200 flex items-center justify-center">
|
|
||||||
<span className="text-gray-400 text-3xl">👥</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div>
|
|
||||||
<label htmlFor="logo" className="cursor-pointer">
|
|
||||||
<span className="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 inline-block">
|
|
||||||
{logoPreview ? 'Change Logo' : 'Upload Logo'}
|
|
||||||
</span>
|
|
||||||
<input
|
|
||||||
id="logo"
|
|
||||||
type="file"
|
|
||||||
accept="image/*"
|
|
||||||
className="hidden"
|
|
||||||
onChange={handleLogoChange}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
{logoPreview && (
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => {
|
|
||||||
setLogoFile(null);
|
|
||||||
setLogoPreview('');
|
|
||||||
}}
|
|
||||||
className="ml-3 px-4 py-2 bg-red-500 text-white rounded-lg hover:bg-red-600"
|
|
||||||
>
|
|
||||||
Remove
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Team Name */}
|
|
||||||
<ControlledInputField
|
|
||||||
control={form.control}
|
|
||||||
label="Team Name"
|
|
||||||
placeholder="Enter your team name"
|
|
||||||
name="name"
|
|
||||||
/>
|
|
||||||
|
|
||||||
{/* City */}
|
|
||||||
<div className="space-y-2">
|
|
||||||
<label className="block text-sm font-medium text-gray-700">
|
|
||||||
City <span className="text-red-500">*</span>
|
|
||||||
</label>
|
|
||||||
<Controller
|
|
||||||
control={form.control}
|
|
||||||
name="city"
|
|
||||||
render={({ field, fieldState }) => (
|
|
||||||
<div>
|
|
||||||
<select
|
|
||||||
{...field}
|
|
||||||
className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent"
|
|
||||||
>
|
|
||||||
<option value="">Select city</option>
|
|
||||||
{INDONESIAN_CITIES.map((city) => (
|
|
||||||
<option key={city} value={city}>
|
|
||||||
{city}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
{fieldState.error && (
|
|
||||||
<p className="text-sm text-red-500 mt-1">{fieldState.error.message}</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Description */}
|
|
||||||
<div className="space-y-2">
|
|
||||||
<label className="block text-sm font-medium text-gray-700">
|
|
||||||
Description <span className="text-red-500">*</span>
|
|
||||||
</label>
|
|
||||||
<Controller
|
|
||||||
control={form.control}
|
|
||||||
name="description"
|
|
||||||
render={({ field, fieldState }) => (
|
|
||||||
<div>
|
|
||||||
<Textarea
|
|
||||||
{...field}
|
|
||||||
placeholder="Tell others about your team, what you're looking for, your goals..."
|
|
||||||
rows={4}
|
|
||||||
className="w-full"
|
|
||||||
/>
|
|
||||||
{fieldState.error && (
|
|
||||||
<p className="text-sm text-red-500 mt-1">{fieldState.error.message}</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Visibility */}
|
|
||||||
<div className="space-y-2">
|
|
||||||
<label className="block text-sm font-medium text-gray-700">
|
|
||||||
Team Visibility <span className="text-red-500">*</span>
|
|
||||||
</label>
|
|
||||||
<Controller
|
|
||||||
control={form.control}
|
|
||||||
name="visibility"
|
|
||||||
render={({ field }) => (
|
|
||||||
<div className="space-y-3">
|
|
||||||
<label className="flex items-start space-x-3 cursor-pointer border rounded-lg p-4 hover:bg-gray-50">
|
|
||||||
<input
|
|
||||||
type="radio"
|
|
||||||
{...field}
|
|
||||||
value={ETeamVisibility.PUBLIC}
|
|
||||||
checked={field.value === ETeamVisibility.PUBLIC}
|
|
||||||
className="mt-1"
|
|
||||||
/>
|
|
||||||
<div>
|
|
||||||
<p className="font-medium text-gray-900">Public</p>
|
|
||||||
<p className="text-sm text-gray-600">
|
|
||||||
Team will be visible in Browse Teams. Anyone can request to join.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</label>
|
|
||||||
<label className="flex items-start space-x-3 cursor-pointer border rounded-lg p-4 hover:bg-gray-50">
|
|
||||||
<input
|
|
||||||
type="radio"
|
|
||||||
{...field}
|
|
||||||
value={ETeamVisibility.PRIVATE}
|
|
||||||
checked={field.value === ETeamVisibility.PRIVATE}
|
|
||||||
className="mt-1"
|
|
||||||
/>
|
|
||||||
<div>
|
|
||||||
<p className="font-medium text-gray-900">Private</p>
|
|
||||||
<p className="text-sm text-gray-600">
|
|
||||||
Team is hidden from Browse Teams. Members can only join via invitation.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Warning */}
|
|
||||||
<div className="bg-yellow-50 border border-yellow-200 rounded-lg p-4">
|
|
||||||
<p className="text-sm text-yellow-800">
|
|
||||||
<strong>Note:</strong> As team leader, you cannot leave or join another team after creating this team.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Submit Button */}
|
|
||||||
<div className="flex space-x-3 pt-4">
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="secondary"
|
|
||||||
className="flex-1"
|
|
||||||
onClick={() => navigate('/dashboard')}
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
type="submit"
|
|
||||||
className="flex-1"
|
|
||||||
disabled={!form.formState.isValid || isCreating || isUploading}
|
|
||||||
>
|
|
||||||
{isCreating || isUploading ? 'Creating Team...' : 'Create Team'}
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default CreateTeamPage;
|
|
||||||
@@ -1,144 +0,0 @@
|
|||||||
import { FC, useState } from 'react';
|
|
||||||
import { Link, useNavigate } from 'react-router';
|
|
||||||
import { useUserMe, useMyTeams } from '@imphnen-frontend-service/service';
|
|
||||||
import { useSession } from '@imphnen-frontend-service/utils';
|
|
||||||
|
|
||||||
export const Navigation: FC = () => {
|
|
||||||
const navigate = useNavigate();
|
|
||||||
const [showUserMenu, setShowUserMenu] = useState(false);
|
|
||||||
const { data: userData } = useUserMe();
|
|
||||||
const { data: teamsData } = useMyTeams();
|
|
||||||
const { signOut } = useSession();
|
|
||||||
|
|
||||||
const user = userData?.data;
|
|
||||||
const myTeams = teamsData?.data || [];
|
|
||||||
const hasTeam = myTeams.length > 0;
|
|
||||||
|
|
||||||
const handleLogout = async () => {
|
|
||||||
await signOut();
|
|
||||||
navigate('/auth/login');
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<nav className="bg-white border-b shadow-sm">
|
|
||||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
|
||||||
<div className="flex justify-between items-center h-16">
|
|
||||||
{/* Logo */}
|
|
||||||
<Link to="/dashboard" className="flex items-center space-x-2">
|
|
||||||
<span className="text-2xl">🏆</span>
|
|
||||||
<span className="text-xl font-bold text-gray-900">Hackathon</span>
|
|
||||||
</Link>
|
|
||||||
|
|
||||||
{/* Navigation Links */}
|
|
||||||
<div className="hidden md:flex items-center space-x-6">
|
|
||||||
<Link
|
|
||||||
to="/dashboard"
|
|
||||||
className="text-gray-700 hover:text-blue-600 font-medium transition-colors"
|
|
||||||
>
|
|
||||||
Dashboard
|
|
||||||
</Link>
|
|
||||||
<Link
|
|
||||||
to="/teams/browse"
|
|
||||||
className="text-gray-700 hover:text-blue-600 font-medium transition-colors"
|
|
||||||
>
|
|
||||||
Browse Teams
|
|
||||||
</Link>
|
|
||||||
{hasTeam && (
|
|
||||||
<Link
|
|
||||||
to={`/teams/${myTeams[0].id}`}
|
|
||||||
className="text-gray-700 hover:text-blue-600 font-medium transition-colors"
|
|
||||||
>
|
|
||||||
My Team
|
|
||||||
</Link>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* User Menu */}
|
|
||||||
<div className="relative">
|
|
||||||
<button
|
|
||||||
onClick={() => setShowUserMenu(!showUserMenu)}
|
|
||||||
className="flex items-center space-x-3 focus:outline-none"
|
|
||||||
>
|
|
||||||
{user?.avatar ? (
|
|
||||||
<img
|
|
||||||
src={user.avatar}
|
|
||||||
alt={user.fullname}
|
|
||||||
className="w-10 h-10 rounded-full object-cover border-2 border-gray-200"
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<div className="w-10 h-10 rounded-full bg-gray-200 flex items-center justify-center">
|
|
||||||
<span className="text-gray-500">👤</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<span className="hidden md:block text-gray-700 font-medium">
|
|
||||||
{user?.fullname}
|
|
||||||
</span>
|
|
||||||
<svg
|
|
||||||
className="w-4 h-4 text-gray-500"
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
strokeLinecap="round"
|
|
||||||
strokeLinejoin="round"
|
|
||||||
strokeWidth={2}
|
|
||||||
d="M19 9l-7 7-7-7"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
{/* Dropdown Menu */}
|
|
||||||
{showUserMenu && (
|
|
||||||
<div className="absolute right-0 mt-2 w-48 bg-white rounded-lg shadow-lg border border-gray-200 py-2 z-50">
|
|
||||||
<div className="px-4 py-2 border-b border-gray-200">
|
|
||||||
<p className="text-sm font-medium text-gray-900">{user?.fullname}</p>
|
|
||||||
<p className="text-xs text-gray-600 truncate">{user?.email}</p>
|
|
||||||
</div>
|
|
||||||
<Link
|
|
||||||
to="/dashboard"
|
|
||||||
className="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100"
|
|
||||||
onClick={() => setShowUserMenu(false)}
|
|
||||||
>
|
|
||||||
Dashboard
|
|
||||||
</Link>
|
|
||||||
<Link
|
|
||||||
to="/teams/browse"
|
|
||||||
className="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100"
|
|
||||||
onClick={() => setShowUserMenu(false)}
|
|
||||||
>
|
|
||||||
Browse Teams
|
|
||||||
</Link>
|
|
||||||
{hasTeam && (
|
|
||||||
<Link
|
|
||||||
to={`/teams/${myTeams[0].id}`}
|
|
||||||
className="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100"
|
|
||||||
onClick={() => setShowUserMenu(false)}
|
|
||||||
>
|
|
||||||
My Team
|
|
||||||
</Link>
|
|
||||||
)}
|
|
||||||
<div className="border-t border-gray-200 mt-2 pt-2">
|
|
||||||
<button
|
|
||||||
onClick={handleLogout}
|
|
||||||
className="block w-full text-left px-4 py-2 text-sm text-red-600 hover:bg-red-50"
|
|
||||||
>
|
|
||||||
Logout
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Close dropdown when clicking outside */}
|
|
||||||
{showUserMenu && (
|
|
||||||
<div
|
|
||||||
className="fixed inset-0 z-40"
|
|
||||||
onClick={() => setShowUserMenu(false)}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</nav>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@@ -1,518 +0,0 @@
|
|||||||
const INDONESIAN_CITIES: string[] = [
|
|
||||||
'Aceh Selatan',
|
|
||||||
'Aceh Tenggara',
|
|
||||||
'Aceh Timur',
|
|
||||||
'Aceh Tengah',
|
|
||||||
'Aceh Barat',
|
|
||||||
'Aceh Besar',
|
|
||||||
'Pidie',
|
|
||||||
'Aceh Utara',
|
|
||||||
'Simeulue',
|
|
||||||
'Aceh Singkil',
|
|
||||||
'Bireuen',
|
|
||||||
'Aceh Barat Daya',
|
|
||||||
'Gayo Lues',
|
|
||||||
'Aceh Jaya',
|
|
||||||
'Nagan Raya',
|
|
||||||
'Aceh Tamiang',
|
|
||||||
'Bener Meriah',
|
|
||||||
'Pidie Jaya',
|
|
||||||
'Kota Banda Aceh',
|
|
||||||
'Kota Sabang',
|
|
||||||
'Kota Lhokseumawe',
|
|
||||||
'Kota Langsa',
|
|
||||||
'Kota Subulussalam',
|
|
||||||
'Tapanuli Tengah',
|
|
||||||
'Tapanuli Utara',
|
|
||||||
'Tapanuli Selatan',
|
|
||||||
'Nias',
|
|
||||||
'Langkat',
|
|
||||||
'Karo',
|
|
||||||
'Deli Serdang',
|
|
||||||
'Simalungun',
|
|
||||||
'Asahan',
|
|
||||||
'Labuhanbatu',
|
|
||||||
'Dairi',
|
|
||||||
'Toba',
|
|
||||||
'Mandailing Natal',
|
|
||||||
'Nias Selatan',
|
|
||||||
'Pakpak Bharat',
|
|
||||||
'Humbang Hasundutan',
|
|
||||||
'Samosir',
|
|
||||||
'Serdang Bedagai',
|
|
||||||
'Batu Bara',
|
|
||||||
'Padang Lawas Utara',
|
|
||||||
'Padang Lawas',
|
|
||||||
'Labuhanbatu Selatan',
|
|
||||||
'Labuhanbatu Utara',
|
|
||||||
'Nias Utara',
|
|
||||||
'Nias Barat',
|
|
||||||
'Kota Medan',
|
|
||||||
'Kota Pematangsiantar',
|
|
||||||
'Kota Sibolga',
|
|
||||||
'Kota Tanjung Balai',
|
|
||||||
'Kota Binjai',
|
|
||||||
'Kota Tebing Tinggi',
|
|
||||||
'Kota Padangsidimpuan',
|
|
||||||
'Kota Gunungsitoli',
|
|
||||||
'Pesisir Selatan',
|
|
||||||
'Solok',
|
|
||||||
'Sijunjung',
|
|
||||||
'Tanah Datar',
|
|
||||||
'Padang Pariaman',
|
|
||||||
'Agam',
|
|
||||||
'Lima Puluh Kota',
|
|
||||||
'Pasaman',
|
|
||||||
'Kepulauan Mentawai',
|
|
||||||
'Dharmasraya',
|
|
||||||
'Solok Selatan',
|
|
||||||
'Pasaman Barat',
|
|
||||||
'Kota Padang',
|
|
||||||
'Kota Solok',
|
|
||||||
'Kota Sawahlunto',
|
|
||||||
'Kota Padang Panjang',
|
|
||||||
'Kota Bukittinggi',
|
|
||||||
'Kota Payakumbuh',
|
|
||||||
'Kota Pariaman',
|
|
||||||
'Kampar',
|
|
||||||
'Indragiri Hulu',
|
|
||||||
'Bengkalis',
|
|
||||||
'Indragiri Hilir',
|
|
||||||
'Pelalawan',
|
|
||||||
'Rokan Hulu',
|
|
||||||
'Rokan Hilir',
|
|
||||||
'Siak',
|
|
||||||
'Kuantan Singingi',
|
|
||||||
'Kepulauan Meranti',
|
|
||||||
'Kota Pekanbaru',
|
|
||||||
'Kota Dumai',
|
|
||||||
'Kerinci',
|
|
||||||
'Merangin',
|
|
||||||
'Sarolangun',
|
|
||||||
'Batanghari',
|
|
||||||
'Muaro Jambi',
|
|
||||||
'Tanjung Jabung Barat',
|
|
||||||
'Tanjung Jabung Timur',
|
|
||||||
'Bungo',
|
|
||||||
'Tebo',
|
|
||||||
'Kota Jambi',
|
|
||||||
'Kota Sungai Penuh',
|
|
||||||
'Ogan Komering Ulu',
|
|
||||||
'Ogan Komering Ilir',
|
|
||||||
'Muara Enim',
|
|
||||||
'Lahat',
|
|
||||||
'Musi Rawas',
|
|
||||||
'Musi Banyuasin',
|
|
||||||
'Banyuasin',
|
|
||||||
'Ogan Komering Ulu Timur',
|
|
||||||
'Ogan Komering Ulu Selatan',
|
|
||||||
'Ogan Ilir',
|
|
||||||
'Empat Lawang',
|
|
||||||
'Penukal Abab Lematang Ilir',
|
|
||||||
'Musi Rawas Utara',
|
|
||||||
'Kota Palembang',
|
|
||||||
'Kota Pagar Alam',
|
|
||||||
'Kota Lubuk Linggau',
|
|
||||||
'Kota Prabumulih',
|
|
||||||
'Bengkulu Selatan',
|
|
||||||
'Rejang Lebong',
|
|
||||||
'Bengkulu Utara',
|
|
||||||
'Kaur',
|
|
||||||
'Seluma',
|
|
||||||
'Muko Muko',
|
|
||||||
'Lebong',
|
|
||||||
'Kepahiang',
|
|
||||||
'Bengkulu Tengah',
|
|
||||||
'Kota Bengkulu',
|
|
||||||
'Lampung Selatan',
|
|
||||||
'Lampung Tengah',
|
|
||||||
'Lampung Utara',
|
|
||||||
'Lampung Barat',
|
|
||||||
'Tulang Bawang',
|
|
||||||
'Tanggamus',
|
|
||||||
'Lampung Timur',
|
|
||||||
'Way Kanan',
|
|
||||||
'Pesawaran',
|
|
||||||
'Pringsewu',
|
|
||||||
'Mesuji',
|
|
||||||
'Tulang Bawang Barat',
|
|
||||||
'Pesisir Barat',
|
|
||||||
'Kota Bandar Lampung',
|
|
||||||
'Kota Metro',
|
|
||||||
'Bangka',
|
|
||||||
'Belitung',
|
|
||||||
'Bangka Selatan',
|
|
||||||
'Bangka Tengah',
|
|
||||||
'Bangka Barat',
|
|
||||||
'Belitung Timur',
|
|
||||||
'Kota Pangkal Pinang',
|
|
||||||
'Bintan',
|
|
||||||
'Karimun',
|
|
||||||
'Natuna',
|
|
||||||
'Lingga',
|
|
||||||
'Kepulauan Anambas',
|
|
||||||
'Kota Batam',
|
|
||||||
'Kota Tanjung Pinang',
|
|
||||||
'Kepulauan Seribu',
|
|
||||||
'Kota Jakarta Pusat',
|
|
||||||
'Kota Jakarta Utara',
|
|
||||||
'Kota Jakarta Barat',
|
|
||||||
'Kota Jakarta Selatan',
|
|
||||||
'Kota Jakarta Timur',
|
|
||||||
'Bogor',
|
|
||||||
'Sukabumi',
|
|
||||||
'Cianjur',
|
|
||||||
'Bandung',
|
|
||||||
'Garut',
|
|
||||||
'Tasikmalaya',
|
|
||||||
'Ciamis',
|
|
||||||
'Kuningan',
|
|
||||||
'Cirebon',
|
|
||||||
'Majalengka',
|
|
||||||
'Sumedang',
|
|
||||||
'Indramayu',
|
|
||||||
'Subang',
|
|
||||||
'Purwakarta',
|
|
||||||
'Karawang',
|
|
||||||
'Bekasi',
|
|
||||||
'Bandung Barat',
|
|
||||||
'Pangandaran',
|
|
||||||
'Kota Bogor',
|
|
||||||
'Kota Sukabumi',
|
|
||||||
'Kota Bandung',
|
|
||||||
'Kota Cirebon',
|
|
||||||
'Kota Bekasi',
|
|
||||||
'Kota Depok',
|
|
||||||
'Kota Cimahi',
|
|
||||||
'Kota Tasikmalaya',
|
|
||||||
'Kota Banjar',
|
|
||||||
'Cilacap',
|
|
||||||
'Banyumas',
|
|
||||||
'Purbalingga',
|
|
||||||
'Banjarnegara',
|
|
||||||
'Kebumen',
|
|
||||||
'Purworejo',
|
|
||||||
'Wonosobo',
|
|
||||||
'Magelang',
|
|
||||||
'Boyolali',
|
|
||||||
'Klaten',
|
|
||||||
'Sukoharjo',
|
|
||||||
'Wonogiri',
|
|
||||||
'Karanganyar',
|
|
||||||
'Sragen',
|
|
||||||
'Grobogan',
|
|
||||||
'Blora',
|
|
||||||
'Rembang',
|
|
||||||
'Pati',
|
|
||||||
'Kudus',
|
|
||||||
'Jepara',
|
|
||||||
'Demak',
|
|
||||||
'Semarang',
|
|
||||||
'Temanggung',
|
|
||||||
'Kendal',
|
|
||||||
'Batang',
|
|
||||||
'Pekalongan',
|
|
||||||
'Pemalang',
|
|
||||||
'Tegal',
|
|
||||||
'Brebes',
|
|
||||||
'Kota Magelang',
|
|
||||||
'Kota Surakarta',
|
|
||||||
'Kota Salatiga',
|
|
||||||
'Kota Semarang',
|
|
||||||
'Kota Pekalongan',
|
|
||||||
'Kota Tegal',
|
|
||||||
'Kulon Progo',
|
|
||||||
'Bantul',
|
|
||||||
'Gunungkidul',
|
|
||||||
'Sleman',
|
|
||||||
'Kota Yogyakarta',
|
|
||||||
'Pacitan',
|
|
||||||
'Ponorogo',
|
|
||||||
'Trenggalek',
|
|
||||||
'Tulungagung',
|
|
||||||
'Blitar',
|
|
||||||
'Kediri',
|
|
||||||
'Malang',
|
|
||||||
'Lumajang',
|
|
||||||
'Jember',
|
|
||||||
'Banyuwangi',
|
|
||||||
'Bondowoso',
|
|
||||||
'Situbondo',
|
|
||||||
'Probolinggo',
|
|
||||||
'Pasuruan',
|
|
||||||
'Sidoarjo',
|
|
||||||
'Mojokerto',
|
|
||||||
'Jombang',
|
|
||||||
'Nganjuk',
|
|
||||||
'Madiun',
|
|
||||||
'Magetan',
|
|
||||||
'Ngawi',
|
|
||||||
'Bojonegoro',
|
|
||||||
'Tuban',
|
|
||||||
'Lamongan',
|
|
||||||
'Gresik',
|
|
||||||
'Bangkalan',
|
|
||||||
'Sampang',
|
|
||||||
'Pamekasan',
|
|
||||||
'Sumenep',
|
|
||||||
'Kota Kediri',
|
|
||||||
'Kota Blitar',
|
|
||||||
'Kota Malang',
|
|
||||||
'Kota Probolinggo',
|
|
||||||
'Kota Pasuruan',
|
|
||||||
'Kota Mojokerto',
|
|
||||||
'Kota Madiun',
|
|
||||||
'Kota Surabaya',
|
|
||||||
'Kota Batu',
|
|
||||||
'Pandeglang',
|
|
||||||
'Lebak',
|
|
||||||
'Tangerang',
|
|
||||||
'Serang',
|
|
||||||
'Kota Tangerang',
|
|
||||||
'Kota Cilegon',
|
|
||||||
'Kota Serang',
|
|
||||||
'Kota Tangerang Selatan',
|
|
||||||
'Jembrana',
|
|
||||||
'Tabanan',
|
|
||||||
'Badung',
|
|
||||||
'Gianyar',
|
|
||||||
'Klungkung',
|
|
||||||
'Bangli',
|
|
||||||
'Karangasem',
|
|
||||||
'Buleleng',
|
|
||||||
'Kota Denpasar',
|
|
||||||
'Lombok Barat',
|
|
||||||
'Lombok Tengah',
|
|
||||||
'Lombok Timur',
|
|
||||||
'Sumbawa',
|
|
||||||
'Dompu',
|
|
||||||
'Bima',
|
|
||||||
'Sumbawa Barat',
|
|
||||||
'Lombok Utara',
|
|
||||||
'Kota Mataram',
|
|
||||||
'Kota Bima',
|
|
||||||
'Kupang',
|
|
||||||
'Timor Tengah Selatan',
|
|
||||||
'Timor Tengah Utara',
|
|
||||||
'Belu',
|
|
||||||
'Alor',
|
|
||||||
'Flores Timur',
|
|
||||||
'Sikka',
|
|
||||||
'Ende',
|
|
||||||
'Ngada',
|
|
||||||
'Manggarai',
|
|
||||||
'Sumba Timur',
|
|
||||||
'Sumba Barat',
|
|
||||||
'Lembata',
|
|
||||||
'Rote Ndao',
|
|
||||||
'Manggarai Barat',
|
|
||||||
'Nagekeo',
|
|
||||||
'Sumba Tengah',
|
|
||||||
'Sumba Barat Daya',
|
|
||||||
'Manggarai Timur',
|
|
||||||
'Sabu Raijua',
|
|
||||||
'Malaka',
|
|
||||||
'Kota Kupang',
|
|
||||||
'Sambas',
|
|
||||||
'Mempawah',
|
|
||||||
'Sanggau',
|
|
||||||
'Ketapang',
|
|
||||||
'Sintang',
|
|
||||||
'Kapuas Hulu',
|
|
||||||
'Bengkayang',
|
|
||||||
'Landak',
|
|
||||||
'Sekadau',
|
|
||||||
'Melawi',
|
|
||||||
'Kayong Utara',
|
|
||||||
'Kubu Raya',
|
|
||||||
'Kota Pontianak',
|
|
||||||
'Kota Singkawang',
|
|
||||||
'Kotawaringin Barat',
|
|
||||||
'Kotawaringin Timur',
|
|
||||||
'Kapuas',
|
|
||||||
'Barito Selatan',
|
|
||||||
'Barito Utara',
|
|
||||||
'Katingan',
|
|
||||||
'Seruyan',
|
|
||||||
'Sukamara',
|
|
||||||
'Lamandau',
|
|
||||||
'Gunung Mas',
|
|
||||||
'Pulang Pisau',
|
|
||||||
'Murung Raya',
|
|
||||||
'Barito Timur',
|
|
||||||
'Kota Palangkaraya',
|
|
||||||
'Tanah Laut',
|
|
||||||
'Kotabaru',
|
|
||||||
'Banjar',
|
|
||||||
'Barito Kuala',
|
|
||||||
'Tapin',
|
|
||||||
'Hulu Sungai Selatan',
|
|
||||||
'Hulu Sungai Tengah',
|
|
||||||
'Hulu Sungai Utara',
|
|
||||||
'Tabalong',
|
|
||||||
'Tanah Bumbu',
|
|
||||||
'Balangan',
|
|
||||||
'Kota Banjarmasin',
|
|
||||||
'Kota Banjarbaru',
|
|
||||||
'Paser',
|
|
||||||
'Kutai Kartanegara',
|
|
||||||
'Berau',
|
|
||||||
'Kutai Barat',
|
|
||||||
'Kutai Timur',
|
|
||||||
'Penajam Paser Utara',
|
|
||||||
'Mahakam Ulu',
|
|
||||||
'Kota Balikpapan',
|
|
||||||
'Kota Samarinda',
|
|
||||||
'Kota Bontang',
|
|
||||||
'Bulungan',
|
|
||||||
'Malinau',
|
|
||||||
'Nunukan',
|
|
||||||
'Tana Tidung',
|
|
||||||
'Kota Tarakan',
|
|
||||||
'Bolaang Mongondow',
|
|
||||||
'Minahasa',
|
|
||||||
'Kepulauan Sangihe',
|
|
||||||
'Kepulauan Talaud',
|
|
||||||
'Minahasa Selatan',
|
|
||||||
'Minahasa Utara',
|
|
||||||
'Minahasa Tenggara',
|
|
||||||
'Bolaang Mongondow Utara',
|
|
||||||
'Kepulauan Siau Tagulandang Biaro (Sitaro)',
|
|
||||||
'Bolaang Mongondow Timur',
|
|
||||||
'Bolaang Mongondow Selatan',
|
|
||||||
'Kota Manado',
|
|
||||||
'Kota Bitung',
|
|
||||||
'Kota Tomohon',
|
|
||||||
'Kota Kotamobagu',
|
|
||||||
'Banggai',
|
|
||||||
'Poso',
|
|
||||||
'Donggala',
|
|
||||||
'Toli Toli',
|
|
||||||
'Buol',
|
|
||||||
'Morowali',
|
|
||||||
'Banggai Kepulauan',
|
|
||||||
'Parigi Moutong',
|
|
||||||
'Tojo Una Una',
|
|
||||||
'Sigi',
|
|
||||||
'Banggai Laut',
|
|
||||||
'Morowali Utara',
|
|
||||||
'Kota Palu',
|
|
||||||
'Kepulauan Selayar',
|
|
||||||
'Bulukumba',
|
|
||||||
'Bantaeng',
|
|
||||||
'Jeneponto',
|
|
||||||
'Takalar',
|
|
||||||
'Gowa',
|
|
||||||
'Sinjai',
|
|
||||||
'Bone',
|
|
||||||
'Maros',
|
|
||||||
'Pangkajene Kepulauan',
|
|
||||||
'Barru',
|
|
||||||
'Soppeng',
|
|
||||||
'Wajo',
|
|
||||||
'Sidenreng Rappang',
|
|
||||||
'Pinrang',
|
|
||||||
'Enrekang',
|
|
||||||
'Luwu',
|
|
||||||
'Tana Toraja',
|
|
||||||
'Luwu Utara',
|
|
||||||
'Luwu Timur',
|
|
||||||
'Toraja Utara',
|
|
||||||
'Kota Makassar',
|
|
||||||
'Kota Pare Pare',
|
|
||||||
'Kota Palopo',
|
|
||||||
'Kolaka',
|
|
||||||
'Konawe',
|
|
||||||
'Muna',
|
|
||||||
'Buton',
|
|
||||||
'Konawe Selatan',
|
|
||||||
'Bombana',
|
|
||||||
'Wakatobi',
|
|
||||||
'Kolaka Utara',
|
|
||||||
'Konawe Utara',
|
|
||||||
'Buton Utara',
|
|
||||||
'Kolaka Timur',
|
|
||||||
'Konawe Kepulauan',
|
|
||||||
'Muna Barat',
|
|
||||||
'Buton Tengah',
|
|
||||||
'Buton Selatan',
|
|
||||||
'Kota Kendari',
|
|
||||||
'Kota Bau Bau',
|
|
||||||
'Gorontalo',
|
|
||||||
'Boalemo',
|
|
||||||
'Bone Bolango',
|
|
||||||
'Pahuwato',
|
|
||||||
'Gorontalo Utara',
|
|
||||||
'Kota Gorontalo',
|
|
||||||
'Pasangkayu (Mamuju Utara)',
|
|
||||||
'Mamuju',
|
|
||||||
'Mamasa',
|
|
||||||
'Polewali Mandar',
|
|
||||||
'Majene',
|
|
||||||
'Mamuju Tengah',
|
|
||||||
'Maluku Tengah',
|
|
||||||
'Maluku Tenggara',
|
|
||||||
'Kepulauan Tanimbar (Maluku Tenggara Barat)',
|
|
||||||
'Buru',
|
|
||||||
'Seram Bagian Timur',
|
|
||||||
'Seram Bagian Barat',
|
|
||||||
'Kepulauan Aru',
|
|
||||||
'Maluku Barat Daya',
|
|
||||||
'Buru Selatan',
|
|
||||||
'Kota Ambon',
|
|
||||||
'Kota Tual',
|
|
||||||
'Halmahera Barat',
|
|
||||||
'Halmahera Tengah',
|
|
||||||
'Halmahera Utara',
|
|
||||||
'Halmahera Selatan',
|
|
||||||
'Kepulauan Sula',
|
|
||||||
'Halmahera Timur',
|
|
||||||
'Pulau Morotai',
|
|
||||||
'Pulau Taliabu',
|
|
||||||
'Kota Ternate',
|
|
||||||
'Kota Tidore Kepulauan',
|
|
||||||
'Jayapura',
|
|
||||||
'Kepulauan Yapen',
|
|
||||||
'Biak Numfor',
|
|
||||||
'Sarmi',
|
|
||||||
'Keerom',
|
|
||||||
'Waropen',
|
|
||||||
'Supiori',
|
|
||||||
'Mamberamo Raya',
|
|
||||||
'Kota Jayapura',
|
|
||||||
'Manokwari',
|
|
||||||
'Fak Fak',
|
|
||||||
'Teluk Bintuni',
|
|
||||||
'Teluk Wondama',
|
|
||||||
'Kaimana',
|
|
||||||
'Manokwari Selatan',
|
|
||||||
'Pegunungan Arfak',
|
|
||||||
'Merauke',
|
|
||||||
'Boven Digoel',
|
|
||||||
'Mappi',
|
|
||||||
'Asmat',
|
|
||||||
'Nabire',
|
|
||||||
'Puncak Jaya',
|
|
||||||
'Paniai',
|
|
||||||
'Mimika',
|
|
||||||
'Puncak',
|
|
||||||
'Dogiyai',
|
|
||||||
'Intan Jaya',
|
|
||||||
'Deiyai',
|
|
||||||
'Jayawijaya',
|
|
||||||
'Pegunungan Bintang',
|
|
||||||
'Yahukimo',
|
|
||||||
'Tolikara',
|
|
||||||
'Mamberamo Tengah',
|
|
||||||
'Yalimo',
|
|
||||||
'Lanny Jaya',
|
|
||||||
'Nduga',
|
|
||||||
'Sorong',
|
|
||||||
'Sorong Selatan',
|
|
||||||
'Raja Ampat',
|
|
||||||
'Tambrauw',
|
|
||||||
'Maybrat',
|
|
||||||
'Kota Sorong',
|
|
||||||
];
|
|
||||||
|
|
||||||
export default INDONESIAN_CITIES;
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
import { useTeamById, useTeamMembers, useUserMe, useTeamSubmission } from '@imphnen-frontend-service/service';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Hook to check if current user is a member of the team
|
|
||||||
*/
|
|
||||||
export const useTeamMembership = (teamId: string) => {
|
|
||||||
const { data: userData } = useUserMe();
|
|
||||||
const { data: membersData } = useTeamMembers(teamId);
|
|
||||||
|
|
||||||
const currentUser = userData?.data;
|
|
||||||
const members = membersData?.data || [];
|
|
||||||
|
|
||||||
const isMember = members.some(m => m.user_id === currentUser?.id);
|
|
||||||
const currentMember = members.find(m => m.user_id === currentUser?.id);
|
|
||||||
|
|
||||||
return {
|
|
||||||
isMember,
|
|
||||||
currentMember,
|
|
||||||
memberRole: currentMember?.role,
|
|
||||||
memberStatus: currentMember?.status,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Hook to check if current user is the team leader
|
|
||||||
*/
|
|
||||||
export const useIsTeamLeader = (teamId: string) => {
|
|
||||||
const { data: teamData } = useTeamById(teamId);
|
|
||||||
const { data: userData } = useUserMe();
|
|
||||||
|
|
||||||
const team = teamData?.data;
|
|
||||||
const currentUser = userData?.data;
|
|
||||||
|
|
||||||
const isLeader = currentUser?.id === team?.leader_id;
|
|
||||||
|
|
||||||
return {
|
|
||||||
isLeader,
|
|
||||||
leaderId: team?.leader_id,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Hook to get team submission status
|
|
||||||
*/
|
|
||||||
export const useTeamSubmissionStatus = (teamId: string) => {
|
|
||||||
const { data: submissionData, isLoading } = useTeamSubmission(teamId, !!teamId);
|
|
||||||
|
|
||||||
const hasSubmission = !!submissionData?.data;
|
|
||||||
const submission = submissionData?.data;
|
|
||||||
const isSubmitted = submission?.status === 'submitted';
|
|
||||||
|
|
||||||
return {
|
|
||||||
hasSubmission,
|
|
||||||
isSubmitted,
|
|
||||||
submission,
|
|
||||||
isLoading,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Hook to check if current user can perform team actions
|
|
||||||
*/
|
|
||||||
export const useTeamPermissions = (teamId: string) => {
|
|
||||||
const { isLeader } = useIsTeamLeader(teamId);
|
|
||||||
const { isMember } = useTeamMembership(teamId);
|
|
||||||
const { hasSubmission } = useTeamSubmissionStatus(teamId);
|
|
||||||
|
|
||||||
return {
|
|
||||||
canEditTeam: isLeader,
|
|
||||||
canManageMembers: isLeader,
|
|
||||||
canSubmitProject: isLeader && !hasSubmission,
|
|
||||||
canViewTeam: isMember,
|
|
||||||
canViewSubmission: isMember,
|
|
||||||
canAccessChat: isMember,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
@@ -1,136 +0,0 @@
|
|||||||
@import url('https://fonts.googleapis.com/css2?family=Bai+Jamjuree:ital,wght@0,200;0,300;0,400;0,500;0,600;0,700;1,200;1,300;1,400;1,500;1,600;1,700&display=swap');
|
|
||||||
@import 'tailwindcss';
|
|
||||||
@source "../../../libs/ui/**/*.{ts,tsx}";
|
|
||||||
|
|
||||||
@theme {
|
|
||||||
--color-primary-50: #f0f8ff;
|
|
||||||
--color-primary-100: #e1f0fd;
|
|
||||||
--color-primary-200: #bce1fb;
|
|
||||||
--color-primary-300: #81cbf8;
|
|
||||||
--color-primary-400: #3eb0f2;
|
|
||||||
--color-primary-500: #23a1eb;
|
|
||||||
--color-primary-600: #0877c1;
|
|
||||||
--color-primary-700: #085f9c;
|
|
||||||
--color-primary-800: #0b5181;
|
|
||||||
--color-primary-900: #0f446b;
|
|
||||||
--color-primary-950: #0a2b47;
|
|
||||||
|
|
||||||
--color-neutral-50: #f6f6f6;
|
|
||||||
--color-neutral-100: #e7e7e7;
|
|
||||||
--color-neutral-200: #d1d1d1;
|
|
||||||
--color-neutral-300: #b0b0b0;
|
|
||||||
--color-neutral-400: #888888;
|
|
||||||
--color-neutral-500: #6d6d6d;
|
|
||||||
--color-neutral-600: #5d5d5d;
|
|
||||||
--color-neutral-700: #4f4f4f;
|
|
||||||
--color-neutral-800: #454545;
|
|
||||||
--color-neutral-900: #3d3d3d;
|
|
||||||
--color-neutral-950: #2b2b2b;
|
|
||||||
|
|
||||||
--color-success-100: #e0fbd8;
|
|
||||||
--color-success-200: #bcf8b0;
|
|
||||||
--color-success-300: #8eea85;
|
|
||||||
--color-success-400: #63d564;
|
|
||||||
--color-success-500: #35ba43;
|
|
||||||
--color-success-600: #269f3e;
|
|
||||||
--color-success-700: #1a8439;
|
|
||||||
--color-success-800: #106b32;
|
|
||||||
--color-success-900: #0b592f;
|
|
||||||
|
|
||||||
--color-info-100: #ccfcfe;
|
|
||||||
--color-info-200: #9bf3fd;
|
|
||||||
--color-info-300: #67e3fb;
|
|
||||||
--color-info-400: #42cdf8;
|
|
||||||
--color-info-500: #04acf3;
|
|
||||||
--color-info-600: #0185d0;
|
|
||||||
--color-info-700: #0264af;
|
|
||||||
--color-info-800: #01478d;
|
|
||||||
--color-info-900: #003375;
|
|
||||||
|
|
||||||
--color-warning-100: #fffcd3;
|
|
||||||
--color-warning-200: #fffaa9;
|
|
||||||
--color-warning-300: #fff67d;
|
|
||||||
--color-warning-400: #fff25d;
|
|
||||||
--color-warning-500: #ffed27;
|
|
||||||
--color-warning-600: #dbc91d;
|
|
||||||
--color-warning-700: #b7a714;
|
|
||||||
--color-warning-800: #93850b;
|
|
||||||
--color-warning-900: #7a6d07;
|
|
||||||
|
|
||||||
--color-danger-100: #ffe8da;
|
|
||||||
--color-danger-200: #ffcbb3;
|
|
||||||
--color-danger-300: #ffaa8d;
|
|
||||||
--color-danger-400: #ff8870;
|
|
||||||
--color-danger-500: #ff5242;
|
|
||||||
--color-danger-600: #da3030;
|
|
||||||
--color-danger-700: #b7212d;
|
|
||||||
--color-danger-800: #93152a;
|
|
||||||
--color-danger-900: #7a0c27;
|
|
||||||
|
|
||||||
--radius-none: 0px;
|
|
||||||
--radius-sm: 2px;
|
|
||||||
--radius-md: 4px;
|
|
||||||
--radius-lg: 8px;
|
|
||||||
--radius-xl: 12px;
|
|
||||||
--radius-2xl: 16px;
|
|
||||||
--radius-3xl: 24px;
|
|
||||||
--radius-full: 50%;
|
|
||||||
|
|
||||||
--font-bai-jamjuree: 'Bai Jamjuree', sans-serif;
|
|
||||||
|
|
||||||
--text-h1: 3.833rem;
|
|
||||||
/* ~46px */
|
|
||||||
--text-h2: 3.083rem;
|
|
||||||
/* ~37px */
|
|
||||||
--text-h3: 2.417rem;
|
|
||||||
/* ~29px */
|
|
||||||
--text-p1: 1.917rem;
|
|
||||||
/* ~23px */
|
|
||||||
--text-p2: 1.583rem;
|
|
||||||
/* ~19px */
|
|
||||||
--text-p3: 1.25rem;
|
|
||||||
/* 15px */
|
|
||||||
--text-label1: 1rem;
|
|
||||||
/* 12px */
|
|
||||||
--text-label2: 0.833rem;
|
|
||||||
/* ~10px */
|
|
||||||
--text-label3: 0.677rem;
|
|
||||||
/* ~8px */
|
|
||||||
}
|
|
||||||
|
|
||||||
@layer base {
|
|
||||||
|
|
||||||
*,
|
|
||||||
::after,
|
|
||||||
::before,
|
|
||||||
::backdrop,
|
|
||||||
::file-selector-button {
|
|
||||||
border-color: var(--color-neutral-200, currentColor);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Custom scrollbar */
|
|
||||||
::-webkit-scrollbar {
|
|
||||||
width: 6px;
|
|
||||||
height: 6px;
|
|
||||||
}
|
|
||||||
|
|
||||||
::-webkit-scrollbar-track {
|
|
||||||
background: var(--color-neutral-50);
|
|
||||||
}
|
|
||||||
|
|
||||||
::-webkit-scrollbar-thumb {
|
|
||||||
background: #cccccc;
|
|
||||||
border-radius: 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
::-webkit-scrollbar-thumb:hover {
|
|
||||||
background: var(--color-neutral-300);
|
|
||||||
}
|
|
||||||
|
|
||||||
html {
|
|
||||||
font-family: 'Bai Jamjuree', sans-serif;
|
|
||||||
font-weight: 400;
|
|
||||||
font-size: 12px;
|
|
||||||
line-height: 1.2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
import { createRoot } from 'react-dom/client';
|
|
||||||
import { StrictMode } from 'react';
|
|
||||||
import { createBrowserRouter, RouteObject, RouterProvider } from 'react-router';
|
|
||||||
import {
|
|
||||||
add404PageToRoutesChildren,
|
|
||||||
addErrorElementToRoutes,
|
|
||||||
convertPagesToRoute,
|
|
||||||
ModalLoginProvider,
|
|
||||||
QueryProvider,
|
|
||||||
} from '@imphnen-frontend-service/utils';
|
|
||||||
import { Toaster } from 'sonner';
|
|
||||||
import './index.css';
|
|
||||||
|
|
||||||
const files = import.meta.glob('./app/**/*(page|layout).tsx');
|
|
||||||
const errorFiles = import.meta.glob('./app/**/*error.tsx');
|
|
||||||
const notFoundFiles = import.meta.glob('./app/**/*404.tsx');
|
|
||||||
const loadingFiles = import.meta.glob('./app/**/*loading.tsx');
|
|
||||||
|
|
||||||
const routes = convertPagesToRoute(files, loadingFiles) as RouteObject;
|
|
||||||
addErrorElementToRoutes(errorFiles, routes);
|
|
||||||
add404PageToRoutesChildren(notFoundFiles, routes);
|
|
||||||
|
|
||||||
const router = createBrowserRouter([
|
|
||||||
{
|
|
||||||
...routes,
|
|
||||||
// MIDDLEWARE TEMPORARILY DISABLED - causing infinite loops with React Router v7
|
|
||||||
// TODO: Implement auth checks at component level or use different pattern
|
|
||||||
// loader: middleware,
|
|
||||||
// shouldRevalidate: () => false,
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
const rootElement = document.getElementById('root');
|
|
||||||
|
|
||||||
if (!rootElement) throw new Error('Failed to find the root element');
|
|
||||||
|
|
||||||
createRoot(rootElement).render(
|
|
||||||
<StrictMode>
|
|
||||||
<QueryProvider>
|
|
||||||
<ModalLoginProvider>
|
|
||||||
<Toaster position="top-right" />
|
|
||||||
<RouterProvider router={router} />
|
|
||||||
</ModalLoginProvider>
|
|
||||||
</QueryProvider>
|
|
||||||
</StrictMode>
|
|
||||||
);
|
|
||||||
@@ -1,141 +0,0 @@
|
|||||||
import { SessionUser } from '@imphnen-frontend-service/utils';
|
|
||||||
import { supabase } from '@imphnen-frontend-service/service';
|
|
||||||
import { LoaderFunctionArgs, redirect } from 'react-router';
|
|
||||||
|
|
||||||
const mappingPublicRoutes = [
|
|
||||||
'/',
|
|
||||||
];
|
|
||||||
|
|
||||||
const mappingOnboardingRoutes = [
|
|
||||||
'/onboarding/user',
|
|
||||||
];
|
|
||||||
|
|
||||||
const mappingRoutePermissions = [
|
|
||||||
{
|
|
||||||
path: '/dashboard',
|
|
||||||
permissions: [],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/teams/browse',
|
|
||||||
permissions: [],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: '/teams/create',
|
|
||||||
permissions: [],
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
const mappingPublicPrefixRoutes = [
|
|
||||||
'/hackathons',
|
|
||||||
];
|
|
||||||
|
|
||||||
// Cache to prevent redundant checks (cache for 5 seconds)
|
|
||||||
const onboardingCache = new Map<string, { hasLocation: boolean; timestamp: number }>();
|
|
||||||
const CACHE_DURATION = 5000; // 5 seconds
|
|
||||||
|
|
||||||
export const middleware = async ({ request }: LoaderFunctionArgs) => {
|
|
||||||
const url = new URL(request.url);
|
|
||||||
const pathname = url.pathname;
|
|
||||||
|
|
||||||
console.log('[Middleware] Checking route:', pathname);
|
|
||||||
|
|
||||||
// Get session from Supabase (authoritative source)
|
|
||||||
const { data: { session: supabaseSession }, error: sessionError } = await supabase.auth.getSession();
|
|
||||||
|
|
||||||
// Handle session errors
|
|
||||||
if (sessionError) {
|
|
||||||
console.error('[Middleware] Session error:', sessionError);
|
|
||||||
// Don't redirect on session errors, let the app handle it
|
|
||||||
}
|
|
||||||
|
|
||||||
// Allow to access the hackathon pages without authentication
|
|
||||||
if (mappingPublicPrefixRoutes.some((prefix) => pathname.startsWith(prefix))) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Public routes - allow everyone to view the landing page
|
|
||||||
if (mappingPublicRoutes.includes(pathname)) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Auth callback - allow without authentication check (for OAuth callback)
|
|
||||||
if (pathname === '/auth/callback') {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Auth routes (all /auth/* paths) - redirect to dashboard if already authenticated
|
|
||||||
if (pathname.startsWith('/auth')) {
|
|
||||||
if (supabaseSession) return redirect('/dashboard');
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Require authentication for all other routes - ONLY check Supabase session
|
|
||||||
if (!supabaseSession) {
|
|
||||||
return redirect('/auth/login');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if user has completed onboarding by querying database (not localStorage!)
|
|
||||||
// Skip onboarding check for onboarding routes themselves
|
|
||||||
if (!mappingOnboardingRoutes.includes(pathname)) {
|
|
||||||
try {
|
|
||||||
const userId = supabaseSession.user.id;
|
|
||||||
const now = Date.now();
|
|
||||||
|
|
||||||
// Check cache first
|
|
||||||
const cached = onboardingCache.get(userId);
|
|
||||||
let hasLocation = false;
|
|
||||||
|
|
||||||
if (cached && (now - cached.timestamp) < CACHE_DURATION) {
|
|
||||||
console.log('[Middleware] Using cached onboarding status');
|
|
||||||
hasLocation = cached.hasLocation;
|
|
||||||
} else {
|
|
||||||
console.log('[Middleware] Fetching fresh onboarding status');
|
|
||||||
const { data: userData, error: userError } = await supabase
|
|
||||||
.from('users')
|
|
||||||
.select('location')
|
|
||||||
.eq('id', userId)
|
|
||||||
.single();
|
|
||||||
|
|
||||||
if (userError) {
|
|
||||||
console.error('[Middleware] Failed to fetch user data:', userError);
|
|
||||||
// If we can't fetch user data, allow access (don't break the app)
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
hasLocation = !!userData?.location;
|
|
||||||
|
|
||||||
// Update cache
|
|
||||||
onboardingCache.set(userId, { hasLocation, timestamp: now });
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!hasLocation) {
|
|
||||||
return redirect('/onboarding/user');
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('[Middleware] Unexpected error checking onboarding:', error);
|
|
||||||
// On error, allow access (fail open)
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check route permissions using fresh user data from Zustand (for UI metadata)
|
|
||||||
const session = SessionUser.get();
|
|
||||||
const userPermissions =
|
|
||||||
session?.role?.permissions?.map?.((perm) => perm?.name) ?? [];
|
|
||||||
|
|
||||||
const matchedRoute = mappingRoutePermissions.find(
|
|
||||||
(route) => route.path === pathname
|
|
||||||
);
|
|
||||||
|
|
||||||
if (matchedRoute) {
|
|
||||||
const hasPermission =
|
|
||||||
!matchedRoute.permissions ||
|
|
||||||
matchedRoute.permissions.some((perm) => userPermissions.includes(perm));
|
|
||||||
|
|
||||||
if (!hasPermission) {
|
|
||||||
return redirect('/dashboard');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
};
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
{
|
|
||||||
"extends": "./tsconfig.json",
|
|
||||||
"compilerOptions": {
|
|
||||||
"outDir": "../../dist/out-tsc",
|
|
||||||
"types": [
|
|
||||||
"node",
|
|
||||||
"@nx/react/typings/cssmodule.d.ts",
|
|
||||||
"@nx/react/typings/image.d.ts",
|
|
||||||
"vite/client"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"exclude": [
|
|
||||||
"src/**/*.spec.ts",
|
|
||||||
"src/**/*.test.ts",
|
|
||||||
"src/**/*.spec.tsx",
|
|
||||||
"src/**/*.test.tsx",
|
|
||||||
"src/**/*.spec.js",
|
|
||||||
"src/**/*.test.js",
|
|
||||||
"src/**/*.spec.jsx",
|
|
||||||
"src/**/*.test.jsx",
|
|
||||||
"vite.config.ts",
|
|
||||||
"vite.config.mts",
|
|
||||||
"vitest.config.ts",
|
|
||||||
"vitest.config.mts"
|
|
||||||
],
|
|
||||||
"include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
"jsx": "react-jsx",
|
|
||||||
"allowJs": false,
|
|
||||||
"esModuleInterop": false,
|
|
||||||
"allowSyntheticDefaultImports": true,
|
|
||||||
"strict": true,
|
|
||||||
"types": ["vite/client", "vitest"]
|
|
||||||
},
|
|
||||||
"files": [],
|
|
||||||
"include": [],
|
|
||||||
"references": [
|
|
||||||
{
|
|
||||||
"path": "./tsconfig.app.json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "./tsconfig.spec.json"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"extends": "../../tsconfig.base.json"
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user