From c086b6cf3b2a077b396392ddcdfddc8626970c94 Mon Sep 17 00:00:00 2001
From: gofnnp <fbicha1234@gmail.com>
Date: Sun, 31 Dec 2023 04:49:54 +0400
Subject: [PATCH] fix: remove commit

---
 src/components/App/index.tsx           | 164 +++++++++++++------------
 src/components/AttentionPage/index.tsx |   2 +-
 src/store/token.ts                     |   2 +-
 3 files changed, 87 insertions(+), 81 deletions(-)

diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx
index 06cb687..789ba1b 100644
--- a/src/components/App/index.tsx
+++ b/src/components/App/index.tsx
@@ -233,71 +233,77 @@ function App(): JSX.Element {
             <Route path=":subPlan" element={<SubscriptionPage />} />
           </Route>
         </Route>
-        {/* <Route element={<PrivateOutlet />}> */}
-        <Route element={<AuthorizedUserOutlet />}>
-          {/* <Route
+        <Route element={<PrivateOutlet />}>
+          <Route element={<AuthorizedUserOutlet />}>
+            {/* <Route
               path={routes.client.subscription()}
               element={<SubscriptionPage />}
             /> */}
-          <Route
-            path={routes.client.paymentMethod()}
-            element={<PaymentPage />}
-          />
-          <Route
-            path={routes.client.paymentStripe()}
-            element={<StripePage />}
-          />
+            <Route
+              path={routes.client.paymentMethod()}
+              element={<PaymentPage />}
+            />
+            <Route
+              path={routes.client.paymentStripe()}
+              element={<StripePage />}
+            />
+          </Route>
+          <Route element={<PrivateSubscriptionOutlet />}>
+            <Route path={routes.client.home()} element={<HomePage />} />
+            <Route
+              path={routes.client.compatibility()}
+              element={<CompatibilityPage />}
+            />
+            <Route
+              path={routes.client.compatibilityResult()}
+              element={<CompatResultPage />}
+            />
+            <Route
+              path={routes.client.breath()}
+              element={<BreathPage leoApng={leoApng} />}
+            />
+            <Route
+              path={routes.client.breathResult()}
+              element={<UserCallbacksPage />}
+            />
+            <Route
+              path={routes.client.wallpaper()}
+              element={<WallpaperPage />}
+            />
+            <Route
+              path={routes.client.magicBall()}
+              element={<MagicBallPage />}
+            />
+            <Route
+              path={routes.client.horoscopeBestiesResult()}
+              element={<BestiesHoroscopeResult />}
+            />
+            <Route
+              path={routes.client.predictionMoonResult()}
+              element={<PredictionMoonResult />}
+            />
+            <Route
+              path={routes.client.myHoroscopeResult()}
+              element={<MyHoroscopeResult />}
+            />
+            <Route
+              path={routes.client.thermalResult()}
+              element={<ThermalResult />}
+            />
+            <Route
+              path={routes.client.moonPhaseTracker()}
+              element={<MoonPhaseTrackerResult />}
+            />
+            <Route
+              path={routes.client.energyVampirismResult()}
+              element={<EnergyVampirismResult />}
+            />
+            <Route
+              path={routes.client.nameHoroscopeResult()}
+              element={<NameHoroscopeResult />}
+            />
+          </Route>
         </Route>
-        {/* <Route element={<PrivateSubscriptionOutlet />}> */}
-        <Route path={routes.client.home()} element={<HomePage />} />
-        <Route
-          path={routes.client.compatibility()}
-          element={<CompatibilityPage />}
-        />
-        <Route
-          path={routes.client.compatibilityResult()}
-          element={<CompatResultPage />}
-        />
-        <Route
-          path={routes.client.breath()}
-          element={<BreathPage leoApng={leoApng} />}
-        />
-        <Route
-          path={routes.client.breathResult()}
-          element={<UserCallbacksPage />}
-        />
-        <Route path={routes.client.wallpaper()} element={<WallpaperPage />} />
-        <Route path={routes.client.magicBall()} element={<MagicBallPage />} />
-        <Route
-          path={routes.client.horoscopeBestiesResult()}
-          element={<BestiesHoroscopeResult />}
-        />
-        <Route
-          path={routes.client.predictionMoonResult()}
-          element={<PredictionMoonResult />}
-        />
-        <Route
-          path={routes.client.myHoroscopeResult()}
-          element={<MyHoroscopeResult />}
-        />
-        <Route
-          path={routes.client.thermalResult()}
-          element={<ThermalResult />}
-        />
-        <Route
-          path={routes.client.moonPhaseTracker()}
-          element={<MoonPhaseTrackerResult />}
-        />
-        <Route
-          path={routes.client.energyVampirismResult()}
-          element={<EnergyVampirismResult />}
-        />
-        <Route
-          path={routes.client.nameHoroscopeResult()}
-          element={<NameHoroscopeResult />}
-        />
-        {/* </Route> */}
-        {/* </Route> */}
         <Route path="*" element={<NotFoundPage />} />
       </Route>
     </Routes>
@@ -431,25 +437,25 @@ function AuthorizedUserOutlet(): JSX.Element {
   );
 }
 
