Refactor utils paths & names (#122)

* Rename `getNoionColor` function * Remove unused `getAllUrls` * Update previews module name * Move `IsetSans` to `styles/fonts` from utils * Rename `textParser` to `getNotionContentItems`
ekaterinburgdev · Dec 21, 2023 · 90d1496 · 90d1496
1 parent 4da39a2
commit 90d1496
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 65 deletions.
diff --git a/components/NotionTypes/Callout/Callout.jsx b/components/NotionTypes/Callout/Callout.jsx
@@ -1,10 +1,8 @@
 import React from 'react'
 import Image from 'next/image'
-
-import { getTextContent } from '../../../utils/textParser'
-
+import { getTextContent } from '../../../utils/getNotionContentItems'
+import { getNotionColor } from '../../../utils/getNotionColor'
 import styles from './Callout.module.css'
-import { getNotionColor } from '../../../utils/colors'
 
 export const Callout = ({ columnItem }) => {
     const iconUrl = columnItem?.content?.icon?.external?.url

diff --git a/components/NotionTypes/Headings/Headings.jsx b/components/NotionTypes/Headings/Headings.jsx
@@ -1,7 +1,5 @@
 import React from 'react'
-
-import { getHeaderContent } from '../../../utils/textParser'
-
+import { getHeaderContent } from '../../../utils/getNotionContentItems'
 import styles from './Headings.module.css'
 
 export function H1({ columnItem }) {

diff --git a/components/NotionTypes/Lists/Ordered/Ordered.jsx b/components/NotionTypes/Lists/Ordered/Ordered.jsx
@@ -1,6 +1,5 @@
 import React from 'react'
-
-import { getTextContent } from '../../../../utils/textParser'
+import { getTextContent } from '../../../../utils/getNotionContentItems'
 import styles from './ordered.module.css'
 
 export function OrderedList({ columnItem }) {

diff --git a/components/NotionTypes/Lists/Unordered/Unordered.jsx b/components/NotionTypes/Lists/Unordered/Unordered.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { getTextContent } from '../../../../utils/textParser'
+import { getTextContent } from '../../../../utils/getNotionContentItems'
 import styles from './unordered.module.css'
 
 function UnorderedList({ columnItem }) {

diff --git a/components/NotionTypes/Text/Code/Code.jsx b/components/NotionTypes/Text/Code/Code.jsx
@@ -1,6 +1,4 @@
 import React from 'react'
-
-// import getTextContent from '../../../../utils/notionTypeParser/textParser'
 import styles from './code.module.css'
 
 export default function Code({ columnItem }) {

diff --git a/components/NotionTypes/Text/Paragraph/Paragraph.jsx b/components/NotionTypes/Text/Paragraph/Paragraph.jsx
@@ -1,7 +1,6 @@
 import React from 'react'
-
+import { getTextContent } from '../../../../utils/getNotionContentItems'
 import styles from './paragraph.module.css'
-import { getTextContent } from '../../../../utils/textParser'
 
 function Paragraph({ columnItem }) {
     const textContent = getTextContent(columnItem, true)

diff --git a/pages/_app.jsx b/pages/_app.jsx
@@ -1,6 +1,6 @@
 import { createContext } from 'react'
 import Head from 'next/head'
-import { isetSansFont } from '../utils/font'
+import { IsetSans } from '../styles/fonts/IsetSans'
 
 import '../styles/globals.css'
 import 'ekb/style.css'
@@ -15,7 +15,7 @@ function MyApp({ Component, pageProps }) {
                 <title>Городские руководства</title>
             </Head>
 
-            <main className={isetSansFont.className}>
+            <main className={IsetSans.className}>
                 <Component {...pageProps} />
             </main>
         </>

diff --git a/pages/index.jsx b/pages/index.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { getTree } from '../api/apiPage'
-import parseManualsPreview from '../utils/manualsPreviewParser'
+import getManualsPreviews from '../utils/getManualsPreviews'
 import MainPage from '../components/MainPage/MainPage'
 
 export default function Home({ manualsPreview }) {
@@ -12,7 +12,7 @@ export async function getServerSideProps() {
 
     return {
         props: {
-            manualsPreview: parseManualsPreview(tree),
+            manualsPreview: getManualsPreviews(tree),
         },
     }
 }
diff --git a/styles/fonts/IsetSans.js b/styles/fonts/IsetSans.js
@@ -0,0 +1,27 @@
+import localFont from 'next/font/local'
+
+export const IsetSans = localFont({
+    src: [
+        {
+            path: 'IsetSans-Light.woff2',
+            weight: '300',
+        },
+        {
+            path: 'IsetSans-Medium.woff2',
+            weight: '500',
+        },
+        {
+            path: 'IsetSans-SemiBold.woff2',
+            weight: '600',
+        },
+        {
+            path: 'IsetSans-Regular.woff2',
+            weight: '400',
+        },
+        {
+            path: 'IsetSans-Regular-Italic.woff2',
+            weight: '400',
+            style: 'italic',
+        },
+    ],
+})
diff --git a/utils/font.js b/utils/font.js
diff --git a/utils/getAllUrls.js b/utils/getAllUrls.js
diff --git a/utils/manualsPreviewParser.js → utils/getManualsPreviews.js b/utils/manualsPreviewParser.js → utils/getManualsPreviews.js
@@ -2,7 +2,7 @@ import t from './typograf'
 import { MANUALS_HIDDEN } from '../consts/manuals'
 import { API_HOST } from '../consts/endpoints'
 
-function parseManualsPreview(tree) {
+function getManualsPreviews(tree) {
     // TODO Remove hard-code after back-end feature https://github.com/ekaterinburgdev/guides-api/issues/10
     const manualsVisible = tree.children.filter((manual) => {
         return !MANUALS_HIDDEN.includes(manual?.properties?.pageUrl?.url)
@@ -39,4 +39,4 @@ function parseManualsPreview(tree) {
         })
 }
 
-export default parseManualsPreview
+export default getManualsPreviews
diff --git a/utils/colors.js → utils/getNotionColor.js b/utils/colors.js → utils/getNotionColor.js
diff --git a/utils/textParser.jsx → utils/getNotionContentItems.js b/utils/textParser.jsx → utils/getNotionContentItems.js
@@ -1,8 +1,6 @@
 import React from 'react'
-
-import { getNotionColor } from './colors'
-
 import t from './typograf'
+import { getNotionColor } from './getNotionColor'
 
 export const getHeaderContent = (item) =>
     item.content.text.map((par) => {