diff --git a/.eslintrc b/.eslintrc index f346890..707f4d4 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,32 +1,32 @@ { - "root": true, - "parser": "@typescript-eslint/parser", - "env": { "node": true }, - "plugins": [ - "@typescript-eslint", - "react", - "react-hooks", - "fsd-import" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/eslint-recommended", - "plugin:@typescript-eslint/recommended" - ], - "parserOptions": { - "sourceType": "module" - }, - "rules": { - "no-unused-vars": "off", - "@typescript-eslint/no-unused-vars": ["off", {}], - "@typescript-eslint/ban-ts-comment": "off", - "no-prototype-builtins": "off", - "@typescript-eslint/no-empty-interface": "off", - "@typescript-eslint/no-empty-function": "off", - "react-hooks/rules-of-hooks": "error", // Hooks의 규칙을 강제 - "react-hooks/exhaustive-deps": "warn", // 의존성 배열 검사 - "fsd-import/fsd-relative-path": "error", - "fsd-import/public-api-imports": "error", - "fsd-import/layer-imports": "error" - } - } \ No newline at end of file + "root": true, + "parser": "@typescript-eslint/parser", + "env": { "node": true }, + "plugins": [ + "@typescript-eslint", + "react", + "react-hooks", + "fsd-import" + ], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended" + ], + "parserOptions": { + "sourceType": "module" + }, + "rules": { + "no-unused-vars": "off", + "@typescript-eslint/no-unused-vars": ["off", {}], + "@typescript-eslint/ban-ts-comment": "off", + "no-prototype-builtins": "off", + "@typescript-eslint/no-empty-interface": "off", + "@typescript-eslint/no-empty-function": "off", + "react-hooks/rules-of-hooks": "error", // Hooks의 규칙을 강제 + "react-hooks/exhaustive-deps": "warn", // 의존성 배열 검사 + "fsd-import/fsd-relative-path": "error", + "fsd-import/public-api-imports": "error", + "fsd-import/layer-imports": "error" + } +} \ No newline at end of file diff --git a/src/app/settings/setting-provider.ts b/src/app/settings/setting-provider.ts index 349b025..e843d95 100644 --- a/src/app/settings/setting-provider.ts +++ b/src/app/settings/setting-provider.ts @@ -1,4 +1,4 @@ -import { plugin } from "@shared/plugin-service-locator" +import { plugin } from "@shared/utils/plugin-service-locator" diff --git a/src/app/ui/DailyRoutineView.tsx b/src/app/ui/DailyRoutineView.tsx index 60ad982..1f3581d 100644 --- a/src/app/ui/DailyRoutineView.tsx +++ b/src/app/ui/DailyRoutineView.tsx @@ -5,7 +5,7 @@ import TabNav from '@mui/material/Tabs'; import { Icon } from "@shared/components/Icon"; import { Day } from "@shared/period/day"; import { Month } from "@shared/period/month"; -import { DrTabType, useTabRoute } from "@shared/use-tab-route"; +import { DrTabType, useTabRoute } from "@shared/tab/use-tab-route"; import { useLeaf } from "@shared/view/use-leaf"; import { useCallback, useEffect } from "react"; import { MUIThemeProvider } from './MUIThemProvider'; diff --git a/src/app/ui/tab-achivement.tsx b/src/app/ui/tab-achivement.tsx index e84df34..1ce7878 100644 --- a/src/app/ui/tab-achivement.tsx +++ b/src/app/ui/tab-achivement.tsx @@ -1,6 +1,6 @@ import { AchivementPage } from "@pages/achivement/AchivementPage"; import { Month } from "@shared/period/month"; -import { useTabRoute } from "@shared/use-tab-route"; +import { useTabRoute } from "@shared/tab/use-tab-route"; import { useMemo } from "react"; diff --git a/src/app/ui/tab-calendar.tsx b/src/app/ui/tab-calendar.tsx index d040985..2754de1 100644 --- a/src/app/ui/tab-calendar.tsx +++ b/src/app/ui/tab-calendar.tsx @@ -1,6 +1,6 @@ import { CalendarPage } from "@pages/calendar"; import { Month } from "@shared/period/month"; -import { useTabRoute } from "@shared/use-tab-route"; +import { useTabRoute } from "@shared/tab/use-tab-route"; import { useMemo } from "react"; diff --git a/src/app/ui/tab-note.tsx b/src/app/ui/tab-note.tsx index 5d863c7..ba3a5a2 100644 --- a/src/app/ui/tab-note.tsx +++ b/src/app/ui/tab-note.tsx @@ -1,4 +1,4 @@ -import { useTabRoute } from "@shared/use-tab-route"; +import { useTabRoute } from "@shared/tab/use-tab-route"; import { RoutineNotePage } from "@pages/routine-note"; import { Day } from "@shared/period/day"; import { useMemo } from "react"; diff --git a/src/entities/note/domain/task-group.ts b/src/entities/note/domain/task-group.ts index bbe4adb..d5743e1 100644 --- a/src/entities/note/domain/task-group.ts +++ b/src/entities/note/domain/task-group.ts @@ -1,4 +1,4 @@ -import { validateObsidianFileTitle } from "@shared/validation/validate-obsidian-file-title"; +import { validateObsidianFileTitle } from "@shared/utils/validate-obsidian-file-title"; import { err, ok, Result } from "neverthrow"; import { isTask, isTaskGroup, RoutineNote, Task, TaskGroup } from "./note.type"; diff --git a/src/entities/note/domain/task.ts b/src/entities/note/domain/task.ts index c5c98b3..5cf625c 100644 --- a/src/entities/note/domain/task.ts +++ b/src/entities/note/domain/task.ts @@ -1,5 +1,5 @@ import { err, ok, Result } from "neverthrow"; -import { validateObsidianFileTitle } from "@shared/validation/validate-obsidian-file-title"; +import { validateObsidianFileTitle } from "@shared/utils/validate-obsidian-file-title"; import { Routine } from "@entities/routine"; import { RoutineNote, RoutineTask, Task, TodoTask } from "./note.type"; import { NoteEntity } from "./note"; diff --git a/src/entities/routine/domain/Routine.ts b/src/entities/routine/domain/Routine.ts index 357025c..400fb40 100644 --- a/src/entities/routine/domain/Routine.ts +++ b/src/entities/routine/domain/Routine.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Day, DayOfWeek } from "@shared/period/day"; -import { validateObsidianFileTitle } from "@shared/validation/validate-obsidian-file-title"; +import { validateObsidianFileTitle } from "@shared/utils/validate-obsidian-file-title"; import { keys } from "lodash"; import { err, Err, ok, Result } from "neverthrow"; import { Routine, RoutineProperties } from "./routine.type"; diff --git a/src/entities/routine/domain/routine-group.ts b/src/entities/routine/domain/routine-group.ts index 7528bad..48ec89d 100644 --- a/src/entities/routine/domain/routine-group.ts +++ b/src/entities/routine/domain/routine-group.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { validateObsidianFileTitle } from "@shared/validation/validate-obsidian-file-title"; +import { validateObsidianFileTitle } from "@shared/utils/validate-obsidian-file-title"; import { Err, err, ok, Result } from "neverthrow"; import { RoutineGroupProperties } from "./routine.type"; diff --git a/src/features/routine/ui/ActiveCriteria.tsx b/src/features/routine/ui/ActiveCriteria.tsx index 26a7c3d..4e6f59b 100644 --- a/src/features/routine/ui/ActiveCriteria.tsx +++ b/src/features/routine/ui/ActiveCriteria.tsx @@ -1,10 +1,10 @@ /** @jsxImportSource @emotion/react */ import { useMemo} from "react"; -import { dr } from "@shared/daily-routine-bem"; +import { dr } from "@shared/utils/daily-routine-bem"; import { Button } from "@shared/components/Button"; import { WeekOption } from "./active-criteria-week"; import { MonthOption } from "./active-criteria-month"; -import { TEXT_CSS } from "@shared/constants/text-style"; +import { TEXT_CSS } from "@shared/components/text-style"; import { Routine, RoutineProperties } from "@entities/routine"; diff --git a/src/features/task-el/ui/BaseTaskFeature.tsx b/src/features/task-el/ui/BaseTaskFeature.tsx index 260fe98..9bac82c 100644 --- a/src/features/task-el/ui/BaseTaskFeature.tsx +++ b/src/features/task-el/ui/BaseTaskFeature.tsx @@ -3,7 +3,7 @@ import { css } from '@emotion/react'; import { RoutineNote, Task, TaskEntity, TaskGroup, TaskState } from '@entities/note'; import { useRoutineNote } from "@features/note"; import { Touchable } from '@shared/components/Touchable'; -import { dr } from '@shared/daily-routine-bem'; +import { dr } from '@shared/utils/daily-routine-bem'; import React, { useCallback, useEffect, useRef, useState } from "react"; import { useTaskDnd } from '../dnd/use-task-dnd'; import { changeTaskState } from '../model/change-task-state'; @@ -13,7 +13,7 @@ import { OptionIcon } from './OptionIcon'; import { baseHeaderStyle, dragReadyStyle, draggingStyle, elementHeight, pressedStyle } from './base-element-style'; import { DELAY_TOUCH_START } from '../dnd/dnd-context'; import { Menu } from 'obsidian'; -import { isMobile } from '@shared/plugin-service-locator'; +import { isMobile } from '@shared/utils/plugin-service-locator'; import { doConfirm } from '@shared/components/modal/confirm-modal'; import { DR_SETTING } from '@app/settings/setting-provider'; diff --git a/src/features/task-el/ui/BaseTaskGroupFeature.tsx b/src/features/task-el/ui/BaseTaskGroupFeature.tsx index 85f6fb4..ea1950f 100644 --- a/src/features/task-el/ui/BaseTaskGroupFeature.tsx +++ b/src/features/task-el/ui/BaseTaskGroupFeature.tsx @@ -3,7 +3,7 @@ import { RoutineNote, TaskEntity, TaskGroup } from '@entities/note'; import { Accordion, AccordionDetails, AccordionSummary, accordionSummaryClasses } from '@mui/material'; import { Icon } from '@shared/components/Icon'; import { Touchable } from '@shared/components/Touchable'; -import { dr } from '@shared/daily-routine-bem'; +import { dr } from '@shared/utils/daily-routine-bem'; import { useLeaf } from '@shared/view/use-leaf'; import React, { useCallback, useEffect, useRef, useState } from "react"; import { useGroupDnd } from '../dnd/use-group-dnd'; @@ -13,7 +13,7 @@ import { OptionIcon } from './OptionIcon'; import { CancelLineName } from './CancelLineName'; import { renderTask } from './render-task-widget'; import { Menu } from 'obsidian'; -import { isMobile } from '@shared/plugin-service-locator'; +import { isMobile } from '@shared/utils/plugin-service-locator'; diff --git a/src/features/task-el/ui/CancelLineName.tsx b/src/features/task-el/ui/CancelLineName.tsx index 69f8133..8818712 100644 --- a/src/features/task-el/ui/CancelLineName.tsx +++ b/src/features/task-el/ui/CancelLineName.tsx @@ -1,6 +1,6 @@ /** @jsxImportSource @emotion/react */ import { css } from "@emotion/react"; -import { dr } from "@shared/daily-routine-bem"; +import { dr } from "@shared/utils/daily-routine-bem"; const bem = dr("task-name"); diff --git a/src/features/task-el/ui/Checkbox.tsx b/src/features/task-el/ui/Checkbox.tsx index 69e05e7..862d49b 100644 --- a/src/features/task-el/ui/Checkbox.tsx +++ b/src/features/task-el/ui/Checkbox.tsx @@ -2,7 +2,7 @@ import { css } from "@emotion/react"; import { TaskState } from "@entities/note"; import { Icon } from "@shared/components/Icon"; -import { dr } from "@shared/daily-routine-bem"; +import { dr } from "@shared/utils/daily-routine-bem"; import { useMemo } from "react"; import { CSSTransition, SwitchTransition } from "react-transition-group"; diff --git a/src/features/task-el/ui/ElementPreview.tsx b/src/features/task-el/ui/ElementPreview.tsx index 30c0e15..e549c44 100644 --- a/src/features/task-el/ui/ElementPreview.tsx +++ b/src/features/task-el/ui/ElementPreview.tsx @@ -3,7 +3,7 @@ import { useLeaf } from "@shared/view/use-leaf"; import { CSSProperties, useEffect, useMemo, useRef } from 'react'; import { useDragLayer } from 'react-dnd'; import { TaskElDragItem } from '../dnd/drag-item'; -import { TEXT_CSS } from "@shared/constants/text-style"; +import { TEXT_CSS } from "@shared/components/text-style"; import { css } from "@emotion/react"; diff --git a/src/main.ts b/src/main.ts index bb7cee2..cdb4869 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-var-requires */ import { Plugin, moment } from 'obsidian'; -import { setPlugin } from '@shared/plugin-service-locator'; +import { setPlugin } from '@shared/utils/plugin-service-locator'; import { DailyRoutinePluginSettings, DailyRoutineSettingTab, DEFAULT_SETTINGS } from '@app/settings/DailyRoutineSettingTab'; import { DailyRoutineObsidianView } from './app'; import { activateView } from '@shared/view/activate-view'; diff --git a/src/pages/routine-note/Content.tsx b/src/pages/routine-note/Content.tsx index 5eee6b8..c4d0e8a 100644 --- a/src/pages/routine-note/Content.tsx +++ b/src/pages/routine-note/Content.tsx @@ -4,7 +4,7 @@ import { useRoutineNote } from "@features/note"; import { renderTask, TaskDndContext } from '@features/task-el'; import { Icon } from '@shared/components/Icon'; import { MenuComponent } from "@shared/components/Menu"; -import { dr } from "@shared/daily-routine-bem"; +import { dr } from "@shared/utils/daily-routine-bem"; import { useStartRoutineModal } from '@widgets/routine'; import { TaskGroupWidget, useCreateGroupModal } from '@widgets/task-group'; import { useAddTodoModal } from '@widgets/todo'; diff --git a/src/shared/components/TextEditComponent.tsx b/src/shared/components/TextEditComponent.tsx index 77576f6..9ebdcf2 100644 --- a/src/shared/components/TextEditComponent.tsx +++ b/src/shared/components/TextEditComponent.tsx @@ -2,7 +2,7 @@ import { css } from "@emotion/react"; import { TextComponent } from "obsidian"; import { useRef, useState, useEffect, memo } from "react"; -import { dr } from "@shared/daily-routine-bem"; +import { dr } from "@shared/utils/daily-routine-bem"; import { Button } from "./Button"; import clsx from "clsx"; diff --git a/src/shared/components/ToggleComponent.tsx b/src/shared/components/ToggleComponent.tsx index b78ec7f..2c6e8d1 100644 --- a/src/shared/components/ToggleComponent.tsx +++ b/src/shared/components/ToggleComponent.tsx @@ -1,5 +1,5 @@ /** @jsxImportSource @emotion/react */ -import { dr } from "@shared/daily-routine-bem"; +import { dr } from "@shared/utils/daily-routine-bem"; import clsx from "clsx"; import { ToggleComponent as ObsidianToggleComponent } from "obsidian"; import { memo, useEffect, useRef } from "react"; diff --git a/src/shared/components/modal/confirm-modal.tsx b/src/shared/components/modal/confirm-modal.tsx index 7c6f6ae..878cb50 100644 --- a/src/shared/components/modal/confirm-modal.tsx +++ b/src/shared/components/modal/confirm-modal.tsx @@ -2,7 +2,7 @@ import { useEffect, useRef } from "react"; import { Button } from "../Button"; import { Modal } from "obsidian"; -import { plugin } from "@shared/plugin-service-locator"; +import { plugin } from "@shared/utils/plugin-service-locator"; import { createRoot } from "react-dom/client"; diff --git a/src/shared/components/modal/create-modal.tsx b/src/shared/components/modal/create-modal.tsx index 254a584..19b55f7 100644 --- a/src/shared/components/modal/create-modal.tsx +++ b/src/shared/components/modal/create-modal.tsx @@ -1,7 +1,7 @@ import React, { useCallback, useEffect, useMemo, useRef } from 'react'; import ReactDOM from 'react-dom'; import { Modal } from 'obsidian'; -import { plugin } from '@shared/plugin-service-locator'; +import { plugin } from '@shared/utils/plugin-service-locator'; import { create } from 'zustand'; diff --git a/src/shared/components/modal/flag-confirm-modal.tsx b/src/shared/components/modal/flag-confirm-modal.tsx index e7e30a1..c601e82 100644 --- a/src/shared/components/modal/flag-confirm-modal.tsx +++ b/src/shared/components/modal/flag-confirm-modal.tsx @@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from "react"; import { Button } from "../Button"; import { Modal } from "obsidian"; -import { plugin } from "@shared/plugin-service-locator"; +import { plugin } from "@shared/utils/plugin-service-locator"; import { createRoot } from "react-dom/client"; diff --git a/src/shared/components/modal/styled.tsx b/src/shared/components/modal/styled.tsx index c1245b4..f7b70a8 100644 --- a/src/shared/components/modal/styled.tsx +++ b/src/shared/components/modal/styled.tsx @@ -3,7 +3,7 @@ */ /** @jsxImportSource @emotion/react */ import { ToggleComponent } from "@shared/components/ToggleComponent"; -import { TEXT_CSS } from '../../constants/text-style'; +import { TEXT_CSS } from '../text-style'; import { useEffect, useMemo } from 'react'; import { ModalApi } from './create-modal'; import { TextEditComponent } from "@shared/components/TextEditComponent" diff --git a/src/shared/constants/text-style.ts b/src/shared/components/text-style.ts similarity index 100% rename from src/shared/constants/text-style.ts rename to src/shared/components/text-style.ts diff --git a/src/shared/constants/initial-tab.ts b/src/shared/constants/initial-tab.ts deleted file mode 100644 index db8b961..0000000 --- a/src/shared/constants/initial-tab.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { DrTabType } from "@shared/use-tab-route"; - - -export const INITIAL_TAB: DrTabType = "note"; \ No newline at end of file diff --git a/src/shared/file/file-accessor.ts b/src/shared/file/file-accessor.ts index ee2b29a..c22e4d2 100644 --- a/src/shared/file/file-accessor.ts +++ b/src/shared/file/file-accessor.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { plugin } from "@shared/plugin-service-locator"; +import { plugin } from "@shared/utils/plugin-service-locator"; import { TFile, TFolder } from "obsidian"; diff --git a/src/shared/suggesters/FileSuggester.ts b/src/shared/suggesters/FileSuggester.ts index bc96921..dd4a45f 100644 --- a/src/shared/suggesters/FileSuggester.ts +++ b/src/shared/suggesters/FileSuggester.ts @@ -2,7 +2,7 @@ import { TAbstractFile, TFile, TFolder } from "obsidian"; import { TextInputSuggest } from "./suggest"; -import { plugin } from "@shared/plugin-service-locator"; +import { plugin } from "@shared/utils/plugin-service-locator"; export class FileSuggest extends TextInputSuggest { diff --git a/src/shared/suggesters/suggest.ts b/src/shared/suggesters/suggest.ts index 5cb1ee8..9a4f4fd 100644 --- a/src/shared/suggesters/suggest.ts +++ b/src/shared/suggesters/suggest.ts @@ -2,7 +2,7 @@ import { ISuggestOwner, Scope } from "obsidian"; import { createPopper, Instance as PopperInstance } from "@popperjs/core"; -import { plugin } from "@shared/plugin-service-locator"; +import { plugin } from "@shared/utils/plugin-service-locator"; const wrapAround = (value: number, size: number): number => { return ((value % size) + size) % size; diff --git a/src/shared/tab/initial-tab.ts b/src/shared/tab/initial-tab.ts new file mode 100644 index 0000000..56be7f8 --- /dev/null +++ b/src/shared/tab/initial-tab.ts @@ -0,0 +1,4 @@ +import { DrTabType } from "@shared/tab/use-tab-route"; + + +export const INITIAL_TAB: DrTabType = "note"; \ No newline at end of file diff --git a/src/shared/use-tab-route.tsx b/src/shared/tab/use-tab-route.tsx similarity index 88% rename from src/shared/use-tab-route.tsx rename to src/shared/tab/use-tab-route.tsx index 0a9d78f..ae833a6 100644 --- a/src/shared/use-tab-route.tsx +++ b/src/shared/tab/use-tab-route.tsx @@ -1,5 +1,5 @@ import { create } from "zustand"; -import { INITIAL_TAB } from "./constants/initial-tab"; +import { INITIAL_TAB } from "./initial-tab"; export type DrTabType = "calendar" | "note" | "achivement"; diff --git "a/src/shared/\bswitch-utils.ts" "b/src/shared/utils/\bswitch-utils.ts" similarity index 100% rename from "src/shared/\bswitch-utils.ts" rename to "src/shared/utils/\bswitch-utils.ts" diff --git a/src/shared/compose.ts b/src/shared/utils/compose.ts similarity index 100% rename from src/shared/compose.ts rename to src/shared/utils/compose.ts diff --git a/src/shared/daily-routine-bem.ts b/src/shared/utils/daily-routine-bem.ts similarity index 100% rename from src/shared/daily-routine-bem.ts rename to src/shared/utils/daily-routine-bem.ts diff --git a/src/shared/plugin-service-locator.ts b/src/shared/utils/plugin-service-locator.ts similarity index 100% rename from src/shared/plugin-service-locator.ts rename to src/shared/utils/plugin-service-locator.ts diff --git a/src/shared/use-async.ts b/src/shared/utils/use-async.ts similarity index 100% rename from src/shared/use-async.ts rename to src/shared/utils/use-async.ts diff --git a/src/shared/validation/validate-obsidian-file-title.ts b/src/shared/utils/validate-obsidian-file-title.ts similarity index 100% rename from src/shared/validation/validate-obsidian-file-title.ts rename to src/shared/utils/validate-obsidian-file-title.ts diff --git a/src/shared/view/activate-view.ts b/src/shared/view/activate-view.ts index 76ae33d..f215e5e 100644 --- a/src/shared/view/activate-view.ts +++ b/src/shared/view/activate-view.ts @@ -1,5 +1,5 @@ import { WorkspaceLeaf } from "obsidian"; -import { plugin } from "@shared/plugin-service-locator"; +import { plugin } from "@shared/utils/plugin-service-locator"; /** * viewType에 해당하는 뷰를 활성화한다. diff --git a/src/shared/view/use-leaf.ts b/src/shared/view/use-leaf.ts index 77e80a4..9f0a509 100644 --- a/src/shared/view/use-leaf.ts +++ b/src/shared/view/use-leaf.ts @@ -1,5 +1,5 @@ import { DailyRoutineObsidianView } from "@app/obsidian-view"; -import { plugin } from "@shared/plugin-service-locator"; +import { plugin } from "@shared/utils/plugin-service-locator"; import { createStoreContext } from "@shared/zustand/create-store-context"; import { WorkspaceLeaf } from "obsidian"; diff --git a/src/widgets/calendar/ui/CalendarSlider.tsx b/src/widgets/calendar/ui/CalendarSlider.tsx index b3c04f8..97cc926 100644 --- a/src/widgets/calendar/ui/CalendarSlider.tsx +++ b/src/widgets/calendar/ui/CalendarSlider.tsx @@ -3,12 +3,12 @@ import { Task } from "@entities/note"; import { BaseCalendar } from "@shared/components/BaseCalendar"; import { Day } from "@shared/period/day"; import { Month } from "@shared/period/month"; -import { useAsync } from "@shared/use-async"; +import { useAsync } from "@shared/utils/use-async"; import { useCallback, useMemo } from "react"; import { CalendarTile } from "./CalendarTile"; import { loadCalendar } from "../model/load-calendar"; import { Tile } from "../model/types"; -import { useTabRoute } from "@shared/use-tab-route"; +import { useTabRoute } from "@shared/tab/use-tab-route"; interface CalendarSlideProps { diff --git a/src/widgets/calendar/ui/CalendarTile.tsx b/src/widgets/calendar/ui/CalendarTile.tsx index 2090dc5..4945b4d 100644 --- a/src/widgets/calendar/ui/CalendarTile.tsx +++ b/src/widgets/calendar/ui/CalendarTile.tsx @@ -1,7 +1,7 @@ /** @jsxImportSource @emotion/react */ import { Day } from "@shared/period/day"; import { Tile } from "../model/types" -import { TEXT_CSS } from "@shared/constants/text-style"; +import { TEXT_CSS } from "@shared/components/text-style"; import { Task } from "@entities/note"; import { css } from "@emotion/react"; diff --git a/src/widgets/note-achivement/NoteAchivementCalendar.tsx b/src/widgets/note-achivement/NoteAchivementCalendar.tsx index 0ea3198..2ecb07f 100644 --- a/src/widgets/note-achivement/NoteAchivementCalendar.tsx +++ b/src/widgets/note-achivement/NoteAchivementCalendar.tsx @@ -3,7 +3,7 @@ import { NoteEntity, noteRepository, RoutineNote } from '@entities/note'; import { Day } from "@shared/period/day"; import { BaseCalendar } from '@shared/components/BaseCalendar'; import { useCallback, useEffect, useState } from "react"; -import { useTabRoute } from '@shared/use-tab-route'; +import { useTabRoute } from '@shared/tab/use-tab-route'; import { Month } from '@shared/period/month'; import { PerformanceCircle } from '@features/performance'; diff --git a/src/widgets/routine/ui/start-routine.tsx b/src/widgets/routine/ui/start-routine.tsx index a1d2e2a..9aeba9d 100644 --- a/src/widgets/routine/ui/start-routine.tsx +++ b/src/widgets/routine/ui/start-routine.tsx @@ -3,7 +3,7 @@ import { routineRepository } from "@entities/routine"; import { RoutineOption, routineReducer, RoutineReducer } from "@features/routine"; import { createModal, ModalApi } from "@shared/components/modal/create-modal"; import { Modal } from "@shared/components/modal/styled"; -import { dr } from "@shared/daily-routine-bem"; +import { dr } from "@shared/utils/daily-routine-bem"; import { Notice } from "obsidian"; import { useCallback, useReducer } from "react"; import { createNewRoutine } from "../create-routine"; diff --git a/src/widgets/task-group/ui/create-group.tsx b/src/widgets/task-group/ui/create-group.tsx index 0b7c3be..ef773db 100644 --- a/src/widgets/task-group/ui/create-group.tsx +++ b/src/widgets/task-group/ui/create-group.tsx @@ -4,7 +4,7 @@ import { groupReducer, GroupReducer } from "@features/group"; import { useRoutineMutationMerge } from "@features/merge-note"; import { createModal, ModalApi } from "@shared/components/modal/create-modal"; import { Modal } from "@shared/components/modal/styled"; -import { dr } from "@shared/daily-routine-bem"; +import { dr } from "@shared/utils/daily-routine-bem"; import { Notice } from "obsidian"; import { useCallback, useReducer } from "react"; diff --git a/src/widgets/todo/ui/add-todo.tsx b/src/widgets/todo/ui/add-todo.tsx index a7e301a..05a81f8 100644 --- a/src/widgets/todo/ui/add-todo.tsx +++ b/src/widgets/todo/ui/add-todo.tsx @@ -4,7 +4,7 @@ import { useRoutineNote } from "@features/note"; import { Button } from "@shared/components/Button"; import { createModal, ModalApi } from "@shared/components/modal/create-modal"; import { Modal } from "@shared/components/modal/styled"; -import { dr } from "@shared/daily-routine-bem"; +import { dr } from "@shared/utils/daily-routine-bem"; import { useCallback, useMemo, useState } from "react"; diff --git a/src/widgets/todo/ui/todo-option.tsx b/src/widgets/todo/ui/todo-option.tsx index c17bf11..2ea5144 100644 --- a/src/widgets/todo/ui/todo-option.tsx +++ b/src/widgets/todo/ui/todo-option.tsx @@ -4,7 +4,7 @@ import { useRoutineNote } from '@features/note'; import { Button } from '@shared/components/Button'; import { createModal, ModalApi } from '@shared/components/modal/create-modal'; import { Modal } from '@shared/components/modal/styled'; -import { dr } from '@shared/daily-routine-bem'; +import { dr } from '@shared/utils/daily-routine-bem'; import { memo, useCallback, useMemo, useState } from "react"; diff --git a/src/widgets/weeks/DayNodeComponent.tsx b/src/widgets/weeks/DayNodeComponent.tsx index f3a5ad8..d532689 100644 --- a/src/widgets/weeks/DayNodeComponent.tsx +++ b/src/widgets/weeks/DayNodeComponent.tsx @@ -2,7 +2,7 @@ import { Day } from "@shared/period/day"; import React, { useEffect, useMemo, useRef, useState } from "react"; import { DayNode } from "./types"; -import { dr } from "@shared/daily-routine-bem"; +import { dr } from "@shared/utils/daily-routine-bem"; import { useLeaf } from "@shared/view/use-leaf"; import { css } from "@emotion/react"; import { useWeeksActiveDay } from "./WeeksContext";