Compare commits

..

13 Commits

Author SHA1 Message Date
1e29aa8583 fixed frontend path
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-02-11 14:48:01 +01:00
214a4c00f5 finished loading item by db id
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-02-11 14:32:41 +01:00
12ed6d47ec working on loading item by id 2026-02-11 13:41:45 +01:00
76651b1e46 bugfix: still had problems with the menu entry urls
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m32s
Build Docker Image / Clean-Registry (push) Successful in 3s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-02-09 16:11:23 +01:00
cb21560f7c bugfix: menu code did not properly handle module paths on non-top-level pages
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m33s
Build Docker Image / Clean-Registry (push) Successful in 3s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-02-09 16:03:31 +01:00
5f07a04c43 added additional key
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 4m18s
Build Docker Image / Clean-Registry (push) Successful in 2s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-02-09 13:13:11 +01:00
ece5a1ae85 implemented configurable menu, needs testing!
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-02-07 17:39:58 +01:00
e48bac4ce2 preparing for main menu configuration
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-02-06 10:05:13 +01:00
d0866ab73f updated colors for code snippets in markdown
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m21s
Build Docker Image / Clean-Registry (push) Successful in 3s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-02-06 08:37:57 +01:00
a13b4f40d4 moved ccosntant CONFIG_SESSION_DURATION to correct file
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m56s
Build Docker Image / Clean-Registry (push) Successful in 4s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-02-04 10:18:25 +01:00
008501357f allowing to configure session duration
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m18s
Build Docker Image / Clean-Registry (push) Successful in -4s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-02-04 10:03:28 +01:00
ce62675fa5 improved style of main menu and message settings for mobile devices
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m29s
Build Docker Image / Clean-Registry (push) Successful in -4s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-02-04 08:42:00 +01:00
586899bdc8 minor bugfix in wiki index
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m43s
Build Docker Image / Clean-Registry (push) Successful in -4s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-02-03 20:24:27 +01:00
24 changed files with 261 additions and 81 deletions

View File

