Browse Source

alguns ajustes

master
Nuno Martinho 5 years ago
parent
commit
84afb822b1
13 changed files with 56 additions and 41 deletions
  1. BIN
      dbs/myapp.mv.db
  2. +1
    -0
      server/services/users/register.post.js
  3. +5
    -0
      server/setup/_end.js
  4. +4
    -34
      server/setup/_schema-form-6-user.js
  5. +7
    -7
      website/src/App.js
  6. +0
    -0
      website/src/components/Menu/Side/index.js
  7. +0
    -0
      website/src/components/Menu/Side/index.less
  8. +0
    -0
      website/src/components/Menu/Top/Auth/index.js
  9. +0
    -0
      website/src/components/Menu/Top/Auth/index.less
  10. +28
    -0
      website/src/components/Menu/Top/NoAuth/index.js
  11. +0
    -0
      website/src/components/Menu/Top/NoAuth/index.less
  12. +11
    -0
      website/src/pages/Dashboard/index.js
  13. +0
    -0
      website/src/pages/Dashboard/index.less

BIN
dbs/myapp.mv.db View File


+ 1
- 0
server/services/users/register.post.js View File

@ -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)


+ 5
- 0
server/setup/_end.js View File

@ -0,0 +1,5 @@
_group.createIfNotExists(
_val.map()
.set("name", "Generic User")
.set("code", "user")
)

+ 4
- 34
server/setup/_schema-form-6-user.js View File

@ -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)
)

+ 7
- 7
website/src/App.js View File

@ -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 (
<Router>
<Layout>
<Header>
<Menu mode="horizontal" theme="dark">
<Menu.Item><Link to="/">Home</Link></Menu.Item>
<Menu.Item><Link to="/login">Login</Link></Menu.Item>
<Menu.Item><Link to="/register">Register</Link></Menu.Item>
</Menu>
</Header>
<TopMenuNoAuth />
<Content>
<Switch>
<Route path="/dashboard">
<Dashboard />
</Route>
<Route path="/login">
<Login />
</Route>


website/src/pages/dashboard/index.js → website/src/components/Menu/Side/index.js View File


website/src/pages/dashboard/index.less → website/src/components/Menu/Side/index.less View File


+ 0
- 0
website/src/components/Menu/Top/Auth/index.js View File


+ 0
- 0
website/src/components/Menu/Top/Auth/index.less View File


+ 28
- 0
website/src/components/Menu/Top/NoAuth/index.js View File

@ -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 (
<Header>
<Menu mode="horizontal" theme="dark">
<Menu.Item><Link to="/">Home</Link></Menu.Item>
<Menu.Item><Link to="/login">Login</Link></Menu.Item>
<Menu.Item><Link to="/register">Register</Link></Menu.Item>
</Menu>
</Header>
);
}
export default topMenuNoAuth;

+ 0
- 0
website/src/components/Menu/Top/NoAuth/index.less View File


+ 11
- 0
website/src/pages/Dashboard/index.js View File

@ -0,0 +1,11 @@
import React from 'react';
import './index.less';
export default () => {
return (
<main>
<h2>DASHBOARD</h2>
</main>
);
};

+ 0
- 0
website/src/pages/Dashboard/index.less View File


Loading…
Cancel
Save