SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'dev' into modules/bookmark

Browse Source
This commit is contained in:
Stephan Richter
2025-08-02 20:34:49 +02:00
parent 125a8c2266 d7687373a6
commit d1b8d1a062
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/routes/tags/TagList.svelte
View File

@@ -100,13 +100,13 @@
{/if}
<div class="taglist">
<span class="tag editor">
<input type="text" bind:value={newTag} onkeyup={typed} autofocus />
</span>
{#each tags as tag,idx}
<span class="tag">
<span onclick={() => show(tag)}>{tag}</span>
<button onclick={() => drop(tag)} class="symbol"></button>
</span>
{/each}
<span class="tag editor">
<input type="text" bind:value={newTag} onkeyup={typed} autofocus />
</span>
</div>

2
notes/src/main/java/de/srsoftware/umbrella/notes/NoteModule.java
View File

@@ -19,10 +19,8 @@ import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Note;
import de.srsoftware.umbrella.core.model.Token;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;

1
notes/src/main/java/de/srsoftware/umbrella/notes/NotesDb.java
View File

@@ -2,7 +2,6 @@
package de.srsoftware.umbrella.notes;
import de.srsoftware.umbrella.core.model.Note;
import java.util.Map;
public interface NotesDb {

1
project/src/main/java/de/srsoftware/umbrella/project/ProjectDb.java
View File

@@ -5,7 +5,6 @@ import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Permission;
import de.srsoftware.umbrella.core.model.Project;
import de.srsoftware.umbrella.core.model.Status;
import java.util.Map;
public interface ProjectDb {

1
project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java
View File

@@ -4,7 +4,6 @@ package de.srsoftware.umbrella.project;
import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.Paths.LIST;
import static de.srsoftware.umbrella.core.Paths.STATES;
import static de.srsoftware.umbrella.core.Util.mapValues;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
import static de.srsoftware.umbrella.core.model.Permission.*;

6
project/src/main/java/de/srsoftware/umbrella/project/SqliteDb.java
View File

@@ -5,24 +5,18 @@ import static de.srsoftware.tools.jdbc.Condition.*;
import static de.srsoftware.tools.jdbc.Query.*;
import static de.srsoftware.tools.jdbc.Query.SelectQuery.ALL;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.Constants.TABLE_SETTINGS;
import static de.srsoftware.umbrella.core.model.Status.COMPLETE;
import static de.srsoftware.umbrella.core.model.Status.OPEN;
import static de.srsoftware.umbrella.project.Constants.*;
import static java.lang.System.Logger.Level.ERROR;
import static java.lang.System.Logger.Level.INFO;
import static java.text.MessageFormat.format;
import de.srsoftware.tools.jdbc.Query;
import de.srsoftware.umbrella.core.BaseDb;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Permission;
import de.srsoftware.umbrella.core.model.Project;
import de.srsoftware.umbrella.core.model.Status;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;

16
web/src/main/resources/web/css/default.css
View File

@@ -156,7 +156,7 @@ textarea{
padding: 2px;
}
.kanban .box{
background: orange;
background: #759eff;
position: relative;
}
.kanban .box .title{
@@ -208,7 +208,19 @@ textarea{
top: 60px;
right: 20px;
}
.kanban .state_10 .box,
.kanban .state_100 .box{
background: #573800;
}
.kanban .state_20 .box{
background: orange;
}
.kanban .state_40 .box{
background: khaki;
}
.kanban .state_60 .box{
background: #d3ff00;
}
.project th,
.task th{
text-align: right;