исправил конфликты

.storybook/main.ts

@@ -0,0 +1,23 @@
+import type { StorybookConfig } from '@storybook/react-webpack5'
+
+const config: StorybookConfig = {
+  stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
+  addons: [
+    '@storybook/addon-links',
+    '@storybook/addon-essentials',
+    '@storybook/addon-onboarding',
+    '@storybook/addon-interactions'
+  ],
+  framework: {
+    name: '@storybook/react-webpack5',
+    options: {
+      builder: {
+        useSWC: true
+      }
+    }
+  },
+  docs: {
+    autodocs: 'tag'
+  }
+}
+export default config

.storybook/preview.ts

@@ -0,0 +1,15 @@
+import type { Preview } from '@storybook/react'
+
+const preview: Preview = {
+  parameters: {
+    actions: { argTypesRegex: '^on[A-Z].*' },
+    controls: {
+      matchers: {
+        color: /(background|color)$/i,
+        date: /Date$/i
+      }
+    }
+  }
+}
+
+export default preview

package.json

@@ -57,6 +57,7 @@
     "@storybook/blocks": "^7.5.1",
     "@storybook/react": "^7.5.1",
     "@storybook/react-webpack5": "^7.5.1",
+    "@storybook/test": "^7.6.16",
     "@storybook/testing-library": "^0.2.2",
     "@svgr/webpack": "^8.1.0",
     "@types/react": "18.2.20",

src/app/router/AppRouter/ui/AppRouter.tsx

@@ -109,6 +109,10 @@ export const AppRouter = createBrowserRouter([
         path: Routes.PRODUCT,
         element: <ProductPage />
       }
+      /*       {
+        path: Routes.CERTIFICATE,
+        element: <Certificate />
+      } */
     ]
   }
 ])

src/pages/HelpPage/HelpPage.tsx

@@ -1,13 +1,11 @@
-import styles from './HelpPage.module.scss'
 import Heading, { HeadingType } from '@/shared/ui/Heading/Heading'
 import Subheading from '@/shared/ui/Subheading/Subheading'
-import HelpCategories from '@/widgets/HelpCategories/HelpCategories'
 import FormReturn from '@/widgets/FormReturn/FormReturn'
+import HelpCategories from '@/widgets/HelpCategories/HelpCategories'
+
 import WrapperForMainContent from '../../components/WrapperForMainContent/WrapperForMainContent'
 
-// @TODO: Сверстать форму возврата
-// Сделал страницу помощи
-// https://github.com/Studio-Yandex-Practicum/maxboom_frontend/issues/222
+import styles from './HelpPage.module.scss'
 
 const HelpPage = () => {
   return (

src/stories/Configure.mdx

@@ -126,7 +126,7 @@ export const RightArrow = () => (
         <p className="sb-section-item-paragraph">Use stories to test a component in all its variations, no matter how
           complex.</p>
         <a
-          href="https://storybook.js.org/docs/react/writing-tests/introduction"
+          href="https://storybook.js.org/docs/react/writing-tests"
           target="_blank"
         >Learn more<RightArrow /></a>
       </div>

src/widgets/HelpCategories/HelpCategories.tsx

@@ -1,23 +1,22 @@
-import styles from './HelpCategories.module.scss'
 import Link from '@/shared/ui/Link/Link'
 
-// @TODO: Сверстать форму возврата
-// Сделал sidebar для страницы помощь
-// https://github.com/Studio-Yandex-Practicum/maxboom_frontend/issues/222
+import styles from './HelpCategories.module.scss'
 
 const HelpCategories = () => {
   return (
-    <nav className={styles.helpCategories}>
-      <Link to="" className={styles.helpCategories__item}>
-        Информация о доставке
-      </Link>
-      <Link to="" className={styles.helpCategories__item}>
-        Возвраты
-      </Link>
-      <Link to="" className={styles.helpCategories__item}>
-        Подарочные сертификаты
-      </Link>
-    </nav>
+    <>
+      <nav className={styles.helpCategories}>
+        <Link to="" className={styles.helpCategories__item}>
+          Информация о доставке
+        </Link>
+        <Link to="" className={styles.helpCategories__item}>
+          Возвраты
+        </Link>
+        <Link to="" className={styles.helpCategories__item}>
+          Подарочные сертификаты
+        </Link>
+      </nav>
+    </>
   )
 }