diff --git a/src/main/java/org/mobidgim/mobidigimproject/MobidigimProjectApplication.java b/src/main/java/org/mobidgim/mobidigimproject/MobidigimProjectApplication.java index 705a770..9bac37d 100644 --- a/src/main/java/org/mobidgim/mobidigimproject/MobidigimProjectApplication.java +++ b/src/main/java/org/mobidgim/mobidigimproject/MobidigimProjectApplication.java @@ -2,13 +2,6 @@ package org.mobidgim.mobidigimproject; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; - -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - @SpringBootApplication // (exclude = { // DataSourceAutoConfiguration.class, @@ -18,21 +11,6 @@ import java.nio.file.Paths; public class MobidigimProjectApplication { public static void main(String[] args) { - ensureDbDirectory(); SpringApplication.run(MobidigimProjectApplication.class, args); } - - private static void ensureDbDirectory() { - try { - Path dbDir = Paths.get(System.getProperty("user.home"), "db"); - Files.createDirectories(dbDir); - Path dbFile = dbDir.resolve("dynamic_data.db"); - if (Files.notExists(dbFile)) { - Files.createFile(dbFile); - } - } catch (Exception e) { - throw new IllegalStateException("Failed to prepare SQLite DB file", e); - } - } - } diff --git a/src/main/java/org/mobidgim/mobidigimproject/config/DatabaseInitializer.java b/src/main/java/org/mobidgim/mobidigimproject/config/DatabaseInitializer.java deleted file mode 100644 index 023c077..0000000 --- a/src/main/java/org/mobidgim/mobidigimproject/config/DatabaseInitializer.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.mobidgim.mobidigimproject.config; - -import lombok.RequiredArgsConstructor; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.stereotype.Component; - -@Component -@RequiredArgsConstructor -public class DatabaseInitializer implements ApplicationRunner { - - private final JdbcTemplate jdbcTemplate; - - @Override - public void run(ApplicationArguments args) { - jdbcTemplate.execute( - "CREATE TABLE IF NOT EXISTS board_config (" + - "\"key\" TEXT PRIMARY KEY, " + - "\"value\" TEXT NOT NULL" + - ")" - ); - } -} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/WiFiSecurity.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/WiFiSecurity.java index f6af7e1..a7f0a41 100644 --- a/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/WiFiSecurity.java +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/WiFiSecurity.java @@ -1,14 +1,27 @@ package org.mobidgim.mobidigimproject.model.device.enums; +import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import lombok.AllArgsConstructor; @AllArgsConstructor public enum WiFiSecurity { NONE("none"), - WPA_WPA2("wpa/wpa2"); + WPA_WPA2("wpa/wpa2"), + WPA3("wpa3"); private final String value; + @JsonCreator + public static WiFiSecurity fromValue(String value) { + for (WiFiSecurity security : values()) { + if (security.value.equalsIgnoreCase(String.valueOf(value).trim())) { + return security; + } + } + + throw new IllegalArgumentException("Invalid wifiSecurity value: " + value); + } + @JsonValue public String getValue() { return value; diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index 3972cb8..8b3a61c 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -210,7 +210,9 @@ details.nav { } .ssid-row select { - width: 100px; + width: 140px; + min-width: 140px; + flex: 0 0 140px; padding: 6px 8px; font-size: 16px; border: 1px solid #aaa; diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index d41c932..1bbb313 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -75,6 +75,7 @@ @@ -170,7 +171,7 @@