Merge branch 'release/1.0.0' into feature/identicon

cryptomator · Sep 26, 2022 · e7f7ccc · e7f7ccc
2 parents f3c9e10 + 0f3582d
commit e7f7ccc
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 14 deletions.
diff --git a/backend/src/main/java/org/cryptomator/hub/filters/FrontendRootPathFilter.java b/backend/src/main/java/org/cryptomator/hub/filters/FrontendRootPathFilter.java
@@ -18,7 +18,7 @@
 import java.io.PrintWriter;
 
 /**
- * Replaces occurences of <code>/%hub.public-root-path%/</code> with the corresponding configuration value.
+ * Replaces occurences of <code>&lt;base href="/"&gt;</code> with the corresponding configuration value from <code>hub.public-root-path</code>.
  */
 public class FrontendRootPathFilter extends HttpFilter {
 
@@ -31,7 +31,7 @@ protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterC
 		var capturedResponse = new CapturingResponseWrapper(res);
 		chain.doFilter(req, capturedResponse);
 		String content = capturedResponse.getCaptureAsString(); // This uses response character encoding.
-		String replacedContent = content.replace("/%hub.public-root-path%/", publicRootPath.get());
+		String replacedContent = content.replace("<base href=\"/\"/>", "<base href=\"%s\"/>".formatted(publicRootPath.get()));
 		res.setContentLength(replacedContent.length());
 		res.getWriter().write(replacedContent);
 		res.getWriter().flush();

diff --git a/backend/src/main/resources/META-INF/web.xml b/backend/src/main/resources/META-INF/web.xml
@@ -13,7 +13,7 @@
         <filter-name>rootPathFilter</filter-name>
         <url-pattern>/index.html</url-pattern>
         <url-pattern>/app/*</url-pattern>
-        <url-pattern>/assets/*</url-pattern>
+        <url-pattern>/</url-pattern>
     </filter-mapping>
 
     <filter>

diff --git a/frontend/index.html b/frontend/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <base href="/"/>
     <meta charset="UTF-8" />
     <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />

diff --git a/frontend/package.json b/frontend/package.json
@@ -12,7 +12,7 @@
     "lint": "eslint -c .eslintrc.js",
     "test": "nyc --reporter lcov mocha -r ts-node/register test/**/*.spec.ts",
     "serve": "vite preview",
-    "dist": "vite build --sourcemap --base=\"/%hub.public-root-path%/\" --outDir=\"../backend/src/main/resources/META-INF/resources\" --emptyOutDir"
+    "dist": "vite build --sourcemap --outDir=\"../backend/src/main/resources/META-INF/resources\" --emptyOutDir"
   },
   "directories": {
     "src": "./src",

diff --git a/frontend/src/common/config.ts b/frontend/src/common/config.ts
@@ -1,7 +1,7 @@
 import AxiosStatic from 'axios';
 
 // these URLs must end on '/':
-export const baseURL = import.meta.env.BASE_URL;
+export const baseURL = new URL(document.baseURI).pathname;
 export const frontendBaseURL = `${baseURL}app/`;
 export const absFrontendBaseURL = `${location.origin}${frontendBaseURL}`;
 export const backendBaseURL = `${baseURL}api/`;

diff --git a/frontend/src/components/Navbar.vue b/frontend/src/components/Navbar.vue
@@ -40,8 +40,8 @@
                   <span class="text-sm font-semibold">{{ me.name }}</span>
                 </div>
                 <div v-for="(itemGroup, index) in profileDropdown" :key="`itemGroup-${index}`" class="px-3.5 py-1.5">
-                  <router-link v-for="item in itemGroup" :key="item.name" v-slot="{ href, navigate }" :to="item.to" >
-                    <MenuItem v-slot="{ active }" :href="href" @click="navigate">
+                  <router-link v-for="item in itemGroup" :key="item.name" v-slot="{ navigate }" :to="item.to" >
+                    <MenuItem v-slot="{ active }" @click="navigate">
                       <div :class="[active ? 'text-primary' : '', 'flex items-center py-1.5 text-sm text-gray-700']">
                         <component :is="item.icon" :class="[active ? 'text-primary' : '', 'flex-none h-5 w-5 text-gray-400 mr-3']" aria-hidden="true" />
                         {{ t(item.name) }}

diff --git a/frontend/src/css/fonts.css b/frontend/src/css/fonts.css
@@ -12,7 +12,7 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('/fonts/opensans-regular.reduced.woff2') format('woff2');
+  src: local('Open Sans Regular'), local('OpenSans-Regular'), url('../fonts/opensans-regular.reduced.woff2') format('woff2');
   unicode-range: U+0020-007F,U+00C4,U+00E4,U+00D6,U+00F6,U+00DC,U+00FC,U+00DF,U+20AC;
 }
 