-// function PrivateOutlet(): JSX.Element {
-//   const { user } = useAuth();
-//   return user ? (
-//     <Outlet />
-//   ) : (
-//     <Navigate to={routes.client.root()} replace={true} />
-//   );
-// }
+function PrivateOutlet(): JSX.Element {
+  const { user } = useAuth();
+  return user ? (
+    <Outlet />
+  ) : (
+    <Navigate to={routes.client.root()} replace={true} />
+  );
+}
 
-// function PrivateSubscriptionOutlet(): JSX.Element {
-//   // const isProduction = import.meta.env.MODE === "production";
-//   const isProduction = false;
-//   const status = useSelector(selectors.selectStatus);
-//   return status === "subscribed" || !isProduction ? (
-//     <Outlet />
-//   ) : (
-//     <Navigate to={getRouteBy(status)} replace={true} />
-//   );
-// }
+function PrivateSubscriptionOutlet(): JSX.Element {
+  // const isProduction = import.meta.env.MODE === "production";
+  const isProduction = false;
+  const status = useSelector(selectors.selectStatus);
+  return status === "subscribed" || !isProduction ? (
+    <Outlet />
+  ) : (
+    <Navigate to={getRouteBy(status)} replace={true} />
+  );
+}
 
 function getIsShowFullDataModal(dataItems: Array<unknown> = []): boolean {
   let hasNoDataItem = false;
diff --git a/src/components/AttentionPage/index.tsx b/src/components/AttentionPage/index.tsx
index 43b3d6e..c8895a8 100644
--- a/src/components/AttentionPage/index.tsx
+++ b/src/components/AttentionPage/index.tsx
@@ -17,7 +17,7 @@ function AttentionPage({
 }: AttentionPageProps): JSX.Element {
   const { t } = useTranslation();
   const navigate = useNavigate();
-  const handleNext = () => navigate(routes.client.home());
+  const handleNext = () => navigate(routes.client.priceList());
 
   return (
     <section className={`${styles.page} page`}>
diff --git a/src/store/token.ts b/src/store/token.ts
index f5f571e..d9e619c 100644
--- a/src/store/token.ts
+++ b/src/store/token.ts
@@ -2,7 +2,7 @@ import { createSlice, createSelector } from '@reduxjs/toolkit'
 import type { PayloadAction } from '@reduxjs/toolkit'
 import type { AuthToken } from '../api'
 
-const initialState: AuthToken = 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOjI5MjY0LCJpYXQiOjE3MDA3ODcwNjcsImV4cCI6MTcwOTQyNzA2NywianRpIjoiNDJlYzI4M2ItY2M1My00ZGY1LWIxYzctZmFhZjM3OTU2NjY2IiwiZW1haWwiOiJmYmljaGExMjM0QGdtYWlsLmNvbSIsInN0YXRlIjoicHJvdmVuIiwibG9jIjoicnUiLCJ0eiI6MTQ0MDAsInR5cGUiOiJvYXV0aCIsImlzcyI6ImF1cmF3ZWIifQ.kPAN5MImnR1lhaotPPQc78faot2W1ceygEq33qLkfOM'
+const initialState: AuthToken = ''
 
 const authTokenSlice = createSlice({
   name: 'token',