+ Change this page by updating {{ `` }} in components/HelloWorld.vue.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/src/components/README.md b/client/src/components/README.md
new file mode 100644
index 0000000..d1dc92f
--- /dev/null
+++ b/client/src/components/README.md
@@ -0,0 +1,35 @@
+# Components
+
+Vue template files in this folder are automatically imported.
+
+## 🚀 Usage
+
+Importing is handled by [unplugin-vue-components](https://github.com/unplugin/unplugin-vue-components). This plugin automatically imports `.vue` files created in the `src/components` directory, and registers them as global components. This means that you can use any component in your application without having to manually import it.
+
+The following example assumes a component located at `src/components/MyComponent.vue`:
+
+```vue
+
+
+
+
+
+
+
+```
+
+When your template is rendered, the component's import will automatically be inlined, which renders to this:
+
+```vue
+
+
+
+
+
+
+
+```
diff --git a/client/src/layouts/README.md b/client/src/layouts/README.md
new file mode 100644
index 0000000..78f68b6
--- /dev/null
+++ b/client/src/layouts/README.md
@@ -0,0 +1,5 @@
+# Layouts
+
+Layouts are reusable components that wrap around pages. They are used to provide a consistent look and feel across multiple pages.
+
+Full documentation for this feature can be found in the Official [vite-plugin-vue-layouts-next](https://github.com/loicduong/vite-plugin-vue-layouts-next) repository.
diff --git a/client/src/layouts/default.vue b/client/src/layouts/default.vue
new file mode 100644
index 0000000..3037ff7
--- /dev/null
+++ b/client/src/layouts/default.vue
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
diff --git a/client/src/main.js b/client/src/main.js
new file mode 100644
index 0000000..a544ae9
--- /dev/null
+++ b/client/src/main.js
@@ -0,0 +1,23 @@
+/**
+ * main.js
+ *
+ * Bootstraps Vuetify and other plugins then mounts the App`
+ */
+
+// Plugins
+import { registerPlugins } from '@/plugins'
+
+// Components
+import App from './App.vue'
+
+// Composables
+import { createApp } from 'vue'
+
+// Styles
+import 'unfonts.css'
+
+const app = createApp(App)
+
+registerPlugins(app)
+
+app.mount('#app')
diff --git a/client/src/pages/README.md b/client/src/pages/README.md
new file mode 100644
index 0000000..341536c
--- /dev/null
+++ b/client/src/pages/README.md
@@ -0,0 +1,5 @@
+# Pages
+
+Vue components created in this folder will automatically be converted to navigatable routes.
+
+Full documentation for this feature can be found in the Official [unplugin-vue-router](https://github.com/posva/unplugin-vue-router) repository.
diff --git a/client/src/pages/index.vue b/client/src/pages/index.vue
new file mode 100644
index 0000000..0166fd6
--- /dev/null
+++ b/client/src/pages/index.vue
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/client/src/plugins/README.md b/client/src/plugins/README.md
new file mode 100644
index 0000000..62201c7
--- /dev/null
+++ b/client/src/plugins/README.md
@@ -0,0 +1,3 @@
+# Plugins
+
+Plugins are a way to extend the functionality of your Vue application. Use this folder for registering plugins that you want to use globally.
diff --git a/client/src/plugins/index.js b/client/src/plugins/index.js
new file mode 100644
index 0000000..be6e2da
--- /dev/null
+++ b/client/src/plugins/index.js
@@ -0,0 +1,17 @@
+/**
+ * plugins/index.js
+ *
+ * Automatically included in `./src/main.js`
+ */
+
+// Plugins
+import vuetify from './vuetify'
+import pinia from '@/stores'
+import router from '@/router'
+
+export function registerPlugins (app) {
+ app
+ .use(vuetify)
+ .use(router)
+ .use(pinia)
+}
diff --git a/client/src/plugins/vuetify.js b/client/src/plugins/vuetify.js
new file mode 100644
index 0000000..30a4980
--- /dev/null
+++ b/client/src/plugins/vuetify.js
@@ -0,0 +1,19 @@
+/**
+ * plugins/vuetify.js
+ *
+ * Framework documentation: https://vuetifyjs.com`
+ */
+
+// Styles
+import '@mdi/font/css/materialdesignicons.css'
+import 'vuetify/styles'
+
+// Composables
+import { createVuetify } from 'vuetify'
+
+// https://vuetifyjs.com/en/introduction/why-vuetify/#feature-guides
+export default createVuetify({
+ theme: {
+ defaultTheme: 'system',
+ },
+})
diff --git a/client/src/router/index.js b/client/src/router/index.js
new file mode 100644
index 0000000..6379d4a
--- /dev/null
+++ b/client/src/router/index.js
@@ -0,0 +1,36 @@
+/**
+ * router/index.ts
+ *
+ * Automatic routes for `./src/pages/*.vue`
+ */
+
+// Composables
+import { createRouter, createWebHistory } from 'vue-router'
+import { setupLayouts } from 'virtual:generated-layouts'
+import { routes } from 'vue-router/auto-routes'
+
+const router = createRouter({
+ history: createWebHistory(import.meta.env.BASE_URL),
+ routes: setupLayouts(routes),
+})
+
+// Workaround for https://github.com/vitejs/vite/issues/11804
+router.onError((err, to) => {
+ if (err?.message?.includes?.('Failed to fetch dynamically imported module')) {
+ if (localStorage.getItem('vuetify:dynamic-reload')) {
+ console.error('Dynamic import error, reloading page did not fix it', err)
+ } else {
+ console.log('Reloading page to fix dynamic import error')
+ localStorage.setItem('vuetify:dynamic-reload', 'true')
+ location.assign(to.fullPath)
+ }
+ } else {
+ console.error(err)
+ }
+})
+
+router.isReady().then(() => {
+ localStorage.removeItem('vuetify:dynamic-reload')
+})
+
+export default router
diff --git a/client/src/stores/README.md b/client/src/stores/README.md
new file mode 100644
index 0000000..54f8e03
--- /dev/null
+++ b/client/src/stores/README.md
@@ -0,0 +1,5 @@
+# Store
+
+Pinia stores are used to store reactive state and expose actions to mutate it.
+
+Full documentation for this feature can be found in the Official [Pinia](https://pinia.esm.dev/) repository.
diff --git a/client/src/stores/app.js b/client/src/stores/app.js
new file mode 100644
index 0000000..7429543
--- /dev/null
+++ b/client/src/stores/app.js
@@ -0,0 +1,8 @@
+// Utilities
+import { defineStore } from 'pinia'
+
+export const useAppStore = defineStore('app', {
+ state: () => ({
+ //
+ }),
+})
diff --git a/client/src/stores/index.js b/client/src/stores/index.js
new file mode 100644
index 0000000..1536252
--- /dev/null
+++ b/client/src/stores/index.js
@@ -0,0 +1,4 @@
+// Utilities
+import { createPinia } from 'pinia'
+
+export default createPinia()
diff --git a/client/src/styles/README.md b/client/src/styles/README.md
new file mode 100644
index 0000000..ea86179
--- /dev/null
+++ b/client/src/styles/README.md
@@ -0,0 +1,3 @@
+# Styles
+
+This directory is for configuring the styles of the application.
diff --git a/client/src/styles/settings.scss b/client/src/styles/settings.scss
new file mode 100644
index 0000000..3e36a27
--- /dev/null
+++ b/client/src/styles/settings.scss
@@ -0,0 +1,10 @@
+/**
+ * src/styles/settings.scss
+ *
+ * Configures SASS variables and Vuetify overwrites
+ */
+
+// https://vuetifyjs.com/features/sass-variables/`
+// @use 'vuetify/settings' with (
+// $color-pack: false
+// );
diff --git a/client/vite.config.mjs b/client/vite.config.mjs
new file mode 100644
index 0000000..42147dd
--- /dev/null
+++ b/client/vite.config.mjs
@@ -0,0 +1,80 @@
+// Plugins
+import AutoImport from 'unplugin-auto-import/vite'
+import Components from 'unplugin-vue-components/vite'
+import Fonts from 'unplugin-fonts/vite'
+import Layouts from 'vite-plugin-vue-layouts-next'
+import Vue from '@vitejs/plugin-vue'
+import VueRouter from 'unplugin-vue-router/vite'
+import { VueRouterAutoImports } from 'unplugin-vue-router'
+import Vuetify, { transformAssetUrls } from 'vite-plugin-vuetify'
+
+// Utilities
+import { defineConfig } from 'vite'
+import { fileURLToPath, URL } from 'node:url'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+ plugins: [
+ VueRouter(),
+ Layouts(),
+ Vue({
+ template: { transformAssetUrls },
+ }),
+ // https://github.com/vuetifyjs/vuetify-loader/tree/master/packages/vite-plugin#readme
+ Vuetify({
+ autoImport: true,
+ styles: {
+ configFile: 'src/styles/settings.scss',
+ },
+ }),
+ Components(),
+ Fonts({
+ google: {
+ families: [{
+ name: 'Roboto',
+ styles: 'wght@100;300;400;500;700;900',
+ }],
+ },
+ }),
+ AutoImport({
+ imports: [
+ 'vue',
+ VueRouterAutoImports,
+ {
+ pinia: ['defineStore', 'storeToRefs'],
+ },
+ ],
+ eslintrc: {
+ enabled: true,
+ },
+ vueTemplate: true,
+ }),
+ ],
+ optimizeDeps: {
+ exclude: [
+ 'vuetify',
+ 'vue-router',
+ 'unplugin-vue-router/runtime',
+ 'unplugin-vue-router/data-loaders',
+ 'unplugin-vue-router/data-loaders/basic',
+ ],
+ },
+ define: { 'process.env': {} },
+ resolve: {
+ alias: {
+ '@': fileURLToPath(new URL('src', import.meta.url)),
+ },
+ extensions: [
+ '.js',
+ '.json',
+ '.jsx',
+ '.mjs',
+ '.ts',
+ '.tsx',
+ '.vue',
+ ],
+ },
+ server: {
+ port: 3000,
+ },
+})
diff --git a/src/main/java/dev/mduchene/App.java b/src/main/java/dev/mduchene/App.java
index d3748d7..817a6ec 100644
--- a/src/main/java/dev/mduchene/App.java
+++ b/src/main/java/dev/mduchene/App.java
@@ -2,9 +2,6 @@ package dev.mduchene;
public class App {
public static void main(String[] args) {
- System.setProperty("org.jooq.no-tips", "true");
- System.setProperty("org.jooq.no-logo", "true");
-
Db db =
Db.builder()
.url("jdbc:postgresql://127.0.0.1:5432/bolts")
diff --git a/src/main/java/dev/mduchene/Db.java b/src/main/java/dev/mduchene/Db.java
index 70ccbd8..158f806 100644
--- a/src/main/java/dev/mduchene/Db.java
+++ b/src/main/java/dev/mduchene/Db.java
@@ -4,18 +4,19 @@ 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 {
+public class Db implements AutoCloseable {
private HikariDataSource dataSource;
private org.jooq.DSLContext dsl;
private Db() {}
-
public static Builder builder() {
return new Builder();
}
@@ -27,7 +28,6 @@ public class Db {
private Builder() {}
-
public Builder url(String url) {
this.url = url;
return this;
@@ -44,6 +44,9 @@ public class Db {
}
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);
@@ -66,15 +69,12 @@ public class Db {
public Connection getConnection() throws Exception {
Connection connection = dataSource.getConnection();
connection.setAutoCommit(false);
+ connection.setSchema("public");
return connection;
}
- public void run(String query) {
- try (Connection connection = getConnection()) {
- run(connection, query);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
+ public void close() {
+ dataSource.close();
}
public void run(Connection connection, String query) {
diff --git a/src/main/java/dev/mduchene/ResourceFileLister.java b/src/main/java/dev/mduchene/ResourceFileLister.java
index 0ff12af..c2bc147 100644
--- a/src/main/java/dev/mduchene/ResourceFileLister.java
+++ b/src/main/java/dev/mduchene/ResourceFileLister.java
@@ -8,7 +8,6 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
public class ResourceFileLister {
diff --git a/src/main/java/dev/mduchene/Server.java b/src/main/java/dev/mduchene/Server.java
index d75a1f2..c3e8334 100644
--- a/src/main/java/dev/mduchene/Server.java
+++ b/src/main/java/dev/mduchene/Server.java
@@ -9,7 +9,13 @@ import java.sql.Connection;
public class Server {
private Javalin app;
- private Db db;
+ private final Db db;
+ private final int port;
+
+ private Server(Db db, int port) {
+ this.db = db;
+ this.port = port;
+ }
public static Builder builder() {
return new Builder();
@@ -66,7 +72,7 @@ public class Server {
throw new RuntimeException("error");
});
- app.start(3001);
+ app.start(port);
return this;
}
@@ -81,6 +87,7 @@ public class Server {
public static class Builder {
private Db db;
+ private int port = 3001;
private Builder() {}
@@ -89,10 +96,13 @@ public class Server {
return this;
}
+ public Builder port(int port) {
+ this.port = port;
+ return this;
+ }
+
public Server build() {
- Server server = new Server();
- server.db = this.db;
- return server;
+ return new Server(db, port);
}
}
}
diff --git a/src/main/resources/migrations/20250920-create-migration.sql b/src/main/resources/migrations/20250920-create-migration.sql
index cde9fe5..54f8e89 100644
--- a/src/main/resources/migrations/20250920-create-migration.sql
+++ b/src/main/resources/migrations/20250920-create-migration.sql
@@ -1,6 +1,6 @@
-create table _migrations (
+create table public._migrations (
name varchar(255) primary key,
executedAt timestamp,
- base int(1),
- content longtext
+ base boolean,
+ content text
)
\ No newline at end of file
diff --git a/src/test/java/dev/mduchene/BasicHttpCallTest.java b/src/test/java/dev/mduchene/BasicHttpCallTest.java
index 99ac0b7..5906a14 100644
--- a/src/test/java/dev/mduchene/BasicHttpCallTest.java
+++ b/src/test/java/dev/mduchene/BasicHttpCallTest.java
@@ -1,12 +1,20 @@
package dev.mduchene;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
+import java.net.http.HttpResponse;
+
+import static dev.mduchene.TestUtil.*;
+import static org.junit.jupiter.api.Assertions.*;
+
@ExtendWith(BoltsIntegrationTest.class)
public class BasicHttpCallTest {
@Test
void test() {
-get("http://localhost:7000/health");
+ HttpResponse res = get("/");
+ assertEquals(200, res.statusCode());
}
}
diff --git a/src/test/java/dev/mduchene/BoltsIntegrationTest.java b/src/test/java/dev/mduchene/BoltsIntegrationTest.java
index 4cb742a..1fad1c6 100644
--- a/src/test/java/dev/mduchene/BoltsIntegrationTest.java
+++ b/src/test/java/dev/mduchene/BoltsIntegrationTest.java
@@ -1,31 +1,40 @@
package dev.mduchene;
-import org.junit.jupiter.api.extension.*;
-
import java.sql.Connection;
+import java.sql.Statement;
+import org.junit.jupiter.api.extension.*;
public class BoltsIntegrationTest
implements BeforeAllCallback, BeforeEachCallback, AfterEachCallback, AfterAllCallback {
+ public static final int PORT = 4001;
+ public static final String BASE_URL = "http://localhost:" + PORT;
private Server server;
@Override
public void beforeAll(ExtensionContext context) throws Exception {
- Db db =
+ Db.Builder dbBuilder =
Db.builder()
- .url("jdbc:postgresql://127.0.0.1:5432/bolts_test")
+ .url("jdbc:postgresql://127.0.0.1:5432/bolts_test?currentSchema=public")
.user("root")
- .password("root")
+ .password("root");
+ Db db =
+ dbBuilder
.build();
- try (Connection connection = db.getConnection()) {
- connection.createStatement().execute("DROP SCHEMA IF EXISTS public CASCADE;");
- connection.createStatement().execute("CREATE SCHEMA public;");
+ try (Connection connection = db.getConnection();
+ Statement stmt = connection.createStatement()) {
+ stmt.executeUpdate("DROP SCHEMA IF EXISTS public CASCADE;");
+ stmt.executeUpdate("CREATE SCHEMA public;");
+ connection.commit();
}
+ db.close();
+ db = dbBuilder.build();
+
Migration.of(db).runBaseMigrations();
- server = Server.builder().db(db).build().start();
+ server = Server.builder().db(db).port(4001).build().start();
}
@Override
diff --git a/src/test/java/dev/mduchene/TestUtil.java b/src/test/java/dev/mduchene/TestUtil.java
index b596742..142b738 100644
--- a/src/test/java/dev/mduchene/TestUtil.java
+++ b/src/test/java/dev/mduchene/TestUtil.java
@@ -1,8 +1,6 @@
package dev.mduchene;
import com.fasterxml.jackson.databind.JsonNode;
-
-import java.io.IOException;
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
@@ -10,8 +8,10 @@ import java.net.http.HttpResponse;
public class TestUtil {
public static HttpResponse get(String url) {
- UriBuilder.
- HttpRequest request = HttpRequest.newBuilder().uri(URI.create(url)).GET().build();
+ StringBuilder sb = new StringBuilder();
+ sb.append(BoltsIntegrationTest.BASE_URL);
+ sb.append(url);
+ HttpRequest request = HttpRequest.newBuilder().uri(URI.create(sb.toString())).GET().build();
try (var client = HttpClient.newHttpClient()) {
return client.send(request, JsonBodyHandler.getInstance());