Compare commits
6 Commits
ad76294d73
...
v0.0.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cc31de6c8d | ||
| 6383916101 | |||
|
|
2dbed7cc7e | ||
| 32ca131dde | |||
|
|
4468148acb | ||
|
|
99a164f088 |
@@ -1,7 +1,7 @@
|
|||||||
import React, { useState, useEffect, useRef, useCallback } from 'react';
|
import React, { useState, useEffect, useRef, useCallback } from 'react';
|
||||||
import { ArrowLeft, Trophy, Sparkles } from 'lucide-react';
|
import { ArrowLeft, Trophy, Sparkles } from 'lucide-react';
|
||||||
|
|
||||||
// --- MODEL KOTA ---
|
// --- MODEL KOTA (Wizualizacja) ---
|
||||||
interface DetailedKittyProps { isGameOver: boolean; }
|
interface DetailedKittyProps { isGameOver: boolean; }
|
||||||
const DetailedKitty: React.FC<DetailedKittyProps> = ({ isGameOver }) => {
|
const DetailedKitty: React.FC<DetailedKittyProps> = ({ isGameOver }) => {
|
||||||
const mainColor = isGameOver ? '#cbd5e1' : '#f472b6';
|
const mainColor = isGameOver ? '#cbd5e1' : '#f472b6';
|
||||||
@@ -32,16 +32,20 @@ const DetailedKitty: React.FC<DetailedKittyProps> = ({ isGameOver }) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
// --- KONFIGURACJA NIEZALEŻNA OD FPS (Wartości na sekundę) ---
|
// --- KONFIGURACJA GRY ---
|
||||||
const GAP_SIZE = 180;
|
const GAP_SIZE = 170; // Przerwa między rurami
|
||||||
const PIPE_WIDTH = 70;
|
const PIPE_WIDTH = 70;
|
||||||
const PIPE_SPEED = 200; // px/s
|
const PIPE_SPEED = 220; // px/s
|
||||||
const PIPE_SPAWN_RATE = 1.8; // sekundy
|
const PIPE_SPAWN_RATE = 1.6; // co ile sekund rura
|
||||||
const GRAVITY = 1400; // px/s^2
|
const GRAVITY = 1400; // siła grawitacji
|
||||||
const FLAP_STRENGTH = -420; // px/s
|
const FLAP_STRENGTH = -420; // siła skoku
|
||||||
const CANVAS_HEIGHT = 450;
|
|
||||||
|
// Logiczne wymiary gry (fizyka działa na tych wartościach, a ekran je tylko skaluje)
|
||||||
|
const GAME_HEIGHT = 450;
|
||||||
|
const GAME_WIDTH = 600;
|
||||||
|
|
||||||
export const FlappyCat: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
export const FlappyCat: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
||||||
|
// --- STANY ---
|
||||||
const [isPlaying, setIsPlaying] = useState(false);
|
const [isPlaying, setIsPlaying] = useState(false);
|
||||||
const [gameOver, setGameOver] = useState(false);
|
const [gameOver, setGameOver] = useState(false);
|
||||||
const [score, setScore] = useState(0);
|
const [score, setScore] = useState(0);
|
||||||
@@ -50,10 +54,13 @@ export const FlappyCat: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
|||||||
return saved ? parseInt(saved, 10) : 0;
|
return saved ? parseInt(saved, 10) : 0;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Stany do renderowania
|
||||||
const [displayKittyY, setDisplayKittyY] = useState(150);
|
const [displayKittyY, setDisplayKittyY] = useState(150);
|
||||||
const [displayPipes, setDisplayPipes] = useState<{ x: number; topHeight: number; id: number }[]>([]);
|
const [displayPipes, setDisplayPipes] = useState<{ x: number; topHeight: number; id: number }[]>([]);
|
||||||
const [rotation, setRotation] = useState(0);
|
const [rotation, setRotation] = useState(0);
|
||||||
|
const [scale, setScale] = useState(1); // Skala RWD
|
||||||
|
|
||||||
|
// --- REFS (FIZYKA) ---
|
||||||
const kittyYRef = useRef(150);
|
const kittyYRef = useRef(150);
|
||||||
const velocityRef = useRef(0);
|
const velocityRef = useRef(0);
|
||||||
const pipesRef = useRef<{ x: number; topHeight: number; id: number; passed?: boolean }[]>([]);
|
const pipesRef = useRef<{ x: number; topHeight: number; id: number; passed?: boolean }[]>([]);
|
||||||
@@ -62,6 +69,26 @@ export const FlappyCat: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
|||||||
const lastTimeRef = useRef<number>(0);
|
const lastTimeRef = useRef<number>(0);
|
||||||
const spawnTimerRef = useRef<number>(0);
|
const spawnTimerRef = useRef<number>(0);
|
||||||
|
|
||||||
|
// --- RWD: Obliczanie skali ---
|
||||||
|
useEffect(() => {
|
||||||
|
const handleResize = () => {
|
||||||
|
const availableWidth = window.innerWidth - 32; // margines boczny
|
||||||
|
const availableHeight = window.innerHeight - 100; // miejsce na nagłówek
|
||||||
|
|
||||||
|
const scaleX = availableWidth / GAME_WIDTH;
|
||||||
|
const scaleY = availableHeight / GAME_HEIGHT;
|
||||||
|
|
||||||
|
// Dopasuj do ekranu, ale nie powiększaj powyżej 100% (żeby nie tracić jakości)
|
||||||
|
const newScale = Math.min(scaleX, scaleY, 1);
|
||||||
|
setScale(newScale);
|
||||||
|
};
|
||||||
|
|
||||||
|
window.addEventListener('resize', handleResize);
|
||||||
|
handleResize(); // Init
|
||||||
|
return () => window.removeEventListener('resize', handleResize);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// --- LOGIKA GRY ---
|
||||||
const endGame = useCallback(() => {
|
const endGame = useCallback(() => {
|
||||||
setGameOver(true);
|
setGameOver(true);
|
||||||
setIsPlaying(false);
|
setIsPlaying(false);
|
||||||
@@ -81,7 +108,7 @@ export const FlappyCat: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
|||||||
velocityRef.current = 0;
|
velocityRef.current = 0;
|
||||||
pipesRef.current = [];
|
pipesRef.current = [];
|
||||||
spawnTimerRef.current = 0;
|
spawnTimerRef.current = 0;
|
||||||
lastTimeRef.current = performance.now(); // Inicjalizacja czasu
|
lastTimeRef.current = performance.now();
|
||||||
setDisplayKittyY(150);
|
setDisplayKittyY(150);
|
||||||
setDisplayPipes([]);
|
setDisplayPipes([]);
|
||||||
setRotation(0);
|
setRotation(0);
|
||||||
@@ -91,64 +118,87 @@ export const FlappyCat: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
|||||||
if (isPlaying && !gameOver) velocityRef.current = FLAP_STRENGTH;
|
if (isPlaying && !gameOver) velocityRef.current = FLAP_STRENGTH;
|
||||||
}, [isPlaying, gameOver]);
|
}, [isPlaying, gameOver]);
|
||||||
|
|
||||||
|
// --- OBSŁUGA INPUTU (NAPRAWIONA) ---
|
||||||
|
const handleAction = useCallback((e?: React.SyntheticEvent) => {
|
||||||
|
// WAŻNE: Nie używamy e.preventDefault() tutaj, bo to powoduje błąd w Chrome.
|
||||||
|
// Zamiast tego CSS 'touch-action: none' blokuje scrollowanie.
|
||||||
|
if (e) {
|
||||||
|
e.stopPropagation();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isPlaying || gameOver) {
|
||||||
|
startGame();
|
||||||
|
} else {
|
||||||
|
flap();
|
||||||
|
}
|
||||||
|
}, [isPlaying, gameOver, startGame, flap]);
|
||||||
|
|
||||||
|
// --- PĘTLA GRY ---
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const update = (currentTime: number) => {
|
const update = (currentTime: number) => {
|
||||||
if (gameOver || !isPlaying) return;
|
if (gameOver || !isPlaying) return;
|
||||||
|
|
||||||
// --- DYNAMICZNY DELTA TIME ---
|
// Delta time w sekundach
|
||||||
// Obliczamy ile sekund upłynęło od ostatniej klatki (np. 0.0069s dla 144Hz)
|
|
||||||
const dt = (currentTime - lastTimeRef.current) / 1000;
|
const dt = (currentTime - lastTimeRef.current) / 1000;
|
||||||
lastTimeRef.current = currentTime;
|
lastTimeRef.current = currentTime;
|
||||||
|
const frameTime = Math.min(dt, 0.1); // Limit laga
|
||||||
|
|
||||||
// Zabezpieczenie przed ogromnym skokiem fizyki przy lagu
|
// 1. Fizyka grawitacji
|
||||||
const frameTime = Math.min(dt, 0.1);
|
|
||||||
|
|
||||||
// Fizyka grawitacji
|
|
||||||
velocityRef.current += GRAVITY * frameTime;
|
velocityRef.current += GRAVITY * frameTime;
|
||||||
kittyYRef.current += velocityRef.current * frameTime;
|
kittyYRef.current += velocityRef.current * frameTime;
|
||||||
|
|
||||||
// Płynna rotacja zależna od prędkości pionowej
|
// Rotacja
|
||||||
setRotation(Math.min(Math.max(velocityRef.current * 0.12, -20), 80));
|
setRotation(Math.min(Math.max(velocityRef.current * 0.12, -25), 90));
|
||||||
|
|
||||||
// Kolizja z sufitem/ziemią
|
// Kolizja z sufitem/podłogą
|
||||||
if (kittyYRef.current > CANVAS_HEIGHT - 40 || kittyYRef.current < -50) {
|
if (kittyYRef.current > GAME_HEIGHT - 40 || kittyYRef.current < -50) {
|
||||||
endGame();
|
endGame();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Spawn rur
|
// 2. Generowanie rur
|
||||||
spawnTimerRef.current += frameTime;
|
spawnTimerRef.current += frameTime;
|
||||||
if (spawnTimerRef.current >= PIPE_SPAWN_RATE) {
|
if (spawnTimerRef.current >= PIPE_SPAWN_RATE) {
|
||||||
const topHeight = Math.random() * (220 - 70) + 70;
|
const minPipe = 60;
|
||||||
pipesRef.current.push({ x: 650, topHeight, id: Date.now() });
|
const maxPipe = GAME_HEIGHT - GAP_SIZE - minPipe;
|
||||||
|
const topHeight = Math.random() * (maxPipe - minPipe) + minPipe;
|
||||||
|
|
||||||
|
pipesRef.current.push({ x: GAME_WIDTH + 50, topHeight, id: Date.now() });
|
||||||
spawnTimerRef.current = 0;
|
spawnTimerRef.current = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ruch rur i kolizje
|
// 3. Ruch rur i kolizje
|
||||||
const updatedPipes = [];
|
const updatedPipes = [];
|
||||||
for (const p of pipesRef.current) {
|
for (const p of pipesRef.current) {
|
||||||
p.x -= PIPE_SPEED * frameTime;
|
p.x -= PIPE_SPEED * frameTime;
|
||||||
|
|
||||||
// Hitbox (z małym marginesem dla kota)
|
// Hitbox rury (marginesy dla łatwiejszej gry)
|
||||||
if (p.x < 100 && p.x + PIPE_WIDTH > 55) {
|
const hitXLeft = p.x + 5;
|
||||||
|
const hitXRight = p.x + PIPE_WIDTH - 5;
|
||||||
|
|
||||||
|
// Sprawdzenie czy kot jest w poziomie rury
|
||||||
|
if (hitXLeft < 100 && hitXRight > 55) {
|
||||||
|
// Sprawdzenie czy kot uderzył w górę lub dół
|
||||||
|
// (dodajemy marginesy bezpieczeństwa)
|
||||||
if (kittyYRef.current < p.topHeight || kittyYRef.current > p.topHeight + GAP_SIZE - 45) {
|
if (kittyYRef.current < p.topHeight || kittyYRef.current > p.topHeight + GAP_SIZE - 45) {
|
||||||
endGame();
|
endGame();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Punktacja
|
// Naliczanie punktów
|
||||||
if (p.x < 50 && !p.passed) {
|
if (p.x < 50 && !p.passed) {
|
||||||
p.passed = true;
|
p.passed = true;
|
||||||
scoreRef.current += 1;
|
scoreRef.current += 1;
|
||||||
setScore(scoreRef.current);
|
setScore(scoreRef.current);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (p.x > -PIPE_WIDTH) updatedPipes.push(p);
|
// Usuwanie starych rur
|
||||||
|
if (p.x > -PIPE_WIDTH - 50) updatedPipes.push(p);
|
||||||
}
|
}
|
||||||
pipesRef.current = updatedPipes;
|
pipesRef.current = updatedPipes;
|
||||||
|
|
||||||
// Update stanów do renderowania
|
// 4. Renderowanie
|
||||||
setDisplayKittyY(kittyYRef.current);
|
setDisplayKittyY(kittyYRef.current);
|
||||||
setDisplayPipes([...pipesRef.current]);
|
setDisplayPipes([...pipesRef.current]);
|
||||||
|
|
||||||
@@ -161,64 +211,108 @@ export const FlappyCat: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
|||||||
return () => cancelAnimationFrame(requestRef.current);
|
return () => cancelAnimationFrame(requestRef.current);
|
||||||
}, [isPlaying, gameOver, endGame]);
|
}, [isPlaying, gameOver, endGame]);
|
||||||
|
|
||||||
|
// Obsługa Spacji
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const handleKey = (e: KeyboardEvent) => {
|
const handleKey = (e: KeyboardEvent) => {
|
||||||
if (e.code === 'Space') {
|
if (e.code === 'Space') {
|
||||||
e.preventDefault();
|
e.preventDefault(); // Tu można bezpiecznie użyć preventDefault dla klawiatury
|
||||||
if (!isPlaying || gameOver) startGame(); else flap();
|
handleAction();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
window.addEventListener('keydown', handleKey);
|
window.addEventListener('keydown', handleKey);
|
||||||
return () => window.removeEventListener('keydown', handleKey);
|
return () => window.removeEventListener('keydown', handleKey);
|
||||||
}, [isPlaying, gameOver, startGame, flap]);
|
}, [handleAction]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col items-center justify-center min-h-[75vh] p-4 font-sans select-none">
|
<div className="flex flex-col items-center justify-start pt-4 sm:justify-center min-h-[80vh] w-full font-sans select-none overflow-hidden">
|
||||||
<button onClick={onBack} className="mb-6 flex items-center gap-2 text-pink-500 font-bold hover:scale-105 transition-all outline-none">
|
|
||||||
|
<button
|
||||||
|
onClick={onBack}
|
||||||
|
className="z-50 mb-4 flex items-center gap-2 text-pink-500 font-bold hover:scale-105 transition-all outline-none px-4 py-2 bg-white/50 rounded-full cursor-pointer"
|
||||||
|
>
|
||||||
<ArrowLeft size={20} /> Back to Menu
|
<ArrowLeft size={20} /> Back to Menu
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
|
{/* WRAPPER SKALUJĄCY GRĘ */}
|
||||||
<div
|
<div
|
||||||
className="relative w-full max-w-[600px] h-[450px] bg-sky-100 rounded-[3rem] shadow-2xl border-4 border-white overflow-hidden cursor-pointer"
|
style={{
|
||||||
onClick={() => { if (!isPlaying || gameOver) startGame(); else flap(); }}
|
width: GAME_WIDTH,
|
||||||
|
height: GAME_HEIGHT,
|
||||||
|
transform: `scale(${scale})`,
|
||||||
|
transformOrigin: 'top center',
|
||||||
|
touchAction: 'none' // KLUCZOWE DLA MOBILE: blokuje gesty przeglądarki
|
||||||
|
}}
|
||||||
|
className="relative shrink-0"
|
||||||
>
|
>
|
||||||
|
<div
|
||||||
|
className="relative w-full h-full bg-sky-100 rounded-[3rem] shadow-2xl border-4 border-white overflow-hidden cursor-pointer"
|
||||||
|
// KLUCZOWE: Używamy onPointerDown zamiast onTouchStart/onMouseDown
|
||||||
|
onPointerDown={handleAction}
|
||||||
|
>
|
||||||
|
{/* TŁO / DEKORACJE */}
|
||||||
<div className="absolute top-10 left-10 text-white/40"><Sparkles size={40} /></div>
|
<div className="absolute top-10 left-10 text-white/40"><Sparkles size={40} /></div>
|
||||||
<div className="absolute top-40 right-20 text-white/30"><Sparkles size={60} /></div>
|
<div className="absolute top-40 right-20 text-white/30"><Sparkles size={60} /></div>
|
||||||
|
|
||||||
<div className="absolute top-6 right-8 text-right z-30 font-black">
|
{/* CHMURY (Ozdoba) */}
|
||||||
<div className="text-pink-500 text-4xl">Score: {score}</div>
|
<div className="absolute bottom-10 left-10 w-24 h-8 bg-white/40 rounded-full" />
|
||||||
|
<div className="absolute top-20 left-1/2 w-32 h-10 bg-white/40 rounded-full" />
|
||||||
|
|
||||||
|
{/* HUD */}
|
||||||
|
<div className="absolute top-6 right-8 text-right z-30 font-black pointer-events-none">
|
||||||
|
<div className="text-pink-500 text-4xl drop-shadow-sm">Score: {score}</div>
|
||||||
<div className="text-pink-300 text-sm flex items-center justify-end gap-1"><Trophy size={14} /> Record: {highScore}</div>
|
<div className="text-pink-300 text-sm flex items-center justify-end gap-1"><Trophy size={14} /> Record: {highScore}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="absolute left-10 z-20" style={{ top: `${displayKittyY}px`, transform: `rotate(${rotation}deg)`, transition: 'transform 0.08s linear' }}>
|
{/* GRACZ (KOT) */}
|
||||||
|
<div className="absolute left-10 z-20 pointer-events-none" style={{ top: `${displayKittyY}px`, transform: `rotate(${rotation}deg)`, transition: 'transform 0.08s linear' }}>
|
||||||
<DetailedKitty isGameOver={gameOver} />
|
<DetailedKitty isGameOver={gameOver} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* RURY */}
|
||||||
{displayPipes.map(p => (
|
{displayPipes.map(p => (
|
||||||
<React.Fragment key={p.id}>
|
<React.Fragment key={p.id}>
|
||||||
<div className="absolute bg-[#e5c29f] border-x-4 border-b-8 border-[#d4ac87] rounded-b-3xl" style={{ left: p.x, top: 0, width: PIPE_WIDTH, height: p.topHeight }} />
|
{/* Górna rura */}
|
||||||
<div className="absolute bg-[#e5c29f] border-x-4 border-t-8 border-[#d4ac87] rounded-t-3xl" style={{ left: p.x, top: p.topHeight + GAP_SIZE, width: PIPE_WIDTH, height: CANVAS_HEIGHT - (p.topHeight + GAP_SIZE) }} />
|
<div className="absolute bg-[#e5c29f] border-x-4 border-b-8 border-[#d4ac87] rounded-b-3xl pointer-events-none"
|
||||||
|
style={{ left: p.x, top: 0, width: PIPE_WIDTH, height: p.topHeight }} />
|
||||||
|
|
||||||
|
{/* Dolna rura */}
|
||||||
|
<div className="absolute bg-[#e5c29f] border-x-4 border-t-8 border-[#d4ac87] rounded-t-3xl pointer-events-none"
|
||||||
|
style={{ left: p.x, top: p.topHeight + GAP_SIZE, width: PIPE_WIDTH, height: GAME_HEIGHT - (p.topHeight + GAP_SIZE) }} />
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
))}
|
))}
|
||||||
|
|
||||||
|
{/* EKRAN STARTOWY */}
|
||||||
{!isPlaying && !gameOver && (
|
{!isPlaying && !gameOver && (
|
||||||
<div className="absolute inset-0 bg-white/40 backdrop-blur-sm flex items-center justify-center z-40">
|
<div className="absolute inset-0 bg-white/40 backdrop-blur-sm flex items-center justify-center z-40">
|
||||||
<div className="bg-white p-10 rounded-[3rem] shadow-2xl text-center border-4 border-pink-100">
|
<div className="bg-white p-10 rounded-[3rem] shadow-2xl text-center border-4 border-pink-100 mx-4 pointer-events-none">
|
||||||
<p className="text-3xl font-black text-pink-500 mb-6">Flappy Cat 🎈</p>
|
<p className="text-3xl font-black text-pink-500 mb-6">Flappy Cat 🎈</p>
|
||||||
<button className="bg-pink-500 text-white px-10 py-4 rounded-2xl font-black animate-bounce text-xl shadow-lg">START</button>
|
<p className="text-slate-400 mb-4 text-sm font-bold uppercase tracking-widest">Tap to Jump</p>
|
||||||
|
<div className="bg-pink-500 text-white px-10 py-4 rounded-2xl font-black animate-bounce text-xl shadow-lg inline-block">START</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* GAME OVER */}
|
||||||
{gameOver && (
|
{gameOver && (
|
||||||
<div className="absolute inset-0 bg-pink-50/90 backdrop-blur-md flex flex-col items-center justify-center z-40 text-center">
|
<div className="absolute inset-0 bg-pink-50/90 backdrop-blur-md flex flex-col items-center justify-center z-40 text-center">
|
||||||
<h3 className="text-5xl font-black text-pink-600 mb-2">Oops! 😿</h3>
|
<h3 className="text-5xl font-black text-pink-600 mb-2">Oops! 😿</h3>
|
||||||
<p className="font-bold text-3xl text-pink-400 mb-8">Score: {score}</p>
|
<p className="font-bold text-3xl text-pink-400 mb-8">Score: {score}</p>
|
||||||
<button className="bg-pink-500 text-white px-12 py-4 rounded-2xl font-black text-xl shadow-xl">TRY AGAIN</button>
|
<button className="bg-pink-500 text-white px-12 py-4 rounded-2xl font-black text-xl shadow-xl hover:bg-pink-600 transition-colors pointer-events-auto"
|
||||||
|
onPointerDown={(e) => {
|
||||||
|
e.stopPropagation(); // Żeby kliknięcie w guzik nie podbiło kota w tle
|
||||||
|
startGame();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
TRY AGAIN
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="mt-4 text-xs text-slate-400 sm:hidden">
|
||||||
|
Tap anywhere to jump
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -1,60 +1,388 @@
|
|||||||
import React from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import { PawPrint, Heart, Sparkles, Cat } from 'lucide-react';
|
import {
|
||||||
|
PawPrint, Heart, Sparkles, Cat, Hash,
|
||||||
|
Globe, BookOpen, Shield, Calendar,
|
||||||
|
Settings2, AlertCircle, X, Save, RefreshCw, Copy, Check, ExternalLink, User as UserIcon
|
||||||
|
} from 'lucide-react';
|
||||||
|
|
||||||
|
// Pobieramy adres API
|
||||||
|
const API_BASE = import.meta.env.VITE_API_TARGET;
|
||||||
|
|
||||||
|
// Nazwa klucza w localStorage
|
||||||
|
const TOKEN_KEY = 'jwt_token';
|
||||||
|
|
||||||
|
type CaseType = 'upper' | 'lower' | 'mixed';
|
||||||
|
|
||||||
|
// 1. Definicja propsów, które przychodzą z App.tsx
|
||||||
interface GeneratorProps {
|
interface GeneratorProps {
|
||||||
url: string;
|
url: string;
|
||||||
setUrl: (val: string) => void;
|
setUrl: (url: string) => void;
|
||||||
onGenerate: () => void;
|
onGenerate: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Generator: React.FC<GeneratorProps> = ({ url, setUrl, onGenerate }) => (
|
interface GeneratorSettings {
|
||||||
<div className="max-w-[800px] mx-auto pt-10 sm:pt-16 px-4 flex flex-col items-center">
|
length: number;
|
||||||
{/* Header - Skalowanie tekstu i ikony */}
|
alphanum: boolean;
|
||||||
<header className="text-center mb-8 sm:mb-12">
|
case: CaseType;
|
||||||
<h1 className="text-4xl sm:text-7xl font-black text-pink-500 mb-2 tracking-tighter flex items-center justify-center gap-2 sm:gap-4">
|
withSubdomain: boolean;
|
||||||
KittyURL <PawPrint className="w-8 h-8 sm:w-12 sm:h-12" fill="currentColor" />
|
}
|
||||||
|
|
||||||
|
// Usunęliśmy 'remoteUrl' stąd, bo teraz przychodzi z propsów (url)
|
||||||
|
interface LinkFormData {
|
||||||
|
uri: string;
|
||||||
|
subdomain: string;
|
||||||
|
privacy: boolean;
|
||||||
|
expiryDate: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface LinkPayload {
|
||||||
|
remoteUrl: string;
|
||||||
|
uri: string;
|
||||||
|
subdomain?: string;
|
||||||
|
privacy: boolean;
|
||||||
|
expiryDate: number;
|
||||||
|
userId?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface User {
|
||||||
|
id: string;
|
||||||
|
username: string;
|
||||||
|
email?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Dodajemy propsy do argumentów funkcji
|
||||||
|
export const Generator: React.FC<GeneratorProps> = ({ url, setUrl, onGenerate }) => {
|
||||||
|
const [user, setUser] = useState<User | null>(null);
|
||||||
|
|
||||||
|
// Stan formularza (bez remoteUrl, bo to jest teraz w 'url')
|
||||||
|
const [formData, setFormData] = useState<LinkFormData>({
|
||||||
|
uri: '',
|
||||||
|
subdomain: '',
|
||||||
|
privacy: true,
|
||||||
|
expiryDate: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0]
|
||||||
|
});
|
||||||
|
|
||||||
|
const [genSettings, setGenSettings] = useState<GeneratorSettings>({
|
||||||
|
length: 6,
|
||||||
|
alphanum: true,
|
||||||
|
case: 'mixed',
|
||||||
|
withSubdomain: false
|
||||||
|
});
|
||||||
|
|
||||||
|
const [loading, setLoading] = useState(false);
|
||||||
|
const [generatingUri, setGeneratingUri] = useState(false);
|
||||||
|
const [errorMsg, setErrorMsg] = useState<string | null>(null);
|
||||||
|
const [result, setResult] = useState<string | null>(null);
|
||||||
|
const [copied, setCopied] = useState(false);
|
||||||
|
|
||||||
|
const getAuthHeaders = () => {
|
||||||
|
const token = localStorage.getItem(TOKEN_KEY);
|
||||||
|
return {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
...(token ? { 'Authorization': `Bearer ${token}` } : {})
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
// Sprawdzenie sesji użytkownika
|
||||||
|
useEffect(() => {
|
||||||
|
const checkUser = async () => {
|
||||||
|
const token = localStorage.getItem(TOKEN_KEY);
|
||||||
|
if (!token) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${API_BASE}/api/v1/user/account`, {
|
||||||
|
headers: getAuthHeaders()
|
||||||
|
});
|
||||||
|
|
||||||
|
if (res.ok) {
|
||||||
|
const data = await res.json();
|
||||||
|
setUser({
|
||||||
|
id: data.id || data._id || data.userId,
|
||||||
|
username: data.username || data.name || data.email || "User",
|
||||||
|
email: data.email
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
console.log("Session expired. Logging out.");
|
||||||
|
localStorage.removeItem(TOKEN_KEY);
|
||||||
|
setUser(null);
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
console.log("API unreachable");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
checkUser();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleGenerateUri = async (type: 'random' | 'wordlist') => {
|
||||||
|
setGeneratingUri(true);
|
||||||
|
setErrorMsg(null);
|
||||||
|
try {
|
||||||
|
let endpoint = '';
|
||||||
|
const params = new URLSearchParams();
|
||||||
|
|
||||||
|
params.append('withSubdomain', genSettings.withSubdomain.toString());
|
||||||
|
|
||||||
|
if (type === 'random') {
|
||||||
|
endpoint = '/api/v1/link/short';
|
||||||
|
params.append('length', genSettings.length.toString());
|
||||||
|
params.append('alphanum', genSettings.alphanum.toString());
|
||||||
|
|
||||||
|
if (genSettings.case !== 'mixed') {
|
||||||
|
params.append('case', genSettings.case);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
endpoint = '/api/v1/link/fromWordlist';
|
||||||
|
}
|
||||||
|
|
||||||
|
const response = await fetch(`${API_BASE}${endpoint}?${params.toString()}`);
|
||||||
|
const data = await response.json();
|
||||||
|
|
||||||
|
if (!response.ok) throw new Error(data.error || 'Generation failed');
|
||||||
|
|
||||||
|
const generatedUri = data.uri || data.shortUrl || data.link || "";
|
||||||
|
setFormData(prev => ({ ...prev, uri: generatedUri }));
|
||||||
|
|
||||||
|
} catch (err: unknown) {
|
||||||
|
if (err instanceof Error) setErrorMsg(err.message);
|
||||||
|
} finally {
|
||||||
|
setGeneratingUri(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleSubmitToDb = async () => {
|
||||||
|
// Używamy propsa 'url' zamiast formData.remoteUrl
|
||||||
|
if (!url) {
|
||||||
|
setErrorMsg("Meow! I need a destination URL first! 🐾");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!formData.uri) {
|
||||||
|
setErrorMsg("Please generate or write a short URI code!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setLoading(true);
|
||||||
|
setErrorMsg(null);
|
||||||
|
setResult(null);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const payload: LinkPayload = {
|
||||||
|
remoteUrl: url, // <-- Tutaj wstawiamy wartość z propsa
|
||||||
|
uri: formData.uri,
|
||||||
|
subdomain: formData.subdomain || undefined,
|
||||||
|
privacy: formData.privacy,
|
||||||
|
expiryDate: new Date(formData.expiryDate).getTime()
|
||||||
|
};
|
||||||
|
|
||||||
|
if (user && user.id) {
|
||||||
|
payload.userId = user.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
const response = await fetch(`${API_BASE}/api/v1/link/new`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: getAuthHeaders(),
|
||||||
|
body: JSON.stringify(payload)
|
||||||
|
});
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(data.error || `Database error ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const finalLink = data.url || `${API_BASE.replace('api.', '')}/${formData.uri}`;
|
||||||
|
setResult(finalLink);
|
||||||
|
|
||||||
|
// Wywołujemy callback z App.tsx (np. żeby pokazać powiadomienie)
|
||||||
|
onGenerate();
|
||||||
|
|
||||||
|
} catch (err: unknown) {
|
||||||
|
if (err instanceof Error) setErrorMsg(err.message);
|
||||||
|
else setErrorMsg("Something went wrong saving to DB!");
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const copyToClipboard = (text: string) => {
|
||||||
|
navigator.clipboard.writeText(text);
|
||||||
|
setCopied(true);
|
||||||
|
setTimeout(() => setCopied(false), 2000);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="max-w-[800px] mx-auto pt-10 px-4 flex flex-col items-center pb-20">
|
||||||
|
{/* Header */}
|
||||||
|
<header className="text-center mb-8 relative w-full flex flex-col items-center">
|
||||||
|
<div className={`mb-4 px-4 py-2 rounded-full text-xs font-bold flex items-center gap-2 transition-colors ${user ? 'bg-pink-100 text-pink-600' : 'bg-gray-100 text-gray-400'}`}>
|
||||||
|
<UserIcon size={14} />
|
||||||
|
{user ? `Logged in as ${user.username}` : 'Guest Mode (Anonymous)'}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h1 className="text-4xl sm:text-6xl font-black text-pink-500 mb-2 tracking-tighter flex items-center justify-center gap-2">
|
||||||
|
KittyURL <PawPrint className="w-8 h-8 sm:w-10 sm:h-10" fill="currentColor" />
|
||||||
</h1>
|
</h1>
|
||||||
<p className="text-pink-300 text-lg sm:text-xl font-medium px-4">
|
<p className="text-pink-300 font-medium">Shorten your links with a purr!</p>
|
||||||
Shorten KKKKKK your links with a purr!
|
|
||||||
</p>
|
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
{/* Główna karta - mniejsze paddingi i zaokrąglenia na mobile */}
|
{/* Error Display */}
|
||||||
<div className="w-full bg-white rounded-[2rem] sm:rounded-[3rem] shadow-2xl shadow-pink-200/50 p-6 sm:p-10 border-4 border-white relative overflow-hidden">
|
{errorMsg && (
|
||||||
<div className="mb-6">
|
<div className="w-full mb-6 animate-in fade-in slide-in-from-top-2">
|
||||||
<label className="block text-[10px] sm:text-xs font-black uppercase tracking-widest text-pink-300 mb-3 ml-2">
|
<div className="bg-red-50 border-2 border-red-200 p-4 rounded-2xl flex items-center gap-3 text-red-600 shadow-lg">
|
||||||
Long URL to shorten
|
<AlertCircle size={20} />
|
||||||
|
<span className="font-bold text-sm flex-1">{errorMsg}</span>
|
||||||
|
<button onClick={() => setErrorMsg(null)}><X size={20} className="hover:scale-110 transition-transform" /></button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Success Result Card */}
|
||||||
|
{result && (
|
||||||
|
<div className="w-full mb-8 animate-in zoom-in-95 duration-500">
|
||||||
|
<div className="bg-gradient-to-r from-green-400 to-emerald-500 p-1 rounded-[2.5rem] shadow-2xl shadow-green-200">
|
||||||
|
<div className="bg-white rounded-[2.3rem] p-6 flex flex-col sm:flex-row items-center gap-4">
|
||||||
|
<div className="bg-green-100 p-3 rounded-full"><Check className="text-green-600 w-6 h-6" /></div>
|
||||||
|
<div className="flex-1 text-center sm:text-left overflow-hidden w-full">
|
||||||
|
<p className="text-[10px] font-black uppercase tracking-widest text-green-400 mb-1">Saved to Database!</p>
|
||||||
|
<p className="text-xl font-black text-gray-700 truncate">{result}</p>
|
||||||
|
</div>
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<button onClick={() => copyToClipboard(result)} className="p-3 bg-gray-100 hover:bg-gray-200 rounded-xl transition-colors">
|
||||||
|
{copied ? <Check size={20} className="text-green-600" /> : <Copy size={20} className="text-gray-600" />}
|
||||||
|
</button>
|
||||||
|
<a href={result} target="_blank" rel="noreferrer" className="p-3 bg-pink-500 hover:bg-pink-600 text-white rounded-xl transition-colors">
|
||||||
|
<ExternalLink size={20} />
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Main Form */}
|
||||||
|
<div className="w-full bg-white rounded-[2.5rem] shadow-2xl shadow-pink-200/50 p-6 sm:p-8 border-4 border-white">
|
||||||
|
|
||||||
|
{/* 1. Destination URL */}
|
||||||
|
<div className="mb-8">
|
||||||
|
<label className="flex items-center gap-2 text-[11px] font-black uppercase tracking-widest text-pink-400 mb-2 ml-1">
|
||||||
|
<Settings2 size={12} /> 1. Destination URL
|
||||||
</label>
|
</label>
|
||||||
<div className="relative">
|
<div className="relative group">
|
||||||
<input
|
<input
|
||||||
type="url"
|
type="url"
|
||||||
placeholder="https://example.com/very-long-url"
|
placeholder="https://very-long-link.com/..."
|
||||||
className="w-full p-4 sm:p-5 bg-pink-50/30 border-2 border-pink-100 rounded-xl sm:rounded-2xl outline-none focus:border-pink-400 focus:bg-white transition-all text-base sm:text-lg shadow-inner pr-12"
|
className="w-full p-4 bg-pink-50/30 border-2 border-pink-100 rounded-2xl outline-none focus:border-pink-400 focus:bg-white transition-all text-pink-600 font-medium pr-12"
|
||||||
value={url}
|
value={url} // Używamy propsa
|
||||||
onChange={(e) => setUrl(e.target.value)}
|
onChange={(e) => setUrl(e.target.value)} // Używamy propsa
|
||||||
/>
|
/>
|
||||||
<Heart className="absolute right-4 top-1/2 -translate-y-1/2 text-pink-200 w-5 h-5 sm:w-6 sm:h-6" />
|
<Heart className="absolute right-4 top-1/2 -translate-y-1/2 text-pink-200 w-5 h-5 group-focus-within:text-pink-400 transition-colors" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button
|
{/* 2. Short Code Generation */}
|
||||||
onClick={onGenerate}
|
<div className="mb-8 bg-pink-50/30 p-5 rounded-[2rem] border border-pink-100">
|
||||||
className="w-full bg-pink-500 hover:bg-pink-600 text-white font-black py-4 sm:py-5 rounded-xl sm:rounded-[1.5rem] transition-all shadow-xl shadow-pink-100 active:scale-[0.98] text-lg sm:text-xl flex items-center justify-center gap-3 cursor-pointer"
|
<label className="flex items-center gap-2 text-[11px] font-black uppercase tracking-widest text-pink-400 mb-3 ml-1">
|
||||||
|
<Sparkles size={12} /> 2. Generate Short Code (URI)
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div className="grid grid-cols-2 sm:grid-cols-4 gap-2 mb-4">
|
||||||
|
<div className="bg-white p-2 rounded-xl border border-pink-100">
|
||||||
|
<label className="text-[9px] font-bold text-gray-400 uppercase block mb-1">Length</label>
|
||||||
|
<input type="number" min="3" max="32" className="w-full font-bold text-pink-500 outline-none text-sm"
|
||||||
|
value={genSettings.length} onChange={e => setGenSettings({ ...genSettings, length: +e.target.value })} />
|
||||||
|
</div>
|
||||||
|
<div className="bg-white p-2 rounded-xl border border-pink-100">
|
||||||
|
<label className="text-[9px] font-bold text-gray-400 uppercase block mb-1">Case</label>
|
||||||
|
<select
|
||||||
|
className="w-full font-bold text-pink-500 outline-none text-sm bg-transparent"
|
||||||
|
value={genSettings.case}
|
||||||
|
onChange={e => setGenSettings({ ...genSettings, case: e.target.value as CaseType })}
|
||||||
>
|
>
|
||||||
<span className="hidden xs:inline">Generate Kitty Link</span>
|
<option value="mixed">Mixed</option>
|
||||||
<span className="xs:hidden">Generate</span>
|
<option value="lower">Lower</option>
|
||||||
<Sparkles className="w-5 h-5 sm:w-6 sm:h-6" />
|
<option value="upper">Upper</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
onClick={() => handleGenerateUri('random')}
|
||||||
|
disabled={generatingUri}
|
||||||
|
className="col-span-2 sm:col-span-1 bg-white hover:bg-pink-100 border-2 border-pink-200 text-pink-500 rounded-xl font-bold text-xs flex flex-col items-center justify-center gap-1 transition-all active:scale-95 py-2"
|
||||||
|
>
|
||||||
|
<Hash size={16} />
|
||||||
|
{generatingUri ? '...' : 'Random'}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => handleGenerateUri('wordlist')}
|
||||||
|
disabled={generatingUri}
|
||||||
|
className="col-span-2 sm:col-span-1 bg-white hover:bg-pink-100 border-2 border-pink-200 text-pink-500 rounded-xl font-bold text-xs flex flex-col items-center justify-center gap-1 transition-all active:scale-95 py-2"
|
||||||
|
>
|
||||||
|
<BookOpen size={16} />
|
||||||
|
{generatingUri ? '...' : 'Sentence'}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Sekcja "No links yet" - Skalowanie paddingu i ikony */}
|
<div className="relative">
|
||||||
<div className="w-full mt-10 sm:mt-16 text-center">
|
<input
|
||||||
<div className="bg-pink-100/50 rounded-[2rem] sm:rounded-[2.5rem] border-4 border-dashed border-pink-200 p-8 sm:p-12">
|
type="text"
|
||||||
<Cat className="mx-auto text-pink-200 mb-4 w-12 h-12 sm:w-16 sm:h-16" />
|
placeholder="my-custom-uri"
|
||||||
<p className="text-pink-300 font-bold text-sm sm:text-base px-2">
|
className="w-full p-4 pl-12 bg-white border-2 border-pink-200 rounded-2xl outline-none focus:border-pink-500 transition-all text-pink-600 font-black text-lg shadow-inner"
|
||||||
No links generated yet. Feed me a URL! 🐾
|
value={formData.uri}
|
||||||
|
onChange={(e) => setFormData({ ...formData, uri: e.target.value })}
|
||||||
|
/>
|
||||||
|
<div className="absolute left-4 top-1/2 -translate-y-1/2 text-pink-300 font-bold select-none">/</div>
|
||||||
|
{formData.uri && (
|
||||||
|
<div className="absolute right-4 top-1/2 -translate-y-1/2">
|
||||||
|
<Check size={18} className="text-green-500" />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 3. Database Settings */}
|
||||||
|
<div className="mb-8 grid grid-cols-1 sm:grid-cols-2 gap-4">
|
||||||
|
<div className="bg-gray-50 p-4 rounded-2xl border border-gray-100">
|
||||||
|
<label className="flex items-center gap-2 text-[10px] font-black uppercase text-gray-400 mb-2"><Calendar size={14} /> Expiry Date</label>
|
||||||
|
<input type="date" className="w-full bg-white border border-gray-200 rounded-lg px-3 py-2 text-xs font-bold text-gray-600 outline-none focus:border-pink-400"
|
||||||
|
value={formData.expiryDate}
|
||||||
|
onChange={e => setFormData({ ...formData, expiryDate: e.target.value })} />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<label className="flex items-center justify-between bg-gray-50 p-4 rounded-2xl border border-gray-100 cursor-pointer hover:bg-pink-50 transition-colors">
|
||||||
|
<span className="flex items-center gap-2 text-[10px] font-black uppercase text-gray-400"><Shield size={14} /> Private Link</span>
|
||||||
|
<input type="checkbox" className="accent-pink-500 w-5 h-5" checked={formData.privacy}
|
||||||
|
onChange={e => setFormData({ ...formData, privacy: e.target.checked })} />
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label className="flex items-center justify-between bg-gray-50 p-4 rounded-2xl border border-gray-100 cursor-pointer hover:bg-pink-50 transition-colors sm:col-span-2">
|
||||||
|
<span className="flex items-center gap-2 text-[10px] font-black uppercase text-gray-400"><Globe size={14} /> Subdomain Support</span>
|
||||||
|
<input type="checkbox" className="accent-pink-500 w-5 h-5" checked={genSettings.withSubdomain}
|
||||||
|
onChange={e => {
|
||||||
|
setGenSettings({ ...genSettings, withSubdomain: e.target.checked });
|
||||||
|
setFormData({ ...formData, subdomain: e.target.checked ? 'true' : '' });
|
||||||
|
}} />
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 4. Submit Button */}
|
||||||
|
<button
|
||||||
|
onClick={handleSubmitToDb}
|
||||||
|
disabled={loading}
|
||||||
|
className="w-full bg-pink-500 hover:bg-pink-600 text-white font-black py-5 rounded-[1.8rem] transition-all shadow-xl shadow-pink-200 active:scale-[0.98] text-xl flex items-center justify-center gap-3 disabled:opacity-50 disabled:grayscale"
|
||||||
|
>
|
||||||
|
{loading ? (
|
||||||
|
<>Saving... <RefreshCw className="animate-spin" /></>
|
||||||
|
) : (
|
||||||
|
<>Save to Database <Save className="w-6 h-6" /></>
|
||||||
|
)}
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<footer className="mt-12 text-center opacity-40">
|
||||||
|
<Cat className="mx-auto text-pink-300 mb-2 w-10 h-10" />
|
||||||
|
<p className="text-pink-300 font-black text-[10px] uppercase tracking-[0.2em]">
|
||||||
|
KittyURL Generator v2.0
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</footer>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
};
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import React, { useState, useEffect, useRef, useCallback } from 'react';
|
import React, { useState, useEffect, useRef, useCallback } from 'react';
|
||||||
import { ArrowLeft, Trophy, Sparkles, Moon, Sun } from 'lucide-react';
|
import { ArrowLeft, Trophy, Sparkles, Moon, Sun } from 'lucide-react';
|
||||||
|
|
||||||
// --- MODEL KOTA (Animacje CSS zostają, bo są czasowe, nie klatkowe) ---
|
// --- MODEL KOTA (Bez zmian) ---
|
||||||
interface DetailedKittyProps {
|
interface DetailedKittyProps {
|
||||||
isJumping: boolean;
|
isJumping: boolean;
|
||||||
isNight: boolean;
|
isNight: boolean;
|
||||||
@@ -49,8 +49,13 @@ const DetailedKitty: React.FC<DetailedKittyProps> = ({ isJumping, isNight, isGam
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
// --- GŁÓWNY KOMPONENT Z DYNAMICZNYM DELTA TIME ---
|
// --- STAŁE WYMIARY LOGICZNE ---
|
||||||
|
const GAME_WIDTH = 650;
|
||||||
|
const GAME_HEIGHT = 340;
|
||||||
|
|
||||||
|
// --- GŁÓWNY KOMPONENT ---
|
||||||
export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
||||||
|
// Stany gry
|
||||||
const [isPlaying, setIsPlaying] = useState(false);
|
const [isPlaying, setIsPlaying] = useState(false);
|
||||||
const [gameOver, setGameOver] = useState(false);
|
const [gameOver, setGameOver] = useState(false);
|
||||||
const [score, setScore] = useState(0);
|
const [score, setScore] = useState(0);
|
||||||
@@ -60,25 +65,46 @@ export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const [displayKittyY, setDisplayKittyY] = useState(0);
|
const [displayKittyY, setDisplayKittyY] = useState(0);
|
||||||
const [displayObstacleX, setDisplayObstacleX] = useState(650);
|
const [displayObstacleX, setDisplayObstacleX] = useState(GAME_WIDTH);
|
||||||
|
|
||||||
|
// RWD State: Skala
|
||||||
|
const [scale, setScale] = useState(1);
|
||||||
|
|
||||||
const isNight = Math.floor(score / 10) % 2 === 1;
|
const isNight = Math.floor(score / 10) % 2 === 1;
|
||||||
|
|
||||||
// Referencje fizyczne
|
// Referencje fizyczne
|
||||||
const kittyYRef = useRef(0);
|
const kittyYRef = useRef(0);
|
||||||
const obstacleXRef = useRef(650);
|
const obstacleXRef = useRef(GAME_WIDTH);
|
||||||
const velocityRef = useRef(0);
|
const velocityRef = useRef(0);
|
||||||
const scoreRef = useRef(0);
|
const scoreRef = useRef(0);
|
||||||
const requestRef = useRef<number>(0);
|
const requestRef = useRef<number>(0);
|
||||||
const lastTimeRef = useRef<number>(0);
|
const lastTimeRef = useRef<number>(0);
|
||||||
|
|
||||||
// STAŁE KONFIGURACYJNE (Wartości na sekundę - niezależne od Hz)
|
// STAŁE KONFIGURACYJNE
|
||||||
const GRAVITY = 1800; // Kot spadnie o 1800px w ciągu sekundy (jeśli nie ma prędkości początkowej)
|
const GRAVITY = 1800;
|
||||||
const JUMP_FORCE = -550; // Prędkość startowa skoku
|
const JUMP_FORCE = -550;
|
||||||
const INITIAL_SPEED = 380; // Prędkość przeszkody w px/s
|
const INITIAL_SPEED = 380;
|
||||||
const SPEED_INCREMENT = 12; // Przyspieszenie px/s na każdy punkt
|
const SPEED_INCREMENT = 12;
|
||||||
const GROUND_Y = 0;
|
const GROUND_Y = 0;
|
||||||
|
|
||||||
|
// --- RWD LOGIC ---
|
||||||
|
useEffect(() => {
|
||||||
|
const handleResize = () => {
|
||||||
|
const availableWidth = window.innerWidth - 32; // marginesy boczne
|
||||||
|
const availableHeight = window.innerHeight - 100; // miejsce na nagłówek
|
||||||
|
|
||||||
|
const scaleX = availableWidth / GAME_WIDTH;
|
||||||
|
const scaleY = availableHeight / GAME_HEIGHT;
|
||||||
|
|
||||||
|
// Skalujemy w dół jeśli ekran jest mały, ale max 1 (nie powiększamy na dużych ekranach)
|
||||||
|
setScale(Math.min(scaleX, scaleY, 1));
|
||||||
|
};
|
||||||
|
|
||||||
|
window.addEventListener('resize', handleResize);
|
||||||
|
handleResize();
|
||||||
|
return () => window.removeEventListener('resize', handleResize);
|
||||||
|
}, []);
|
||||||
|
|
||||||
const endGame = useCallback(() => {
|
const endGame = useCallback(() => {
|
||||||
setGameOver(true);
|
setGameOver(true);
|
||||||
setIsPlaying(false);
|
setIsPlaying(false);
|
||||||
@@ -95,12 +121,11 @@ export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
|||||||
setScore(0);
|
setScore(0);
|
||||||
scoreRef.current = 0;
|
scoreRef.current = 0;
|
||||||
kittyYRef.current = 0;
|
kittyYRef.current = 0;
|
||||||
obstacleXRef.current = 700;
|
obstacleXRef.current = GAME_WIDTH + 50;
|
||||||
velocityRef.current = 0;
|
velocityRef.current = 0;
|
||||||
// Kluczowe: inicjalizacja czasu startu
|
|
||||||
lastTimeRef.current = performance.now();
|
lastTimeRef.current = performance.now();
|
||||||
setDisplayKittyY(0);
|
setDisplayKittyY(0);
|
||||||
setDisplayObstacleX(700);
|
setDisplayObstacleX(GAME_WIDTH + 50);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const jump = useCallback(() => {
|
const jump = useCallback(() => {
|
||||||
@@ -109,19 +134,23 @@ export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
|||||||
}
|
}
|
||||||
}, [gameOver, isPlaying]);
|
}, [gameOver, isPlaying]);
|
||||||
|
|
||||||
|
// --- OBSŁUGA WEJŚCIA (Touch & Mouse) ---
|
||||||
|
const handleAction = useCallback((e?: React.SyntheticEvent) => {
|
||||||
|
// Nie używamy e.preventDefault() tutaj, bo CSS touch-action załatwia sprawę
|
||||||
|
if (e) e.stopPropagation();
|
||||||
|
|
||||||
|
if (!isPlaying || gameOver) startGame(); else jump();
|
||||||
|
}, [isPlaying, gameOver, startGame, jump]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const update = (currentTime: number) => {
|
const update = (currentTime: number) => {
|
||||||
if (gameOver || !isPlaying) return;
|
if (gameOver || !isPlaying) return;
|
||||||
|
|
||||||
// --- OBLICZANIE DELTA TIME (Dynamiczna szybkość) ---
|
|
||||||
// dt to czas w sekundach, jaki upłynął od ostatniej klatki (np. 0.016 dla 60Hz, 0.007 dla 144Hz)
|
|
||||||
const dt = (currentTime - lastTimeRef.current) / 1000;
|
const dt = (currentTime - lastTimeRef.current) / 1000;
|
||||||
lastTimeRef.current = currentTime;
|
lastTimeRef.current = currentTime;
|
||||||
|
|
||||||
// Zabezpieczenie przed "skokiem" (np. gdy użytkownik zmieni kartę w przeglądarce)
|
|
||||||
const frameTime = Math.min(dt, 0.1);
|
const frameTime = Math.min(dt, 0.1);
|
||||||
|
|
||||||
// Fizyka kota (jednostki * czas)
|
// Fizyka
|
||||||
velocityRef.current += GRAVITY * frameTime;
|
velocityRef.current += GRAVITY * frameTime;
|
||||||
kittyYRef.current -= velocityRef.current * frameTime;
|
kittyYRef.current -= velocityRef.current * frameTime;
|
||||||
|
|
||||||
@@ -130,24 +159,22 @@ export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
|||||||
velocityRef.current = 0;
|
velocityRef.current = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ruch przeszkody (prędkość * czas)
|
// Przeszkoda
|
||||||
const currentSpeed = INITIAL_SPEED + (scoreRef.current * SPEED_INCREMENT);
|
const currentSpeed = INITIAL_SPEED + (scoreRef.current * SPEED_INCREMENT);
|
||||||
obstacleXRef.current -= currentSpeed * frameTime;
|
obstacleXRef.current -= currentSpeed * frameTime;
|
||||||
|
|
||||||
// Reset przeszkody
|
|
||||||
if (obstacleXRef.current < -80) {
|
if (obstacleXRef.current < -80) {
|
||||||
obstacleXRef.current = 750;
|
obstacleXRef.current = GAME_WIDTH + 50;
|
||||||
scoreRef.current += 1;
|
scoreRef.current += 1;
|
||||||
setScore(scoreRef.current);
|
setScore(scoreRef.current);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Kolizja (strefa trafienia dopasowana do czasu)
|
// Kolizja
|
||||||
if (obstacleXRef.current < 100 && obstacleXRef.current > 20 && kittyYRef.current < 45) {
|
if (obstacleXRef.current < 100 && obstacleXRef.current > 20 && kittyYRef.current < 45) {
|
||||||
endGame();
|
endGame();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Renderowanie wizualne
|
|
||||||
setDisplayKittyY(kittyYRef.current);
|
setDisplayKittyY(kittyYRef.current);
|
||||||
setDisplayObstacleX(obstacleXRef.current);
|
setDisplayObstacleX(obstacleXRef.current);
|
||||||
|
|
||||||
@@ -164,23 +191,39 @@ export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
|||||||
const handleKey = (e: KeyboardEvent) => {
|
const handleKey = (e: KeyboardEvent) => {
|
||||||
if (e.code === 'Space') {
|
if (e.code === 'Space') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if (!isPlaying || gameOver) startGame(); else jump();
|
handleAction();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
window.addEventListener('keydown', handleKey);
|
window.addEventListener('keydown', handleKey);
|
||||||
return () => window.removeEventListener('keydown', handleKey);
|
return () => window.removeEventListener('keydown', handleKey);
|
||||||
}, [isPlaying, gameOver, startGame, jump]);
|
}, [handleAction]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col items-center justify-center min-h-[70vh] p-4 font-sans select-none">
|
<div className="flex flex-col items-center justify-start pt-8 sm:justify-center min-h-[80vh] w-full font-sans select-none overflow-hidden">
|
||||||
<button onClick={onBack} className="mb-6 flex items-center gap-2 text-pink-500 font-bold hover:scale-105 transition-all outline-none">
|
|
||||||
|
<button
|
||||||
|
onClick={onBack}
|
||||||
|
className="z-50 mb-6 flex items-center gap-2 text-pink-500 font-bold hover:scale-105 transition-all outline-none bg-white/50 px-4 py-2 rounded-full cursor-pointer"
|
||||||
|
>
|
||||||
<ArrowLeft size={20} /> Back
|
<ArrowLeft size={20} /> Back
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
|
{/* KONTENER SKALOWANIA */}
|
||||||
<div
|
<div
|
||||||
className={`relative w-full max-w-[650px] h-[340px] rounded-[3.5rem] shadow-2xl border-4 transition-colors duration-1000 overflow-hidden cursor-pointer
|
style={{
|
||||||
|
width: GAME_WIDTH,
|
||||||
|
height: GAME_HEIGHT,
|
||||||
|
transform: `scale(${scale})`,
|
||||||
|
transformOrigin: 'top center',
|
||||||
|
touchAction: 'none' // Zapobiega scrollowaniu na mobile
|
||||||
|
}}
|
||||||
|
className="relative shrink-0"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
className={`relative w-full h-full rounded-[3.5rem] shadow-2xl border-4 transition-colors duration-1000 overflow-hidden cursor-pointer
|
||||||
${isNight ? 'bg-slate-950 border-indigo-500 shadow-indigo-500/20' : 'bg-white border-pink-100 shadow-pink-200/50'}`}
|
${isNight ? 'bg-slate-950 border-indigo-500 shadow-indigo-500/20' : 'bg-white border-pink-100 shadow-pink-200/50'}`}
|
||||||
onClick={() => { if (!isPlaying || gameOver) startGame(); else jump(); }}
|
// Używamy onPointerDown zamiast onClick/onTouchStart
|
||||||
|
onPointerDown={handleAction}
|
||||||
>
|
>
|
||||||
{/* Niebo */}
|
{/* Niebo */}
|
||||||
<div className={`absolute top-10 left-12 transition-all duration-1000 ${isNight ? 'translate-y-0 opacity-100' : '-translate-y-20 opacity-0'}`}>
|
<div className={`absolute top-10 left-12 transition-all duration-1000 ${isNight ? 'translate-y-0 opacity-100' : '-translate-y-20 opacity-0'}`}>
|
||||||
@@ -199,13 +242,13 @@ export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* KOTEK */}
|
{/* KOTEK */}
|
||||||
<div className="absolute left-10" style={{ bottom: `${displayKittyY + 48}px` }}>
|
<div className="absolute left-10 pointer-events-none" style={{ bottom: `${displayKittyY + 48}px` }}>
|
||||||
<DetailedKitty isJumping={displayKittyY > 2} isNight={isNight} isGameOver={gameOver} />
|
<DetailedKitty isJumping={displayKittyY > 2} isNight={isNight} isGameOver={gameOver} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* PRZESZKODA */}
|
{/* PRZESZKODA */}
|
||||||
<div
|
<div
|
||||||
className={`absolute bottom-12 w-14 h-14 rounded-full border-2 flex items-center justify-center animate-spin transition-colors duration-1000
|
className={`absolute bottom-12 w-14 h-14 rounded-full border-2 flex items-center justify-center animate-spin transition-colors duration-1000 pointer-events-none
|
||||||
${isNight ? 'bg-indigo-900 border-indigo-400 shadow-[0_0_15px_rgba(129,140,248,0.3)]' : 'bg-pink-100 border-pink-300'}`}
|
${isNight ? 'bg-indigo-900 border-indigo-400 shadow-[0_0_15px_rgba(129,140,248,0.3)]' : 'bg-pink-100 border-pink-300'}`}
|
||||||
style={{ left: `${displayObstacleX}px` }}
|
style={{ left: `${displayObstacleX}px` }}
|
||||||
>
|
>
|
||||||
@@ -214,36 +257,45 @@ export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Ziemia */}
|
{/* Ziemia */}
|
||||||
<div className={`absolute bottom-0 w-full h-12 border-t-4 transition-colors duration-1000 flex items-center justify-around
|
<div className={`absolute bottom-0 w-full h-12 border-t-4 transition-colors duration-1000 flex items-center justify-around pointer-events-none
|
||||||
${isNight ? 'bg-slate-900 border-indigo-900 text-indigo-950' : 'bg-pink-50 border-pink-100 text-pink-100'}`}>
|
${isNight ? 'bg-slate-900 border-indigo-900 text-indigo-950' : 'bg-pink-50 border-pink-100 text-pink-100'}`}>
|
||||||
{[...Array(10)].map((_, i) => <span key={i} className="text-2xl grayscale opacity-50">🐾</span>)}
|
{[...Array(10)].map((_, i) => <span key={i} className="text-2xl grayscale opacity-50">🐾</span>)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Ekrany start/stop */}
|
{/* EKRAN STARTOWY */}
|
||||||
{!isPlaying && !gameOver && (
|
{!isPlaying && !gameOver && (
|
||||||
<div className="absolute inset-0 bg-white/20 backdrop-blur-[4px] flex items-center justify-center z-20">
|
<div className="absolute inset-0 bg-white/20 backdrop-blur-[4px] flex items-center justify-center z-20">
|
||||||
<div className="bg-white p-12 rounded-[3.5rem] shadow-2xl flex flex-col items-center border-4 border-pink-100 transform hover:scale-105 transition-transform">
|
<div className="bg-white p-12 rounded-[3.5rem] shadow-2xl flex flex-col items-center border-4 border-pink-100 transform hover:scale-105 transition-transform">
|
||||||
<Sparkles className="text-yellow-400 mb-4 animate-pulse" size={50} />
|
<Sparkles className="text-yellow-400 mb-4 animate-pulse" size={50} />
|
||||||
<button className="bg-pink-500 text-white px-12 py-5 rounded-2xl font-black text-2xl shadow-lg hover:bg-pink-600 transition-colors">
|
<button className="bg-pink-500 text-white px-12 py-5 rounded-2xl font-black text-2xl shadow-lg hover:bg-pink-600 transition-colors pointer-events-none">
|
||||||
START
|
START
|
||||||
</button>
|
</button>
|
||||||
<p className="mt-4 text-slate-400 font-bold text-sm uppercase tracking-widest">Click or Space</p>
|
<p className="mt-4 text-slate-400 font-bold text-sm uppercase tracking-widest">Tap or Space</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* GAME OVER */}
|
||||||
{gameOver && (
|
{gameOver && (
|
||||||
<div className={`absolute inset-0 backdrop-blur-md flex flex-col items-center justify-center text-center p-6 z-30 transition-colors duration-1000
|
<div className={`absolute inset-0 backdrop-blur-md flex flex-col items-center justify-center text-center p-6 z-30 transition-colors duration-1000
|
||||||
${isNight ? 'bg-slate-950/90' : 'bg-pink-50/90'}`}>
|
${isNight ? 'bg-slate-950/90' : 'bg-pink-50/90'}`}>
|
||||||
<h3 className={`text-6xl font-black mb-4 ${isNight ? 'text-white' : 'text-pink-600'}`}>Oh No! 😿</h3>
|
<h3 className={`text-6xl font-black mb-4 ${isNight ? 'text-white' : 'text-pink-600'}`}>Oh No! 😿</h3>
|
||||||
<div className={`text-3xl font-bold mb-8 ${isNight ? 'text-indigo-300' : 'text-pink-400'}`}>Score: {score}</div>
|
<div className={`text-3xl font-bold mb-8 ${isNight ? 'text-indigo-300' : 'text-pink-400'}`}>Score: {score}</div>
|
||||||
<button className="bg-pink-500 text-white border-4 border-white px-14 py-5 rounded-2xl font-black text-2xl hover:scale-110 transition-all shadow-xl active:scale-95">
|
<button
|
||||||
|
className="bg-pink-500 text-white border-4 border-white px-14 py-5 rounded-2xl font-black text-2xl hover:scale-110 transition-all shadow-xl active:scale-95 pointer-events-auto"
|
||||||
|
onPointerDown={(e) => { e.stopPropagation(); startGame(); }}
|
||||||
|
>
|
||||||
TRY AGAIN
|
TRY AGAIN
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Informacja dla mobile */}
|
||||||
|
<div className="mt-4 text-xs text-slate-400 sm:hidden">
|
||||||
|
Tap anywhere to jump
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -1,40 +1,18 @@
|
|||||||
import { useState, useCallback, type ReactNode } from 'react';
|
import { useState, useCallback, type ReactNode } from 'react';
|
||||||
import Cookies from 'js-cookie';
|
|
||||||
import { AuthContext } from './AuthContext';
|
import { AuthContext } from './AuthContext';
|
||||||
import { sha512 } from '../utils/crypto';
|
import { sha512 } from '../utils/crypto';
|
||||||
|
|
||||||
const TOKEN_KEY = 'ktty_shared_token';
|
// Nazwa klucza w localStorage (musi być spójna z Generator.tsx)
|
||||||
|
const TOKEN_KEY = 'jwt_token';
|
||||||
|
|
||||||
const getCookieConfig = () => {
|
// Adres API
|
||||||
const hostname = window.location.hostname;
|
const API_BASE = import.meta.env.VITE_API_TARGET || 'https://ktty.is';
|
||||||
|
|
||||||
// Sprawdzamy, czy jesteśmy na localhost
|
|
||||||
const isLocal = hostname === 'localhost' || hostname === '127.0.0.1';
|
|
||||||
|
|
||||||
// Sprawdzamy, czy połączenie jest bezpieczne (HTTPS)
|
|
||||||
const isSecure = window.location.protocol === 'https:';
|
|
||||||
|
|
||||||
return {
|
|
||||||
// Na produkcji używamy domeny nadrzędnej z kropką, by działało na subdomenach
|
|
||||||
// Na localhost MUSI być undefined, inaczej przeglądarka odrzuci ciasteczko
|
|
||||||
domain: isLocal ? undefined : '.ktty.is',
|
|
||||||
|
|
||||||
// Atrybut Secure wymaga HTTPS. Na localhost wyłączamy, na produkcji włączamy.
|
|
||||||
secure: isSecure,
|
|
||||||
|
|
||||||
// 'Lax' jest bezpieczne i pozwala na współdzielenie w obrębie subdomen.
|
|
||||||
// Jeśli API jest na zupełnie innej domenie, rozważ 'None' (wymaga Secure: true).
|
|
||||||
sameSite: 'Lax' as const,
|
|
||||||
|
|
||||||
path: '/',
|
|
||||||
expires: 7
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
export function AuthProvider({ children }: { children: ReactNode }) {
|
export function AuthProvider({ children }: { children: ReactNode }) {
|
||||||
const [token, setToken] = useState<string | null>(() => Cookies.get(TOKEN_KEY) || null);
|
// Inicjalizacja stanu
|
||||||
|
const [token, setToken] = useState<string | null>(() => localStorage.getItem(TOKEN_KEY));
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const [error, setError] = useState<string | null>(null); // DODANE
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
const authRequest = useCallback(async (endpoint: 'signIn' | 'signUp', name: string, pass: string) => {
|
const authRequest = useCallback(async (endpoint: 'signIn' | 'signUp', name: string, pass: string) => {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
@@ -42,24 +20,26 @@ export function AuthProvider({ children }: { children: ReactNode }) {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const hashedPassword = await sha512(pass);
|
const hashedPassword = await sha512(pass);
|
||||||
const response = await fetch(`/api/v1/user/${endpoint}`, {
|
|
||||||
|
const response = await fetch(`${API_BASE}/api/v1/user/${endpoint}`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
credentials: 'include',
|
|
||||||
body: JSON.stringify({ name, password: hashedPassword }),
|
body: JSON.stringify({ name, password: hashedPassword }),
|
||||||
});
|
});
|
||||||
|
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error(data?.message || 'Błąd autoryzacji');
|
throw new Error(data?.message || data?.error || 'Błąd autoryzacji');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data?.token) {
|
if (data?.token) {
|
||||||
Cookies.set(TOKEN_KEY, data.token, getCookieConfig());
|
localStorage.setItem(TOKEN_KEY, data.token);
|
||||||
setToken(data.token);
|
setToken(data.token);
|
||||||
}
|
}
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
|
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
const msg = err instanceof Error ? err.message : 'Wystąpił błąd';
|
const msg = err instanceof Error ? err.message : 'Wystąpił błąd';
|
||||||
setError(msg);
|
setError(msg);
|
||||||
@@ -69,11 +49,18 @@ export function AuthProvider({ children }: { children: ReactNode }) {
|
|||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
// ZMODYFIKOWANA FUNKCJA LOGOUT
|
||||||
const logout = useCallback(() => {
|
const logout = useCallback(() => {
|
||||||
const config = getCookieConfig();
|
// 1. Usuwamy token z pamięci
|
||||||
// When removing, you must match the domain and path used when setting
|
localStorage.removeItem(TOKEN_KEY);
|
||||||
Cookies.remove(TOKEN_KEY, { domain: config.domain, path: config.path });
|
|
||||||
setToken(null);
|
setToken(null);
|
||||||
|
|
||||||
|
// 2. Wymuszamy odświeżenie aplikacji
|
||||||
|
// To jest "Hard Refresh", który czyści cały stan Reacta
|
||||||
|
window.location.reload();
|
||||||
|
|
||||||
|
// Opcjonalnie: Jeśli wolisz tylko przekierowanie na główną bez pełnego przeładowania (szybciej, ale zostawia stan w pamięci):
|
||||||
|
// window.location.href = '/';
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
Reference in New Issue
Block a user