Yuki Takei 1 год назад
Родитель
Сommit
0e66b39fc2

+ 0 - 0
apps/app/src/components/Navbar/GroundGlassBar.module.scss → apps/app/src/components-universal/Navbar/GroundGlassBar.module.scss


+ 0 - 0
apps/app/src/components/Navbar/GroundGlassBar.tsx → apps/app/src/components-universal/Navbar/GroundGlassBar.tsx


+ 0 - 6
apps/app/src/components/.eslintrc.js

@@ -1,11 +1,5 @@
 module.exports = {
   extends: '../../.eslintrc.js',
   rules: {
-    // restrict importing from client/ and components/ directories
-    'no-restricted-imports': ['error', {
-      patterns: [
-        'components-universal/',
-      ],
-    }],
   },
 };

+ 2 - 2
apps/app/src/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -16,6 +16,7 @@ import { DropdownItem } from 'reactstrap';
 
 import { useShouldExpandContent } from '~/client/services/layout';
 import { exportAsMarkdown, updateContentWidth } from '~/client/services/page-operation';
+import { GroundGlassBar } from '~/components-universal/Navbar/GroundGlassBar';
 import type { OnDuplicatedFunction, OnRenamedFunction, OnDeletedFunction } from '~/interfaces/ui';
 import {
   useCurrentPathname,
@@ -35,11 +36,10 @@ import {
   useIsDeviceLargerThanMd,
 } from '~/stores/ui';
 
+
 import { NotAvailable } from '../NotAvailable';
 import { Skeleton } from '../Skeleton';
 
-import { GroundGlassBar } from './GroundGlassBar';
-
 import styles from './GrowiContextualSubNavigation.module.scss';
 import PageEditorModeManagerStyles from './PageEditorModeManager.module.scss';
 

+ 1 - 2
apps/app/src/components/Navbar/GrowiNavbarBottom.tsx

@@ -2,14 +2,13 @@ import React, {
   useCallback,
 } from 'react';
 
+import { GroundGlassBar } from '~/components-universal/Navbar/GroundGlassBar';
 import { useSearchModal } from '~/features/search/client/stores/search';
 import { useIsSearchPage } from '~/stores/context';
 import { usePageCreateModal } from '~/stores/modal';
 import { useCurrentPagePath } from '~/stores/page';
 import { useDrawerOpened } from '~/stores/ui';
 
-import { GroundGlassBar } from './GroundGlassBar';
-
 import styles from './GrowiNavbarBottom.module.scss';
 
 

+ 1 - 1
apps/app/src/pages/me/[[...path]].page.tsx

@@ -10,7 +10,7 @@ import Head from 'next/head';
 import { useRouter } from 'next/router';
 
 import { BasicLayout } from '~/components-universal/Layout/BasicLayout';
-import { GroundGlassBar } from '~/components/Navbar/GroundGlassBar';
+import { GroundGlassBar } from '~/components-universal/Navbar/GroundGlassBar';
 import type { CrowiRequest } from '~/interfaces/crowi-request';
 import type { RendererConfig } from '~/interfaces/services/renderer';
 import type { ISidebarConfig } from '~/interfaces/sidebar-config';

+ 1 - 1
apps/app/src/pages/tags.page.tsx

@@ -10,7 +10,7 @@ import dynamic from 'next/dynamic';
 import Head from 'next/head';
 
 import { BasicLayout } from '~/components-universal/Layout/BasicLayout';
-import { GroundGlassBar } from '~/components/Navbar/GroundGlassBar';
+import { GroundGlassBar } from '~/components-universal/Navbar/GroundGlassBar';
 import type { CrowiRequest } from '~/interfaces/crowi-request';
 import type { RendererConfig } from '~/interfaces/services/renderer';
 import type { ISidebarConfig } from '~/interfaces/sidebar-config';

+ 1 - 1
apps/app/src/pages/trash.page.tsx

@@ -8,8 +8,8 @@ import dynamic from 'next/dynamic';
 import Head from 'next/head';
 
 import { BasicLayout } from '~/components-universal/Layout/BasicLayout';
+import { GroundGlassBar } from '~/components-universal/Navbar/GroundGlassBar';
 import { PagePathNavSticky } from '~/components/Common/PagePathNav';
-import { GroundGlassBar } from '~/components/Navbar/GroundGlassBar';
 import type { CrowiRequest } from '~/interfaces/crowi-request';
 import type { RendererConfig } from '~/interfaces/services/renderer';
 import type { ISidebarConfig } from '~/interfaces/sidebar-config';