@setoelkahfi / svara / commits / 6272c3d

Small reorganization of project

mellobacon committed Oct 5, 2022 at 14:59 UTC 6272c3d687a63d4bb7ac9b620e7468cd9d14bbb8
15 files changed +22 -24
src/components/Content/Editor/CodeMirrorEditor.svelte
+1 -1
@@ -4,7 +4,7 @@
4 import { EditorView, keymap } from "@codemirror/view";
5 import { indentWithTab } from "@codemirror/commands";
6 import { EditorState } from "@codemirror/state";
7 - import { default_theme } from "./DefaultTheme";
7 + import { default_theme } from "./scripts/DefaultTheme";
8
9 export let hidden = false;
10 let editorElement;
src/components/Content/Editor/Editor.svelte
+1 -1
@@ -1,6 +1,6 @@
1 <script lang="ts">
2 import EditorTabs from "./EditorTabs.svelte";
3 - import { hidden } from "./Tabs";
3 + import { hidden } from "./scripts/Tabs";
4 </script>
5
6 <EditorTabs />
src/components/Content/Editor/EditorTabs.svelte
+1 -1
@@ -2,7 +2,7 @@
2 import { Sortable } from "sortablejs";
3 import { onMount } from "svelte";
4 import Tab from "./Tab.svelte";
5 - import { tabs, hidden } from "./Tabs";
5 + import { tabs, hidden } from "./scripts/Tabs";
6
7 let tabcontainer;
8 // TODO: Get this to work
src/components/Content/Editor/Tab.svelte
+1 -1
@@ -1,6 +1,6 @@
1 <script lang="ts">
2 import TabMenu from "./TabMenu.svelte";
3 - import { setActive, closeTab } from "./Tabs";
3 + import { setActive, closeTab } from "./scripts/Tabs";
4 export let id = 0;
5 export let label = "Untitled-1";
6 export let path = "";
src/components/Content/Editor/TabMenu.svelte
+1 -1
@@ -4,7 +4,7 @@
4 import CopyFile from "carbon-icons-svelte/lib/CopyFile.svelte";
5 import Cut from "carbon-icons-svelte/lib/Cut.svelte";
6 import { clipboard, path, invoke } from "@tauri-apps/api";
7 - import { closeTab, setActive } from "./Tabs";
7 + import { closeTab, setActive } from "./scripts/Tabs";
8 export let id: number;
9 export let target;
10 export let filename;
src/components/Content/Editor/scripts/DefaultTheme.ts renamed
src/components/Content/Editor/scripts/Tabs.ts renamed
+2 -2
@@ -1,7 +1,7 @@
1 import { writeFile, writeTextFile } from '@tauri-apps/api/fs';
2 import { writable } from 'svelte/store';
3 -import { loadFile } from '../../FileTree/TreeData';
4 -import CodeMirrorEditor from './CodeMirrorEditor.svelte';
3 +import { loadFile } from '../../../FileTree/scripts/TreeData';
4 +import CodeMirrorEditor from '../CodeMirrorEditor.svelte';
5 export let tabs = writable([]);
6 export let hidden = writable(true);
7
src/components/FileTree/Tree.svelte
+3 -3
@@ -2,10 +2,10 @@
2 import ArrowUp from "carbon-icons-svelte/lib/ArrowUp.svelte";
3 import WatsonHealthRotate_360 from "carbon-icons-svelte/lib/WatsonHealthRotate_360.svelte";
4 import TreeView from "./TreeView.svelte";
5 - import { updateTree } from "../FileTree/TreeData";
5 + import { updateTree } from "./scripts/TreeData";
6 import { onMount } from "svelte";
7 - import { filetree, workspacename } from "./TreeStore";
8 - import { data, workspace } from "../FileTree/TreeData";
7 + import { filetree, workspacename } from "./scripts/TreeStore";
8 + import { data, workspace } from "./scripts/TreeData";
9 let treeview = null;
10 let tree = $filetree;
11 onMount(() => {
src/components/FileTree/TreeStore.ts deleted
-7
@@ -1,7 +0,0 @@
1 -import { writable } from 'svelte/store';
2 -
3 -let testtree = [
4 -
5 -];
6 -export let filetree = writable(testtree);
7 -export let workspacename = writable("Untitled Workspace");
\ No newline at end of file
src/components/FileTree/TreeViewNode.svelte
+1 -1
@@ -41,7 +41,7 @@
41 export let icon = undefined;
42
43 import { afterUpdate, getContext } from "svelte";
44 - import { addTab } from "../Content/Editor/Tabs";
44 + import { addTab } from "../Content/Editor/scripts/Tabs";
45 import RenameModel from "../Modal/RenameModel.svelte";
46 import LeafNodeMenu from "./LeafNodeMenu.svelte";
47
src/components/FileTree/scripts/TreeData.ts renamed
+1 -1
@@ -1,7 +1,7 @@
1 import { dialog, fs } from "@tauri-apps/api";
2 import { readTextFile } from "@tauri-apps/api/fs";
3 import { sep } from "@tauri-apps/api/path";
4 -import { filetree } from "../FileTree/TreeStore";
4 +import { filetree } from "./TreeStore";
5 let parentname: string;
6 let dir;
7 export async function data() {
src/components/FileTree/scripts/TreeStore.ts new
+5
@@ -0,0 +1,5 @@
1 +import { writable } from 'svelte/store';
2 +
3 +let treedata = [];
4 +export let filetree = writable(treedata);
5 +export let workspacename = writable("Untitled Workspace");
\ No newline at end of file
src/components/Header/Header.svelte
+1 -1
@@ -4,7 +4,7 @@
4 import "../../overrides.css";
5 import { filemenu, editmenu, viewmenu, runmenu, helpmenu} from "../Menu/menu";
6 import { appWindow } from "@tauri-apps/api/window";
7 - import { workspacename } from "../FileTree/TreeStore";
7 + import { workspacename } from "../FileTree/scripts/TreeStore";
8 </script>
9 <div id="header" data-tauri-drag-region>
10 <div id="logo"></div>
src/components/Menu/menu.ts
+3 -3
@@ -1,6 +1,6 @@
1 -import { filetree, workspacename } from "../FileTree/TreeStore";
2 -import { data, workspace } from "../FileTree/TreeData";
3 -import { addTab } from "../Content/Editor/Tabs";
1 +import { filetree, workspacename } from "../FileTree/scripts/TreeStore";
2 +import { data, workspace } from "../FileTree/scripts/TreeData";
3 +import { addTab } from "../Content/Editor/scripts/Tabs";
4 import { dialog } from "@tauri-apps/api";
5 import { appWindow } from "@tauri-apps/api/window";
6 export const filemenu = [
src/components/Modal/RenameModel.svelte
+1 -1
@@ -2,7 +2,7 @@
2 import { Modal } from "carbon-components-svelte";
3 import Input from "../Input/Input.svelte";
4 import { fs } from "@tauri-apps/api";
5 - import { updateTree } from "../FileTree/TreeData";
5 + import { updateTree } from "../FileTree/scripts/TreeData";
6 import langlist from "../../scripts/languages/languages.json";
7 import { sep } from "@tauri-apps/api/path";
8 export let open = false;