Compare commits
No commits in common. "d8c0e553404fe36705df6fd973ca8e67609b1eee" and "6c548272fe307c9f207580c834ad0fe1bc46b99d" have entirely different histories.
d8c0e55340
...
6c548272fe
|
|
@ -33,8 +33,8 @@
|
|||
}
|
||||
},
|
||||
"caldav": {
|
||||
"address": "http://localhost:8000/calendars/-/demo",
|
||||
"username": "demo-{{username}}",
|
||||
"address": "http://localhost:8000/calendars/-/lampukistan",
|
||||
"username": "lampukistan-{{username}}",
|
||||
"password": "{{password}}",
|
||||
"setup_hints": [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,296 +0,0 @@
|
|||
{
|
||||
"users": [
|
||||
{
|
||||
"id": 1,
|
||||
"name": "alice",
|
||||
"email_address": "alice@example.org",
|
||||
"dav_token": "alice_dav",
|
||||
"password": "alice"
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"name": "bob",
|
||||
"email_address": "bob@example.org",
|
||||
"dav_token": null,
|
||||
"password": "bob"
|
||||
}
|
||||
],
|
||||
"calendars": [
|
||||
{
|
||||
"id": 1,
|
||||
"name": "Feiertage",
|
||||
"hue": 0.0000,
|
||||
"access": {
|
||||
"public": true,
|
||||
"default_level": "edit",
|
||||
"attributed": [
|
||||
]
|
||||
},
|
||||
"resource": {
|
||||
"kind": "local",
|
||||
"data": {
|
||||
"events": [
|
||||
{
|
||||
"name": "Tag des Wassers",
|
||||
"begin": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": [0]},
|
||||
{"action": "shift_week", "args": [-1]},
|
||||
{"action": "shift_day", "args": [1]}
|
||||
],
|
||||
"time": null
|
||||
},
|
||||
"end": null,
|
||||
"location": null,
|
||||
"description": null
|
||||
},
|
||||
{
|
||||
"name": "Tag der Erde",
|
||||
"begin": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": [0]},
|
||||
{"action": "shift_week", "args": [0]},
|
||||
{"action": "shift_day", "args": [6]}
|
||||
],
|
||||
"time": null
|
||||
},
|
||||
"end": null,
|
||||
"location": null,
|
||||
"description": null
|
||||
},
|
||||
{
|
||||
"name": "Tag der Luft",
|
||||
"begin": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": [0]},
|
||||
{"action": "shift_week", "args": [2]},
|
||||
{"action": "shift_day", "args": [4]}
|
||||
],
|
||||
"time": null
|
||||
},
|
||||
"end": null,
|
||||
"location": null,
|
||||
"description": null
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"name": "Garten",
|
||||
"hue": 0.3333,
|
||||
"access": {
|
||||
"public": false,
|
||||
"default_level": "none",
|
||||
"attributed": [
|
||||
{
|
||||
"user_id": 1,
|
||||
"level": "admin"
|
||||
},
|
||||
{
|
||||
"user_id": 2,
|
||||
"level": "view"
|
||||
}
|
||||
]
|
||||
},
|
||||
"resource": {
|
||||
"kind": "local",
|
||||
"data": {
|
||||
"events": [
|
||||
{
|
||||
"name": "Unkraut jähten",
|
||||
"begin": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": []},
|
||||
{"action": "shift_week", "args": [-1]},
|
||||
{"action": "shift_day", "args": [3]}
|
||||
],
|
||||
"time": {"hour": 10, "minute": 0, "second": 0}
|
||||
},
|
||||
"end": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": []},
|
||||
{"action": "shift_week", "args": [-1]},
|
||||
{"action": "shift_day", "args": [3]}
|
||||
],
|
||||
"time": {"hour": 11, "minute": 0, "second": 0}
|
||||
},
|
||||
"location": "Drosselweg 7",
|
||||
"description": "Giersch und Rainkohl haben wider gewuchert"
|
||||
},
|
||||
{
|
||||
"name": "Holz hacken",
|
||||
"begin": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": []},
|
||||
{"action": "shift_week", "args": [0]},
|
||||
{"action": "shift_day", "args": [0]}
|
||||
],
|
||||
"time": {"hour": 13, "minute": 0, "second": 0}
|
||||
},
|
||||
"end": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": []},
|
||||
{"action": "shift_week", "args": [0]},
|
||||
{"action": "shift_day", "args": [0]}
|
||||
],
|
||||
"time": {"hour": 14, "minute": 0, "second": 0}
|
||||
},
|
||||
"location": "Drosselweg 7",
|
||||
"description": "die alte Birke ist bereits in Segmente geschnitten und muss nun noch in handliche Scheite zerlegt werden"
|
||||
},
|
||||
{
|
||||
"name": "Blumen gießen",
|
||||
"begin": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": []},
|
||||
{"action": "shift_week", "args": [1]},
|
||||
{"action": "shift_day", "args": [2]}
|
||||
],
|
||||
"time": {"hour": 18, "minute": 0, "second": 0}
|
||||
},
|
||||
"end": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": []},
|
||||
{"action": "shift_week", "args": [1]},
|
||||
{"action": "shift_day", "args": [2]}
|
||||
],
|
||||
"time": {"hour": 19, "minute": 0, "second": 0}
|
||||
},
|
||||
"location": "Drosselweg 7",
|
||||
"description": "erst in der Abendzeit, damit die Sonne tief steht und das Gießen sich lohnt"
|
||||
},
|
||||
{
|
||||
"name": "Grill-Fete",
|
||||
"begin": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": []},
|
||||
{"action": "shift_week", "args": [1]},
|
||||
{"action": "shift_day", "args": [5]}
|
||||
],
|
||||
"time": {"hour": 18, "minute": 0, "second": 0}
|
||||
},
|
||||
"end": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": []},
|
||||
{"action": "shift_week", "args": [1]},
|
||||
{"action": "shift_day", "args": [5]}
|
||||
],
|
||||
"time": {"hour": 23, "minute": 0, "second": 0}
|
||||
},
|
||||
"location": "Drosselweg 7",
|
||||
"description": "Grillgut ist selbst mitzubringen; Getränke sind bereits vor Ort"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"name": "Haus",
|
||||
"hue": 0.6667,
|
||||
"access": {
|
||||
"public": false,
|
||||
"default_level": "none",
|
||||
"attributed": [
|
||||
{
|
||||
"user_id": 1,
|
||||
"level": "none"
|
||||
},
|
||||
{
|
||||
"user_id": 2,
|
||||
"level": "admin"
|
||||
}
|
||||
]
|
||||
},
|
||||
"resource": {
|
||||
"kind": "local",
|
||||
"data": {
|
||||
"events": [
|
||||
{
|
||||
"name": "Bad putzen",
|
||||
"begin": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": []},
|
||||
{"action": "shift_week", "args": [-1]},
|
||||
{"action": "shift_day", "args": [4]}
|
||||
],
|
||||
"time": {"hour": 8, "minute": 0, "second": 0}
|
||||
},
|
||||
"end": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": []},
|
||||
{"action": "shift_week", "args": [-1]},
|
||||
{"action": "shift_day", "args": [4]}
|
||||
],
|
||||
"time": {"hour": 9, "minute": 0, "second": 0}
|
||||
},
|
||||
"location": "Eschenhain 11",
|
||||
"description": "das Waschbecken sollte unbedingt von Keimen befreit werden"
|
||||
},
|
||||
{
|
||||
"name": "Abstellkammer aufräumen",
|
||||
"begin": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": []},
|
||||
{"action": "shift_week", "args": [1]},
|
||||
{"action": "shift_day", "args": [0]}
|
||||
],
|
||||
"time": {"hour": 12, "minute": 0, "second": 0}
|
||||
},
|
||||
"end": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": []},
|
||||
{"action": "shift_week", "args": [1]},
|
||||
{"action": "shift_day", "args": [0]}
|
||||
],
|
||||
"time": {"hour": 13, "minute": 0, "second": 0}
|
||||
},
|
||||
"location": "Eschenhain 11",
|
||||
"description": "einiges davon kann vermutlich gleich entsorgt werden"
|
||||
},
|
||||
{
|
||||
"name": "Treppe wischen",
|
||||
"begin": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": []},
|
||||
{"action": "shift_week", "args": [2]},
|
||||
{"action": "shift_day", "args": [1]}
|
||||
],
|
||||
"time": {"hour": 14, "minute": 0, "second": 0}
|
||||
},
|
||||
"end": {
|
||||
"timezone_shift": 0,
|
||||
"date_relative": [
|
||||
{"action": "trunc_week", "args": []},
|
||||
{"action": "shift_week", "args": [2]},
|
||||
{"action": "shift_day", "args": [1]}
|
||||
],
|
||||
"time": {"hour": 15, "minute": 0, "second": 0}
|
||||
},
|
||||
"location": "Eschenhain 11",
|
||||
"description": "die dreckigen Schuhe haben ihre Spuren hinterlassen"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -75,7 +75,7 @@ namespace _zeitbild.api
|
|||
?
|
||||
null
|
||||
:
|
||||
(await _zeitbild.service.user.get(user_id))
|
||||
await _zeitbild.service.user.get(user_id)
|
||||
);
|
||||
return Promise.resolve(
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue