robodev 0.22.0 → 0.24.0

package/templates/marketplace/apps/fe/src/providers/jwt.provider.tsx

@@ -0,0 +1,95 @@
+import { AuthContext } from "@povio/openapi-codegen-cli";
+import { useQueryClient } from "@tanstack/react-query";
+import { type PropsWithChildren, useCallback, useEffect, useMemo, useRef, useSyncExternalStore } from "react";
+
+import { authTokenStore } from "@/clients/auth-token-store";
+import { LoadingState } from "@/components/shared/layout/LoadingState";
+import { UserApi } from "@/openapi/user/user.api";
+import type { UserModels } from "@/openapi/user/user.models";
+import { UserQueries } from "@/openapi/user/user.queries";
+
+const routes: AuthContext.Routes = {
+  authenticated: "/",
+  unauthenticated: "/login",
+};
+
+export const JWTProvider = ({ children }: PropsWithChildren) => {
+  const queryClient = useQueryClient();
+
+  const previousAccessToken = useRef<string | null>(null);
+  const accessToken = useSyncExternalStore(
+    authTokenStore.subscribe,
+    authTokenStore.getAccessToken,
+    authTokenStore.getServerSnapshot,
+  );
+
+  const authenticated = !!accessToken;
+  const isInitializing = false;
+
+  const { data: user } = UserQueries.useGet({
+    enabled: authenticated,
+    staleTime: 10 * 60 * 1000,
+  });
+
+  const onAccessTokenChange = useCallback((token: string | null) => {
+    authTokenStore.setAccessToken(token);
+  }, []);
+
+  const onRefreshTokenChange = useCallback((token: string | null) => {
+    authTokenStore.setRefreshToken(token);
+  }, []);
+
+  const logout = useCallback(() => {
+    authTokenStore.clear();
+    queryClient.clear();
+  }, [queryClient]);
+
+  useEffect(() => {
+    if (previousAccessToken.current && !accessToken) {
+      queryClient.clear();
+    }
+
+    previousAccessToken.current = accessToken;
+  }, [accessToken, queryClient]);
+
+  const userPromise = useCallback(async () => {
+    try {
+      const user = await UserApi.get();
+      queryClient.setQueryData<UserModels.UserMeResponse>(UserQueries.keys.get(), user);
+      return user;
+    } catch {
+      logout();
+      return null;
+    }
+  }, [logout, queryClient]);
+
+  const updateTokens = useCallback(
+    (accessToken: string | null, refreshToken?: string | null) => {
+      if (accessToken !== null) {
+        onAccessTokenChange(accessToken);
+      }
+      if (refreshToken !== null && refreshToken !== undefined) {
+        onRefreshTokenChange(refreshToken);
+      }
+    },
+    [onAccessTokenChange, onRefreshTokenChange],
+  );
+
+  const loadingState = useMemo(() => <LoadingState />, []);
+
+  return (
+    <AuthContext.Provider
+      isAuthenticated={authenticated}
+      isInitializing={isInitializing}
+      logout={logout}
+      updateTokens={updateTokens}
+      accessToken={accessToken}
+      user={user}
+      userPromise={userPromise}
+      routes={routes}
+      loadingState={loadingState}
+    >
+      {children}
+    </AuthContext.Provider>
+  );
+};

package/templates/marketplace/apps/fe/src/routeTree.gen.ts

@@ -0,0 +1,435 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './pages/__root'
+import { Route as guestRouteRouteImport } from './pages/(guest)/route'
+import { Route as privateRouteRouteImport } from './pages/(private)/route'
+import { Route as publicRouteRouteImport } from './pages/(public)/route'
+import { Route as guestLoginRouteImport } from './pages/(guest)/login'
+import { Route as guestRegisterRouteImport } from './pages/(guest)/register'
+import { Route as privateIndexRouteImport } from './pages/(private)/index'
+import { Route as privateCartRouteImport } from './pages/(private)/cart'
+import { Route as privateCheckoutRouteImport } from './pages/(private)/checkout'
+import { Route as privateMyListingsRouteImport } from './pages/(private)/my-listings'
+import { Route as privateProfileRouteImport } from './pages/(private)/profile'
+import { Route as privateSalesRouteImport } from './pages/(private)/sales'
+import { Route as privateWatchlistRouteImport } from './pages/(private)/watchlist'
+import { Route as publicAuthRouteImport } from './pages/(public)/auth'
+import { Route as privateOrdersIndexRouteImport } from './pages/(private)/orders/index'
+import { Route as privateOrdersIdRouteImport } from './pages/(private)/orders/$id'
+import { Route as privateSellIndexRouteImport } from './pages/(private)/sell/index'
+import { Route as privateSellIdRouteImport } from './pages/(private)/sell/$id'
+import { Route as privateListingsIdIndexRouteImport } from './pages/(private)/listings/$id/index'
+
+const guestRouteRoute = guestRouteRouteImport.update({
+  id: '/(guest)',
+  getParentRoute: () => rootRouteImport,
+} as any)
+const privateRouteRoute = privateRouteRouteImport.update({
+  id: '/(private)',
+  getParentRoute: () => rootRouteImport,
+} as any)
+const publicRouteRoute = publicRouteRouteImport.update({
+  id: '/(public)',
+  getParentRoute: () => rootRouteImport,
+} as any)
+const guestLoginRoute = guestLoginRouteImport.update({
+  id: '/login',
+  path: '/login',
+  getParentRoute: () => guestRouteRoute,
+} as any)
+const guestRegisterRoute = guestRegisterRouteImport.update({
+  id: '/register',
+  path: '/register',
+  getParentRoute: () => guestRouteRoute,
+} as any)
+const privateIndexRoute = privateIndexRouteImport.update({
+  id: '/',
+  path: '/',
+  getParentRoute: () => privateRouteRoute,
+} as any)
+const privateCartRoute = privateCartRouteImport.update({
+  id: '/cart',
+  path: '/cart',
+  getParentRoute: () => privateRouteRoute,
+} as any)
+const privateCheckoutRoute = privateCheckoutRouteImport.update({
+  id: '/checkout',
+  path: '/checkout',
+  getParentRoute: () => privateRouteRoute,
+} as any)
+const privateMyListingsRoute = privateMyListingsRouteImport.update({
+  id: '/my-listings',
+  path: '/my-listings',
+  getParentRoute: () => privateRouteRoute,
+} as any)
+const privateProfileRoute = privateProfileRouteImport.update({
+  id: '/profile',
+  path: '/profile',
+  getParentRoute: () => privateRouteRoute,
+} as any)
+const privateSalesRoute = privateSalesRouteImport.update({
+  id: '/sales',
+  path: '/sales',
+  getParentRoute: () => privateRouteRoute,
+} as any)
+const privateWatchlistRoute = privateWatchlistRouteImport.update({
+  id: '/watchlist',
+  path: '/watchlist',
+  getParentRoute: () => privateRouteRoute,
+} as any)
+const publicAuthRoute = publicAuthRouteImport.update({
+  id: '/auth',
+  path: '/auth',
+  getParentRoute: () => publicRouteRoute,
+} as any)
+const privateOrdersIndexRoute = privateOrdersIndexRouteImport.update({
+  id: '/orders/',
+  path: '/orders/',
+  getParentRoute: () => privateRouteRoute,
+} as any)
+const privateOrdersIdRoute = privateOrdersIdRouteImport.update({
+  id: '/orders/$id',
+  path: '/orders/$id',
+  getParentRoute: () => privateRouteRoute,
+} as any)
+const privateSellIndexRoute = privateSellIndexRouteImport.update({
+  id: '/sell/',
+  path: '/sell/',
+  getParentRoute: () => privateRouteRoute,
+} as any)
+const privateSellIdRoute = privateSellIdRouteImport.update({
+  id: '/sell/$id',
+  path: '/sell/$id',
+  getParentRoute: () => privateRouteRoute,
+} as any)
+const privateListingsIdIndexRoute = privateListingsIdIndexRouteImport.update({
+  id: '/listings/$id/',
+  path: '/listings/$id/',
+  getParentRoute: () => privateRouteRoute,
+} as any)
+
+export interface FileRoutesByFullPath {
+  '/login': typeof guestLoginRoute
+  '/register': typeof guestRegisterRoute
+  '/cart': typeof privateCartRoute
+  '/checkout': typeof privateCheckoutRoute
+  '/my-listings': typeof privateMyListingsRoute
+  '/profile': typeof privateProfileRoute
+  '/sales': typeof privateSalesRoute
+  '/watchlist': typeof privateWatchlistRoute
+  '/auth': typeof publicAuthRoute
+  '/': typeof privateIndexRoute
+  '/orders/$id': typeof privateOrdersIdRoute
+  '/sell/$id': typeof privateSellIdRoute
+  '/orders/': typeof privateOrdersIndexRoute
+  '/sell/': typeof privateSellIndexRoute
+  '/listings/$id/': typeof privateListingsIdIndexRoute
+}
+export interface FileRoutesByTo {
+  '/login': typeof guestLoginRoute
+  '/register': typeof guestRegisterRoute
+  '/cart': typeof privateCartRoute
+  '/checkout': typeof privateCheckoutRoute
+  '/my-listings': typeof privateMyListingsRoute
+  '/profile': typeof privateProfileRoute
+  '/sales': typeof privateSalesRoute
+  '/watchlist': typeof privateWatchlistRoute
+  '/auth': typeof publicAuthRoute
+  '/': typeof privateIndexRoute
+  '/orders/$id': typeof privateOrdersIdRoute
+  '/sell/$id': typeof privateSellIdRoute
+  '/orders': typeof privateOrdersIndexRoute
+  '/sell': typeof privateSellIndexRoute
+  '/listings/$id': typeof privateListingsIdIndexRoute
+}
+export interface FileRoutesById {
+  __root__: typeof rootRouteImport
+  '/(guest)': typeof guestRouteRouteWithChildren
+  '/(private)': typeof privateRouteRouteWithChildren
+  '/(public)': typeof publicRouteRouteWithChildren
+  '/(guest)/login': typeof guestLoginRoute
+  '/(guest)/register': typeof guestRegisterRoute
+  '/(private)/cart': typeof privateCartRoute
+  '/(private)/checkout': typeof privateCheckoutRoute
+  '/(private)/my-listings': typeof privateMyListingsRoute
+  '/(private)/profile': typeof privateProfileRoute
+  '/(private)/sales': typeof privateSalesRoute
+  '/(private)/watchlist': typeof privateWatchlistRoute
+  '/(public)/auth': typeof publicAuthRoute
+  '/(private)/': typeof privateIndexRoute
+  '/(private)/orders/$id': typeof privateOrdersIdRoute
+  '/(private)/sell/$id': typeof privateSellIdRoute
+  '/(private)/orders/': typeof privateOrdersIndexRoute
+  '/(private)/sell/': typeof privateSellIndexRoute
+  '/(private)/listings/$id/': typeof privateListingsIdIndexRoute
+}
+export interface FileRouteTypes {
+  fileRoutesByFullPath: FileRoutesByFullPath
+  fullPaths:
+    | '/login'
+    | '/register'
+    | '/cart'
+    | '/checkout'
+    | '/my-listings'
+    | '/profile'
+    | '/sales'
+    | '/watchlist'
+    | '/auth'
+    | '/'
+    | '/orders/$id'
+    | '/sell/$id'
+    | '/orders/'
+    | '/sell/'
+    | '/listings/$id/'
+  fileRoutesByTo: FileRoutesByTo
+  to:
+    | '/login'
+    | '/register'
+    | '/cart'
+    | '/checkout'
+    | '/my-listings'
+    | '/profile'
+    | '/sales'
+    | '/watchlist'
+    | '/auth'
+    | '/'
+    | '/orders/$id'
+    | '/sell/$id'
+    | '/orders'
+    | '/sell'
+    | '/listings/$id'
+  id:
+    | '__root__'
+    | '/(guest)'
+    | '/(private)'
+    | '/(public)'
+    | '/(guest)/login'
+    | '/(guest)/register'
+    | '/(private)/cart'
+    | '/(private)/checkout'
+    | '/(private)/my-listings'
+    | '/(private)/profile'
+    | '/(private)/sales'
+    | '/(private)/watchlist'
+    | '/(public)/auth'
+    | '/(private)/'
+    | '/(private)/orders/$id'
+    | '/(private)/sell/$id'
+    | '/(private)/orders/'
+    | '/(private)/sell/'
+    | '/(private)/listings/$id/'
+  fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+  guestRouteRoute: typeof guestRouteRouteWithChildren
+  privateRouteRoute: typeof privateRouteRouteWithChildren
+  publicRouteRoute: typeof publicRouteRouteWithChildren
+}
+
+declare module '@tanstack/react-router' {
+  interface FileRoutesByPath {
+    '/(guest)': {
+      id: '/(guest)'
+      path: ''
+      fullPath: ''
+      preLoaderRoute: typeof guestRouteRouteImport
+      parentRoute: typeof rootRouteImport
+    }
+    '/(private)': {
+      id: '/(private)'
+      path: ''
+      fullPath: ''
+      preLoaderRoute: typeof privateRouteRouteImport
+      parentRoute: typeof rootRouteImport
+    }
+    '/(public)': {
+      id: '/(public)'
+      path: ''
+      fullPath: ''
+      preLoaderRoute: typeof publicRouteRouteImport
+      parentRoute: typeof rootRouteImport
+    }
+    '/(guest)/login': {
+      id: '/(guest)/login'
+      path: '/login'
+      fullPath: '/login'
+      preLoaderRoute: typeof guestLoginRouteImport
+      parentRoute: typeof guestRouteRoute
+    }
+    '/(guest)/register': {
+      id: '/(guest)/register'
+      path: '/register'
+      fullPath: '/register'
+      preLoaderRoute: typeof guestRegisterRouteImport
+      parentRoute: typeof guestRouteRoute
+    }
+    '/(private)/': {
+      id: '/(private)/'
+      path: '/'
+      fullPath: '/'
+      preLoaderRoute: typeof privateIndexRouteImport
+      parentRoute: typeof privateRouteRoute
+    }
+    '/(private)/cart': {
+      id: '/(private)/cart'
+      path: '/cart'
+      fullPath: '/cart'
+      preLoaderRoute: typeof privateCartRouteImport
+      parentRoute: typeof privateRouteRoute
+    }
+    '/(private)/checkout': {
+      id: '/(private)/checkout'
+      path: '/checkout'
+      fullPath: '/checkout'
+      preLoaderRoute: typeof privateCheckoutRouteImport
+      parentRoute: typeof privateRouteRoute
+    }
+    '/(private)/my-listings': {
+      id: '/(private)/my-listings'
+      path: '/my-listings'
+      fullPath: '/my-listings'
+      preLoaderRoute: typeof privateMyListingsRouteImport
+      parentRoute: typeof privateRouteRoute
+    }
+    '/(private)/profile': {
+      id: '/(private)/profile'
+      path: '/profile'
+      fullPath: '/profile'
+      preLoaderRoute: typeof privateProfileRouteImport
+      parentRoute: typeof privateRouteRoute
+    }
+    '/(private)/sales': {
+      id: '/(private)/sales'
+      path: '/sales'
+      fullPath: '/sales'
+      preLoaderRoute: typeof privateSalesRouteImport
+      parentRoute: typeof privateRouteRoute
+    }
+    '/(private)/watchlist': {
+      id: '/(private)/watchlist'
+      path: '/watchlist'
+      fullPath: '/watchlist'
+      preLoaderRoute: typeof privateWatchlistRouteImport
+      parentRoute: typeof privateRouteRoute
+    }
+    '/(public)/auth': {
+      id: '/(public)/auth'
+      path: '/auth'
+      fullPath: '/auth'
+      preLoaderRoute: typeof publicAuthRouteImport
+      parentRoute: typeof publicRouteRoute
+    }
+    '/(private)/orders/': {
+      id: '/(private)/orders/'
+      path: '/orders'
+      fullPath: '/orders/'
+      preLoaderRoute: typeof privateOrdersIndexRouteImport
+      parentRoute: typeof privateRouteRoute
+    }
+    '/(private)/orders/$id': {
+      id: '/(private)/orders/$id'
+      path: '/orders/$id'
+      fullPath: '/orders/$id'
+      preLoaderRoute: typeof privateOrdersIdRouteImport
+      parentRoute: typeof privateRouteRoute
+    }
+    '/(private)/sell/': {
+      id: '/(private)/sell/'
+      path: '/sell'
+      fullPath: '/sell/'
+      preLoaderRoute: typeof privateSellIndexRouteImport
+      parentRoute: typeof privateRouteRoute
+    }
+    '/(private)/sell/$id': {
+      id: '/(private)/sell/$id'
+      path: '/sell/$id'
+      fullPath: '/sell/$id'
+      preLoaderRoute: typeof privateSellIdRouteImport
+      parentRoute: typeof privateRouteRoute
+    }
+    '/(private)/listings/$id/': {
+      id: '/(private)/listings/$id/'
+      path: '/listings/$id'
+      fullPath: '/listings/$id/'
+      preLoaderRoute: typeof privateListingsIdIndexRouteImport
+      parentRoute: typeof privateRouteRoute
+    }
+  }
+}
+
+interface guestRouteRouteChildren {
+  guestLoginRoute: typeof guestLoginRoute
+  guestRegisterRoute: typeof guestRegisterRoute
+}
+
+const guestRouteRouteChildren: guestRouteRouteChildren = {
+  guestLoginRoute: guestLoginRoute,
+  guestRegisterRoute: guestRegisterRoute,
+}
+
+const guestRouteRouteWithChildren = guestRouteRoute._addFileChildren(
+  guestRouteRouteChildren,
+)
+
+interface privateRouteRouteChildren {
+  privateCartRoute: typeof privateCartRoute
+  privateCheckoutRoute: typeof privateCheckoutRoute
+  privateMyListingsRoute: typeof privateMyListingsRoute
+  privateProfileRoute: typeof privateProfileRoute
+  privateSalesRoute: typeof privateSalesRoute
+  privateWatchlistRoute: typeof privateWatchlistRoute
+  privateIndexRoute: typeof privateIndexRoute
+  privateOrdersIdRoute: typeof privateOrdersIdRoute
+  privateSellIdRoute: typeof privateSellIdRoute
+  privateOrdersIndexRoute: typeof privateOrdersIndexRoute
+  privateSellIndexRoute: typeof privateSellIndexRoute
+  privateListingsIdIndexRoute: typeof privateListingsIdIndexRoute
+}
+
+const privateRouteRouteChildren: privateRouteRouteChildren = {
+  privateCartRoute: privateCartRoute,
+  privateCheckoutRoute: privateCheckoutRoute,
+  privateMyListingsRoute: privateMyListingsRoute,
+  privateProfileRoute: privateProfileRoute,
+  privateSalesRoute: privateSalesRoute,
+  privateWatchlistRoute: privateWatchlistRoute,
+  privateIndexRoute: privateIndexRoute,
+  privateOrdersIdRoute: privateOrdersIdRoute,
+  privateSellIdRoute: privateSellIdRoute,
+  privateOrdersIndexRoute: privateOrdersIndexRoute,
+  privateSellIndexRoute: privateSellIndexRoute,
+  privateListingsIdIndexRoute: privateListingsIdIndexRoute,
+}
+
+const privateRouteRouteWithChildren = privateRouteRoute._addFileChildren(
+  privateRouteRouteChildren,
+)
+
+interface publicRouteRouteChildren {
+  publicAuthRoute: typeof publicAuthRoute
+}
+
+const publicRouteRouteChildren: publicRouteRouteChildren = {
+  publicAuthRoute: publicAuthRoute,
+}
+
+const publicRouteRouteWithChildren = publicRouteRoute._addFileChildren(
+  publicRouteRouteChildren,
+)
+
+const rootRouteChildren: RootRouteChildren = {
+  guestRouteRoute: guestRouteRouteWithChildren,
+  privateRouteRoute: privateRouteRouteWithChildren,
+  publicRouteRoute: publicRouteRouteWithChildren,
+}
+export const routeTree = rootRouteImport
+  ._addFileChildren(rootRouteChildren)
+  ._addFileTypes<FileRouteTypes>()

