fix: вернул прежнюю загрузку шрифтов

habralab · Oct 24, 2023 · 6b6db1a · 6b6db1a
1 parent 6588caf
commit 6b6db1a
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 140 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/@fontsource-inter-npm-5.0.15-b66541edb9-9d65a95f1e.zip b/.yarn/cache/@fontsource-inter-npm-5.0.15-b66541edb9-9d65a95f1e.zip
diff --git a/.yarn/cache/@fontsource-raleway-npm-5.0.15-bcf6ce9ce5-edb1acb22d.zip b/.yarn/cache/@fontsource-raleway-npm-5.0.15-bcf6ce9ce5-edb1acb22d.zip
diff --git a/index.html b/index.html
@@ -13,146 +13,6 @@
     <meta name="author" content="Sapphire" />
     <meta name="robots" content="index, follow" />
     <title>Найди IT-проект | Sapphire</title>
-
-    <link
-      rel="preload"
-      href="/assets/fonts/Inter-Regular.woff"
-      as="font"
-      type="font/woff"
-      crossorigin
-    />
-    <link
-      rel="preload"
-      href="/assets/fonts/Inter-Regular.woff2"
-      as="font"
-      type="font/woff2"
-      crossorigin
-    />
-    <link
-      rel="preload"
-      href="/assets/fonts/RalewayThin-Bold.woff"
-      as="font"
-      type="font/woff"
-      crossorigin
-    />
-    <link
-      rel="preload"
-      href="/assets/fonts/RalewayThin-Bold.woff2"
-      as="font"
-      type="font/woff2"
-      crossorigin
-    />
-
-    <link
-      rel="preload"
-      href="/assets/fonts/Inter-SemiBold.woff"
-      as="font"
-      type="font/woff"
-      crossorigin
-    />
-    <link
-      rel="preload"
-      href="/assets/fonts/Inter-SemiBold.woff2"
-      as="font"
-      type="font/woff2"
-      crossorigin
-    />
-    <link
-      rel="preload"
-      href="/assets/fonts/Inter-Bold.woff"
-      as="font"
-      type="font/woff"
-      crossorigin
-    />
-    <link
-      rel="preload"
-      href="/assets/fonts/Inter-Bold.woff2"
-      as="font"
-      type="font/woff2"
-      crossorigin
-    />
-
-    <style>
-      @font-face {
-        font-family: 'Inter';
-        src:
-          url('/assets/fonts/Inter-Bold.woff2') format('woff2'),
-          url('/assets/fonts/Inter-Bold.woff') format('woff');
-        font-weight: bold;
-        font-style: normal;
-        font-display: swap;
-      }
-
-      @font-face {
-        font-family: 'Inter';
-        src:
-          url('/assets/fonts/Inter-SemiBold.woff2') format('woff2'),
-          url('/assets/fonts/Inter-SemiBold.woff') format('woff');
-        font-weight: 600;
-        font-style: normal;
-        font-display: swap;
-      }
-
-      @font-face {
-        font-family: 'Inter';
-        src:
-          url('/assets/fonts/Inter-SemiBold.woff2') format('woff2'),
-          url('/assets/fonts/Inter-SemiBold.woff') format('woff');
-        font-weight: 600;
-        font-style: normal;
-        font-display: swap;
-      }
-
-      @font-face {
-        font-family: 'Inter';
-        src:
-          url('/assets/fonts/Inter-Bold.woff2') format('woff2'),
-          url('/assets/fonts/Inter-Bold.woff') format('woff');
-        font-weight: bold;
-        font-style: normal;
-        font-display: swap;
-      }
-
-      @font-face {
-        font-family: 'Inter';
-        src:
-          url('/assets/fonts/Inter-Regular.woff2') format('woff2'),
-          url('/assets/fonts/Inter-Regular.woff') format('woff');
-        font-weight: normal;
-        font-style: normal;
-        font-display: swap;
-      }
-
-      @font-face {
-        font-family: 'Inter';
-        src:
-          url('/assets/fonts/Inter-Regular.woff2') format('woff2'),
-          url('/assets/fonts/Inter-Regular.woff') format('woff');
-        font-weight: normal;
-        font-style: normal;
-        font-display: swap;
-      }
-
-      @font-face {
-        font-family: 'Raleway';
-        src:
-          url('/assets/fonts/RalewayThin-Bold.woff2') format('woff2'),
-          url('/assets/fonts/RalewayThin-Bold.woff') format('woff');
-        font-weight: 100;
-        font-style: normal;
-        font-display: swap;
-      }
-
-      @font-face {
-        font-family: 'Raleway';
-        src:
-          url('/assets/fonts/RalewayThin-Bold.woff2') format('woff2'),
-          url('/assets/fonts/RalewayThin-Bold.woff') format('woff');
-        font-weight: 100;
-        font-style: normal;
-        font-display: swap;
-      }
-    </style>
   </head>
   <body background="#F5F5F5">
     <div id="root"></div>

