gofnnp/w-aura
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'remove-commit' into 'main'

Browse Source 
fix: remove commit

See merge request witapp/aura-webapp!21
This commit is contained in:
Victor Ershov 2023-12-31 01:00:19 +00:00
commit 2c68672ff7
3 changed files with 87 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
src/components/App/index.tsx
View File

@ -233,71 +233,77 @@ function App(): JSX.Element {
<Route path=":subPlan" element={<SubscriptionPage />} /> <Route path=":subPlan" element={<SubscriptionPage />} />
</Route> </Route>
</Route> </Route>
{/* <Route element={<PrivateOutlet />}> */} <Route element={<PrivateOutlet />}>
<Route element={<AuthorizedUserOutlet />}> <Route element={<AuthorizedUserOutlet />}>
{/* <Route {/* <Route
path={routes.client.subscription()} path={routes.client.subscription()}
element={<SubscriptionPage />} element={<SubscriptionPage />}
/> */} /> */}
<Route <Route
path={routes.client.paymentMethod()} path={routes.client.paymentMethod()}
element={<PaymentPage />} element={<PaymentPage />}
/> />
<Route <Route
path={routes.client.paymentStripe()} path={routes.client.paymentStripe()}
element={<StripePage />} 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>
{/* <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 path="*" element={<NotFoundPage />} />
</Route> </Route>
</Routes> </Routes>
@ -431,25 +437,25 @@ function AuthorizedUserOutlet(): JSX.Element {
); );
} }
// function PrivateOutlet(): JSX.Element { function PrivateOutlet(): JSX.Element {
// const { user } = useAuth(); const { user } = useAuth();
// return user ? ( return user ? (
// <Outlet /> <Outlet />
// ) : ( ) : (
// <Navigate to={routes.client.root()} replace={true} /> <Navigate to={routes.client.root()} replace={true} />
// ); );
// } }
// function PrivateSubscriptionOutlet(): JSX.Element { function PrivateSubscriptionOutlet(): JSX.Element {
// // const isProduction = import.meta.env.MODE === "production"; // const isProduction = import.meta.env.MODE === "production";
// const isProduction = false; const isProduction = false;
// const status = useSelector(selectors.selectStatus); const status = useSelector(selectors.selectStatus);
// return status === "subscribed" || !isProduction ? ( return status === "subscribed" || !isProduction ? (
// <Outlet /> <Outlet />
// ) : ( ) : (
// <Navigate to={getRouteBy(status)} replace={true} /> <Navigate to={getRouteBy(status)} replace={true} />
// ); );
// } }
function getIsShowFullDataModal(dataItems: Array<unknown> = []): boolean { function getIsShowFullDataModal(dataItems: Array<unknown> = []): boolean {
let hasNoDataItem = false; let hasNoDataItem = false;

2
src/components/AttentionPage/index.tsx
View File

@ -17,7 +17,7 @@ function AttentionPage({
}: AttentionPageProps): JSX.Element { }: AttentionPageProps): JSX.Element {
const { t } = useTranslation(); const { t } = useTranslation();
const navigate = useNavigate(); const navigate = useNavigate();
const handleNext = () => navigate(routes.client.home()); const handleNext = () => navigate(routes.client.priceList());
return ( return (
<section className={`${styles.page} page`}> <section className={`${styles.page} page`}>

2
src/store/token.ts
View File

@ -2,7 +2,7 @@ import { createSlice, createSelector } from '@reduxjs/toolkit'
import type { PayloadAction } from '@reduxjs/toolkit' import type { PayloadAction } from '@reduxjs/toolkit'
import type { AuthToken } from '../api' import type { AuthToken } from '../api'
const initialState: AuthToken = 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOjI5MjY0LCJpYXQiOjE3MDA3ODcwNjcsImV4cCI6MTcwOTQyNzA2NywianRpIjoiNDJlYzI4M2ItY2M1My00ZGY1LWIxYzctZmFhZjM3OTU2NjY2IiwiZW1haWwiOiJmYmljaGExMjM0QGdtYWlsLmNvbSIsInN0YXRlIjoicHJvdmVuIiwibG9jIjoicnUiLCJ0eiI6MTQ0MDAsInR5cGUiOiJvYXV0aCIsImlzcyI6ImF1cmF3ZWIifQ.kPAN5MImnR1lhaotPPQc78faot2W1ceygEq33qLkfOM' const initialState: AuthToken = ''
const authTokenSlice = createSlice({ const authTokenSlice = createSlice({
name: 'token', name: 'token',