@@ -12,6 +12,7 @@ import de.srsoftware.tools.ColorLogger;
import de.srsoftware.umbrella.bookmarks.BookmarkApi;
import de.srsoftware.umbrella.company.CompanyModule;
import de.srsoftware.umbrella.contact.ContactModule;
import de.srsoftware.umbrella.core.SettingsService;
import de.srsoftware.umbrella.core.Util;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.documents.DocumentApi;
@@ -88,6 +89,7 @@ public class Application {
new WebHandler().bindPath("/").on(server);
new WikiModule(config).bindPath("/api/wiki").on(server);
new FileModule(config).bindPath("/api/files").on(server);
new SettingsService(config).bindPath("/api/settings").on(server);
} catch (Exception e) {
LOG.log(ERROR,"Startup failed",e);
System.exit(-1);

View File

@@ -0,0 +1,119 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.core;
import static de.srsoftware.umbrella.core.ModuleRegistry.userService;
import static de.srsoftware.umbrella.core.constants.Constants.CLASS;
import static de.srsoftware.umbrella.core.constants.Field.*;
import static de.srsoftware.umbrella.core.constants.Path.MENU;
import static de.srsoftware.umbrella.core.constants.Text.*;
import static de.srsoftware.umbrella.core.constants.Text.USERS;
import static java.text.MessageFormat.format;
import com.sun.net.httpserver.HttpExchange;
import de.srsoftware.configuration.Configuration;
import de.srsoftware.tools.Mappable;
import de.srsoftware.tools.Path;
import de.srsoftware.tools.SessionToken;
import de.srsoftware.umbrella.core.constants.Module;
import de.srsoftware.umbrella.core.constants.Text;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Token;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.io.IOException;
import java.util.*;
import org.json.JSONObject;
public class SettingsService extends BaseHandler {
private final Configuration config;
public SettingsService(Configuration config) {
this.config = config;
}
@Override
public boolean doGet(Path path, HttpExchange ex) throws IOException {
addCors(ex);
try {
Optional<Token> token = SessionToken.from(ex).map(Token::of);
var user = userService().loadUser(token);
if (user.isEmpty()) return unauthorized(ex);
var head = path.pop();
return switch (head) {
case MENU -> getMenuSettings(user.get(), ex);
case null, default -> super.doGet(path, ex);
};
} catch (UmbrellaException e) {
return send(ex, e);
}
}
private record MenuEntry(int pos, String module, String clazz, String title) implements Mappable {
public static MenuEntry of(int pos, String module){
return new MenuEntry(pos, module, module, module);
}
public static MenuEntry of(int pos, String module, String title){
return new MenuEntry(pos,module,module,title);
}
public static MenuEntry of(int pos, String module, String clazz, String title){
return new MenuEntry(pos,module,clazz,title);
}
@Override
public Map<String, Object> toMap() {
return Map.of(MODULE,module,CLASS,clazz,TITLE,title);
}
}
private boolean getMenuSettings(UmbrellaUser user, HttpExchange ex) throws IOException {
Optional<JSONObject> modules = config.get("umbrella.modules");
if (modules.isEmpty()) throw UmbrellaException.missingConfig("umbrella.modules");
var entries = new ArrayList<MenuEntry>();
entries.add(MenuEntry.of(1, Module.USER, USERS));
entries.add(MenuEntry.of(2, Module.COMPANY, COMPANIES));
entries.add(MenuEntry.of(3, Module.PROJECT,Text.PROJECTS));
entries.add(MenuEntry.of(4,Module.TASK,Text.TASKS));
entries.add(MenuEntry.of(5,Module.TAGS));
entries.add(MenuEntry.of(6,Module.DOCUMENT,"doc",Text.DOCUMENTS));
entries.add(MenuEntry.of(7,Module.BOOKMARK,"mark",BOOKMARKS));
entries.add(MenuEntry.of(8,Module.NOTES,"note",Text.NOTES));
entries.add(MenuEntry.of(9,Module.FILES,"file", FILES));
entries.add(MenuEntry.of(10,Module.TIME, Text.TIMETRACKING));
entries.add(MenuEntry.of(11,Module.WIKI));
entries.add(MenuEntry.of(12,Module.CONTACT, CONTACTS));
entries.add(MenuEntry.of(13,Module.STOCK));
entries.add(MenuEntry.of(14,Module.MESSAGE, MESSAGES));
entries.add(MenuEntry.of(15,Module.POLL,Text.POLLS));
for (var i=0; i<entries.size(); i++){
var entry = entries.get(i);
var key = format("umbrella.modules.{0}.menuIndex",entry.module);
Optional<Integer> val = config.get(key);
if (val.isEmpty()) {
key = format("umbrella.modules.{0}.menu_index",entry.module);
val = config.get(key);
}
if (val.isPresent()) {
var index = val.get();
if (index<0) {
entries.remove(i);
i--;
continue;
} else {
entry = MenuEntry.of(index,entry.module,entry.clazz,entry.title);
entries.set(i,entry);
}
}
key = format("umbrella.modules.{0}.baseUrl",entry.module);
Optional<String> baseUrl = config.get(key);
if (baseUrl.isPresent()) {
entry = MenuEntry.of(entry.pos,baseUrl.get(), entry.clazz,entry.title);
entries.set(i,entry);
}
}
var list = entries.stream().sorted((a,b) -> a.pos - b.pos)
.map(MenuEntry::toMap).toList();
return sendContent(ex,list);
}
}

View File

@@ -12,7 +12,10 @@ public class Constants {
// prevent instantiation
}
public static final String COUNT = "COUNT(*)";
public static final String CLASS = "class";
public static final String CONFIG_SESSION_DURATION = "umbrella.session.duration";
public static final String COUNT = "COUNT(*)";
public static final String FALLBACK_LANG = "de";
public static final String HOME = "home";
public static final String JSONARRAY = "json array";
@@ -20,8 +23,10 @@ public class Constants {
public static final String KEEP_ALIVE = "keep-alive";
public static final String NO_CACHE = "no-cache";
public static final String NONE = "none";
public static final String TABLE_SETTINGS = "settings";
public static final String TABLE_SETTINGS = "settings";
public static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
public static final String UMBRELLA = "Umbrella";
public static final String UTF8 = UTF_8.displayName();

View File

@@ -86,6 +86,7 @@ public class Field {
public static final String LOGIN = "login";
public static final String MEMBERS = "members";
public static final String MENU_INDEX = "menu_index";
public static final String MESSAGE_ID = "message_id";
public static final String MIME = "mime";
public static final String MODULE = "module";

View File

@@ -4,8 +4,17 @@ package de.srsoftware.umbrella.core.constants;
public class Module {
public static final String BOOKMARK = "bookmark";
public static final String COMPANY = "company";
public static final String CONTACT = "contact";
public static final String DOCUMENT = "document";
public static final String FILES = "files";
public static final String MESSAGE = "message";
public static final String NOTES = "notes";
public static final String POLL = "poll";
public static final String PROJECT = "project";
public static final String STOCK = "stock";
public static final String TAGS = "tags";
public static final String TASK = "task";
public static final String TIME = "time";
public static final String USER = "user";
public static final String WIKI = "wiki";
}

View File

@@ -6,10 +6,10 @@ public class Path {
public static final String ADD = "add";
public static final String AVAILABLE = "available";
public static final String CSS = "css";
public static final String COMMON_TEMPLATES = "common_templates";
public static final String COMPANY = "company";
public static final String CONNECTED = "connected";
public static final String CSS = "css";
public static final String COMMON_TEMPLATES = "common_templates";
public static final String COMPANY = "company";
public static final String CONNECTED = "connected";
public static final String ITEM = "item";
@@ -22,6 +22,9 @@ public class Path {
public static final String LOGIN = "login";
public static final String LOGOUT = "logout";
public static final String MENU = "menu";
public static final String PAGE = "page";
public static final String PASSWORD = "password";
public static final String PROJECT = "project";

View File

@@ -5,8 +5,9 @@ package de.srsoftware.umbrella.core.constants;
* This is a collection of messages that appear throughout the project
*/
public class Text {
public static final String BOOKMARK = "bookmark";
public static final String BOOLEAN = "Boolean";
public static final String BOOKMARK = "bookmark";
public static final String BOOKMARKS = "bookmarks";
public static final String BOOLEAN = "Boolean";
public static final String COMPANIES = "companies";
public static final String COMPANY = "company";
@@ -24,6 +25,8 @@ public class Text {
public static final String EMAILS_FOR_RECEIVER = "emails for {email}";
public static final String FILES = "files";
public static final String INVALID_DB_CODE = "Encountered invalid dbCode: {code}";
public static final String ITEM = "item";
public static final String ITEMS = "items";
@@ -34,13 +37,16 @@ public class Text {
public static final String LONG = "Long";
public static final String MESSAGE = "message";
public static final String MESSAGES = "messages";
public static final String NOTE = "note";
public static final String NOTES = "notes";
public static final String NOTE_WITH_ID = "note ({id})";
public static final String NUMBER = "number";
public static final String PATH = "path";
public static final String PROJECT = "project";
public static final String POLLS = "polls";
public static final String PROJECTS = "projects";
public static final String PROJECT_WITH_ID = "project ({id})";
public static final String PROPERTIES = "properties";
public static final String PROPERTY = "property";
@@ -52,18 +58,21 @@ public class Text {
public static final String SERVICE_WITH_ID = "service ({id})";
public static final String SESSION = "session";
public static final String SETTINGS = "settings";
public static final String STOCK = "stock";
public static final String STRING = "string";
public static final String TABLE_WITH_NAME = "table {name}";
public static final String TAGS = "tags";
public static final String TASK = "task";
public static final String TASKS = "tasks";
public static final String TIMETRACKING = "timetracking";
public static final String TIME_WITH_ID = "time ({id})";
public static final String TYPE = "type";
public static final String UNIT = "unit";
public static final String USER_WITH_ID = "user ({id})";
public static final String WIKI = "wiki";
public static final String WIKI_PAGE = "wiki page";
public static final String WIKI_PAGES = "wiki pages";

View File

@@ -103,7 +103,8 @@
<Route path="/search" component={Search} />
<Route path="/stock" component={Stock} />
<Route path="/stock/location/:location_id" component={Stock} />
<Route path="/stock/:owner/:owner_id/item/:item_id" component={Stock} />
<Route path="/stock/:item_id/view" component={Stock} />
<Route path="/stock/:owner/:owner_id/item/:owner_number" component={Stock} />
<Route path="/tags" component={TagList} />
<Route path="/tags/use/:tag" component={TagUses} />
<Route path="/task" component={TaskList} />

View File

@@ -2,27 +2,25 @@
import { onMount } from 'svelte';
import { useTinyRouter } from 'svelte-tiny-router';
import { logout, user } from '../user.svelte.js';
import { t } from '../translations.svelte.js';
import { api, get } from '../urls.svelte';
import { error } from '../warn.svelte';
import { logout, user } from '../user.svelte';
import { t } from '../translations.svelte';
import TimeRecorder from './TimeRecorder.svelte';
let key = $state(null);
const router = useTinyRouter();
const modules = $state([]);
let modules = $state(null);
let expand = $state(false);
async function fetchModules(){
const url = `${location.protocol}//${location.host.replace('5173','8080')}/legacy/user/modules`;
const resp = await fetch(url,{credentials:'include'});
if (resp.ok){
const arr = await resp.json();
for (let entry of arr) {
let name = t('module.'+entry.module);
if (name) modules.push({name:name,url:entry.url});
}
let url = api('settings/menu');
const res = await get(url);
if (res.ok){
modules = await res.json();
} else {
console.log('error');
error(res);
}
}
@@ -30,7 +28,11 @@ function onclick(e){
e.preventDefault();
expand = false;
let href = e.target.getAttribute('href');
if (href) router.navigate(href);
if (href) {
if (href.includes('://')) {
window.location.href = href;
} else router.navigate(href);
}
return false;
}
@@ -55,27 +57,13 @@ onMount(fetchModules);
<input type="text" bind:value={key} />
<button type="submit">{t('search')}</button>
</form>
<button class="symbol" onclick={e => expand = !expand}></button>
<a href="/user" {onclick} class="user">{t('users')}</a>
<a href="/company" {onclick} class="company">{t('companies')}</a>
<a href="/project" {onclick} class="project">{t('projects')}</a>
<a href="/task" {onclick} class="task">{t('tasks')}</a>
<a href="/tags" {onclick} class="tags">{t('tags')}</a>
<a href="/document" {onclick} class="doc">{t('documents')}</a>
<a href="/bookmark" {onclick} class="mark">{t('bookmarks')}</a>
<a href="/notes" {onclick} class="note">{t('notes')}</a>
<a href="/files" {onclick} class="file">{t('files')}</a>
<a href="/time" {onclick} class="time">{t('timetracking')}</a>
<a href="/wiki" {onclick} class="wiki">{t('wiki')}</a>
<a href="/contact" {onclick} class="contact">{t('contacts')}</a>
<a href="/stock" {onclick} class="stock">{t('stock')}</a>
<a href="/message" {onclick} class="message">{t('messages')}</a>
<button class="symbol" onclick={e => expand = !expand}> </button>
{#each modules as module,i}
<a href={module.module.includes('://') ? module.module : '/'+module.module} {onclick} class={module.class}>{@html t(module.title)}</a>
{/each}
{#if user.id == 2}
<a href="https://svelte.dev/tutorial/svelte/state" target="_blank">{t('tutorial')}</a>
{/if}
{#each modules as module,i}
{#if module.name.trim()}<a href={module.url}>{module.name}</a>{/if}
{/each}
{#if user.name }
<a class="logout" onclick={logout}>{t('logout_user',{user:user.name})}</a>
{/if}

View File

@@ -62,7 +62,7 @@
</script>
<fieldset>
<legend>{t('messages')} <button onclick={showSettings}>{t('settings')}</button></legend>
<legend>{@html t('messages')} <button onclick={showSettings}>{t('settings')}</button></legend>
<table>
<thead>
<tr>

View File

@@ -1,5 +1,6 @@
<script>
import { onMount } from 'svelte';
import { useTinyRouter } from 'svelte-tiny-router';
import { api, drop, get, patch } from '../../urls.svelte';
import { error, yikes } from '../../warn.svelte';
import { t } from '../../translations.svelte';
@@ -17,8 +18,9 @@
let location = $state(null);
let draggedItem = $state(null)
let draggedLocation = $state(null)
let { item_id, location_id, owner, owner_id } = $props();
let { item_id, location_id, owner, owner_id, owner_number } = $props();
let skip_location = false; // disable effect on setting location within loadItem()
let router = useTinyRouter();
$effect(() => {
// This effect runs whenever `location` changes
@@ -98,8 +100,8 @@
}
async function loadItem(){
if (!item_id) return;
const url = api(`stock/${owner}/${owner_id}/item/${item_id}`);
if (!owner_number) return;
const url = api(`stock/${owner}/${owner_id}/item/${owner_number}`);
const res = await get(url);
if (res.ok){
yikes();
@@ -116,7 +118,7 @@
}
}
for (let i of json.items){
if (i.owner_number == +item_id) item = i;
if (i.owner_number == +owner_number) item = i;
}
} else {
error(res);
@@ -170,12 +172,27 @@
}
async function load(){
await preload();
await loadUserLocations();
await loadPath();
await loadProperties();
await loadItem();
}
async function preload(){
if (item_id) {
let url = api(`stock/item/${item_id}`);
const res = await get(url);
if (res.ok){
const json = await res.json();
owner = json.owner.type;
owner_id = json.owner.id;
owner_number = json.owner_number;
location_id = json.location.id;
}
}
}
function moveToTop(loc){
if (patchLocation(location,'parent_location_id',0)){
loc.parent_location_id = 0;

View File

@@ -74,6 +74,15 @@ Code: <LineEditor type="span" editable={true} value={item.code} onSet={v => patc
</div>
<table>
<tbody>
<tr>
<td>
{t('ID')}
</td>
<td>
{item.id}
</td>
</tr>
{#each item.properties.toSorted(byName) as prop}
<tr>
<td>

View File

@@ -39,6 +39,6 @@
<h2>{lastLetter = page.charAt(0).toUpperCase()||page.charAt(0).toUpperCase()}</h2>
{/if}
<a class="wikilink" href={`/wiki/${page}/view`} {onclick} >{page}</a>
<a class="wikilink" href={`/wiki/${encodeURIComponent(page)}/view`} {onclick} >{page}</a>
{/each}
{/if}

View File

@@ -27,6 +27,7 @@ import de.srsoftware.umbrella.core.api.Owner;
import de.srsoftware.umbrella.core.api.StockService;
import de.srsoftware.umbrella.core.constants.Field;
import de.srsoftware.umbrella.core.constants.Path;
import de.srsoftware.umbrella.core.constants.Text;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.*;
import de.srsoftware.umbrella.core.model.Location;
@@ -113,6 +114,7 @@ public class StockModule extends BaseHandler implements StockService {
yield super.doGet(path,ex);
}
}
case Path.ITEM -> getItemById(user.get(),path,ex);
case Path.LOCATION -> {
try {
var location = Location.of(Long.parseLong(path.pop()));
@@ -155,6 +157,22 @@ public class StockModule extends BaseHandler implements StockService {
}
}
private boolean getItemById(UmbrellaUser user, de.srsoftware.tools.Path path, HttpExchange ex) throws IOException {
var head = path.pop();
if (head == null) throw missingField(Field.ID);
try {
var itemId = Long.parseLong(head);
var item = stockDb.loadItem(itemId);
var owner = item.location().resolve().owner().resolve();
boolean allowed = owner instanceof UmbrellaUser u && user.equals(u);
allowed = allowed || owner instanceof Company c && companyService().membership(c.id(),user.id());
if (!allowed) throw forbidden("You are not allowed to access item {id}",ID,itemId);
return sendContent(ex,item);
} catch (NumberFormatException e) {
throw invalidField(Field.ID, Text.NUMBER);
}
}
@Override
public boolean doPatch(de.srsoftware.tools.Path path, HttpExchange ex) throws IOException {
addCors(ex);

View File

@@ -210,7 +210,7 @@
"member": "Mitarbeiter",
"members": "Mitarbeiter",
"message": "Nachricht",
"messages": "Benachrichtigungen",
"messages": "Be&shy;nach&shy;rich&shy;ti&shy;gung&shy;en",
"miscellaneous_settings": "sonstige Einstellungen",
"missing_new_item_id": "Alter Artikel-ID ({0}) wurde keine neue ID zugeordnet!",
"mismatch": "ungleich",

View File

@@ -9,6 +9,7 @@ import static de.srsoftware.umbrella.core.ModuleRegistry.postBox;
import static de.srsoftware.umbrella.core.ResponseCode.*;
import static de.srsoftware.umbrella.core.ResponseCode.HTTP_SERVER_ERROR;
import static de.srsoftware.umbrella.core.Util.*;
import static de.srsoftware.umbrella.core.constants.Constants.CONFIG_SESSION_DURATION;
import static de.srsoftware.umbrella.core.constants.Field.*;
import static de.srsoftware.umbrella.core.constants.Field.PASSWORD;
import static de.srsoftware.umbrella.core.constants.Field.REDIRECT;
@@ -88,9 +89,14 @@ public class UserModule extends BaseHandler implements UserService {
public UserModule(Configuration config) throws UmbrellaException {
super();
var dbFile = config.get(CONFIG_DATABASE).orElseThrow(() -> missingConfig(CONFIG_DATABASE));
var sqlite = new SqliteDB(connect(dbFile));
// may be splitted in separate db files later
logins = new SqliteDB(connect(dbFile));
users = new SqliteDB(connect(dbFile));
logins = sqlite;
users = sqlite;
Optional<Number> sessionDuration = config.get(CONFIG_SESSION_DURATION);
sessionDuration.ifPresent(users::setSessionDuration);
ModuleRegistry.add(this);
}

View File

@@ -41,4 +41,6 @@ public interface UserDb {
UmbrellaUser save(DbUser user) throws UmbrellaException;
Map<Long,DbUser> search(String key);
UserDb setSessionDuration(Number minutes);
}

View File

@@ -35,12 +35,14 @@ import java.security.NoSuchAlgorithmException;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDateTime;
import java.util.*;
public class SqliteDB extends BaseDb implements LoginServiceDb, UserDb {
private static final System.Logger LOG = System.getLogger(SqliteDB.class.getSimpleName());
private static Duration sessionDuration = DEFAULT_SESSION_DURATION;
public SqliteDB(Connection conn){
super(conn);
@@ -481,8 +483,15 @@ CREATE TABLE IF NOT EXISTS {0} (
}
}
@Override
public UserDb setSessionDuration(Number minutes) {
LOG.log(INFO,"Session duration set to {} minutes",minutes);
sessionDuration = Duration.ofMinutes(minutes.longValue());
return this;
}
public Instant then(){
return LocalDateTime.now().plus(DEFAULT_SESSION_DURATION).toInstant(UTC);
return LocalDateTime.now().plus(sessionDuration).toInstant(UTC);
}
private ForeignLogin toForeignLogin(ResultSet rs) throws SQLException {

View File

@@ -74,6 +74,10 @@ tr:hover .taglist .tag button {
color: black;
}
.code{
color: orangered;
}
.error {
background-color: red;
color: black;

View File

@@ -142,16 +142,6 @@ td, tr{
font-weight: normal;
}
.settings {
position: fixed;
top: 60px;
left: 10px;
right: 10px;
padding: 10px;
border: 1px solid;
border-radius: 5px;
}
.project.list td:not(.actions){
cursor: pointer;
}

View File

@@ -72,6 +72,10 @@ tr:hover .taglist .tag button {
color: black;
}
.code{
color: chocolate;
}
.em {
background: rgba(255, 215, 0, 0.09);
}

View File

@@ -225,16 +225,6 @@ td, tr{
font-weight: normal;
}
.settings {
position: fixed;
top: 60px;
left: 10px;
right: 10px;
padding: 10px;
border: 1px solid;
border-radius: 5px;
}
.project.list td:not(.actions){
cursor: pointer;
}

View File

@@ -67,6 +67,10 @@ tr:hover .taglist .tag button {
color: black;
}
.code{
color: black;
}
.error {
background-color: red;
color: black;

View File

@@ -142,16 +142,6 @@ td, tr{
font-weight: normal;
}
.settings {
position: fixed;
top: 60px;
left: 10px;
right: 10px;
padding: 10px;
border: 1px solid;
border-radius: 5px;
}
.project.list td:not(.actions){
cursor: pointer;
}