diff --git a/.dockerignore b/.dockerignore index 4489d51..54483f6 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,4 @@ node_modules public/node_modules -public/dist \ No newline at end of file +public/dist +private/minis-backend/build diff --git a/Dockerfile b/Dockerfile index 0d064bc..0b4b88f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN npm install RUN npm run build-only -FROM amazoncorretto:18 as miniplan +FROM amazoncorretto:21 as miniplan LABEL authors="walamana" RUN mkdir -p /app/public diff --git a/private/minis-backend/build.gradle.kts b/private/minis-backend/build.gradle.kts index ed561f5..2bb2733 100644 --- a/private/minis-backend/build.gradle.kts +++ b/private/minis-backend/build.gradle.kts @@ -5,9 +5,9 @@ val logback_version: String by project val exposed_version: String by project val h2_version: String by project plugins { - kotlin("jvm") version "2.3.21" + kotlin("jvm") version "2.4.10" id("io.ktor.plugin") version "3.5.1" - kotlin("plugin.serialization") version "2.3.21" + kotlin("plugin.serialization") version "2.4.10" id("com.palantir.docker") version "0.36.0" } diff --git a/public/src/router/index.ts b/public/src/router/index.ts index 44bb034..24cab87 100644 --- a/public/src/router/index.ts +++ b/public/src/router/index.ts @@ -13,9 +13,9 @@ const router = createRouter({ { path: "/", name: "home-redirect", - component: null, + component: HomeView, beforeEnter: async (to, from) => { - const groups = (await API.getPlans()) + const groups = (await API.getPlans().then(res => Array.isArray(res) ? res : [])) .sort((a, b) => a.id - b.id) return { name: "home",