package/templates/marketplace/apps/fe/src/styles/base.css

@@ -0,0 +1,103 @@
+@plugin "tailwindcss-react-aria-components";
+
+@layer base {
+  button:not(:disabled),
+  [role="button"]:not(:disabled) {
+    cursor: pointer;
+  }
+}
+
+@theme static {
+  --color-*: initial;
+  --color-inherit: inherit;
+  --color-transparent: transparent;
+  --color-current: currentColor;
+  --radius-*: initial;
+  --radius-none: 0rem;
+  --container-*: initial;
+  --container-none: none;
+  --container-modal: 32.5rem;
+  --container-toast: 45rem;
+  --spacing-*: initial;
+  --spacing-0: 0rem;
+  --shadow-*: initial;
+  --shadow-none: none;
+  --text-*: initial;
+  --text-inherit: inherit;
+  --text-inherit--line-height: inherit;
+  --text-inherit--letter-spacing: inherit;
+  --breakpoint-*: initial;
+  --breakpoint-sm: 23.75rem;
+  --breakpoint-md: 37.5rem;
+  --breakpoint-lg: 80rem;
+  --breakpoint-xl: 105rem;
+  --rotate-*: initial;
+  --rotate-0: 0deg;
+  --rotate-45: 45deg;
+  --rotate-90: 90deg;
+  --rotate-180: 180deg;
+  --rotate-270: 270deg;
+  --rotate-360: 360deg;
+  --animate-drawer-enter-right: drawer-slide-right 0.3s;
+  --animate-drawer-exit-right: drawer-slide-right 0.3s reverse;
+  --animate-drawer-enter-left: drawer-slide-left 0.3s;
+  --animate-drawer-exit-left: drawer-slide-left 0.3s reverse;
+  --animate-loader-spin: loader-spin 1s linear infinite;
+  --z-index-base: 0;
+  --z-index-raised: 1;
+  --z-index-sticky: 10;
+  --z-index-drawer: 20;
+  --z-index-modal: 30;
+  --z-index-bottom-sheet: 40;
+  --z-index-drop-target: 50;
+  --z-index-overlay-above: 100;
+
+  @keyframes drawer-slide-right {
+    from {
+      transform: translateX(100%);
+    }
+    to {
+      transform: translateX(0);
+    }
+  }
+  @keyframes drawer-slide-left {
+    from {
+      transform: translateX(-100%);
+    }
+    to {
+      transform: translateX(0);
+    }
+  }
+  @keyframes loader-spin {
+    to {
+      transform: rotate(360deg);
+    }
+  }
+}
+
+html {
+  -webkit-font-smoothing: antialiased;
+}
+
+.flex-fill {
+  flex: 1 0 0;
+}
+
+:root {
+  --elevation-fill-default-2-base: 248 249 249;
+  --elevation-outline-default-1-base: 218 220 221;
+  --elevation-outline-default-2-base: 198 200 201;
+  --interactive-contained-primary-idle-base: 0 90 154;
+  --interactive-contained-primary-hover-base: 46 142 210;
+  --interactive-contained-primary-pressed-base: 95 170 224;
+  --interactive-contained-primary-disabled-base: 155 194 221;
+  --interactive-contained-primary-focus-base: 95 170 224;
+  --interactive-outlined-primary-on-idle-base: 0 90 154;
+  --interactive-outlined-primary-outline-idle-base: 0 90 154;
+  --interactive-outlined-primary-outline-hover-base: 46 142 210;
+  --interactive-text-primary-idle-base: 0 90 154;
+  --interactive-text-primary-hover-base: 46 142 210;
+  --text-default-1-base: 25 26 27;
+  --text-default-2-base: 79 85 88;
+  --text-default-3-base: 111 114 116;
+}

package/templates/marketplace/apps/fe/src/styles/fonts/fonts.tsx

@@ -0,0 +1,10 @@
+export const globalFontClass = "font-primary";
+
+export const Fonts = () => (
+  <style>{`
+    :root {
+      --font-inter-base: "General Sans";
+      --font-geist-base: "Geist Variable";
+    }
+  `}</style>
+);

package/templates/marketplace/apps/fe/src/styles/fonts/general-sans.css

@@ -0,0 +1,31 @@
+@font-face {
+  font-family: "General Sans";
+  src: url("../../assets/fonts/GeneralSans-Regular.otf") format("opentype");
+  font-weight: 400;
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: "General Sans";
+  src: url("../../assets/fonts/GeneralSans-Medium.otf") format("opentype");
+  font-weight: 500;
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: "General Sans";
+  src: url("../../assets/fonts/GeneralSans-Semibold.otf") format("opentype");
+  font-weight: 600;
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: "General Sans";
+  src: url("../../assets/fonts/GeneralSans-Bold.otf") format("opentype");
+  font-weight: 700;
+  font-style: normal;
+  font-display: swap;
+}