diff --git a/back/pom.xml b/back/pom.xml
index 93f4b07..43a2b21 100644
--- a/back/pom.xml
+++ b/back/pom.xml
@@ -22,6 +22,12 @@
archidata0.3.7
+
+ org.slf4j
+ slf4j-simple
+ 2.0.7
+
+
@@ -29,6 +35,11 @@
srctest/src${project.basedir}/out/maven/
+
+
+ src/resources
+
+ org.apache.maven.plugins
diff --git a/back/src/org/kar/karideo/WebLauncher.java b/back/src/org/kar/karideo/WebLauncher.java
index 835bd7a..5e04e9e 100755
--- a/back/src/org/kar/karideo/WebLauncher.java
+++ b/back/src/org/kar/karideo/WebLauncher.java
@@ -8,14 +8,9 @@ import org.glassfish.jersey.server.ResourceConfig;
import org.kar.karideo.api.*;
import org.kar.karideo.filter.KarideoAuthenticationFilter;
import org.kar.karideo.migration.Initialization;
-import org.kar.karideo.model.Media;
-import org.kar.karideo.model.Season;
-import org.kar.karideo.model.Series;
-import org.kar.karideo.model.Type;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.kar.archidata.GlobalConfiguration;
-import org.kar.archidata.SqlWrapper;
import org.kar.archidata.UpdateJwtPublicKey;
import org.kar.archidata.api.DataResource;
import org.kar.archidata.catcher.ExceptionCatcher;
@@ -26,8 +21,6 @@ import org.kar.archidata.db.DBConfig;
import org.kar.archidata.filter.CORSFilter;
import org.kar.archidata.filter.OptionFilter;
import org.kar.archidata.migration.MigrationEngine;
-import org.kar.archidata.model.Data;
-import org.kar.archidata.model.User;
import org.kar.archidata.util.ConfigBaseVariable;
import org.glassfish.jersey.jackson.JacksonFeature;
@@ -37,6 +30,7 @@ import java.net.URI;
public class WebLauncher {
final static Logger LOGGER = LoggerFactory.getLogger(WebLauncher.class);
public static DBConfig dbConfig;
+ protected UpdateJwtPublicKey keyUpdater = null;
public WebLauncher() {
ConfigBaseVariable.bdDatabase = "karideo";
}
@@ -50,6 +44,8 @@ public class WebLauncher {
MigrationEngine migrationEngine = new MigrationEngine();
WebLauncher.LOGGER.info("Add initialization");
migrationEngine.setInit(new Initialization());
+ WebLauncher.LOGGER.info("Add migration since last version");
+ // NOTHING for now
WebLauncher.LOGGER.info("Migrate the DB [START]");
migrationEngine.migrate(GlobalConfiguration.dbConfig);
WebLauncher.LOGGER.info("Migrate the DB [STOP]");
@@ -58,12 +54,13 @@ public class WebLauncher {
public static void main(String[] args) throws Exception {
WebLauncher.LOGGER.info("[START] application wake UP");
WebLauncher launcher = new WebLauncher();
- launcher.migrateDB();
-
+ launcher.migrateDB();
launcher.process();
WebLauncher.LOGGER.info("end-configure the server & wait finish process:");
Thread.currentThread().join();
- WebLauncher.LOGGER.info("STOP the REST server:");
+ WebLauncher.LOGGER.info("STOP Key updater");
+ launcher.stopOther();
+ WebLauncher.LOGGER.info("STOP the REST server");
}
@@ -116,20 +113,22 @@ public class WebLauncher {
// ===================================================================
// start periodic update of the token ...
// ===================================================================
- UpdateJwtPublicKey keyUpdater = new UpdateJwtPublicKey();
+ this.keyUpdater = new UpdateJwtPublicKey();
keyUpdater.start();
-
+
// ===================================================================
// run JERSEY
// ===================================================================
try {
server.start();
- System.out.println("Jersey app started at " + getBaseURI());
- Thread.currentThread().join();
+ LOGGER.info("Jersey app started at {}", getBaseURI());
} catch (Exception e) {
- System.out.println("There was an error while starting Grizzly HTTP server.");
+ LOGGER.error("There was an error while starting Grizzly HTTP server.");
e.printStackTrace();
}
+ }
+
+ public void stopOther() {
keyUpdater.kill();
try {
keyUpdater.join(4000, 0);
diff --git a/back/src/org/kar/karideo/api/Front.java b/back/src/org/kar/karideo/api/Front.java
index 319f969..4212114 100644
--- a/back/src/org/kar/karideo/api/Front.java
+++ b/back/src/org/kar/karideo/api/Front.java
@@ -7,7 +7,7 @@ import jakarta.ws.rs.Path;
import org.kar.karideo.util.ConfigVariable;
-@Path("/karideo")
+@Path("/front")
public class Front extends FrontGeneric {
public Front() {
this.baseFrontFolder = ConfigVariable.getFrontFolder();
diff --git a/back/src/resources/simplelogger.properties b/back/src/resources/simplelogger.properties
new file mode 100644
index 0000000..4314b58
--- /dev/null
+++ b/back/src/resources/simplelogger.properties
@@ -0,0 +1,35 @@
+# SLF4J's SimpleLogger configuration file
+# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
+# Default logging detail level for all instances of SimpleLogger.
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, defaults to "info".
+org.slf4j.simpleLogger.defaultLogLevel=trace
+
+# Logging detail level for a SimpleLogger instance named "xxxxx".
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, the default logging detail level is used.
+#org.slf4j.simpleLogger.log.xxxxx=
+
+# Set to true if you want the current date and time to be included in output messages.
+# Default is false, and will output the number of milliseconds elapsed since startup.
+#org.slf4j.simpleLogger.showDateTime=false
+
+# The date and time format to be used in the output messages.
+# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
+# If the format is not specified or is invalid, the default format is used.
+# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
+#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
+
+# Set to true if you want to output the current thread name.
+# Defaults to true.
+org.slf4j.simpleLogger.showThreadName=true
+
+# Set to true if you want the Logger instance name to be included in output messages.
+# Defaults to true.
+#org.slf4j.simpleLogger.showLogName=true
+
+# Set to true if you want the last component of the name to be included in output messages.
+# Defaults to false.
+#org.slf4j.simpleLogger.showShortLogName=false
+
+
diff --git a/front/src/assets/images/block.svg b/front/src/assets/images/block.svg
new file mode 100644
index 0000000..62df84f
--- /dev/null
+++ b/front/src/assets/images/block.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/front/src/assets/images/dashboard.svg b/front/src/assets/images/dashboard.svg
new file mode 100644
index 0000000..6a3e10f
--- /dev/null
+++ b/front/src/assets/images/dashboard.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/front/src/assets/images/group.svg b/front/src/assets/images/group.svg
new file mode 100644
index 0000000..15a0edd
--- /dev/null
+++ b/front/src/assets/images/group.svg
@@ -0,0 +1,38 @@
+
+
diff --git a/front/src/assets/images/lan.svg b/front/src/assets/images/lan.svg
new file mode 100644
index 0000000..44af020
--- /dev/null
+++ b/front/src/assets/images/lan.svg
@@ -0,0 +1,63 @@
+
+
diff --git a/front/src/assets/images/person.svg b/front/src/assets/images/person.svg
new file mode 100644
index 0000000..db6026d
--- /dev/null
+++ b/front/src/assets/images/person.svg
@@ -0,0 +1,38 @@
+
+
diff --git a/front/src/assets/images/settings.svg b/front/src/assets/images/settings.svg
new file mode 100644
index 0000000..0d6f550
--- /dev/null
+++ b/front/src/assets/images/settings.svg
@@ -0,0 +1 @@
+
\ No newline at end of file