17 Commits
Author SHA1 Message Date
Torstem_JetBrain c711e0ae24 Es ist möglich einen neuen Eintrag zu generieren. 2021-04-10 11:26:34 +02:00
Torstem_JetBrain 74fd96cf25 Ein Eintrag kann verändert werden. 2021-04-09 21:56:08 +02:00
Torstem_JetBrain 9686a8505e Das löschen eines Eintrages wird nicht unterstützt. 2021-04-09 21:53:52 +02:00
Torstem_JetBrain bc83fc8dd1 Die Einträge werden aufgelistet und angezeigt. 2021-04-09 21:19:19 +02:00
Torstem_JetBrain 9d5af9a0fb Die Daten für die Ansichten werden von einer API abgefragt. 2021-04-09 18:20:47 +02:00
Torstem_JetBrain 7f8a50799f Die Web-App kann per *dotEnv* konfiguriert werden. 2021-04-09 18:19:42 +02:00
TorstenHettstedt 365c2f041c Merge pull request 'html-sites' (#3) from html-sites into master
Reviewed-on: #3
2021-04-08 20:15:59 +02:00
Torstem_JetBrain 89ad394773 Die gewünschte HTML-Struktur wurde übernommen. 2021-04-08 19:09:44 +02:00
Torstem_JetBrain 881e7362f8 Großschreibung ist gefordert. 2021-04-08 19:08:50 +02:00
Torstem_JetBrain c8d9bc040e Die HTML-Dateien für die Anzeige und Bearbeitung der Daten sind vorhanden. 2021-04-08 18:12:05 +02:00
Torstem_JetBrain e3ef53b119 Übernahme der Namen aus der OpenAPI-Datei. 2021-04-08 13:29:31 +02:00
Torstem_JetBrain f78fdfbbd5 Definition der Beispieldaten für jede Liste. 2021-04-08 13:20:08 +02:00
Torstem_JetBrain 02771828c9 Das Fav-Icon wurde hinzugefügt. 2021-04-08 12:49:54 +02:00
Torstem_JetBrain 5a88ff3c6f Die Links müssen bleiben. 2021-04-08 12:44:26 +02:00
Torstem_JetBrain f36324bfbd Die grundlegenden HTML-Dateien sind vorhanden. 2021-04-08 12:30:36 +02:00
Torstem_JetBrain 9b99c6a4dc Für die Svelte-Oberfläche sind alle notwendigen Dateien vorhanden. 2021-04-08 12:28:26 +02:00
Torstem_JetBrain fe3a4f69bf Die Struktur der Oberfläche für die Eintragungen wurde skizziert. 2021-04-07 21:28:10 +02:00
19 changed files with 574 additions and 0 deletions
+10
View File
@@ -0,0 +1,10 @@
# http://editorconfig.org
root = true
[*]
indent_size = 4
indent_style = space
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = false
+11
View File
@@ -0,0 +1,11 @@
@startuml
'https://plantuml.com/salt
salt
{
Datum |"Datum <&calendar>"
Uhrzeit | "Uhrzeit <&clock>"
[Übernehmen <&plus>]
[Abbrechen <&action-undo>]
}
@enduml
@@ -0,0 +1,20 @@
@startuml
'https://plantuml.com/salt
salt
{
Woche vom <&calendar> bis zum <&calendar>
[<&chevron-left> Woche zurück] | [Woche vor <&chevron-right>]
{!
Montag | "00:00:00 <&clock>"
Dienstag | "00:00:00 <&clock>"
Mittwoch | "00:00:00 <&clock>"
Donnerstag | "00:00:00 <&clock>"
Freitag | "00:00:00 <&clock>"
<color:red>Samstag | "<color:red>00:00:00 <&clock>"
<color:red>Sontag | "<color:red>00:00:00 <&clock>"
}
[Übernehmen <&plus>]
[Abbrechen <&action-undo>]
}
@enduml
+2
View File
@@ -0,0 +1,2 @@
# Url ohne abschlißenden Slash
API_URL= http://localhost:8080
+6
View File
@@ -0,0 +1,6 @@
.DS_Store
node_modules
package-lock.json
yarn.lock
public
/.env
+30
View File
@@ -0,0 +1,30 @@
{
"private": true,
"name": "svelte-demo",
"scripts": {
"build": "rollup -c",
"autobuild": "rollup -c -w",
"dev": "run-p start:dev autobuild",
"start": "sirv public --single",
"start:dev": "sirv public --dev --single"
},
"dependencies": {
"ganalytics": "^3.1.2",
"navaid": "^1.0.2",
"open-iconic": "^1.1.1"
},
"devDependencies": {
"@iconify-icons/oi": "^1.1.0",
"@iconify/svelte": "^1.0.4",
"@rollup/plugin-commonjs": "^15.0.0",
"@rollup/plugin-node-resolve": "^9.0.0",
"@rollup/plugin-replace": "^2.3.0",
"dotenv": "^8.2.0",
"npm-run-all": "^4.1.3",
"rollup": "^2.30.0",
"rollup-plugin-svelte": "^6.0.0",
"rollup-plugin-terser": "^7.0.0",
"sirv-cli": "^1.0.8",
"svelte": "^3.4.4"
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

+1
View File
@@ -0,0 +1 @@
+21
View File
@@ -0,0 +1,21 @@
<!doctype html>
<!--suppress HtmlUnknownTarget -->
<!--suppress JSUnresolvedLibraryURL -->
<html lang="de">
<head>
<base href="/" />
<meta charset="utf8">
<meta name="viewport" content="width=device-width">
<title>Svelte app</title>
<link rel='icon' type='image/png' href='/favicon.png'>
<link rel="stylesheet" href="/global.css">
<link rel="stylesheet" href="/bundle.css">
<script type="module" src="https://unpkg.com/dimport?module" data-main="/index.js"></script>
<script nomodule src="https://unpkg.com/dimport/nomodule" data-main="/index.js"></script>
</head>
<body>
</body>
</html>
+51
View File
@@ -0,0 +1,51 @@
import svelte from 'rollup-plugin-svelte';
import replace from '@rollup/plugin-replace';
import resolve from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';
import { terser } from 'rollup-plugin-terser';
import {config} from 'dotenv';
const production = !process.env.ROLLUP_WATCH;
export default {
input: 'src/index.js',
output: {
name: 'app',
format: 'esm',
sourcemap: true,
dir: 'public',
},
preserveEntrySignatures: false,
plugins: [
svelte({
// enable run-time checks when not in production
dev: !production,
// we'll extract any component CSS out into
// a separate file — better for performance
css: css => {
css.write('bundle.css');
}
}),
// 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/rollup-plugin-commonjs
resolve(),
commonjs(),
replace({
'process.env.NODE_ENV': JSON.stringify(production ? 'production' : 'development'),
'env': JSON.stringify({...config().parsed /* attached the .env config*/})
}),
// If we're building for production (npm run build
// instead of npm run dev), minify
production && terser()
],
watch: {
clearScreen: false
}
};
+67
View File
@@ -0,0 +1,67 @@
<header>
Arbeitszeiten
</header>
<Nav {active} />
<main>
<svelte:component this={Route} {params} />
</main>
<footer><p>© Torsten Lücke 2021</p></footer>
<script>
import Navaid from 'navaid';
import { onDestroy } from 'svelte';
import Nav from './Nav.svelte';
let Route, params={}, active;
let uri = location.pathname;
$: active = uri.split('/').pop() || 'home';
function run(thunk, obj) {
const target = uri;
thunk.then(m => {
if (target !== uri) return;
params = obj || {};
if (m.preload) {
m.preload({ params }).then(() => {
if (target !== uri) return;
Route = m.default;
window.scrollTo(0, 0);
});
} else {
Route = m.default;
window.scrollTo(0, 0);
}
});
}
function track(obj) {
uri = obj.state || obj.uri || location.pathname;
}
addEventListener('replacestate', track);
addEventListener('pushstate', track);
addEventListener('popstate', track);
let r = {
"workingDay": "2020-01-15",
"workingTime": "09:00:00"
};
let records = {
"title" : "Einträge",
"records" : [r, r]
};
const router = Navaid('/')
.on('/', () => run(import('../routes/Home.svelte')))
.on('/views/weekly', () => run(import('../routes/WeeklyViews.svelte')))
.on('/views/monthly', () => run(import('../routes/MonthlyViews.svelte')))
.on('/views/yearly', () => run(import('../routes/YearlyViews.svelte')))
.on('/working-hours', () => run(import('../routes/WorkingHours.svelte'), records))
.listen();
onDestroy(router.unlisten);
</script>
+15
View File
@@ -0,0 +1,15 @@
<!--suppress HtmlUnknownTarget -->
<nav>
<ul>
<li><a class="{ isActive('home') }" href="/">Home</a></li>
<li><a class="{ isActive('weekly') }" href="/views/weekly">Wochenansicht</a></li>
<li><a class="{ isActive('monthly') }" href="/views/monthly">Monatsansicht</a></li>
<li><a class="{ isActive('yearly') }" href="/views/yearly">Jahresansicht</a></li>
<li><a class="{ isActive('working-hours') }" href="/working-hours">Einträge</a></li>
</ul>
</nav>
<script>
export let active;
$: isActive = str => active === str ? 'selected' : '';
</script>
+5
View File
@@ -0,0 +1,5 @@
import App from './components/App.svelte';
new App({
target: document.body
});
+5
View File
@@ -0,0 +1,5 @@
<Views />
<script>
import Views from "./WeeklyViews.svelte";
</script>
+31
View File
@@ -0,0 +1,31 @@
<script>
import Views from "./Views.svelte";
export let params;
params = {
title: 'Monatsansicht',
records: [],
isLoading: true
}
const View = {
'browse': () => {
fetch(env.API_URL + '/views/working-hours/monthly')
.then(res => {
if (!res.ok) {
throw new Error('Fail!');
}
return res.json();
})
.then(data => {
params.records = data;
params.isLoading = false;
})
.catch(err => {
params.isLoading = false;
console.log(err);
});
}
};
View.browse();
</script>
<Views {params} />
+40
View File
@@ -0,0 +1,40 @@
<script>
export let params;
console.log(params)
</script>
<svelte:head>
<title>{params.title}</title>
</svelte:head>
<section id="list-records">
<header>
<h1>{params.title}</h1>
</header>
<article>
{#if params.isLoading === true}
<p>Loading...</p>
{:else}
<table>
<thead>
<tr>
<th>Zeitraum</th>
<th>Arbeitstage</th>
<th>Arbeitsstunden</th>
<th>Über- / Unterstunden</th>
</tr>
</thead>
<tbody>
{#each params.records as record}
<tr>
<td>{record.period}</td>
<td>{record.workingDays}</td>
<td>{record.totalHours}</td>
<td>{record.overtime}</td>
</tr>
{/each}
</tbody>
</table>
{/if}
</article>
</section>
+31
View File
@@ -0,0 +1,31 @@
<script>
import Views from "./Views.svelte";
export let params;
params = {
title: 'Wochenansicht',
records: [],
isLoading: true
}
const View = {
'browse': () => {
fetch(env.API_URL + '/views/working-hours/weekly')
.then(res => {
if (!res.ok) {
throw new Error('Fail!');
}
return res.json();
})
.then(data => {
params.records = data;
params.isLoading = false;
})
.catch(err => {
params.isLoading = false;
console.log(err);
});
}
};
View.browse();
</script>
<Views {params} />
+197
View File
@@ -0,0 +1,197 @@
<script>
export let params;
let title = "Bearbeitung Einträge"
import IconifyIcon from '@iconify/svelte';
import wrenchIcon from '@iconify-icons/oi/wrench';
import checkIcon from '@iconify-icons/oi/check';
import xIcon from '@iconify-icons/oi/x';
import documentIcon from '@iconify-icons/oi/document';
let activeRecord = null;
let newRecord = false;
params = {
title: 'Einträge',
records: [],
isLoading: true
}
const Records = {
'browse': () => {
// noinspection JSUnresolvedVariable
fetch(env.API_URL + '/working-hours')
.then(res => {
if (!res.ok) {
throw new Error('Fail!');
}
return res.json();
})
.then(data => {
activeRecord = null;
params.records = data;
params.isLoading = false;
})
.catch(err => {
params.isLoading = false;
console.log(err);
});
},
'read': date => {
// noinspection JSUnresolvedVariable
fetch(env.API_URL + '/working-hours/' + date)
.then(res => {
if (!res.ok) {
throw new Error('Fail!');
}
return res.json();
})
.then(data => {
activeRecord = data;
if (date === null) {
Records.browse();
}
})
.catch(err => {
console.log(err);
});
},
'add': record => {
console.log(record);
// noinspection JSUnresolvedVariable
fetch(env.API_URL + '/working-hours', {
method: 'POST',
mode: 'no-cors',
cache: 'no-cache',
credentials: 'same-origin',
headers: {
'Content-Type': 'application/json'
},
redirect: 'follow',
referrerPolicy: 'no-referrer',
body: JSON.stringify(record)
})
.then(res => {
if (!res.ok) {
throw new Error('Fail!');
}
})
.then(() => {
newRecord = false;
Records.browse();
})
.catch(err => {
console.log(err);
});
},
'update': (date, record) => {
console.log(record);
// noinspection JSUnresolvedVariable
fetch(env.API_URL + '/working-hours/' + date, {
method: 'PUT',
mode: 'no-cors',
cache: 'no-cache',
credentials: 'same-origin',
headers: {
'Content-Type': 'application/json'
},
redirect: 'follow',
referrerPolicy: 'no-referrer',
body: JSON.stringify(record)
})
.then(res => {
if (!res.ok) {
throw new Error('Fail!');
}
})
.then(() => {
Records.browse();
})
.catch(err => {
console.log(err);
});
}
};
Records.browse();
</script>
<svelte:head>
<title>{title}</title>
</svelte:head>
{#if activeRecord === null}
<section id="list-records">
<header>
<h1>{title}</h1>
</header>
<article>
{#if params.isLoading === true}
<p>Loading...</p>
{:else}
<!--suppress HtmlUnknownTarget -->
<form action="/working-hours">
<fieldset>
<button on:click={() => {activeRecord = {}; newRecord = true}}>Neuer Eintrag
<IconifyIcon icon={documentIcon}/>
</button>
</fieldset>
</form>
<table>
<thead>
<tr>
<th>Datum</th>
<th>Arbeitsstunden</th>
<th>Aktionen</th>
</tr>
</thead>
<tbody>
{#each params.records as record}
<tr>
<td>{record.workingDay}</td>
<td>{record.workingTime}</td>
<td>
<button on:click={() => Records.read(record.workingDay)}>Bearbeiten
<IconifyIcon icon={wrenchIcon}/>
</button>
</td>
</tr>
{/each}
</tbody>
</table>
{/if}
</article>
</section>
{:else}
<section id="edit-record">
<header>
<h1>{title}</h1>
</header>
<article>
<!--suppress HtmlUnknownTarget -->
<form action="/working-hours" name="editRecord">
<fieldset name="record-data">
<div>
<label for="workingDay">Arbeitstag</label>
<input bind:value={activeRecord.workingDay} placeholder="Arbeitstag" type="date"
id="workingDay">
</div>
<div>
<label for="workingTime">Arbeitszeit</label>
<input bind:value={activeRecord.workingTime} placeholder="Arbeitszeit" type="time"
id="workingTime">
</div>
</fieldset>
<fieldset name="buttons">
{#if newRecord === true}
<button on:click={() => Records.add(activeRecord)}>Übernehmen
<IconifyIcon icon={checkIcon} color="green"/>
</button>
{:else}
<button on:click={() => Records.update(activeRecord.workingDay, activeRecord)}>Übernehmen
<IconifyIcon icon={checkIcon} color="green"/>
</button>
{/if}
<button on:click={() => Records.read(null)}>Abbrechen
<IconifyIcon icon={xIcon}/>
</button>
</fieldset>
</form>
</article>
</section>
{/if}
+31
View File
@@ -0,0 +1,31 @@
<script>
import Views from "./Views.svelte";
export let params;
params = {
title: 'Jahresansicht',
records: [],
isLoading: true
}
const View = {
'browse': () => {
fetch(env.API_URL + '/views/working-hours/yearly')
.then(res => {
if (!res.ok) {
throw new Error('Fail!');
}
return res.json();
})
.then(data => {
params.records = data;
params.isLoading = false;
})
.catch(err => {
params.isLoading = false;
console.log(err);
});
}
};
View.browse();
</script>
<Views {params} />