Merge pull request #10 from LexaFrontDev/dev

feat(frontend): remove cache system, refactor pages, and add Tailwind…

Author: LexaFrontDev

.env

@@ -1,9 +1,9 @@
 APP_ENV=prod
-APP_SECRET=25aeff0645dafb0ce3dc54218fd03bed
+APP_SECRET=
 
-DB_USER=root
-DB_PASS=
-DB_HOST=127.0.0.1
+DB_USER=your-database_user_name
+DB_PASS=your-database_password
+DB_HOST=your-database_host
 DB_NAME=Time
 
 MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
@@ -20,6 +20,12 @@ MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
 ###> lexik/jwt-authentication-bundle ###
 JWT_PRIVATE_KEY_PATH=%kernel.project_dir%/config/jwt/private.pem
 JWT_PUBLIC_KEY_PATH=%kernel.project_dir%/config/jwt/public.pem
-JWT_PASSPHRASE=e357a5e49f1839042101695a96c07c9edfdf4939d4e91b1368d5c177153a71bc
+JWT_PASSPHRASE=
 ###< lexik/jwt-authentication-bundle ###
 
+VITE_CACHE_DB_NAME=
+VITE_CACHE_STORE_NAME=
+VITE_GOOGLE_CLIENT_ID=
+VITE_GOOGLE_REDIRECT_URI=
+VITE_PUSH_PUBLIC_KEY=
+VITE_PUSH_PRIVATE_KEY=

.env.dev

@@ -1,5 +1,6 @@
 
 ###> symfony/framework-bundle ###
+package-lock.json
 .env
 .env.dev
 .env.test
@@ -37,5 +38,4 @@ phpstan.neon
 ###> friendsofphp/php-cs-fixer ###
 /.php-cs-fixer.php
 /.php-cs-fixer.cache
-package-lock.json
 ###< friendsofphp/php-cs-fixer ###

.env.test

@@ -8,19 +8,19 @@ import Habits_page from "./pages/Habits/HabitsPage";
 import TasksPage from "./pages/Tasks/TasksPage";
 //@ts-ignore
 import MatricPage from "./pages/MatricPage/MatricPage";
-import Premium from "./pages/main/pages/Premium";
 import PremiumPage from "./pages/main/pages/Premium";
 import Lending from "./pages/main/pages/Main";
 import LoginPage from "./pages/AuthPages/Login";
 import RegisterPage from "./pages/AuthPages/Register";
-import {AuthCheck} from "./ui/props/Auth/AuthCheck";
+import { AuthCheck } from "./ui/props/Auth/AuthCheck";
 import HabitCalendar from "./pages/Statistic/StatisticPage";
 
 const RouterDom = () => {
-    const [isAuthenticated, setIsAuthenticated] = useState<boolean|null>(null);
+    const [isAuthenticated, setIsAuthenticated] = useState<boolean | null>(null);
     const location = useLocation();
     const navigate = useNavigate();
 
+    // Сохраняем последнюю защищённую страницу
     useEffect(() => {
         const allowedPages = [
             '/tasks',
@@ -30,92 +30,131 @@ const RouterDom = () => {
             '/profile',
             '/profile/statistics'
         ];
-
         if (allowedPages.includes(location.pathname.toLowerCase())) {
             localStorage.setItem('last_page', location.pathname);
         }
     }, [location.pathname]);
 
+
     useEffect(() => {
         const checkAuth = async () => {
             try {
                 const res = await fetch('/api/auth/check');
                 const ok = res.ok;
                 setIsAuthenticated(ok);
 
+                if(ok){
+                    console.log('Зов пениса');
+                    subscribePush();
+                }
+
                 if (ok && location.pathname === '/') {
-                    const lastPage = localStorage.getItem('last_page') || '/Tasks';
+                    const lastPage = localStorage.getItem('last_page') || '/tasks';
                     navigate(lastPage, { replace: true });
                 }
+
+                const protectedPages = [
+                    '/tasks',
+                    '/habits',
+                    '/matric',
+                    '/pomodoro',
+                    '/profile',
+                    '/profile/statistics',
+                    '/premium'
+                ];
+                if (!ok && protectedPages.includes(location.pathname.toLowerCase())) {
+                    navigate('/users/login', { replace: true });
+                }
+
             } catch {
                 setIsAuthenticated(false);
+                if (!['/users/login', '/users/register'].includes(location.pathname.toLowerCase())) {
+                    navigate('/users/login', { replace: true });
+                }
             }
         };
         checkAuth();
-    }, []);
+    }, [location.pathname, navigate]);
 
-    if (isAuthenticated === null) return <Loading />;
 
