Skip to content

NG-Switch feat: Add animation during switching the pages #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Aiiyuu merged 1 commit into from
Nov 25, 2025
Merged

NG-Switch feat: Add animation during switching the pages #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 128 additions & 37 deletions src/app/routes/AppRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Navigate, Route, Routes } from 'react-router-dom';
import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
import App from '../App';

import AuthPage, { LoginPage, SignupPage } from '../../features/auth';
Expand All @@ -14,40 +14,131 @@ import { CheckoutPage } from '../../features/checkout';
import { ProfilePage } from '../../features/profile';
import { CreatorsPage } from '../../features/creators';
import { ROUTES } from '../../shared/config/routes';
import { AnimatePresence } from 'framer-motion';
import { PageSwitcher } from '../../shared/animation/PageSwitcher';

export const AppRoutes = () => (
<Routes>
<Route path="/" element={<Navigate to="/en" replace />} />

<Route path=":lng" element={<App />}>
<Route index element={<HomePage />} />
<Route path={ROUTES.home} element={<Navigate to=".." replace />} />

<Route path={ROUTES.catalog} element={<CatalogPage />} />
<Route path={ROUTES.catalogCategory} element={<CatalogPage />} />
<Route path={ROUTES.productDetail} element={<ProductDetailPage />} />

<Route path={ROUTES.cart} element={<CartPage />} />
<Route path={ROUTES.favorite} element={<FavoritePage />} />

<Route path={ROUTES.contacts} element={<ContactsPage />} />
<Route path={ROUTES.creators} element={<CreatorsPage />} />
<Route path={ROUTES.rights} element={<RightsPage />} />
<Route path={ROUTES.checkout} element={<CheckoutPage />} />
<Route path={ROUTES.profile} element={<ProfilePage />} />
</Route>

<Route path="*" element={<NotFound />} />

<Route path=":lng/auth" element={<AuthPage />}>
<Route
index
element={<Navigate to={ROUTES.login.replace('auth/', '')} replace />}
/>
<Route path="login" element={<LoginPage />} />
<Route path="signup" element={<SignupPage />} />
</Route>

<Route path="*" element={<Navigate to="/en" replace />} />
</Routes>
);
export const AppRoutes = () => {
const location = useLocation();

return (
<AnimatePresence>
<Routes location={location} key={location.pathname}>
<Route path="/" element={
<PageSwitcher>
<Navigate to="/en" replace />
</PageSwitcher>
} />

<Route
path=":lng"
element={
<PageSwitcher>
<App />
</PageSwitcher>
}
>
<Route index element={
<PageSwitcher>
<HomePage />
</PageSwitcher>
} />
<Route path={ROUTES.home} element={
<PageSwitcher>
<Navigate to=".." replace />
</PageSwitcher>
} />

<Route path={ROUTES.catalog} element={
<PageSwitcher>
<CatalogPage />
</PageSwitcher>
} />
<Route path={ROUTES.catalogCategory} element={
<PageSwitcher>
<CatalogPage />
</PageSwitcher>
} />
<Route path={ROUTES.productDetail} element={
<PageSwitcher>
<ProductDetailPage />
</PageSwitcher>
} />

<Route path={ROUTES.cart} element={
<PageSwitcher>
<CartPage />
</PageSwitcher>
} />
<Route path={ROUTES.favorite} element={
<PageSwitcher>
<FavoritePage />
</PageSwitcher>
} />

<Route path={ROUTES.contacts} element={
<PageSwitcher>
<ContactsPage />
</PageSwitcher>
} />
<Route path={ROUTES.creators} element={
<PageSwitcher>
<CreatorsPage />
</PageSwitcher>
} />
<Route path={ROUTES.rights} element={
<PageSwitcher>
<RightsPage />
</PageSwitcher>
} />
<Route path={ROUTES.checkout} element={
<PageSwitcher>
<CheckoutPage />
</PageSwitcher>
} />
<Route path={ROUTES.profile} element={
<PageSwitcher>
<ProfilePage />
</PageSwitcher>
} />
</Route>

<Route path="*" element={
<PageSwitcher>
<NotFound />
</PageSwitcher>
} />

<Route path=":lng/auth" element={
<PageSwitcher>
<AuthPage />
</PageSwitcher>
}>
<Route
index
element={
<PageSwitcher>
<Navigate to={ROUTES.login.replace('auth/', '')} replace />
</PageSwitcher>
}
/>
<Route path="login" element={
<PageSwitcher>
<LoginPage />
</PageSwitcher>
} />
<Route path="signup" element={
<PageSwitcher>
<SignupPage />
</PageSwitcher>
} />
</Route>

<Route path="*" element={
<PageSwitcher>
<Navigate to="/en" replace />
</PageSwitcher>
} />
</Routes>
</AnimatePresence>
);
};
34 changes: 34 additions & 0 deletions src/shared/animation/PageSwitcher/PageSwitcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import React from 'react';
import { motion, type Variants } from 'framer-motion';

type Props = {
children: React.ReactNode;
transitionVariants?: Variants
};

const DEFAULT_VARIANTS = {
initial: { opacity: 0, y: 20 },
in: {
opacity: 1,
y: 0,
transition: { type: 'tween', duration: 0.7, ease: 'easeInOut' }
},
out: {
opacity: 0,
y: -20,
transition: { type: 'tween', duration: 0.5, ease: 'easeInOut' }
}
};

export const PageSwitcher: React.FC<Props> = ({ children, transitionVariants = DEFAULT_VARIANTS as Props['transitionVariants']}) => {
return (
<motion.div
initial="initial"
animate="in"
exit="out"
variants={transitionVariants}
>
{children}
</motion.div>
);
};
1 change: 1 addition & 0 deletions src/shared/animation/PageSwitcher/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './PageSwitcher';
Loading