Merge branch 'staging' of github.com:xi-effect/xi.app into 40177321

xi-effect · Oct 28, 2024 · bc15cc1 · bc15cc1
2 parents ee55ef0 + e3fd14a
commit bc15cc1
Show file tree

Hide file tree

Showing 50 changed files with 10,950 additions and 11,020 deletions.
diff --git a/apps/xi.front/app/layout.tsx b/apps/xi.front/app/layout.tsx
@@ -54,7 +54,7 @@ export default function RootLayout({ children }: { children: ReactNode }) {
     <html
       lang="en"
       suppressHydrationWarning
-      className={`${inter.variable} ${markerHand.variable} text-[16px]`}
+      className={`${inter.variable} ${markerHand.variable} text-[16px] font-sans`}
     >
       <body className="overflow-hidden bg-gray-0">
         {process.env.NODE_ENV === 'production' && (

diff --git a/apps/xi.front/next-env.d.ts b/apps/xi.front/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
diff --git a/apps/xi.front/next.config.js b/apps/xi.front/next.config.js
@@ -57,6 +57,7 @@ const nextConfig = {
     '@xipkg/file',
     '@xipkg/tooltip',
     '@xipkg/breadcrumbs',
+    '@xipkg/sheet',
   ],
   compiler: {
     removeConsole: process.env.NODE_ENV !== 'development',

diff --git a/apps/xi.front/public/sw.js b/apps/xi.front/public/sw.js
diff --git a/apps/xi.front/public/sw.js.map b/apps/xi.front/public/sw.js.map
diff --git a/apps/xi.front/public/workbox-495fd258.js b/apps/xi.front/public/workbox-495fd258.js
diff --git a/apps/xi.front/public/workbox-495fd258.js.map b/apps/xi.front/public/workbox-495fd258.js.map
diff --git a/apps/xi.front/tailwind.config.ts b/apps/xi.front/tailwind.config.ts
@@ -11,6 +11,7 @@ module.exports = {
   theme: {
     extend: {
       fontFamily: {
+        sans: ['var(--font-inter)', 'sans-serif'],
         'marker-hand': ['var(--font-marker-hand)'],
       },
     },