Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@stillday
stillday committed Oct 28, 2021
2 parents bfc4c0b + 5688502 commit 474d0be
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 32 deletions.
38 changes: 18 additions & 20 deletions src/lib/Header/index.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,31 @@
</div>
<div class="nav-burger-menu-list">
<div class="nav-burger-menu-link" class:active={$page.path === '/'}><a class="nav-menu-link" sveltekit:prefetch href="/">Home</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/classes'}><a class="nav-menu-link" sveltekit:prefetch href="/classes">Classes</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/classfeatures'}><a class="nav-menu-link" sveltekit:prefetch href="/classfeatures">Class features</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/heroes'}><a class="nav-menu-link" sveltekit:prefetch href="/heroes">Heroes</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/items'}><a class="nav-menu-link" sveltekit:prefetch href="/items">Items</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/monsterfeatures'}><a class="nav-menu-link" sveltekit:prefetch href="/monsterfeatures">Monster features</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/items'}><a class="nav-menu-link" sveltekit:prefetch href="/items">Gegenstände</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/tradegoods'}><a class="nav-menu-link" sveltekit:prefetch href="/tradegoods">Handelsgüter</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/heroes'}><a class="nav-menu-link" sveltekit:prefetch href="/heroes">Helden</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/classes'}><a class="nav-menu-link" sveltekit:prefetch href="/classes">Klassen</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/classfeatures'}><a class="nav-menu-link" sveltekit:prefetch href="/classfeatures">Klassenfähigkeiten</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/monster'}><a class="nav-menu-link" sveltekit:prefetch href="/monster">Monster</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/races'}><a class="nav-menu-link" sveltekit:prefetch href="/races">Races</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/rules'}><a class="nav-menu-link" sveltekit:prefetch href="/rules">Rules</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/spells'}><a class="nav-menu-link" sveltekit:prefetch href="/spells">Spells</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/tradegoods'}><a class="nav-menu-link" sveltekit:prefetch href="/tradegoods">Tragegoods</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/monsterfeatures'}><a class="nav-menu-link" sveltekit:prefetch href="/monsterfeatures">Monsterfähigkeiten</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/rules'}><a class="nav-menu-link" sveltekit:prefetch href="/rules">Regeln</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/races'}><a class="nav-menu-link" sveltekit:prefetch href="/races">Völker</a></div>
<div class="nav-burger-menu-link" class:active={$page.path === '/spells'}><a class="nav-menu-link" sveltekit:prefetch href="/spells">Zauber</a></div>
</div>
</div>
</div>
<div class="nav-menu-wp">
<div class="nav-menu-inner" class:active={$page.path === '/'}><a class="nav-menu-link" sveltekit:prefetch href="/">Home</a></div>
{#if $isAuthenticated}
<div class="nav-menu-inner" class:active={$page.path === '/classes'}><a class="nav-menu-link" sveltekit:prefetch href="/classes">Classes</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/classfeatures'}><a class="nav-menu-link" sveltekit:prefetch href="/classfeatures">Class features</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/heroes'}><a class="nav-menu-link" sveltekit:prefetch href="/heroes">Heroes</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/items'}><a class="nav-menu-link" sveltekit:prefetch href="/items">Items</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/monsterfeatures'}><a class="nav-menu-link" sveltekit:prefetch href="/monsterfeatures">Monster features</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/items'}><a class="nav-menu-link" sveltekit:prefetch href="/items">Gegenstände</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/tradegoods'}><a class="nav-menu-link" sveltekit:prefetch href="/tradegoods">Handelsgüter</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/heroes'}><a class="nav-menu-link" sveltekit:prefetch href="/heroes">Helden</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/classes'}><a class="nav-menu-link" sveltekit:prefetch href="/classes">Klassen</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/classfeatures'}><a class="nav-menu-link" sveltekit:prefetch href="/classfeatures">Klassenfähigkeiten</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/monster'}><a class="nav-menu-link" sveltekit:prefetch href="/monster">Monster</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/races'}><a class="nav-menu-link" sveltekit:prefetch href="/races">Races</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/rules'}><a class="nav-menu-link" sveltekit:prefetch href="/rules">Rules</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/spells'}><a class="nav-menu-link" sveltekit:prefetch href="/spells">Spells</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/tradegoods'}><a class="nav-menu-link" sveltekit:prefetch href="/tradegoods">Tragegoods</a></div>
{/if}
<div class="nav-menu-inner" class:active={$page.path === '/monsterfeatures'}><a class="nav-menu-link" sveltekit:prefetch href="/monsterfeatures">Monsterfähigkeiten</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/rules'}><a class="nav-menu-link" sveltekit:prefetch href="/rules">Regeln</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/races'}><a class="nav-menu-link" sveltekit:prefetch href="/races">Völker</a></div>
<div class="nav-menu-inner" class:active={$page.path === '/spells'}><a class="nav-menu-link" sveltekit:prefetch href="/spells">Zauber</a></div>
</div>
<div class="nav-menu-user-wp">
{#if $isAuthenticated}
Expand Down
8 changes: 8 additions & 0 deletions src/lib/components/translater.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,8 @@ if ($isAuthenticated) {
<button on:click={() => handelClick(i, 'name')} class="btn">
{shown.name[i] ?'safe' : 'Edit'}
</button>
{:else}
<button disabled>Edit</button>
{/if}
</div>
</div>
Expand All @@ -263,6 +265,8 @@ if ($isAuthenticated) {
<button on:click={() => handelClick(i, 'description')} class="btn" id="{file + '.description.' + [i]}">
{shown.description[i] ? 'safe' : 'Edit'}
</button>
{:else}
<button disabled>Edit</button>
{/if}
</div>
{#if filename === 'Zauber (SRD)'}
Expand All @@ -273,6 +277,8 @@ if ($isAuthenticated) {
<button on:click={() => handelClick(i, 'material')} class="btn" id="{file + '.material.' + [i]}">
{shown.material[i] ? 'safe' : 'Edit'}
</button>
{:else}
<button disabled>Edit</button>
{/if}
</div>
{/if}
Expand All @@ -283,6 +289,8 @@ if ($isAuthenticated) {
<button on:click={() => handelClick(i, 'source')} class="btn">
{shown.source[i] ?'safe' : 'Edit'}
</button>
{:else}
<button disabled>Edit</button>
{/if}
</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions src/lib/cookie.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ export function setCookie(cname, cvalue, exdays) {
}

export function readCookie(request) {
const cookies = {};
request.headers.cookie.split(';').forEach(function(cookie) {
const parts = cookie.match(/(.*?)=(.*)$/)
cookies[ parts[1].trim() ] = (parts[2] || '').trim();
});
return cookies;
const cookies = {};
request.headers.cookie.split(';').forEach(function(cookie) {
const parts = cookie.match(/(.*?)=(.*)$/)
cookies[ parts[1].trim() ] = (parts[2] || '').trim();
});
return cookies;
}
3 changes: 2 additions & 1 deletion src/lib/logger.ts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import * as SimpleNodeLogger from 'simple-node-logger';
const create = SimpleNodeLogger?.createSimpleLogger;

// create a custom timestamp format for log statements
const opts = {
logFilePath:'./src/lib/log/changefrom.log',
timestampFormat:'YYYY-MM-DD HH:mm:ss'
}
export const log = SimpleNodeLogger.createSimpleLogger( opts );
export const log = typeof create === 'function' ? create( opts ): null;
2 changes: 1 addition & 1 deletion src/lib/ts/log.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ import { log } from "$lib/logger";

export function setFileLog(openFile):void {

log.info('User ', ' öffnet folgende file', openFile);
log?.info('User ', ' öffnet folgende file', openFile);
};
1 change: 0 additions & 1 deletion src/routes/api/db.json.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export const get: RequestHandler<Locals, string> = async (request) => {
const file = request.query.get('file');

if (file) {
setFileLog(file, readCookie(request)[translatorUser]);
body = await readFile(file);
}
return {
Expand Down
5 changes: 2 additions & 3 deletions src/routes/index.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<script lang="ts">
import { isAuthenticated, login } from '$lib/auth';
import { user } from '$lib/store';
import { readCookie, setCookie, translatorUser } from '$lib/cookie';
import { setCookie, translatorUser } from '$lib/cookie';
import Translater from '$lib/components/Translater.svelte';
import { src_url_equal } from 'svelte/internal';
Expand Down Expand Up @@ -44,8 +44,7 @@ if ($isAuthenticated) {
</div>
<div>
<p>
Krümelchen, [27.10.21 22:04]
Großartig, dass du uns bei der Übersetzung von DnD unterstützen möchtest.
Großartig, dass du uns bei der Übersetzung von DnD unterstützen möchtest.
Die Seite befindet sich aktuell in einer Beta, daher kann es zu kleinen Problemen kommen.
Du hast einen Fehler entdeckt oder einen Vorschlag für Verbesserung? Dann erstelle bitte ein Issue:
<a href="https://github.com/League-of-Foundry-Developers/foundryvtt-dnd5e-lang-de-ui/issues">github</a>
Expand Down

0 comments on commit 474d0be

Please sign in to comment.