Skip to content

Commit e6f26dc

Browse files
author
Sascha Pfeiffer
committed
removed devexpress due to their license
Signed-off-by: Sascha Pfeiffer <sascha.pfeiffer@psono.com>
1 parent c025d9a commit e6f26dc

13 files changed

+487
-395
lines changed

‎.gitlab-ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -235,4 +235,3 @@ deploy-github:
235235
# url: https://addons.mozilla.org/de/firefox/addon/psono-pw-password-manager/
236236
# only:
237237
# - /^v[0-9]*\.[0-9]*\.[0-9]*$/
238-

‎LICENSE.md

+25
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,28 @@ https://www.creative-tim.com/product/material-dashboard-react#
4343
SOFTWARE.
4444

4545

46+
## MIT: mui-org/material-ui
47+
48+
https://github.com/mui-org/material-ui
49+
50+
The MIT License (MIT)
51+
52+
Copyright (c) 2014 Call-Em-All
53+
54+
Permission is hereby granted, free of charge, to any person obtaining a copy
55+
of this software and associated documentation files (the "Software"), to deal
56+
in the Software without restriction, including without limitation the rights
57+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
58+
copies of the Software, and to permit persons to whom the Software is
59+
furnished to do so, subject to the following conditions:
60+
61+
The above copyright notice and this permission notice shall be included in all
62+
copies or substantial portions of the Software.
63+
64+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
65+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
66+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
67+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
68+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
69+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
70+
SOFTWARE.

‎package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
"repository": "git@gitlab.com:psono/psono-admin-client.git",
88
"author": "Sascha Pfeiffer",
99
"license": "Apache-2.0",
10+
"homepage": ".",
1011
"dependencies": {
11-
"@devexpress/dx-react-core": "^1.0.1",
12-
"@devexpress/dx-react-grid": "^1.0.1",
13-
"@devexpress/dx-react-grid-material-ui": "^1.0.1",
1412
"axios": "^0.18.0",
1513
"chartist": "^0.10.1",
1614
"clientjs": "^0.1.11",

‎src/components/Cards/ReleaseCard.jsx

+17-9
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
import { Domain, DevicesOther } from 'material-ui-icons';
1212
import PropTypes from 'prop-types';
1313

14-
import { DxTableReleases } from '../../components';
14+
import { CustomPaginationActionsTable } from '../../components';
1515

1616
import { tasksCardStyle } from '../../variables/styles';
1717

@@ -73,23 +73,31 @@ class ReleaseCard extends React.Component {
7373
<CardContent>
7474
{this.state.value === 0 && (
7575
<Typography component="div">
76-
<DxTableReleases
77-
columns={[
76+
<CustomPaginationActionsTable
77+
tableHead={[
7878
{ name: 'name', title: 'Version' },
79-
{ name: 'created_at', title: 'Date' }
79+
{ name: 'created_at', title: 'Date' },
80+
{
81+
name: 'description',
82+
title: 'Release Notes'
83+
}
8084
]}
81-
rows={server_releases}
85+
tableData={server_releases}
8286
/>
8387
</Typography>
8488
)}
8589
{this.state.value === 1 && (
8690
<Typography component="div">
87-
<DxTableReleases
88-
columns={[
91+
<CustomPaginationActionsTable
92+
tableHead={[
8993
{ name: 'name', title: 'Version' },
90-
{ name: 'created_at', title: 'Date' }
94+
{ name: 'created_at', title: 'Date' },
95+
{
96+
name: 'description',
97+
title: 'Release Notes'
98+
}
9199
]}
92-
rows={client_releases}
100+
tableData={client_releases}
93101
/>
94102
</Typography>
95103
)}

‎src/components/Cards/UsersCard.jsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
import { Person, DevicesOther } from 'material-ui-icons';
1212
import PropTypes from 'prop-types';
1313

14-
import { DxTableAllFeatures } from '../../components';
14+
import { CustomPaginationActionsTable } from '../../components';
1515

1616
import { tasksCardStyle } from '../../variables/styles';
1717

@@ -73,8 +73,8 @@ class UsersCard extends React.Component {
7373
<CardContent>
7474
{this.state.value === 0 && (
7575
<Typography component="div">
76-
<DxTableAllFeatures
77-
columns={[
76+
<CustomPaginationActionsTable
77+
tableHead={[
7878
{ name: 'username', title: 'Username' },
7979
{
8080
name: 'create_date',
@@ -89,14 +89,14 @@ class UsersCard extends React.Component {
8989
{ name: 'ga_2fa', title: 'Google Auth' },
9090
{ name: 'duo_2fa', title: 'Duo Auth' }
9191
]}
92-
rows={users}
92+
tableData={users}
9393
/>
9494
</Typography>
9595
)}
9696
{this.state.value === 1 && (
9797
<Typography component="div">
98-
<DxTableAllFeatures
99-
columns={[
98+
<CustomPaginationActionsTable
99+
tableHead={[
100100
{ name: 'username', title: 'Username' },
101101
{
102102
name: 'create_date',
@@ -113,7 +113,7 @@ class UsersCard extends React.Component {
113113
},
114114
{ name: 'active', title: 'Active' }
115115
]}
116-
rows={sessions}
116+
tableData={sessions}
117117
/>
118118
</Typography>
119119
)}

‎src/components/Form/LoginForm.jsx

+5-3
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,12 @@ class LoginForm extends React.Component {
244244
result => {
245245
if (result.hasOwnProperty('errors')) {
246246
let errors = result.errors;
247-
this.setState({ errors });
247+
this.setState({ errors, loginLoading: false });
248248
} else {
249-
console.log(result);
250-
this.setState({ errors: [result] });
249+
this.setState({
250+
errors: [result],
251+
loginLoading: false
252+
});
251253
}
252254
}
253255
)

0 commit comments

Comments
 (0)