@@ -25,7 +25,7 @@
   font-style: normal;
   font-weight: 400;
   font-display: swap;
-  src: url('/fonts/quicksand-regular.reduced.woff2') format('woff2');
+  src: url('../fonts/quicksand-regular.reduced.woff2') format('woff2');
   unicode-range: U+0020-007F,U+00C4,U+00E4,U+00D6,U+00F6,U+00DC,U+00FC,U+00DF,U+20AC;
 }
 
@@ -38,7 +38,7 @@
   font-style: normal;
   font-weight: 500;
   font-display: swap;
-  src: url('/fonts/quicksand-medium.reduced.woff2') format('woff2');
+  src: url('../fonts/quicksand-medium.reduced.woff2') format('woff2');
   unicode-range: U+0020-007F,U+00C4,U+00E4,U+00D6,U+00F6,U+00DC,U+00FC,U+00DF,U+20AC;
 }
 
@@ -51,6 +51,6 @@
   font-style: normal;
   font-weight: 700;
   font-display: swap;
-  src: url('/fonts/quicksand-bold.reduced.woff2') format('woff2');
+  src: url('../fonts/quicksand-bold.reduced.woff2') format('woff2');
   unicode-range: U+0043,U+0052,U+0059,U+0050,U+0054,U+004F,U+004D,U+0041,U+0020,U+0048,U+0055,U+0042;
 }
diff --git a/frontend/public/fonts/OFL.txt → frontend/src/fonts/OFL.txt b/frontend/public/fonts/OFL.txt → frontend/src/fonts/OFL.txt
diff --git a/...blic/fonts/opensans-regular.reduced.woff2 → .../src/fonts/opensans-regular.reduced.woff2 b/...blic/fonts/opensans-regular.reduced.woff2 → .../src/fonts/opensans-regular.reduced.woff2
diff --git a/frontend/public/fonts/opensans-regular.woff2 → frontend/src/fonts/opensans-regular.woff2 b/frontend/public/fonts/opensans-regular.woff2 → frontend/src/fonts/opensans-regular.woff2
diff --git a/...public/fonts/quicksand-bold.reduced.woff2 → ...nd/src/fonts/quicksand-bold.reduced.woff2 b/...public/fonts/quicksand-bold.reduced.woff2 → ...nd/src/fonts/quicksand-bold.reduced.woff2
diff --git a/frontend/public/fonts/quicksand-bold.woff2 → frontend/src/fonts/quicksand-bold.woff2 b/frontend/public/fonts/quicksand-bold.woff2 → frontend/src/fonts/quicksand-bold.woff2
diff --git a/...blic/fonts/quicksand-medium.reduced.woff2 → .../src/fonts/quicksand-medium.reduced.woff2 b/...blic/fonts/quicksand-medium.reduced.woff2 → .../src/fonts/quicksand-medium.reduced.woff2
diff --git a/frontend/public/fonts/quicksand-medium.woff2 → frontend/src/fonts/quicksand-medium.woff2 b/frontend/public/fonts/quicksand-medium.woff2 → frontend/src/fonts/quicksand-medium.woff2
diff --git a/...lic/fonts/quicksand-regular.reduced.woff2 → ...src/fonts/quicksand-regular.reduced.woff2 b/...lic/fonts/quicksand-regular.reduced.woff2 → ...src/fonts/quicksand-regular.reduced.woff2
diff --git a/...tend/public/fonts/quicksand-regular.woff2 → frontend/src/fonts/quicksand-regular.woff2 b/...tend/public/fonts/quicksand-regular.woff2 → frontend/src/fonts/quicksand-regular.woff2
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
@@ -6,15 +6,28 @@ import { defineConfig } from 'vite';
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  base: '/',
+  base: './', // we use a <base href="/"/> tag, which all other urls need to be relative to
   plugins: [
     vue(),
     vueI18n({
       include: path.resolve(__dirname, './src/i18n/*.json')
-    })],
+    }),
+  ],
   build: {
     minify: 'esbuild',
-    target: 'esnext'
+    target: 'esnext',
+    assetsInlineLimit: 0,
+    rollupOptions: {
+      output: {
+        manualChunks: (id: string) => {
+          if (id.includes('node_modules')) {
+            return 'vendor';
+          } else {
+            return 'main';
+          }
+        }
+      }
+    }
   },
   server: {
     proxy: {