Browse Source

Added tabs to the Dashboard

master
ss.pedroisac 5 years ago
parent
commit
a50751454b
16 changed files with 21669 additions and 16155 deletions
  1. BIN
      CachedExtensionVSIXs/dracula-theme.theme-dracula-2.22.3
  2. BIN
      CachedExtensionVSIXs/esbenp.prettier-vscode-6.3.1
  3. BIN
      CachedExtensionVSIXs/fisheva.eva-theme-1.1.4
  4. BIN
      CachedExtensionVSIXs/pkief.material-icon-theme-4.0.1
  5. +1
    -1
      User/state/24ce6c0.json
  6. +1
    -1
      User/state/global.json
  7. BIN
      dbs/social.mv.db
  8. +30
    -0
      dbs/social.trace.db
  9. +0
    -1
      languagepacks.json
  10. +0
    -1
      machineid
  11. +21594
    -16143
      public/scripts/main.js
  12. +1
    -1
      public/scripts/main.js.map
  13. +2
    -1
      ui/package.json
  14. +30
    -3
      ui/src/containers/DashboardContainer/index.jsx
  15. +7
    -0
      ui/src/containers/DashboardContainer/index.less
  16. +3
    -3
      ui/webpack.config.js

BIN
CachedExtensionVSIXs/dracula-theme.theme-dracula-2.22.3 View File


BIN
CachedExtensionVSIXs/esbenp.prettier-vscode-6.3.1 View File


BIN
CachedExtensionVSIXs/fisheva.eva-theme-1.1.4 View File


BIN
CachedExtensionVSIXs/pkief.material-icon-theme-4.0.1 View File


+ 1
- 1
User/state/24ce6c0.json
File diff suppressed because it is too large
View File


+ 1
- 1
User/state/global.json
File diff suppressed because it is too large
View File


BIN
dbs/social.mv.db View File


+ 30
- 0
dbs/social.trace.db View File

@ -2978,3 +2978,33 @@ select * from netuno_app where uid = 'social-netuno' [22018-198]
2021-04-01 14:41:49 jdbc[3]: exception
org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "pessoas" not found; SQL statement:
SELECT * FROM pessoas [42102-198]
2021-04-02 12:06:59 jdbc[3]: exception
org.h2.jdbc.JdbcSQLDataException: Data conversion error converting "social-netuno"; SQL statement:
select * from netuno_app where uid = 'social-netuno' [22018-198]
2021-04-02 12:22:07 jdbc[3]: exception
org.h2.jdbc.JdbcSQLDataException: Data conversion error converting "social-netuno"; SQL statement:
select * from netuno_app where uid = 'social-netuno' [22018-198]
2021-04-02 12:24:31 jdbc[3]: exception
org.h2.jdbc.JdbcSQLDataException: Data conversion error converting "social-netuno"; SQL statement:
select * from netuno_app where uid = 'social-netuno' [22018-198]
2021-04-02 12:25:39 jdbc[3]: exception
org.h2.jdbc.JdbcSQLDataException: Data conversion error converting "social-netuno"; SQL statement:
select * from netuno_app where uid = 'social-netuno' [22018-198]
2021-04-02 12:27:31 jdbc[3]: exception
org.h2.jdbc.JdbcSQLDataException: Data conversion error converting "social-netuno"; SQL statement:
select * from netuno_app where uid = 'social-netuno' [22018-198]
2021-04-02 12:39:10 jdbc[3]: exception
org.h2.jdbc.JdbcSQLDataException: Data conversion error converting "social-netuno"; SQL statement:
select * from netuno_app where uid = 'social-netuno' [22018-198]
2021-04-02 12:44:46 jdbc[3]: exception
org.h2.jdbc.JdbcSQLDataException: Data conversion error converting "social-netuno"; SQL statement:
select * from netuno_app where uid = 'social-netuno' [22018-198]
2021-04-02 12:51:37 jdbc[3]: exception
org.h2.jdbc.JdbcSQLDataException: Data conversion error converting "social-netuno"; SQL statement:
select * from netuno_app where uid = 'social-netuno' [22018-198]
2021-04-02 12:59:16 jdbc[3]: exception
org.h2.jdbc.JdbcSQLDataException: Data conversion error converting "social-netuno"; SQL statement:
select * from netuno_app where uid = 'social-netuno' [22018-198]
2021-04-02 13:34:25 jdbc[3]: exception
org.h2.jdbc.JdbcSQLDataException: Data conversion error converting "social-netuno"; SQL statement:
select * from netuno_app where uid = 'social-netuno' [22018-198]

+ 0
- 1
languagepacks.json View File

@ -1 +0,0 @@
{}

+ 0
- 1
machineid View File

@ -1 +0,0 @@
16b73cf1-174b-4e12-99f3-9f7de15559f8

+ 21594
- 16143
public/scripts/main.js
File diff suppressed because it is too large
View File


+ 1
- 1
public/scripts/main.js.map
File diff suppressed because it is too large
View File


+ 2
- 1
ui/package.json View File

@ -31,6 +31,7 @@
"dependencies": {
"antd": "^4.1.0",
"chart.js": "^2.9.3",
"react-chartjs-2": "^2.9.0"
"react-chartjs-2": "^2.9.0",
"react-icons": "^4.2.0"
}
}

+ 30
- 3
ui/src/containers/DashboardContainer/index.jsx View File

@ -1,10 +1,12 @@
import React, { Component } from "react";
import MyButton from "../../components/MyButton/index.jsx";
import PessoasTabela from "../../components/PessoasTabela/index.jsx";
import Tabs from 'antd/lib/tabs';
import {AiOutlineUser, AiOutlineBarChart, AiOutlineLineChart} from 'react-icons/ai'
import "./index.less";
const { TabPane } = Tabs;
export default class DashboardContainer extends Component {
constructor(props) {
super(props);
@ -44,7 +46,32 @@ export default class DashboardContainer extends Component {
const { counter, data } = this.state;
return (
<div className="my-dashboard">
<PessoasTabela />
<Tabs defaultActiveKey="1">
<TabPane tab={
<span className="tab-name">
<AiOutlineUser size={24} color="#444" style={{marginRight: 5}} />
Pessoas
</span>
} key="1">
<PessoasTabela />
</TabPane>
<TabPane tab={
<span className="tab-name">
<AiOutlineBarChart size={24} color="#444" style={{marginRight: 5}} />
Gráfico de barras
</span>
} key="2">
<>Gráfico</>
</TabPane>
<TabPane tab={
<span className="tab-name">
<AiOutlineLineChart size={24} color="#444" style={{marginRight: 5}} />
Gráfico de linhas
</span>
} key="3">
<>Content 3</>
</TabPane>
</Tabs>
</div>
);
}


+ 7
- 0
ui/src/containers/DashboardContainer/index.less View File

@ -6,3 +6,10 @@
text-align: center;
}
}
.tab-name{
display: flex;
justify-content: center;
align-items: center;
}

+ 3
- 3
ui/webpack.config.js View File

@ -55,9 +55,9 @@ module.exports = {
loader: 'less-loader', // compiles Less to CSS
options: {
modifyVars: {
'primary-color': '#5b5ce1',
'link-color': '#5b5ce1',
'border-radius-base': '5px'
'primary-color': '#444',
'link-color': '#444',
'border-radius-base': '4px',
},
javascriptEnabled: true
}


Loading…
Cancel
Save