Merge branch 'questionnaire' into 'main'

fix: subscription route protected

See merge request witapp/aura-webapp!33

src/components/App/index.tsx

@@ -318,69 +318,75 @@ function App(): JSX.Element {
           </Route>
         </Route>
         <Route element={<PrivateOutlet />}>
-        <Route element={<AuthorizedUserOutlet />}>
-          {/* <Route
+          <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>
-        <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
+              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 path="*" element={<NotFoundPage />} />
       </Route>

src/routes.ts

@@ -297,7 +297,7 @@ export const getRouteBy = (status: UserStatus): string => {
       return routes.client.gender();
     case "registred":
     case "unsubscribed":
-      return routes.client.subscription();
+      return routes.client.trialPayment();
     case "subscribed":
       return routes.client.home();
     default: