parent
8d8f569997
commit
623cb491f0
11 changed files with 108 additions and 50 deletions
|
|
@ -11,6 +11,7 @@
|
|||
"devDependencies": {
|
||||
"@rollup/plugin-commonjs": "^14.0.0",
|
||||
"@rollup/plugin-node-resolve": "^8.4.0",
|
||||
"@rollup/plugin-replace": "^2.3.3",
|
||||
"@rollup/plugin-typescript": "^6.0.0",
|
||||
"@testing-library/svelte": "^3.0.0",
|
||||
"@tsconfig/svelte": "^1.0.0",
|
||||
|
|
|
|||
19
frontend/public/editor.html
Normal file
19
frontend/public/editor.html
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset='utf-8'>
|
||||
<meta name='viewport' content='width=device-width,initial-scale=1'>
|
||||
|
||||
<title>Editor úloh</title>
|
||||
|
||||
<link rel='icon' type='image/png' href='/favicon.png'>
|
||||
<link rel='stylesheet' href='/global.css'>
|
||||
<link rel='stylesheet' href='/build/editor.css'>
|
||||
|
||||
<script type="module" src='/build/editor.js'></script>
|
||||
</head>
|
||||
|
||||
<body style="padding: 0">
|
||||
<div id="svelte-root" style="position: relative;"></div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -5,13 +5,13 @@ import livereload from 'rollup-plugin-livereload';
|
|||
import { terser } from 'rollup-plugin-terser';
|
||||
import sveltePreprocess from 'svelte-preprocess';
|
||||
import typescript from '@rollup/plugin-typescript';
|
||||
import replace from '@rollup/plugin-replace'
|
||||
|
||||
const production = !process.env.ROLLUP_WATCH;
|
||||
const halfProduction = production || !!process.env.HALF_PRODUCTION;
|
||||
|
||||
function serve() {
|
||||
let server;
|
||||
|
||||
function toExit() {
|
||||
if (server) server.kill(0);
|
||||
}
|
||||
|
|
@ -30,33 +30,19 @@ function serve() {
|
|||
};
|
||||
}
|
||||
|
||||
export default {
|
||||
input: 'src/main.ts',
|
||||
output: {
|
||||
sourcemap: true,
|
||||
format: 'es',
|
||||
name: 'app',
|
||||
file: 'public/build/bundle.js'
|
||||
},
|
||||
plugins: [
|
||||
// nodePolyfills(),
|
||||
|
||||
function plugins(editor) {
|
||||
return [
|
||||
svelte({
|
||||
// enable run-time checks when not in production
|
||||
dev: !halfProduction,
|
||||
// we'll extract any component CSS out into
|
||||
// a separate file - better for performance
|
||||
css: css => {
|
||||
css.write('bundle.css');
|
||||
css.write(editor ? 'editor.css' : 'bundle.css');
|
||||
},
|
||||
preprocess: sveltePreprocess(),
|
||||
}),
|
||||
|
||||
// If you have external dependencies installed from
|
||||
// npm, you'll most likely need these plugins. In
|
||||
// some cases you'll need additional configuration -
|
||||
// consult the documentation for details:
|
||||
// https://github.com/rollup/plugins/tree/master/packages/commonjs
|
||||
resolve({
|
||||
browser: true,
|
||||
dedupe: ['svelte']
|
||||
|
|
@ -66,20 +52,42 @@ export default {
|
|||
sourceMap: !halfProduction,
|
||||
inlineSources: !halfProduction
|
||||
}),
|
||||
replace({
|
||||
"allowEditor": false,
|
||||
}),
|
||||
|
||||
// In dev mode, call `npm run start` once
|
||||
// the bundle has been generated
|
||||
!production && serve(),
|
||||
!production && !editor && serve(),
|
||||
|
||||
// Watch the `public` directory and refresh the
|
||||
// browser on changes when not in production
|
||||
!halfProduction && livereload('public'),
|
||||
!halfProduction && !editor && livereload('public'),
|
||||
|
||||
// If we're building for production (npm run build
|
||||
// instead of npm run dev), minify
|
||||
halfProduction && terser()
|
||||
],
|
||||
// halfProduction && terser()
|
||||
]
|
||||
}
|
||||
|
||||
export default [{
|
||||
input: 'src/main.ts',
|
||||
output: {
|
||||
sourcemap: !halfProduction,
|
||||
format: 'es',
|
||||
file: 'public/build/bundle.js'
|
||||
},
|
||||
plugins: plugins(false),
|
||||
watch: {
|
||||
clearScreen: false
|
||||
}
|
||||
};
|
||||
},
|
||||
{
|
||||
input: 'src/editor-main.ts',
|
||||
output: {
|
||||
sourcemap: !halfProduction,
|
||||
format: 'es',
|
||||
file: 'public/build/editor.js'
|
||||
},
|
||||
plugins: plugins(true)
|
||||
}];
|
||||
|
|
|
|||
|
|
@ -4,13 +4,9 @@
|
|||
import type { TasksFile, TaskDescriptor } from "./tasks";
|
||||
import TasksLoader from "./TasksLoader.svelte";
|
||||
import TaskPanel from "./TaskPanel.svelte";
|
||||
import Editor from "./Editor.svelte";
|
||||
import Modal from "svelte-simple-modal";
|
||||
|
||||
const tasksPromise: Promise<TasksFile> = loadTasks();
|
||||
|
||||
let taskPanel: TaskPanel;
|
||||
|
||||
// react to hash changes
|
||||
let hash = window.location.hash.substr(1);
|
||||
window.onhashchange = () => {
|
||||
|
|
@ -28,21 +24,13 @@
|
|||
</style>
|
||||
|
||||
<main>
|
||||
<Modal>
|
||||
{#if hash == 'editor'}
|
||||
<TasksLoader promise={tasksPromise} let:data={t}>
|
||||
<Editor tasks={t} />
|
||||
</TasksLoader>
|
||||
{:else}
|
||||
<TasksLoader promise={tasksPromise} let:data={t}>
|
||||
<TaskPanel tasks={t} bind:this={taskPanel} {selectedTaskId} />
|
||||
<div style="height: 100%">
|
||||
<Graph
|
||||
tasks={t}
|
||||
on:selectTask={(e) => { if (e.detail.type != "label") (location.hash = `#task/${e.detail.id}`)}}
|
||||
on:closeTask={() => {location.hash = '#'}} />
|
||||
</div>
|
||||
</TasksLoader>
|
||||
{/if}
|
||||
</Modal>
|
||||
<TasksLoader promise={tasksPromise} let:data={t}>
|
||||
<TaskPanel tasks={t} {selectedTaskId} />
|
||||
<div style="height: 100%">
|
||||
<Graph
|
||||
tasks={t}
|
||||
on:closeTask={() => { location.hash = ""}}
|
||||
on:selectTask={(e) => { if (e.detail.type != "label") (location.hash = `#task/${e.detail.id}`)}}/>
|
||||
</div>
|
||||
</TasksLoader>
|
||||
</main>
|
||||
|
|
|
|||
27
frontend/src/Editor-main.svelte
Normal file
27
frontend/src/Editor-main.svelte
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
<script type="ts">
|
||||
import Editor from "./Editor.svelte";
|
||||
import Modal from "svelte-simple-modal";
|
||||
import { loadTasks } from "./tasks";
|
||||
import type { TasksFile, TaskDescriptor } from "./tasks";
|
||||
import TasksLoader from "./TasksLoader.svelte";
|
||||
|
||||
const tasksPromise: Promise<TasksFile> = loadTasks();
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<style>
|
||||
main {
|
||||
text-align: center;
|
||||
margin: 0 auto;
|
||||
min-height: 420px;
|
||||
}
|
||||
</style>
|
||||
|
||||
<main>
|
||||
<Modal>
|
||||
<TasksLoader promise={tasksPromise} let:data={t}>
|
||||
<Editor tasks={t}/>
|
||||
</TasksLoader>
|
||||
</Modal>
|
||||
</main>
|
||||
|
|
@ -6,8 +6,6 @@
|
|||
import type { TasksFile, TaskDescriptor } from "./tasks";
|
||||
import { createEdges } from "./tasks";
|
||||
import { taskStatuses } from "./task-status-cache";
|
||||
import { grabAssignment } from "./ksp-task-grabber";
|
||||
import TaskDetailEditor from "./TaskDetailEditor.svelte";
|
||||
|
||||
export let tasks: TasksFile;
|
||||
export let nodeDraggingEnabled: boolean = false;
|
||||
|
|
|
|||
8
frontend/src/editor-main.ts
Normal file
8
frontend/src/editor-main.ts
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
import Editor from './Editor-main.svelte';
|
||||
import { loadTasks } from './tasks';
|
||||
import type { TasksFile } from './tasks'
|
||||
|
||||
const app = new Editor({
|
||||
target: document.getElementById("svelte-root")!,
|
||||
props: {}
|
||||
});
|
||||
|
|
@ -2,8 +2,7 @@ import App from './App.svelte';
|
|||
|
||||
const app = new App({
|
||||
target: document.getElementById("svelte-root")!,
|
||||
props: {
|
||||
}
|
||||
props: { }
|
||||
});
|
||||
|
||||
export default app;
|
||||
|
|
|
|||
1
frontend/src/typescripthack.d.ts
vendored
Normal file
1
frontend/src/typescripthack.d.ts
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
declare const allowEditor: boolean
|
||||
|
|
@ -3,7 +3,8 @@
|
|||
"compilerOptions": {
|
||||
// "target": "ES2019"
|
||||
"strict": true,
|
||||
"types": ["jest", "node"]
|
||||
"types": ["jest", "node"],
|
||||
"module": "esnext"
|
||||
},
|
||||
|
||||
"include": ["src/**/*"],
|
||||
|
|
|
|||
|
|
@ -524,6 +524,14 @@
|
|||
is-module "^1.0.0"
|
||||
resolve "^1.17.0"
|
||||
|
||||
"@rollup/plugin-replace@^2.3.3":
|
||||
version "2.3.3"
|
||||
resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.3.3.tgz#cd6bae39444de119f5d905322b91ebd4078562e7"
|
||||
integrity sha512-XPmVXZ7IlaoWaJLkSCDaa0Y6uVo5XQYHhiMFzOd5qSv5rE+t/UJToPIOE56flKIxBFQI27ONsxb7dqHnwSsjKQ==
|
||||
dependencies:
|
||||
"@rollup/pluginutils" "^3.0.8"
|
||||
magic-string "^0.25.5"
|
||||
|
||||
"@rollup/plugin-typescript@^6.0.0":
|
||||
version "6.0.0"
|
||||
resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-6.0.0.tgz#08635d9d04dc3a099ef0150c289ba5735200bc63"
|
||||
|
|
@ -3215,7 +3223,7 @@ lower-case@^2.0.1:
|
|||
dependencies:
|
||||
tslib "^1.10.0"
|
||||
|
||||
magic-string@^0.25.2:
|
||||
magic-string@^0.25.2, magic-string@^0.25.5:
|
||||
version "0.25.7"
|
||||
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
|
||||
integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
|
||||
|
|
|
|||
Reference in a new issue