From 5ad11fbd189a625c8809f70af0ccae51ee8c3b6e Mon Sep 17 00:00:00 2001 From: Leandro Alves Date: Wed, 22 Jun 2022 15:34:01 +0200 Subject: Add vespa assets --- client/js/app/src/app/assets/favicon.svg | 15 -- client/js/app/src/app/assets/img/favicon.svg | 33 ++++ client/js/app/src/app/assets/img/vespa-icon.svg | 33 ++++ client/js/app/src/app/assets/img/vespa-logo.svg | 235 ++++++++++++++++++++++++ client/js/app/src/app/assets/index.js | 2 + client/js/app/src/app/assets/logo.svg | 7 - 6 files changed, 303 insertions(+), 22 deletions(-) delete mode 100644 client/js/app/src/app/assets/favicon.svg create mode 100644 client/js/app/src/app/assets/img/favicon.svg create mode 100644 client/js/app/src/app/assets/img/vespa-icon.svg create mode 100644 client/js/app/src/app/assets/img/vespa-logo.svg create mode 100644 client/js/app/src/app/assets/index.js delete mode 100644 client/js/app/src/app/assets/logo.svg 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 @@ - - - - - - - - - - - - - - - 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 @@ + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - - - - - - - -- cgit v1.2.3 From 99a9c9e471160b226d36ecd3ad4c2f5e640b03e8 Mon Sep 17 00:00:00 2001 From: Leandro Alves Date: Wed, 22 Jun 2022 15:53:58 +0200 Subject: Add basic layout and remove sample code --- client/js/app/index.html | 8 +++- client/js/app/src/app/app.jsx | 16 ++++++++ client/js/app/src/app/components/index.js | 2 +- client/js/app/src/app/components/layout/app.jsx | 43 ---------------------- .../app/src/app/components/layout/header-logo.jsx | 7 ++++ client/js/app/src/app/components/layout/header.jsx | 11 ++++++ client/js/app/src/app/components/layout/layout.jsx | 11 ++++++ client/js/app/src/app/main.jsx | 9 +++++ client/js/app/src/app/pages/home/home.jsx | 5 +++ client/js/app/src/app/pages/main.jsx | 15 -------- client/js/app/src/app/styles/App.css | 42 --------------------- client/js/app/src/app/styles/index.css | 13 ------- 12 files changed, 66 insertions(+), 116 deletions(-) create mode 100644 client/js/app/src/app/app.jsx delete mode 100644 client/js/app/src/app/components/layout/app.jsx create mode 100644 client/js/app/src/app/components/layout/header-logo.jsx create mode 100644 client/js/app/src/app/components/layout/header.jsx create mode 100644 client/js/app/src/app/components/layout/layout.jsx create mode 100644 client/js/app/src/app/main.jsx create mode 100644 client/js/app/src/app/pages/home/home.jsx delete mode 100644 client/js/app/src/app/pages/main.jsx delete mode 100644 client/js/app/src/app/styles/App.css delete mode 100644 client/js/app/src/app/styles/index.css 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 @@ - + Vite App
- + 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 ( + + + + + + + ); +} 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 ( -
-
- logo -

Hello Vite + React!

-

- -

-

- Edit App.jsx and save to test HMR updates. -

-

- - Learn React - - {' | '} - - Vite Docs - -

-
-
- ); -} 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 ; +} 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 ( + + + + ); +} 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 ( + } fixed> + {children} + + ); +} 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( + + + +); 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( - - - - - - -); 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; -} -- cgit v1.2.3