Skip to content

Commit b1bdc84

Browse files
committed
Reorganize data services
1 parent 4ea3c44 commit b1bdc84

68 files changed

Lines changed: 102 additions & 98 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

frontend/viewer/.storybook/decorators/FWLiteDecorator.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
<script lang="ts">
1818
import { ResizablePaneGroup, ResizablePane, ResizableHandle } from '$lib/components/ui/resizable';
19-
import ThemePicker from '$lib/ThemePicker.svelte';
19+
import ThemePicker from '$lib/components/ThemePicker.svelte';
2020
import {initView} from '$lib/views/view-service';
2121
import {ModeWatcher} from 'mode-watcher';
2222
import {Context} from 'runed';
2323
import { type Snippet } from 'svelte';
2424
import ViewPicker from '../../src/project/browse/ViewPicker.svelte';
25-
import {InMemoryDemoApi} from '$lib/in-memory-demo-api';
25+
import {InMemoryDemoApi} from '$project/demo/in-memory-demo-api';
2626
import {setupServiceProvider} from '$lib/services/service-provider';
2727
import {setupDotnetServiceProvider} from '$lib/services/service-provider-dotnet';
2828
import {XButton} from '$lib/components/ui/button';

frontend/viewer/src/DotnetProjectView.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import type {
1212
ISyncServiceJsInvokable
1313
} from '$lib/dotnet-types/generated-types/FwLiteShared/Services/ISyncServiceJsInvokable';
14-
import {initProjectContext} from '$lib/project-context.svelte';
14+
import {initProjectContext} from '$project/project-context.svelte';
1515
1616
const projectServicesProvider = useProjectServicesProvider();
1717

frontend/viewer/src/TestProjectView.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script lang="ts">
22
import ProjectView from './ProjectView.svelte';
3-
import {InMemoryDemoApi} from '$lib/in-memory-demo-api';
3+
import {InMemoryDemoApi} from '$project/demo/in-memory-demo-api';
44
import ProjectLoader from './ProjectLoader.svelte';
55
66
const projectName = InMemoryDemoApi.setup().projectName;

frontend/viewer/src/WebComponent.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import css from './app.postcss?inline';
1111
import {DotnetService, type IMiniLcmJsInvokable} from '$lib/dotnet-types';
1212
import ProjectLoader from './ProjectLoader.svelte';
13-
import {initProjectContext} from '$lib/project-context.svelte';
14-
import {mockFwLiteConfig} from '$lib/in-memory-demo-api';
13+
import {initProjectContext} from '$project/project-context.svelte';
14+
import {mockFwLiteConfig} from '$project/demo/in-memory-demo-api';
1515
import type {IFwEvent} from '$lib/dotnet-types/generated-types/FwLiteShared/Events/IFwEvent';
1616
1717
let connecting = true;

frontend/viewer/src/home/HomeView.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import {t} from 'svelte-i18n-lingui';
1515
import LocalizationPicker from '$lib/i18n/LocalizationPicker.svelte';
1616
import type {IProjectModel} from '$lib/dotnet-types';
17-
import ThemePicker from '$lib/ThemePicker.svelte';
17+
import ThemePicker from '$lib/components/ThemePicker.svelte';
1818
import {Button} from '$lib/components/ui/button';
1919
import {mode} from 'mode-watcher';
2020
import * as ResponsiveMenu from '$lib/components/responsive-menu';

frontend/viewer/src/lib/DialogsProvider.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import NewEntryDialog from '$lib/entry-editor/NewEntryDialog.svelte';
33
import DeleteDialog from '$lib/entry-editor/DeleteDialog.svelte';
44
import {useDialogsService} from '$lib/services/dialogs-service';
5-
import {useProjectContext} from '$lib/project-context.svelte';
5+
import {useProjectContext} from '$project/project-context.svelte';
66
const projectContext = useProjectContext();
77
const dialogsService = useDialogsService();
88
let deleteDialog = $state<DeleteDialog>();

frontend/viewer/src/lib/activity/ActivityView.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script lang="ts">
22
import { useHistoryService } from '$lib/services/history-service';
33
import { t, T } from 'svelte-i18n-lingui';
4-
import { useProjectContext } from '$lib/project-context.svelte';
4+
import { useProjectContext } from '$project/project-context.svelte';
55
import { resource } from 'runed';
66
import {SidebarTrigger} from '$lib/components/ui/sidebar';
77
import ListItem from '$lib/components/ListItem.svelte';

frontend/viewer/src/lib/OpenInFieldWorksButton.svelte renamed to frontend/viewer/src/lib/components/OpenInFieldWorksButton.svelte

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<script lang="ts">
22
import flexLogo from '$lib/assets/flex-logo.png';
33
import {AppNotification} from '$lib/notifications/notifications';
4-
import {useAppLauncherService} from './services/app-launcher-service';
5-
import {useProjectContext} from './project-context.svelte';
6-
import type {IEntry} from './dotnet-types';
7-
import {buttonVariants, type ButtonProps} from './components/ui/button';
4+
import {useAppLauncherService} from '../services/app-launcher-service';
5+
import {useProjectContext} from '$project/project-context.svelte';
6+
import type {IEntry} from '../dotnet-types';
7+
import {buttonVariants, type ButtonProps} from './ui/button';
88
import {t} from 'svelte-i18n-lingui';
99
import {mergeProps} from 'bits-ui';
10-
import {cn} from './utils';
11-
import {Icon} from './components/ui/icon';
10+
import {cn} from '../utils';
11+
import {Icon} from './ui/icon';
1212
1313
type Props = {
1414
entry: IEntry
File renamed without changes.

frontend/viewer/src/lib/components/field-editors/audio-input.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<script lang="ts">
4444
import {onDestroy} from 'svelte';
4545
import {useEventListener, watch} from 'runed';
46-
import {useProjectContext} from '$lib/project-context.svelte';
46+
import {useProjectContext} from '$project/project-context.svelte';
4747
import {AppNotification} from '$lib/notifications/notifications';
4848
import {Button} from '$lib/components/ui/button';
4949
import {Slider} from '$lib/components/ui/slider';
@@ -55,7 +55,7 @@
5555
import {tryUseFieldBody} from '$lib/components/editor/field/field-root.svelte';
5656
import {useSubjectContext} from '$lib/entry-editor/object-editors/subject-context';
5757
import LexiconEditorPrimitive from '$lib/entry-editor/object-editors/LexiconEditorPrimitive.svelte';
58-
import OverrideFields from '$lib/OverrideFields.svelte';
58+
import OverrideFields from '$lib/views/OverrideFields.svelte';
5959
6060
const handled = Symbol();
6161
let {

0 commit comments

Comments
 (0)