From 84afb822b126aea8d666b13f6feccc407b502b3c Mon Sep 17 00:00:00 2001 From: Nuno Martinho Date: Thu, 22 Apr 2021 22:59:48 +0000 Subject: [PATCH] alguns ajustes --- dbs/myapp.mv.db | Bin 77824 -> 81920 bytes server/services/users/register.post.js | 1 + server/setup/_end.js | 5 +++ server/setup/_schema-form-6-user.js | 38 ++---------------- website/src/App.js | 14 +++---- .../Menu/Side}/index.js | 0 .../Menu/Side}/index.less | 0 website/src/components/Menu/Top/Auth/index.js | 0 .../src/components/Menu/Top/Auth/index.less | 0 .../src/components/Menu/Top/NoAuth/index.js | 28 +++++++++++++ .../src/components/Menu/Top/NoAuth/index.less | 0 website/src/pages/Dashboard/index.js | 11 +++++ website/src/pages/Dashboard/index.less | 0 13 files changed, 56 insertions(+), 41 deletions(-) rename website/src/{pages/dashboard => components/Menu/Side}/index.js (100%) rename website/src/{pages/dashboard => components/Menu/Side}/index.less (100%) create mode 100644 website/src/components/Menu/Top/Auth/index.js create mode 100644 website/src/components/Menu/Top/Auth/index.less create mode 100644 website/src/components/Menu/Top/NoAuth/index.js create mode 100644 website/src/components/Menu/Top/NoAuth/index.less create mode 100644 website/src/pages/Dashboard/index.js create mode 100644 website/src/pages/Dashboard/index.less diff --git a/dbs/myapp.mv.db b/dbs/myapp.mv.db index 68c495106bd039ad6e306e8e1c2705c0d6da777e..baed4163006209d268cd6bea328fb1b20985e99a 100644 GIT binary patch delta 6256 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 delta 5431 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 a(!+Gb&FK+NRS!v2!YUt@ljXw>tp5g)+FB|A diff --git a/server/services/users/register.post.js b/server/services/users/register.post.js index 98bcd79..6197209 100644 --- a/server/services/users/register.post.js +++ b/server/services/users/register.post.js @@ -34,6 +34,7 @@ if (emailExists != null) { 'user', _val.map() .set("name", name) + .set("user", username) .set("email", email) .set("client_user_id", user_id) .set("role_id", 1) diff --git a/server/setup/_end.js b/server/setup/_end.js index e69de29..07aaa19 100644 --- a/server/setup/_end.js +++ b/server/setup/_end.js @@ -0,0 +1,5 @@ +_group.createIfNotExists( + _val.map() + .set("name", "Generic User") + .set("code", "user") +) \ No newline at end of file diff --git a/server/setup/_schema-form-6-user.js b/server/setup/_schema-form-6-user.js index 3768fb2..50076f3 100644 --- a/server/setup/_schema-form-6-user.js +++ b/server/setup/_schema-form-6-user.js @@ -53,7 +53,7 @@ _form.createComponentIfNotExists( .set("whenview", true) .set("width", 0) .set("x", 1) - .set("y", 6) + .set("y", 7) ) _form.createComponentIfNotExists( "e5ec80ac-841c-416d-b73b-dc3ab56dad69", @@ -83,7 +83,7 @@ _form.createComponentIfNotExists( .set("whenview", true) .set("width", 0) .set("x", 1) - .set("y", 2) + .set("y", 3) ) _form.createComponentIfNotExists( "e5ec80ac-841c-416d-b73b-dc3ab56dad69", @@ -115,36 +115,6 @@ _form.createComponentIfNotExists( .set("x", 1) .set("y", 1) ) -_form.createComponentIfNotExists( - "e5ec80ac-841c-416d-b73b-dc3ab56dad69", - _val.init() - .set("colspan", 0) - .set("displayname", "Password") - .set("firebase", "") - .set("group_id", 0) - .set("height", 0) - .set("max", 0) - .set("min", 0) - .set("name", "password") - .set("notnull", false) - .set("primarykey", false) - .set("properties", "{\"MASK_REVERSE\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"MASK_SELECTONFOCUS\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"MASK\":{\"default\":\"\",\"type\":\"STRING\",\"value\":\"\"}}") - .set("rowspan", 0) - .set("tdheight", 0) - .set("tdwidth", 0) - .set("type", "text") - .set("uid", "c980e7fa-8435-441c-92b4-b6f3145b54ee") - .set("user_id", 0) - .set("whenedit", true) - .set("whenexport", true) - .set("whenfilter", true) - .set("whennew", true) - .set("whenresult", true) - .set("whenview", true) - .set("width", 0) - .set("x", 1) - .set("y", 4) -) _form.createComponentIfNotExists( "e5ec80ac-841c-416d-b73b-dc3ab56dad69", _val.init() @@ -173,7 +143,7 @@ _form.createComponentIfNotExists( .set("whenview", true) .set("width", 0) .set("x", 1) - .set("y", 5) + .set("y", 6) ) _form.createComponentIfNotExists( "e5ec80ac-841c-416d-b73b-dc3ab56dad69", @@ -203,5 +173,5 @@ _form.createComponentIfNotExists( .set("whenview", true) .set("width", 0) .set("x", 1) - .set("y", 1) + .set("y", 2) ) diff --git a/website/src/App.js b/website/src/App.js index a408ca5..00f1379 100644 --- a/website/src/App.js +++ b/website/src/App.js @@ -17,9 +17,12 @@ import { Redirect } from "react-router-dom"; +import TopMenuNoAuth from './components/Menu/Top/NoAuth'; + import Home from './pages/Home'; import Login from './pages/Login'; import Register from './pages/Register'; +import Dashboard from './pages/Dashboard'; import NotFound from './pages/NotFound'; const { Header, Content, Footer } = Layout; @@ -30,15 +33,12 @@ export default () => { return ( -
- - Home - Login - Register - -
+ + + + diff --git a/website/src/pages/dashboard/index.js b/website/src/components/Menu/Side/index.js similarity index 100% rename from website/src/pages/dashboard/index.js rename to website/src/components/Menu/Side/index.js diff --git a/website/src/pages/dashboard/index.less b/website/src/components/Menu/Side/index.less similarity index 100% rename from website/src/pages/dashboard/index.less rename to website/src/components/Menu/Side/index.less diff --git a/website/src/components/Menu/Top/Auth/index.js b/website/src/components/Menu/Top/Auth/index.js new file mode 100644 index 0000000..e69de29 diff --git a/website/src/components/Menu/Top/Auth/index.less b/website/src/components/Menu/Top/Auth/index.less new file mode 100644 index 0000000..e69de29 diff --git a/website/src/components/Menu/Top/NoAuth/index.js b/website/src/components/Menu/Top/NoAuth/index.js new file mode 100644 index 0000000..4f823da --- /dev/null +++ b/website/src/components/Menu/Top/NoAuth/index.js @@ -0,0 +1,28 @@ +import React, { userState, useEffect } from 'react'; + +import { Layout, Menu, Button } from 'antd'; + +import { Link } from "react-router-dom"; + +import './index.less'; + +const topMenuNoAuth = () => { + + const { Header } = Layout; + + return ( +
+ + Home + Login + Register + +
+ + ); + +} + + +export default topMenuNoAuth; + diff --git a/website/src/components/Menu/Top/NoAuth/index.less b/website/src/components/Menu/Top/NoAuth/index.less new file mode 100644 index 0000000..e69de29 diff --git a/website/src/pages/Dashboard/index.js b/website/src/pages/Dashboard/index.js new file mode 100644 index 0000000..04a75c4 --- /dev/null +++ b/website/src/pages/Dashboard/index.js @@ -0,0 +1,11 @@ +import React from 'react'; + +import './index.less'; + +export default () => { + return ( +
+

DASHBOARD

+
+ ); +}; diff --git a/website/src/pages/Dashboard/index.less b/website/src/pages/Dashboard/index.less new file mode 100644 index 0000000..e69de29