diff --git a/package.json b/package.json
@@ -23,6 +23,8 @@
     "@chakra-ui/system": "^2.6.0",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
+    "@fontsource/inter": "^5.0.15",
+    "@fontsource/raleway": "^5.0.15",
     "@tanstack/react-query": "^4.35.3",
     "axios": "^1.5.0",
     "framer-motion": "^10.16.4",

diff --git a/public/assets/fonts/Inter-Bold.woff b/public/assets/fonts/Inter-Bold.woff
diff --git a/public/assets/fonts/Inter-Bold.woff2 b/public/assets/fonts/Inter-Bold.woff2
diff --git a/public/assets/fonts/Inter-Regular.woff b/public/assets/fonts/Inter-Regular.woff
diff --git a/public/assets/fonts/Inter-Regular.woff2 b/public/assets/fonts/Inter-Regular.woff2
diff --git a/public/assets/fonts/Inter-SemiBold.woff b/public/assets/fonts/Inter-SemiBold.woff
diff --git a/public/assets/fonts/Inter-SemiBold.woff2 b/public/assets/fonts/Inter-SemiBold.woff2
diff --git a/public/assets/fonts/RalewayThin-Bold.woff b/public/assets/fonts/RalewayThin-Bold.woff
diff --git a/public/assets/fonts/RalewayThin-Bold.woff2 b/public/assets/fonts/RalewayThin-Bold.woff2
diff --git a/src/pages/blank/theme.ts b/src/pages/blank/theme.ts
@@ -1,4 +1,5 @@
 import { extendTheme, defineStyleConfig } from '@chakra-ui/react';
+import '@fontsource/raleway/700.css';
 
 const Button = defineStyleConfig({
   baseStyle: {

diff --git a/src/shared/config/theme/theme.ts b/src/shared/config/theme/theme.ts
@@ -10,6 +10,14 @@ import { accordionTheme } from './customAnatomy/accordionTheme';
 import { avatarTheme } from './customAnatomy/avatarTheme';
 import { checkboxTheme } from './customAnatomy/checkboxTheme';
 import { inputTheme } from './customAnatomy/inputTheme';
+
+import '@fontsource/raleway/cyrillic-600.css';
+import '@fontsource/raleway/cyrillic-700.css';
+import '@fontsource/inter/cyrillic-400.css';
+import '@fontsource/inter/cyrillic-500.css';
+import '@fontsource/inter/cyrillic-600.css';
+import '@fontsource/inter/cyrillic-700.css';
+
 /**
  * Можно посмотреть исходники и понять, что можно переопределить
  * https://github.com/chakra-ui/chakra-ui/tree/main/packages/components/theme/src

diff --git a/yarn.lock b/yarn.lock
@@ -3247,6 +3247,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@fontsource/inter@npm:^5.0.15":
+  version: 5.0.15
+  resolution: "@fontsource/inter@npm:5.0.15"
+  checksum: 9d65a95f1e90fbba06fd48a5729ea5148cf01a18d5d40e03bbafc75090ee04f1b852fbfc3e0c44366ab2ad932e69c73d5dd829b8b58bdd90dae8616e61436ce9
+  languageName: node
+  linkType: hard
+
+"@fontsource/raleway@npm:^5.0.15":
+  version: 5.0.15
+  resolution: "@fontsource/raleway@npm:5.0.15"
+  checksum: edb1acb22dcc6df48ed62682f64f35f5c138a94f88e4bf8daad3fc2f28f694f65fa05bb55240f685899f40b04b26e6f04e396b31cde48d060274ff553d06c76d
+  languageName: node
+  linkType: hard
+
 "@humanwhocodes/config-array@npm:^0.11.10":
   version: 0.11.11
   resolution: "@humanwhocodes/config-array@npm:0.11.11"
@@ -11488,6 +11502,8 @@ __metadata:
     "@commitlint/config-conventional": ^17.7.0
     "@emotion/react": ^11.11.1
     "@emotion/styled": ^11.11.0
+    "@fontsource/inter": ^5.0.15
+    "@fontsource/raleway": ^5.0.15
     "@tanstack/eslint-plugin-query": ^4.34.1
     "@tanstack/react-query": ^4.35.3
     "@tanstack/react-query-devtools": ^4.35.3