diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..03d9549 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/jsLinters/eslint.xml b/.idea/jsLinters/eslint.xml new file mode 100644 index 0000000..541945b --- /dev/null +++ b/.idea/jsLinters/eslint.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/client/src/components/AppFooter.vue b/client/src/components/AppFooter.vue index 7444827..1984bef 100644 --- a/client/src/components/AppFooter.vue +++ b/client/src/components/AppFooter.vue @@ -36,7 +36,7 @@ - diff --git a/client/src/layouts/default.vue b/client/src/layouts/default.vue index 3037ff7..93a11d2 100644 --- a/client/src/layouts/default.vue +++ b/client/src/layouts/default.vue @@ -1,11 +1,60 @@ - diff --git a/client/src/layouts/none.vue b/client/src/layouts/none.vue new file mode 100644 index 0000000..136b7f1 --- /dev/null +++ b/client/src/layouts/none.vue @@ -0,0 +1,7 @@ + + diff --git a/client/src/pages/index.vue b/client/src/pages/index.vue index 0166fd6..82e4331 100644 --- a/client/src/pages/index.vue +++ b/client/src/pages/index.vue @@ -1,5 +1,5 @@ diff --git a/client/src/plugins/index.js b/client/src/plugins/index.js index be6e2da..cb8f7e8 100644 --- a/client/src/plugins/index.js +++ b/client/src/plugins/index.js @@ -4,10 +4,10 @@ * Automatically included in `./src/main.js` */ +import router from '@/router' +import pinia from '@/stores' // Plugins import vuetify from './vuetify' -import pinia from '@/stores' -import router from '@/router' export function registerPlugins (app) { app diff --git a/client/src/plugins/vuetify.js b/client/src/plugins/vuetify.js index 30a4980..856b6c3 100644 --- a/client/src/plugins/vuetify.js +++ b/client/src/plugins/vuetify.js @@ -4,12 +4,12 @@ * Framework documentation: https://vuetifyjs.com` */ -// Styles -import '@mdi/font/css/materialdesignicons.css' -import 'vuetify/styles' - // Composables import { createVuetify } from 'vuetify' +// Styles +import '@mdi/font/css/materialdesignicons.css' + +import 'vuetify/styles' // https://vuetifyjs.com/en/introduction/why-vuetify/#feature-guides export default createVuetify({ diff --git a/client/src/router/index.js b/client/src/router/index.js index 6379d4a..10d81e7 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -4,9 +4,9 @@ * Automatic routes for `./src/pages/*.vue` */ +import { setupLayouts } from 'virtual:generated-layouts' // Composables import { createRouter, createWebHistory } from 'vue-router' -import { setupLayouts } from 'virtual:generated-layouts' import { routes } from 'vue-router/auto-routes' const router = createRouter({ diff --git a/client/src/stores/app.js b/client/src/stores/app.js index 7429543..f370a2a 100644 --- a/client/src/stores/app.js +++ b/client/src/stores/app.js @@ -3,6 +3,6 @@ import { defineStore } from 'pinia' export const useAppStore = defineStore('app', { state: () => ({ - // + userInfo: null, }), }) diff --git a/src/main/java/dev/mduchene/Db.java b/src/main/java/dev/mduchene/Db.java index 158f806..59dbd66 100644 --- a/src/main/java/dev/mduchene/Db.java +++ b/src/main/java/dev/mduchene/Db.java @@ -4,85 +4,85 @@ import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import java.sql.Connection; import java.sql.SQLException; -import java.sql.Statement; - import org.jooq.SQLDialect; import org.jooq.conf.RenderQuotedNames; import org.jooq.conf.Settings; import org.jooq.impl.DSL; public class Db implements AutoCloseable { - private HikariDataSource dataSource; - private org.jooq.DSLContext dsl; - private Db() {} + private HikariDataSource dataSource; + private org.jooq.DSLContext dsl; - public static Builder builder() { - return new Builder(); - } + private Db() {} - public static class Builder { - private String url; - private String user; - private String password; - - private Builder() {} - - public Builder url(String url) { - this.url = url; - return this; + public static Builder builder() { + return new Builder(); } - public Builder user(String user) { - this.user = user; - return this; + public static class Builder { + + private String url; + private String user; + private String password; + + private Builder() {} + + public Builder url(String url) { + this.url = url; + return this; + } + + public Builder user(String user) { + this.user = user; + return this; + } + + public Builder password(String password) { + this.password = password; + return this; + } + + public Db build() { + System.setProperty("org.jooq.no-tips", "true"); + System.setProperty("org.jooq.no-logo", "true"); + + Db db = new Db(); + HikariConfig config = new HikariConfig(); + config.setJdbcUrl(url); + config.setUsername(user); + config.setPassword(password); + config.addDataSourceProperty("cachePrepStmts", "true"); + config.addDataSourceProperty("prepStmtCacheSize", "250"); + config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048"); + config.setMaximumPoolSize(64); + db.dataSource = new HikariDataSource(config); + db.dsl = DSL.using( + db.dataSource, + SQLDialect.MARIADB, + new Settings().withRenderQuotedNames(RenderQuotedNames.NEVER) + ); + return db; + } } - public Builder password(String password) { - this.password = password; - return this; + public Connection getConnection() throws Exception { + Connection connection = dataSource.getConnection(); + connection.setAutoCommit(false); + connection.setSchema("public"); + return connection; } - public Db build() { - System.setProperty("org.jooq.no-tips", "true"); - System.setProperty("org.jooq.no-logo", "true"); - - Db db = new Db(); - HikariConfig config = new HikariConfig(); - config.setJdbcUrl(url); - config.setUsername(user); - config.setPassword(password); - config.addDataSourceProperty("cachePrepStmts", "true"); - config.addDataSourceProperty("prepStmtCacheSize", "250"); - config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048"); - config.setMaximumPoolSize(64); - db.dataSource = new HikariDataSource(config); - db.dsl = - DSL.using( - db.dataSource, - SQLDialect.MARIADB, - new Settings().withRenderQuotedNames(RenderQuotedNames.NEVER)); - return db; + public void close() { + dataSource.close(); } - } - public Connection getConnection() throws Exception { - Connection connection = dataSource.getConnection(); - connection.setAutoCommit(false); - connection.setSchema("public"); - return connection; - } - - public void close() { - dataSource.close(); - } - - public void run(Connection connection, String query) { - try { - DSL.using(connection).execute(query); - connection.commit(); - } catch (SQLException e) { - throw new RuntimeException(e); + public void run(Connection connection, String query) { + try { + DSL.using(connection).execute(query); + connection.commit(); + } catch (SQLException e) { + throw new RuntimeException(e); + } } - } }