[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant-backoffice] 01/06: added icons
|
From: |
gnunet |
|
Subject: |
[taler-merchant-backoffice] 01/06: added icons |
|
Date: |
Mon, 08 Feb 2021 21:35:26 +0100 |
This is an automated email from the git hooks/post-receive script.
sebasjm pushed a commit to branch master
in repository merchant-backoffice.
commit a03c4896e4be3f248ce69c0dd60efd90e58a6d19
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Mon Feb 8 15:28:43 2021 -0300
added icons
---
package.json | 1 +
preact.config.js | 28 +++++++++
prerender-urls.json | 6 ++
.../fonts/materialdesignicons-webfont-4.9.95.eot | Bin 0 -> 844600 bytes
.../fonts/materialdesignicons-webfont-4.9.95.ttf | Bin 0 -> 844380 bytes
.../fonts/materialdesignicons-webfont-4.9.95.woff | Bin 0 -> 404384 bytes
.../fonts/materialdesignicons-webfont-4.9.95.woff2 | Bin 0 -> 283040 bytes
.../icons/materialdesignicons-4.9.95.min.css | 3 +
src/components/navbar/index.tsx | 69 +--------------------
src/components/sidebar/index.tsx | 35 +++--------
src/routes/index.tsx | 13 +++-
src/routes/instances/index.tsx | 10 +--
src/template.html | 5 +-
yarn.lock | 39 +++---------
14 files changed, 78 insertions(+), 131 deletions(-)
diff --git a/package.json b/package.json
index 0c88c82..2098077 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
},
"devDependencies": {
"@babel/core": "^7.12.13",
+ "@babel/plugin-transform-react-jsx-source": "^7.12.13",
"@storybook/addon-actions": "^6.1.16",
"@storybook/addon-essentials": "^6.1.16",
"@storybook/addon-links": "^6.1.16",
diff --git a/preact.config.js b/preact.config.js
new file mode 100644
index 0000000..4b4f2ba
--- /dev/null
+++ b/preact.config.js
@@ -0,0 +1,28 @@
+import { lstatSync, readdirSync } from 'fs';
+import path from 'path';
+
+// https://github.com/preactjs/preact-cli/issues/934
+const isDirectory = source => lstatSync(source).isDirectory();
+const getDirectories = source =>
+ readdirSync(source).map(name => path.join(source, name)).filter(isDirectory);
+
+const _useAbsoluteImport = config => getDirectories('src/').map((dir) => {
+ config.resolve.alias[dir.replace('src/', '')] = path.resolve(__dirname, dir);
+});
+
+export default {
+ webpack: (config, env, helpers) => {
+
+ if (env.isProd) {
+ config.devtool = false;
+ }
+ _useAbsoluteImport(config)
+ // const { rule } = helpers.getLoadersByName(config, 'babel-loader')[0];
+ // const babelConfig = rule.options;
+
+ // babelConfig.plugins.push([
+ // require.resolve('@babel/plugin-transform-react-jsx-source'),
+ // { pragma: 'h', pragmaFrag: 'Fragment' },
+ // ]);
+ }
+}
diff --git a/prerender-urls.json b/prerender-urls.json
new file mode 100644
index 0000000..dddcd35
--- /dev/null
+++ b/prerender-urls.json
@@ -0,0 +1,6 @@
+[
+ {
+ "url": "/instances",
+ "title": "Instances"
+ }
+]
diff --git a/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.eot
b/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.eot
new file mode 100644
index 0000000..ab6b25d
Binary files /dev/null and
b/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.eot differ
diff --git a/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.ttf
b/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.ttf
new file mode 100644
index 0000000..824be10
Binary files /dev/null and
b/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.ttf differ
diff --git a/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.woff
b/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.woff
new file mode 100644
index 0000000..7e087c1
Binary files /dev/null and
b/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.woff differ
diff --git a/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.woff2
b/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.woff2
new file mode 100644
index 0000000..b5caa4d
Binary files /dev/null and
b/src/assets/icons/fonts/materialdesignicons-webfont-4.9.95.woff2 differ
diff --git a/src/assets/icons/materialdesignicons-4.9.95.min.css
b/src/assets/icons/materialdesignicons-4.9.95.min.css
new file mode 100644
index 0000000..f7981c3
--- /dev/null
+++ b/src/assets/icons/materialdesignicons-4.9.95.min.css
@@ -0,0 +1,3 @@
+@font-face{font-family:"Material Design
Icons";src:url("/assets/icons/fonts/materialdesignicons-webfont-4.9.95.eot");src:url("/assets/icons/fonts/materialdesignicons-webfont-4.9.95.woff2")
format("woff2"),url("/assets/icons/fonts/materialdesignicons-webfont-4.9.95.woff")
format("woff"),url("/assets/icons/fonts/materialdesignicons-webfont-4.9.95.ttf")
format("truetype");font-weight:normal;font-style:normal}.mdi:before,.mdi-set{display:inline-block;font:normal
normal normal 24px/1 "Materia [...]
+
+/*# sourceMappingURL=materialdesignicons.css.map */
diff --git a/src/components/navbar/index.tsx b/src/components/navbar/index.tsx
index 18f30ce..ab86cad 100644
--- a/src/components/navbar/index.tsx
+++ b/src/components/navbar/index.tsx
@@ -16,73 +16,8 @@ export default function NavigationBar(): VNode {
<span class="icon"><i class="mdi mdi-dots-vertical" /></span>
</a>
</div>
- <div class="navbar-menu fadeIn animated faster" id="navbar-menu">
- <div class="navbar-end">
- <div class="navbar-item has-dropdown has-dropdown-with-icons
has-divider is-hoverable">
- <a class="navbar-link is-arrowless">
- <span class="icon"><i class="mdi mdi-menu" /></span>
- <span>Sample Menu</span>
- <span class="icon">
- <i class="mdi mdi-chevron-down" />
- </span>
- </a>
- <div class="navbar-dropdown">
- <a href="/profile" class="navbar-item">
- <span class="icon"><i class="mdi mdi-account" /></span>
- <span>My Profile</span>
- </a>
- <a class="navbar-item">
- <span class="icon"><i class="mdi mdi-settings" /></span>
- <span>Settings</span>
- </a>
- <a class="navbar-item">
- <span class="icon"><i class="mdi mdi-email" /></span>
- <span>Messages</span>
- </a>
- <hr class="navbar-divider" />
- <a class="navbar-item">
- <span class="icon"><i class="mdi mdi-logout" /></span>
- <span>Log Out</span>
- </a>
- </div>
- </div>
- <div class="navbar-item has-dropdown has-dropdown-with-icons
has-divider has-user-avatar is-hoverable">
- <a class="navbar-link is-arrowless">
- <div class="is-user-avatar">
- <img
src="https://avatars.dicebear.com/4.5/api/male/john-doe.svg"; alt="John Doe" />
- </div>
- <div class="is-user-name"><span>John Doe</span></div>
- <span class="icon"><i class="mdi mdi-chevron-down" /></span>
- </a>
- <div class="navbar-dropdown">
- <a href="/profile" class="navbar-item">
- <span class="icon"><i class="mdi mdi-account" /></span>
- <span>My Profile</span>
- </a>
- <a class="navbar-item">
- <span class="icon"><i class="mdi mdi-settings" /></span>
- <span>Settings</span>
- </a>
- <a class="navbar-item">
- <span class="icon"><i class="mdi mdi-email" /></span>
- <span>Messages</span>
- </a>
- <hr class="navbar-divider" />
- <a class="navbar-item">
- <span class="icon"><i class="mdi mdi-logout" /></span>
- <span>Log Out</span>
- </a>
- </div>
- </div>
- <a href="https://taler.net"; title="About" class="navbar-item
has-divider is-desktop-icon-only">
- <span class="icon"><i class="mdi mdi-help-circle-outline" /></span>
- <span>About</span>
- </a>
- <a title="Log out" class="navbar-item is-desktop-icon-only">
- <span class="icon"><i class="mdi mdi-logout" /></span>
- <span>Log out</span>
- </a>
- </div>
+ <div class="navbar-menu navbar-end">
+ <button class="button is-primary">Log out</button>
</div>
</nav>
);
diff --git a/src/components/sidebar/index.tsx b/src/components/sidebar/index.tsx
index f686eb0..fe569aa 100644
--- a/src/components/sidebar/index.tsx
+++ b/src/components/sidebar/index.tsx
@@ -5,59 +5,44 @@ export default function Sidebar(): VNode {
<aside class="aside is-placed-left is-expanded">
<div class="aside-tools">
<div class="aside-tools-label">
- <span><b>Admin</b> One HTML</span>
+ <span><b>Taler</b> Merchant Backend</span>
</div>
</div>
<div class="menu is-menu-main">
<p class="menu-label">General</p>
<ul class="menu-list">
<li>
- <a href="/" class="is-active router-link-active has-icon">
+ <a href="/instances" class="is-active router-link-active has-icon">
<span class="icon"><i class="mdi mdi-desktop-mac" /></span>
- <span class="menu-item-label">Dashboard</span>
+ <span class="menu-item-label">Instances</span>
</a>
</li>
</ul>
- <p class="menu-label">Examples</p>
+ <p class="menu-label">Instance</p>
<ul class="menu-list">
<li>
<a href="/instances" class="has-icon">
<span class="icon has-update-mark"><i class="mdi mdi-table"
/></span>
- <span class="menu-item-label">Instances</span>
+ <span class="menu-item-label">Manage</span>
</a>
</li>
<li>
<a href="/forms" class="has-icon">
<span class="icon"><i class="mdi mdi-square-edit-outline"
/></span>
- <span class="menu-item-label">Forms</span>
+ <span class="menu-item-label">Orders</span>
</a>
</li>
<li>
<a href="/profile" class="has-icon">
<span class="icon"><i class="mdi mdi-account-circle" /></span>
- <span class="menu-item-label">Profile</span>
+ <span class="menu-item-label">Inventory</span>
</a>
</li>
<li>
- <a class="has-icon has-dropdown-icon">
- <span class="icon"><i class="mdi mdi-view-list" /></span>
- <span class="menu-item-label">Submenus</span>
- <div class="dropdown-icon">
- <span class="icon"><i class="mdi mdi-plus" /></span>
- </div>
+ <a href="/profile" class="has-icon">
+ <span class="icon"><i class="mdi mdi-account-circle" /></span>
+ <span class="menu-item-label">Tipping</span>
</a>
- <ul>
- <li>
- <a href="#void">
- <span>Sub-item One</span>
- </a>
- </li>
- <li>
- <a href="#void">
- <span>Sub-item Two</span>
- </a>
- </li>
- </ul>
</li>
</ul>
<p class="menu-label">About</p>
diff --git a/src/routes/index.tsx b/src/routes/index.tsx
index f3ce566..723fc13 100644
--- a/src/routes/index.tsx
+++ b/src/routes/index.tsx
@@ -1,5 +1,5 @@
import { h, VNode } from 'preact';
-import { Route, Router } from 'preact-router';
+import { route, Route, Router } from 'preact-router';
import NotFoundPage from './notfound';
import Instances from './instances';
@@ -9,6 +9,14 @@ import BulmaProfile from './profile';
import Footer from '../components/footer';
import Sidebar from '../components/sidebar';
import NavigationBar from '../components/navbar';
+import { useEffect } from 'preact/hooks';
+
+function Redirector({ to }: { path: string; to: string }): null {
+ useEffect(() => {
+ route(to, true);
+ })
+ return null;
+}
export default function PageRouter(): VNode {
return (
@@ -16,8 +24,9 @@ export default function PageRouter(): VNode {
<NavigationBar />
<Sidebar />
<Router>
- <Route path="/dashboard" component={Dash} />
+ <Redirector path="/" to="/instances" />
<Route path="/instances" component={Instances} />
+ <Route path="/dashboard" component={Dash} />
<Route path="/forms" component={BulmaForms} />
<Route path="/profile" component={BulmaProfile} />
<NotFoundPage default />
diff --git a/src/routes/instances/index.tsx b/src/routes/instances/index.tsx
index aa0a8f0..2ad4272 100644
--- a/src/routes/instances/index.tsx
+++ b/src/routes/instances/index.tsx
@@ -69,8 +69,8 @@ export default function BulmaTable({}): VNode {
<div class="level-left">
<div class="level-item">
<ul>
- <li>Admin2</li>
- <li>Tables</li>
+ <li>Merchant</li>
+ <li>Instances</li>
</ul>
</div>
</div>
@@ -81,7 +81,7 @@ export default function BulmaTable({}): VNode {
<div class="level">
<div class="level-left">
<div class="level-item"><h1 class="title">
- Responsive Tables
+ List of configured instances
</h1></div>
</div>
<div class="level-right" style="display: none;">
@@ -95,8 +95,8 @@ export default function BulmaTable({}): VNode {
<header class="card-header">
<p class="card-header-title">
<span class="icon"><i class="mdi mdi-account-multiple" /></span>
- Instances
- </p>
+ Instances
+ </p>
<a href="#" class="card-header-icon">
<span class="icon"><i class="mdi mdi-reload" /></span>
</a>
diff --git a/src/template.html b/src/template.html
index e17719a..c1625a9 100644
--- a/src/template.html
+++ b/src/template.html
@@ -6,8 +6,9 @@
<meta name="viewport"
content="width=device-width,initial-scale=1">
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes">
- <link rel="apple-touch-icon"
href="/assets/icons/apple-touch-icon.png">
- <link href="/assets/fonts/nunito.css" rel="stylesheet"
type="text/css">
+ <link rel="apple-touch-icon"
href="/assets/icons/apple-touch-icon.png">
+ <link rel="stylesheet" type="text/css"
href="/assets/fonts/nunito.css" >
+ <link rel="stylesheet" type="text/css"
href="/assets/icons/materialdesignicons-4.9.95.min.css" >
<% preact.headEnd %>
</head>
<body>
diff --git a/yarn.lock b/yarn.lock
index 951ea97..ba0e0f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -746,6 +746,13 @@
dependencies:
"@babel/plugin-transform-react-jsx" "^7.12.12"
+"@babel/plugin-transform-react-jsx-source@^7.12.13":
+ version "7.12.13"
+ resolved
"https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.13.tgz#051d76126bee5c9a6aa3ba37be2f6c1698856bcb";
+ integrity
sha512-O5JJi6fyfih0WfDgIJXksSPhGP/G0fQpfxYy87sDc+1sFmsCS6wr3aAn+whbzkhbjtq4VMqLRaSzR6IsshIC0Q==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.12.13"
+
"@babel/plugin-transform-react-jsx@^7.10.1",
"@babel/plugin-transform-react-jsx@^7.12.1",
"@babel/plugin-transform-react-jsx@^7.12.12",
"@babel/plugin-transform-react-jsx@^7.12.13",
"@babel/plugin-transform-react-jsx@^7.9.0":
version "7.12.13"
resolved
"https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.13.tgz#6c9f993b9f6fb6f0e32a4821ed59349748576a3e";
@@ -4076,29 +4083,6 @@ chardet@^0.7.0:
resolved
"https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e";
integrity
sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-chart.js@^2.9.3:
- version "2.9.4"
- resolved
"https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684";
- integrity
sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==
- dependencies:
- chartjs-color "^2.1.0"
- moment "^2.10.2"
-
-chartjs-color-string@^0.6.0:
- version "0.6.0"
- resolved
"https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71";
- integrity
sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
- dependencies:
- color-name "^1.0.0"
-
-chartjs-color@^2.1.0:
- version "2.4.1"
- resolved
"https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0";
- integrity
sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
- dependencies:
- chartjs-color-string "^0.6.0"
- color-convert "^1.9.3"
-
check-types@^8.0.3:
version "8.0.3"
resolved
"https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552";
@@ -4342,7 +4326,7 @@ collection-visit@^1.0.0:
map-visit "^1.0.0"
object-visit "^1.0.0"
-color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3:
+color-convert@^1.9.0, color-convert@^1.9.1:
version "1.9.3"
resolved
"https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8";
integrity
sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -4621,7 +4605,7 @@ core-js@^2.4.0:
resolved
"https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec";
integrity
sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-core-js@^3.0.1, core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.3:
+core-js@^3.0.1, core-js@^3.0.4, core-js@^3.6.5:
version "3.8.3"
resolved
"https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0";
integrity
sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==
@@ -9538,11 +9522,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
resolved
"https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e";
integrity
sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-moment@^2.10.2:
- version "2.29.1"
- resolved
"https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3";
- integrity
sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
-
moo@^0.5.0:
version "0.5.1"
resolved
"https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4";
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant-backoffice] branch master updated (379e8f2 -> e1bc057), gnunet, 2021/02/08
- [taler-merchant-backoffice] 04/06: missing babelrc for storybook, gnunet, 2021/02/08
- [taler-merchant-backoffice] 01/06: added icons,
gnunet <=
- [taler-merchant-backoffice] 02/06: removing stories directory, gnunet, 2021/02/08
- [taler-merchant-backoffice] 03/06: configuring storybook with styling, gnunet, 2021/02/08
- [taler-merchant-backoffice] 05/06: removed until needed, gnunet, 2021/02/08
- [taler-merchant-backoffice] 06/06: working on instances listing, gnunet, 2021/02/08