-    return (
-        <Routes>
-            <Route path="/" element={<Lending />} />
 
-            <Route
-                path="/profile"
-                element={
-                    <AuthCheck isAuthenticated={isAuthenticated}>
-                        <Profile />
-                    </AuthCheck>
-                }
-            />
-
-            <Route
-                path="/pomodoro"
-                element={
-                    <AuthCheck isAuthenticated={isAuthenticated}>
-                        <Pomodoro />
-                    </AuthCheck>
-                }
-            />
-
-            <Route
-                path="/habits"
-                element={
-                    <AuthCheck isAuthenticated={isAuthenticated}>
-                        <Habits_page />
-                    </AuthCheck>
-                }
-            />
 
-            <Route path="/users/register" element={<RegisterPage />} />
-            <Route path="/users/login" element={<LoginPage />} />
 
-            <Route
-                path="/tasks"
-                element={
-                    <AuthCheck isAuthenticated={isAuthenticated}>
-                        <TasksPage />
-                    </AuthCheck>
-                }
-            />
+    const getPlatform = () => {
+        const ua = navigator.userAgent;
 
+        let os = 'Unknown OS';
+        if (/Windows NT/.test(ua)) os = 'Windows';
+        else if (/Macintosh/.test(ua)) os = 'Mac';
+        else if (/Android/.test(ua)) os = 'Android';
+        else if (/iPhone|iPad|iPod/.test(ua)) os = 'iOS';
+        else if (/Linux/.test(ua)) os = 'Linux';
 
+        let browser = 'Unknown Browser';
+        if (/Chrome/.test(ua) && /Mobile/.test(ua)) browser = 'Chrome Mobile';
+        else if (/Chrome/.test(ua)) browser = 'Chrome';
+        else if (/Firefox/.test(ua)) browser = 'Firefox';
+        else if (/Safari/.test(ua) && !/Chrome/.test(ua)) browser = 'Safari';
+        else if (/Edg/.test(ua)) browser = 'Edge';
+        else if (/OPR/.test(ua)) browser = 'Opera';
 
-            <Route
-                path="/premium"
-                element={
-                        <PremiumPage isAuthenticated={isAuthenticated} />
-                }
-            />
-
-            <Route
-                path="/profile/statistics"
-                element={
-                    <AuthCheck isAuthenticated={isAuthenticated}>
-                        <HabitCalendar />
-                    </AuthCheck>
-                }
-            />
+        return `${browser}_${os}`;
+    };
+
+
+
+    const subscribePush = async () => {
+        if ('serviceWorker' in navigator) {
+            navigator.serviceWorker.register('/serviceWorker/ServiceWorker.js')
+                .then(registration => console.log('Service Worker зарегистрирован:', registration))
+                .catch(err => console.error('Не удалось зарегистрировать Service Worker:', err));
+        }
+
+        try {
+            console.log('Дошлм епта')
+            const registration = await navigator.serviceWorker.ready;
+            const subscription = await registration.pushManager.subscribe({
+                userVisibleOnly: true,
+                applicationServerKey: urlBase64ToUint8Array(import.meta.env.VITE_PUSH_PUBLIC_KEY)
+            });
+
+            const pushData = {
+                platform: getPlatform(),
+                endpoint: subscription.endpoint,
+                keys: subscription.toJSON().keys
+            };
+
+            console.log(pushData);
+
+
+            await fetch('/api/save/subscription/web', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': `Bearer ${localStorage.getItem('jwt')}`
+                },
+                body: JSON.stringify(pushData)
+            });
+        } catch (err) {
+            console.error('Не удалось подписать на пуши:', err);
+        }
+    };
+
+
+    if (isAuthenticated === null) return <Loading />;
+
+    return (
+        <Routes>
+            <Route path="/" element={<Lending />} />
+            <Route path="/profile" element={<AuthCheck isAuthenticated={isAuthenticated}><Profile /></AuthCheck>} />
+            <Route path="/pomodoro" element={<AuthCheck isAuthenticated={isAuthenticated}><Pomodoro /></AuthCheck>} />
+            <Route path="/habits" element={<AuthCheck isAuthenticated={isAuthenticated}><Habits_page /></AuthCheck>} />
+            <Route path="/tasks" element={<AuthCheck isAuthenticated={isAuthenticated}><TasksPage /></AuthCheck>} />
+            <Route path="/profile/statistics" element={<AuthCheck isAuthenticated={isAuthenticated}><HabitCalendar /></AuthCheck>} />
+            <Route path="/matric" element={<AuthCheck isAuthenticated={isAuthenticated}><MatricPage /></AuthCheck>} />
+            <Route path="/premium" element={<AuthCheck isAuthenticated={isAuthenticated}><PremiumPage isAuthenticated={isAuthenticated} /></AuthCheck>} />
+            <Route path="/users/register" element={<RegisterPage />} />
+            <Route path="/users/login" element={<LoginPage />} />
         </Routes>
     );
 };
@@ -127,3 +166,11 @@ const WrappedRouterDom = () => (
 );
 
 export default WrappedRouterDom;
+
+
+function urlBase64ToUint8Array(base64String: string) {
+    const padding = '='.repeat((4 - (base64String.length % 4)) % 4);
+    const base64 = (base64String + padding).replace(/-/g, '+').replace(/_/g, '/');
+    const rawData = atob(base64);
+    return new Uint8Array([...rawData].map(c => c.charCodeAt(0)));
+}