summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2022-06-22 17:42:01 +0200
committerGitHub <noreply@github.com>2022-06-22 17:42:01 +0200
commit31ebdd12ecef0aea384176ed882a12b611480866 (patch)
tree20c4883b913d9d9581c3951bddcb1bbe816d06d6
parent52a552f10e1767a626fd7aa0a17d6f60dc1ad096 (diff)
parent99a9c9e471160b226d36ecd3ad4c2f5e640b03e8 (diff)
Merge pull request #23201 from vespa-engine/ldalves/main-layout
main layout
Diffstat
-rw-r--r--client/js/app/index.html8
-rw-r--r--client/js/app/src/app/app.jsx16
-rw-r--r--client/js/app/src/app/assets/favicon.svg15
-rw-r--r--client/js/app/src/app/assets/img/favicon.svg33
-rw-r--r--client/js/app/src/app/assets/img/vespa-icon.svg33
-rw-r--r--client/js/app/src/app/assets/img/vespa-logo.svg235
-rw-r--r--client/js/app/src/app/assets/index.js2
-rw-r--r--client/js/app/src/app/assets/logo.svg7
-rw-r--r--client/js/app/src/app/components/index.js2
-rw-r--r--client/js/app/src/app/components/layout/app.jsx43
-rw-r--r--client/js/app/src/app/components/layout/header-logo.jsx7
-rw-r--r--client/js/app/src/app/components/layout/header.jsx11
-rw-r--r--client/js/app/src/app/components/layout/layout.jsx11
-rw-r--r--client/js/app/src/app/main.jsx9
-rw-r--r--client/js/app/src/app/pages/home/home.jsx5
-rw-r--r--client/js/app/src/app/pages/main.jsx15
-rw-r--r--client/js/app/src/app/styles/App.css42
-rw-r--r--client/js/app/src/app/styles/index.css13
18 files changed, 369 insertions, 138 deletions
diff --git a/client/js/app/index.html b/client/js/app/index.html
index f6304d618e5..d245c706374 100644
--- a/client/js/app/index.html
+++ b/client/js/app/index.html
@@ -2,12 +2,16 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
- <link rel="icon" type="image/svg+xml" href="/src/app/assets/favicon.svg" />
+ <link
+ rel="icon"
+ type="image/svg+xml"
+ href="/src/app/assets/img/favicon.svg"
+ />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite App</title>
</head>
<body>
<div id="root"></div>
- <script type="module" src="/src/app/pages/main.jsx"></script>
+ <script type="module" src="/src/app/main.jsx"></script>
</body>
</html>
diff --git a/client/js/app/src/app/app.jsx b/client/js/app/src/app/app.jsx
new file mode 100644
index 00000000000..57eba3ea95d
--- /dev/null
+++ b/client/js/app/src/app/app.jsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import { Layout } from 'app/components';
+import { AppRouter } from 'app/libs/app-router';
+import { Home } from 'app/pages/home/home';
+import { QueryBuilder } from 'app/pages/querybuilder/query-builder';
+
+export function App() {
+ return (
+ <Layout>
+ <AppRouter>
+ <Home path="/" />
+ <QueryBuilder path="querybuilder" />
+ </AppRouter>
+ </Layout>
+ );
+}
diff --git a/client/js/app/src/app/assets/favicon.svg b/client/js/app/src/app/assets/favicon.svg
deleted file mode 100644
index de4aeddc12b..00000000000
--- a/client/js/app/src/app/assets/favicon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg width="410" height="404" viewBox="0 0 410 404" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M399.641 59.5246L215.643 388.545C211.844 395.338 202.084 395.378 198.228 388.618L10.5817 59.5563C6.38087 52.1896 12.6802 43.2665 21.0281 44.7586L205.223 77.6824C206.398 77.8924 207.601 77.8904 208.776 77.6763L389.119 44.8058C397.439 43.2894 403.768 52.1434 399.641 59.5246Z" fill="url(#paint0_linear)"/>
-<path d="M292.965 1.5744L156.801 28.2552C154.563 28.6937 152.906 30.5903 152.771 32.8664L144.395 174.33C144.198 177.662 147.258 180.248 150.51 179.498L188.42 170.749C191.967 169.931 195.172 173.055 194.443 176.622L183.18 231.775C182.422 235.487 185.907 238.661 189.532 237.56L212.947 230.446C216.577 229.344 220.065 232.527 219.297 236.242L201.398 322.875C200.278 328.294 207.486 331.249 210.492 326.603L212.5 323.5L323.454 102.072C325.312 98.3645 322.108 94.137 318.036 94.9228L279.014 102.454C275.347 103.161 272.227 99.746 273.262 96.1583L298.731 7.86689C299.767 4.27314 296.636 0.855181 292.965 1.5744Z" fill="url(#paint1_linear)"/>
-<defs>
-<linearGradient id="paint0_linear" x1="6.00017" y1="32.9999" x2="235" y2="344" gradientUnits="userSpaceOnUse">
-<stop stop-color="#41D1FF"/>
-<stop offset="1" stop-color="#BD34FE"/>
-</linearGradient>
-<linearGradient id="paint1_linear" x1="194.651" y1="8.81818" x2="236.076" y2="292.989" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFEA83"/>
-<stop offset="0.0833333" stop-color="#FFDD35"/>
-<stop offset="1" stop-color="#FFA800"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/client/js/app/src/app/assets/img/favicon.svg b/client/js/app/src/app/assets/img/favicon.svg
new file mode 100644
index 00000000000..f5c574a20c5
--- /dev/null
+++ b/client/js/app/src/app/assets/img/favicon.svg
@@ -0,0 +1,33 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 150 150">
+ <defs>
+ <style>
+ .cls-1 {
+ fill: #ff9d4b;
+ }
+ .cls-2 {
+ fill: url(#linear-gradient);
+ }
+ .cls-3 {
+ fill: #1a7db6;
+ }
+ .cls-4 {
+ fill: url(#linear-gradient-2);
+ }
+ </style>
+ <linearGradient id="linear-gradient" x1="-2012.74" y1="44.83" x2="-2057.81" y2="73.4"
+ gradientTransform="matrix(-1, 0, 0, 1, -1921.57, 0)" gradientUnits="userSpaceOnUse">
+ <stop offset="0.01" stop-color="#c6783e" />
+ <stop offset="0.54" stop-color="#ff9750" />
+ </linearGradient>
+ <linearGradient id="linear-gradient-2" x1="60.71" y1="104.56" x2="-15.54" y2="63" gradientUnits="userSpaceOnUse">
+ <stop offset="0" stop-color="#005a8e" />
+ <stop offset="0.54" stop-color="#1a7db6" />
+ </linearGradient>
+ </defs>
+ <polygon class="cls-1" points="84.84 10 34.1 44.46 34.1 103.78 84.84 68.02 135.57 103.78 135.57 44.46 84.84 10" />
+ <polygon class="cls-2" points="84.84 68.02 84.84 10 135.57 44.46 135.57 103.78 84.84 68.02" />
+ <polygon class="cls-3"
+ points="65.07 81.99 14.34 46.22 14.34 105.54 65.07 140 115.81 105.54 115.81 46.22 65.07 81.99" />
+ <polygon class="cls-4" points="65.07 81.99 65.07 140 14.34 105.54 14.34 46.22 65.07 81.99" />
+</svg>
diff --git a/client/js/app/src/app/assets/img/vespa-icon.svg b/client/js/app/src/app/assets/img/vespa-icon.svg
new file mode 100644
index 00000000000..f5c574a20c5
--- /dev/null
+++ b/client/js/app/src/app/assets/img/vespa-icon.svg
@@ -0,0 +1,33 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 150 150">
+ <defs>
+ <style>
+ .cls-1 {
+ fill: #ff9d4b;
+ }
+ .cls-2 {
+ fill: url(#linear-gradient);
+ }
+ .cls-3 {
+ fill: #1a7db6;
+ }
+ .cls-4 {
+ fill: url(#linear-gradient-2);
+ }
+ </style>
+ <linearGradient id="linear-gradient" x1="-2012.74" y1="44.83" x2="-2057.81" y2="73.4"
+ gradientTransform="matrix(-1, 0, 0, 1, -1921.57, 0)" gradientUnits="userSpaceOnUse">
+ <stop offset="0.01" stop-color="#c6783e" />
+ <stop offset="0.54" stop-color="#ff9750" />
+ </linearGradient>
+ <linearGradient id="linear-gradient-2" x1="60.71" y1="104.56" x2="-15.54" y2="63" gradientUnits="userSpaceOnUse">
+ <stop offset="0" stop-color="#005a8e" />
+ <stop offset="0.54" stop-color="#1a7db6" />
+ </linearGradient>
+ </defs>
+ <polygon class="cls-1" points="84.84 10 34.1 44.46 34.1 103.78 84.84 68.02 135.57 103.78 135.57 44.46 84.84 10" />
+ <polygon class="cls-2" points="84.84 68.02 84.84 10 135.57 44.46 135.57 103.78 84.84 68.02" />
+ <polygon class="cls-3"
+ points="65.07 81.99 14.34 46.22 14.34 105.54 65.07 140 115.81 105.54 115.81 46.22 65.07 81.99" />
+ <polygon class="cls-4" points="65.07 81.99 65.07 140 14.34 105.54 14.34 46.22 65.07 81.99" />
+</svg>
diff --git a/client/js/app/src/app/assets/img/vespa-logo.svg b/client/js/app/src/app/assets/img/vespa-logo.svg
new file mode 100644
index 00000000000..239a2a0fc13
--- /dev/null
+++ b/client/js/app/src/app/assets/img/vespa-logo.svg
@@ -0,0 +1,235 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 426.73 157">
+ <defs>
+ <style>
+ .cls-1 {
+ fill: none;
+ clip-rule: evenodd;
+ }
+ .cls-2 {
+ clip-path: url(#clip-path);
+ }
+ .cls-3 {
+ clip-path: url(#clip-path-2);
+ }
+ .cls-4 {
+ clip-path: url(#clip-path-3);
+ }
+ .cls-5 {
+ clip-path: url(#clip-path-4);
+ }
+ .cls-6 {
+ clip-path: url(#clip-path-5);
+ }
+ .cls-7 {
+ clip-path: url(#clip-path-6);
+ }
+ .cls-8 {
+ clip-path: url(#clip-path-7);
+ }
+ .cls-9 {
+ clip-path: url(#clip-path-8);
+ }
+ .cls-10 {
+ clip-path: url(#clip-path-9);
+ }
+ .cls-11 {
+ clip-path: url(#clip-path-10);
+ }
+ .cls-12 {
+ clip-path: url(#clip-path-11);
+ }
+ .cls-13 {
+ clip-path: url(#clip-path-12);
+ }
+ .cls-14 {
+ clip-path: url(#clip-path-13);
+ }
+ .cls-15 {
+ clip-path: url(#clip-path-14);
+ }
+ .cls-16 {
+ clip-path: url(#clip-path-15);
+ }
+ .cls-17 {
+ clip-path: url(#clip-path-16);
+ }
+ .cls-18 {
+ clip-path: url(#clip-path-17);
+ }
+ .cls-19 {
+ clip-path: url(#clip-path-18);
+ }
+ .cls-20 {
+ clip-path: url(#clip-path-19);
+ }
+ .cls-21 {
+ clip-path: url(#clip-path-20);
+ }
+ .cls-22 {
+ clip-path: url(#clip-path-21);
+ }
+ .cls-23 {
+ clip-path: url(#clip-path-22);
+ }
+ .cls-24 {
+ clip-path: url(#clip-path-23);
+ }
+ .cls-25 {
+ clip-path: url(#clip-path-24);
+ }
+ .cls-26 {
+ clip-path: url(#clip-path-25);
+ }
+ .cls-27 {
+ fill: #ff9d4b;
+ }
+ .cls-28 {
+ fill: url(#linear-gradient);
+ }
+ .cls-29 {
+ fill: #1a7db6;
+ }
+ .cls-30 {
+ fill: url(#linear-gradient-2);
+ }
+ .cls-31 {
+ fill: #fff;
+ }
+ </style>
+ <clipPath id="clip-path">
+ <polygon class="cls-1"
+ points="-126.52 -1487.49 133.48 -1388.16 133.48 -1648.82 -126.52 -1748.16 -126.52 -1487.49" />
+ </clipPath>
+ <clipPath id="clip-path-2">
+ <path class="cls-1"
+ d="M-1.82-1672.51a6.31,6.31,0,0,1-6.3-6.32,6.31,6.31,0,0,1,6.3-6.33,6.31,6.31,0,0,1,6.3,6.33,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-3">
+ <path class="cls-1"
+ d="M-1.82-1616a6.31,6.31,0,0,1-6.3-6.33,6.3,6.3,0,0,1,6.3-6.31,6.3,6.3,0,0,1,6.3,6.31,6.31,6.31,0,0,1-6.3,6.33" />
+ </clipPath>
+ <clipPath id="clip-path-4">
+ <path class="cls-1"
+ d="M-1.82-1559.57a6.31,6.31,0,0,1-6.3-6.32,6.3,6.3,0,0,1,6.3-6.32,6.3,6.3,0,0,1,6.3,6.32,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-5">
+ <path class="cls-1"
+ d="M-1.82-1504.78a6.32,6.32,0,0,1-6.3-6.33,6.31,6.31,0,0,1,6.3-6.32,6.31,6.31,0,0,1,6.3,6.32,6.32,6.32,0,0,1-6.3,6.33" />
+ </clipPath>
+ <clipPath id="clip-path-6">
+ <path class="cls-1"
+ d="M-1.82-1446.63a6.31,6.31,0,0,1-6.3-6.32,6.31,6.31,0,0,1,6.3-6.32,6.31,6.31,0,0,1,6.3,6.32,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-7">
+ <path class="cls-1"
+ d="M-1.82-1390.16a6.31,6.31,0,0,1-6.3-6.32,6.31,6.31,0,0,1,6.3-6.32,6.31,6.31,0,0,1,6.3,6.32,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-8">
+ <path class="cls-1"
+ d="M-55.58-1672.51a6.31,6.31,0,0,1-6.3-6.32,6.31,6.31,0,0,1,6.3-6.33,6.31,6.31,0,0,1,6.3,6.33,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-9">
+ <path class="cls-1"
+ d="M-55.58-1616a6.31,6.31,0,0,1-6.3-6.33,6.3,6.3,0,0,1,6.3-6.31,6.3,6.3,0,0,1,6.3,6.31,6.31,6.31,0,0,1-6.3,6.33" />
+ </clipPath>
+ <clipPath id="clip-path-10">
+ <path class="cls-1"
+ d="M-55.58-1559.57a6.31,6.31,0,0,1-6.3-6.32,6.3,6.3,0,0,1,6.3-6.32,6.3,6.3,0,0,1,6.3,6.32,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-11">
+ <path class="cls-1"
+ d="M-55.58-1504.78a6.32,6.32,0,0,1-6.3-6.33,6.31,6.31,0,0,1,6.3-6.32,6.31,6.31,0,0,1,6.3,6.32,6.32,6.32,0,0,1-6.3,6.33" />
+ </clipPath>
+ <clipPath id="clip-path-12">
+ <path class="cls-1"
+ d="M-55.58-1446.63a6.31,6.31,0,0,1-6.3-6.32,6.31,6.31,0,0,1,6.3-6.32,6.31,6.31,0,0,1,6.3,6.32,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-13">
+ <path class="cls-1"
+ d="M-55.58-1390.16a6.31,6.31,0,0,1-6.3-6.32,6.31,6.31,0,0,1,6.3-6.32,6.31,6.31,0,0,1,6.3,6.32,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-14">
+ <path class="cls-1"
+ d="M-106-1672.51a6.31,6.31,0,0,1-6.3-6.32,6.31,6.31,0,0,1,6.3-6.33,6.31,6.31,0,0,1,6.3,6.33,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-15">
+ <path class="cls-1"
+ d="M-106-1616a6.31,6.31,0,0,1-6.3-6.33,6.3,6.3,0,0,1,6.3-6.31,6.3,6.3,0,0,1,6.3,6.31A6.31,6.31,0,0,1-106-1616" />
+ </clipPath>
+ <clipPath id="clip-path-16">
+ <path class="cls-1"
+ d="M-106-1559.57a6.31,6.31,0,0,1-6.3-6.32,6.3,6.3,0,0,1,6.3-6.32,6.3,6.3,0,0,1,6.3,6.32,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-17">
+ <path class="cls-1"
+ d="M-106-1504.78a6.32,6.32,0,0,1-6.3-6.33,6.31,6.31,0,0,1,6.3-6.32,6.31,6.31,0,0,1,6.3,6.32,6.32,6.32,0,0,1-6.3,6.33" />
+ </clipPath>
+ <clipPath id="clip-path-18">
+ <path class="cls-1"
+ d="M-106-1446.63a6.31,6.31,0,0,1-6.3-6.32,6.31,6.31,0,0,1,6.3-6.32,6.31,6.31,0,0,1,6.3,6.32,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-19">
+ <path class="cls-1"
+ d="M-106-1390.16a6.31,6.31,0,0,1-6.3-6.32,6.31,6.31,0,0,1,6.3-6.32,6.31,6.31,0,0,1,6.3,6.32,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-20">
+ <path class="cls-1"
+ d="M-157.22-1672.51a6.31,6.31,0,0,1-6.3-6.32,6.31,6.31,0,0,1,6.3-6.33,6.31,6.31,0,0,1,6.3,6.33,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-21">
+ <path class="cls-1"
+ d="M-157.22-1616a6.31,6.31,0,0,1-6.3-6.33,6.3,6.3,0,0,1,6.3-6.31,6.3,6.3,0,0,1,6.3,6.31,6.31,6.31,0,0,1-6.3,6.33" />
+ </clipPath>
+ <clipPath id="clip-path-22">
+ <path class="cls-1"
+ d="M-157.22-1559.57a6.31,6.31,0,0,1-6.3-6.32,6.3,6.3,0,0,1,6.3-6.32,6.3,6.3,0,0,1,6.3,6.32,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-23">
+ <path class="cls-1"
+ d="M-157.22-1504.78a6.32,6.32,0,0,1-6.3-6.33,6.31,6.31,0,0,1,6.3-6.32,6.31,6.31,0,0,1,6.3,6.32,6.32,6.32,0,0,1-6.3,6.33" />
+ </clipPath>
+ <clipPath id="clip-path-24">
+ <path class="cls-1"
+ d="M-157.22-1446.63a6.31,6.31,0,0,1-6.3-6.32,6.31,6.31,0,0,1,6.3-6.32,6.31,6.31,0,0,1,6.3,6.32,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <clipPath id="clip-path-25">
+ <path class="cls-1"
+ d="M-157.22-1390.16a6.31,6.31,0,0,1-6.3-6.32,6.31,6.31,0,0,1,6.3-6.32,6.31,6.31,0,0,1,6.3,6.32,6.31,6.31,0,0,1-6.3,6.32" />
+ </clipPath>
+ <linearGradient id="linear-gradient" x1="838.35" y1="43.03" x2="793.28" y2="71.6"
+ gradientTransform="matrix(-1, 0, 0, 1, 920.21, 0)" gradientUnits="userSpaceOnUse">
+ <stop offset="0.01" stop-color="#c6783e" />
+ <stop offset="0.54" stop-color="#ff9750" />
+ </linearGradient>
+ <linearGradient id="linear-gradient-2" x1="51.41" y1="102.76" x2="-24.85" y2="61.2" gradientUnits="userSpaceOnUse">
+ <stop offset="0" stop-color="#005a8e" />
+ <stop offset="0.54" stop-color="#1a7db6" />
+ </linearGradient>
+ </defs>
+ <polygon class="cls-27"
+ points="75.53 8.2 24.79 42.66 24.79 101.98 75.53 66.22 126.27 101.98 126.27 42.66 75.53 8.2" />
+ <polygon class="cls-28" points="75.53 66.22 75.53 8.2 126.27 42.66 126.27 101.98 75.53 66.22" />
+ <polygon class="cls-29"
+ points="55.77 80.19 5.03 44.42 5.03 103.74 55.77 138.2 106.51 103.74 106.51 44.42 55.77 80.19" />
+ <polygon class="cls-30" points="55.77 80.19 55.77 138.2 5.03 103.74 5.03 44.42 55.77 80.19" />
+ <path class="cls-31"
+ d="M186.09,100.33H171a.91.91,0,0,1-.85-.61L151.62,46.43a.9.9,0,0,1,.85-1.2h7.89a8.49,8.49,0,0,1,8.19,6.22l10,35.82h.3l9.93-35.81A8.5,8.5,0,0,1,197,45.23h7.54a.9.9,0,0,1,.85,1.2L187,99.72A.92.92,0,0,1,186.09,100.33Z" />
+ <path class="cls-31"
+ d="M283.73,44.28c13.18,0,22.09,6.53,22.82,16.49a.91.91,0,0,1-.9,1H293.88A.89.89,0,0,1,293,61c-.65-3.92-4.2-6.36-9.47-6.36s-8.76,2.35-8.76,5.9c0,2.76,2.4,4.61,7.35,5.76l10.36,2.25c11.06,2.5,15.46,6.76,15.46,15,0,10.71-9.85,17.77-24.26,17.77-14.05,0-23-6.56-24.28-16.6a.92.92,0,0,1,.9-1h12.52a.91.91,0,0,1,.88.69c.95,4.22,4.63,6.57,10.38,6.57s9.35-2.25,9.35-5.86c0-2.85-1.9-4.35-6.9-5.55l-10.16-2.3C266,74.86,260.66,69.5,260.66,61.44,260.66,51.09,269.76,44.28,283.73,44.28Z" />
+ <path class="cls-31"
+ d="M367.47,72.75c0,17.52-8.6,28.23-22.41,28.23-8,0-14.11-3.66-17.12-9.91h-.3v18.77a8.49,8.49,0,0,1-8.5,8.5h-5.21a.9.9,0,0,1-.9-.9V46.13a.9.9,0,0,1,.9-.9h12.61a.9.9,0,0,1,.9.9v8.51h.3c2.9-6.21,9.36-10.06,17.12-10.06C358.82,44.58,367.47,55.24,367.47,72.75Zm-15,0c0-9.9-4.95-16.36-12.51-16.36S327.59,63,327.59,72.8s5,16.37,12.41,16.37S352.51,82.76,352.51,72.75Z" />
+ <path class="cls-31"
+ d="M371.86,84.46c0-10,7.66-15.66,21.72-16.51l12.91-.8a.9.9,0,0,0,.85-.9v-2.8c0-5.31-3.65-8.21-9.66-8.21-5,0-8.59,2.5-9.56,6.15a.94.94,0,0,1-.9.66H375.58a.89.89,0,0,1-.9-1c.92-10,10.26-16.8,23.6-16.8,14.16,0,23.42,7.26,23.42,18.27V99.43a.9.9,0,0,1-.9.9h-4.7a8.51,8.51,0,0,1-8.51-8.51h-.3c-3,5.75-9.81,9.16-16.86,9.16C379.82,101,371.86,94.32,371.86,84.46Zm35.48-4.35v-4l-11.56.8c-6.11.4-9.36,2.8-9.36,6.85s3.46,6.61,8.76,6.61C401.93,90.32,407.34,86.11,407.34,80.11Z" />
+ <path class="cls-31"
+ d="M229.48,44.28C213.32,44.28,203,55.49,203,73s10.26,28.27,27,28.27c12.47,0,22-6.16,24.51-15.6a1.71,1.71,0,0,0-1.64-2.17H242.68a1.87,1.87,0,0,0-1.53,1c-1.71,3.67-5.8,5.88-10.87,5.88A12.63,12.63,0,0,1,221,86.7a13.58,13.58,0,0,1-3.54-9.64v-.9h36.33a1.7,1.7,0,0,0,1.7-1.7V71.65C255.45,54.89,245.34,44.28,229.48,44.28ZM217.57,67.1c.51-7.06,5.4-11.91,12.07-11.91s11.45,4.7,11.7,11.91Z" />
+ <path class="cls-31"
+ d="M188.47,127c-.55-2.91-2.64-4.83-6.08-4.83-4.36,0-6.81,3.25-6.81,9.28s2.47,9.42,6.81,9.42c3.3,0,5.47-1.61,6.08-4.64H196c-.67,6.86-5.67,11.28-13.64,11.28-9.56,0-15-5.78-15-16.06s5.39-15.92,15-15.92c8.11,0,13,4.5,13.64,11.47Z" />
+ <path class="cls-31" d="M199.21,104.5h0a8.08,8.08,0,0,1,8.08,8.08v34.26h0a8.08,8.08,0,0,1-8.08-8.08Z" />
+ <path class="cls-31"
+ d="M210.18,131.5c0-9.92,5.75-16,15.09-16s15.09,6,15.09,16-5.67,16-15.09,16S210.18,141.53,210.18,131.5Zm21.87,0c0-5.89-2.5-9.36-6.78-9.36s-6.78,3.47-6.78,9.36,2.44,9.4,6.78,9.4S232.05,137.45,232.05,131.5Z" />
+ <path class="cls-31"
+ d="M271.83,146.84H264v-4.92h-.5c-1.45,3.56-4.31,5.59-8.95,5.59-6.61,0-10.72-4.22-10.72-11.34v-20h8.08v17.9c0,4.22,1.92,6.39,5.64,6.39,4,0,6.2-2.53,6.2-6.61V116.19h8.08Z" />
+ <path class="cls-31"
+ d="M274.62,131.48c0-9.76,4.78-15.79,12.47-15.79,4.14,0,7.56,2,9.15,5.39h.47V104.5h0a8.08,8.08,0,0,1,8.08,8.08v34.26h-3A4.81,4.81,0,0,1,297,142h-.5c-1.64,3.31-5.11,5.28-9.37,5.28C279.37,147.31,274.62,141.26,274.62,131.48Zm8.31,0c0,5.67,2.58,9.06,6.91,9.06s7-3.42,7-9-2.64-9.06-7-9.06S282.93,125.89,282.93,131.5Z" />
+</svg>
diff --git a/client/js/app/src/app/assets/index.js b/client/js/app/src/app/assets/index.js
new file mode 100644
index 00000000000..a62869fa71b
--- /dev/null
+++ b/client/js/app/src/app/assets/index.js
@@ -0,0 +1,2 @@
+export { default as VespaLogo } from 'app/assets/img/vespa-logo.svg';
+export { default as VespaIcon } from 'app/assets/img/vespa-icon.svg';
diff --git a/client/js/app/src/app/assets/logo.svg b/client/js/app/src/app/assets/logo.svg
deleted file mode 100644
index 6b60c1042f5..00000000000
--- a/client/js/app/src/app/assets/logo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
- <g fill="#61DAFB">
- <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
- <circle cx="420.9" cy="296.5" r="45.7"/>
- <path d="M520.5 78.1z"/>
- </g>
-</svg>
diff --git a/client/js/app/src/app/components/index.js b/client/js/app/src/app/components/index.js
index e7c597c3971..488fc1b23fa 100644
--- a/client/js/app/src/app/components/index.js
+++ b/client/js/app/src/app/components/index.js
@@ -1,2 +1,2 @@
-export { App } from 'app/components/layout/app';
export { Error } from 'app/components/layout/error';
+export { Layout } from 'app/components/layout/layout';
diff --git a/client/js/app/src/app/components/layout/app.jsx b/client/js/app/src/app/components/layout/app.jsx
deleted file mode 100644
index ba8047ba04c..00000000000
--- a/client/js/app/src/app/components/layout/app.jsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, { useState } from 'react';
-import logo from 'app/assets/logo.svg';
-import 'app/styles/App.css';
-
-export function App() {
- const [count, setCount] = useState(0);
-
- return (
- <div className="App">
- <header className="App-header">
- <img src={logo} className="App-logo" alt="logo" />
- <p>Hello Vite + React!</p>
- <p>
- <button type="button" onClick={() => setCount((count) => count + 1)}>
- count is: {count}
- </button>
- </p>
- <p>
- Edit <code>App.jsx</code> and save to test HMR updates.
- </p>
- <p>
- <a
- className="App-link"
- href="https://reactjs.org"
- target="_blank"
- rel="noopener noreferrer"
- >
- Learn React
- </a>
- {' | '}
- <a
- className="App-link"
- href="https://vitejs.dev/guide/features.html"
- target="_blank"
- rel="noopener noreferrer"
- >
- Vite Docs
- </a>
- </p>
- </header>
- </div>
- );
-}
diff --git a/client/js/app/src/app/components/layout/header-logo.jsx b/client/js/app/src/app/components/layout/header-logo.jsx
new file mode 100644
index 00000000000..42b03af4bf6
--- /dev/null
+++ b/client/js/app/src/app/components/layout/header-logo.jsx
@@ -0,0 +1,7 @@
+import React from 'react';
+import { Image } from '@mantine/core';
+import { VespaLogo } from 'app/assets';
+
+export function HeaderLogo() {
+ return <Image height={34} src={VespaLogo} />;
+}
diff --git a/client/js/app/src/app/components/layout/header.jsx b/client/js/app/src/app/components/layout/header.jsx
new file mode 100644
index 00000000000..2ddc3943445
--- /dev/null
+++ b/client/js/app/src/app/components/layout/header.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { Header as MantineHeader } from '@mantine/core';
+import { HeaderLogo } from 'app/components/layout/header-logo';
+
+export function Header() {
+ return (
+ <MantineHeader height={55} sx={{ display: 'flex', alignItems: 'center' }}>
+ <HeaderLogo />
+ </MantineHeader>
+ );
+}
diff --git a/client/js/app/src/app/components/layout/layout.jsx b/client/js/app/src/app/components/layout/layout.jsx
new file mode 100644
index 00000000000..f0f5a0594c0
--- /dev/null
+++ b/client/js/app/src/app/components/layout/layout.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import { AppShell } from '@mantine/core';
+import { Header } from 'app/components/layout/header';
+
+export function Layout({ children }) {
+ return (
+ <AppShell header={<Header />} fixed>
+ {children}
+ </AppShell>
+ );
+}
diff --git a/client/js/app/src/app/main.jsx b/client/js/app/src/app/main.jsx
new file mode 100644
index 00000000000..96514d419e1
--- /dev/null
+++ b/client/js/app/src/app/main.jsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import { App } from 'app/app';
+
+ReactDOM.createRoot(document.getElementById('root')).render(
+ <React.StrictMode>
+ <App />
+ </React.StrictMode>
+);
diff --git a/client/js/app/src/app/pages/home/home.jsx b/client/js/app/src/app/pages/home/home.jsx
new file mode 100644
index 00000000000..d39b696bf08
--- /dev/null
+++ b/client/js/app/src/app/pages/home/home.jsx
@@ -0,0 +1,5 @@
+import React from 'react';
+
+export function Home() {
+ return <>home</>;
+}
diff --git a/client/js/app/src/app/pages/main.jsx b/client/js/app/src/app/pages/main.jsx
deleted file mode 100644
index 00444180447..00000000000
--- a/client/js/app/src/app/pages/main.jsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom/client';
-import { App } from 'app/components';
-import 'app/styles/index.css';
-import { AppRouter } from 'app/libs/app-router';
-import { QueryBuilder } from 'app/pages/querybuilder/query-builder';
-
-ReactDOM.createRoot(document.getElementById('root')).render(
- <React.StrictMode>
- <AppRouter>
- <App path="/" />
- <QueryBuilder path="querybuilder" />
- </AppRouter>
- </React.StrictMode>
-);
diff --git a/client/js/app/src/app/styles/App.css b/client/js/app/src/app/styles/App.css
deleted file mode 100644
index 8da3fde63d9..00000000000
--- a/client/js/app/src/app/styles/App.css
+++ /dev/null
@@ -1,42 +0,0 @@
-.App {
- text-align: center;
-}
-
-.App-logo {
- height: 40vmin;
- pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
- .App-logo {
- animation: App-logo-spin infinite 20s linear;
- }
-}
-
-.App-header {
- background-color: #282c34;
- min-height: 100vh;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- font-size: calc(10px + 2vmin);
- color: white;
-}
-
-.App-link {
- color: #61dafb;
-}
-
-@keyframes App-logo-spin {
- from {
- transform: rotate(0deg);
- }
- to {
- transform: rotate(360deg);
- }
-}
-
-button {
- font-size: calc(10px + 2vmin);
-}
diff --git a/client/js/app/src/app/styles/index.css b/client/js/app/src/app/styles/index.css
deleted file mode 100644
index ec2585e8c0b..00000000000
--- a/client/js/app/src/app/styles/index.css
+++ /dev/null
@@ -1,13 +0,0 @@
-body {
- margin: 0;
- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
- 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
- sans-serif;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-code {
- font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
- monospace;
-}