From 638369000362a1ea4e51cbcbb4ff467c02684ce9 Mon Sep 17 00:00:00 2001 From: Jef Oliver Date: Tue, 17 Jan 2023 08:44:33 -0800 Subject: [PATCH 1/2] fix(doc): Update Subdirectory Documentation * This updates subdirectory documentation to denote the requirement of a trailing slash. * Reflects change introduced in frontend/2964. Signed-off-by: Jef Oliver --- docs/content/doc/setup/subdirectory.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/docs/content/doc/setup/subdirectory.md b/docs/content/doc/setup/subdirectory.md index ef438c69d..fb442f5e7 100644 --- a/docs/content/doc/setup/subdirectory.md +++ b/docs/content/doc/setup/subdirectory.md @@ -17,15 +17,27 @@ However, you can still run it in a subdirectory but need to build the frontend y First, make sure you're able to build the frontend from source. Check [the guide about building from source]({{< ref "build-from-source.md">}}#frontend) about that. -Then, run +### Dynamicly set with build command + +Run the build with the `VIKUNJA_FRONTEND_SUBPATH` variable specified. ``` -pnpm vite build --base=/SUBPATH -pnpm workbox copyLibraries dist/ +VIKUNJA_FRONTEND_SUBPATH=/SUBPATH/ pnpm run build ``` Where `SUBPATH` is the subdirectory you want to run Vikunja on. +### Set via .env.local + +* Copy `.env.local.example` to `.env.local` +* Uncomment `VIKUNJA_FRONTEND_SUBPATH` and set `/subpath/` to the desired path. + +After saving, build Vikunja as normal. + +``` +pnpm run build +``` + Once you have the build files you can deploy them as usual. Note that when deploying in docker you'll need to put the files in a web container yourself, you can't use the `Dockerfile` in the repo without modifications. -- 2.45.1 From 5ad290176e4d3f419fc55875c7ae9e001567914f Mon Sep 17 00:00:00 2001 From: kolaente Date: Fri, 3 Feb 2023 09:26:57 +0100 Subject: [PATCH 2/2] chore: update path name --- docs/content/doc/setup/subdirectory.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/content/doc/setup/subdirectory.md b/docs/content/doc/setup/subdirectory.md index fb442f5e7..cc7379f80 100644 --- a/docs/content/doc/setup/subdirectory.md +++ b/docs/content/doc/setup/subdirectory.md @@ -19,10 +19,10 @@ Check [the guide about building from source]({{< ref "build-from-source.md">}}#f ### Dynamicly set with build command -Run the build with the `VIKUNJA_FRONTEND_SUBPATH` variable specified. +Run the build with the `VIKUNJA_FRONTEND_BASE` variable specified. ``` -VIKUNJA_FRONTEND_SUBPATH=/SUBPATH/ pnpm run build +VIKUNJA_FRONTEND_BASE=/SUBPATH/ pnpm run build ``` Where `SUBPATH` is the subdirectory you want to run Vikunja on. @@ -30,7 +30,7 @@ Where `SUBPATH` is the subdirectory you want to run Vikunja on. ### Set via .env.local * Copy `.env.local.example` to `.env.local` -* Uncomment `VIKUNJA_FRONTEND_SUBPATH` and set `/subpath/` to the desired path. +* Uncomment `VIKUNJA_FRONTEND_BASE` and set `/subpath/` to the desired path. After saving, build Vikunja as normal. -- 2.45.1