From 496398f82e7bd33bda2b6895cebe7db220d27c35 Mon Sep 17 00:00:00 2001 From: Yves AGOSTINI Date: Thu, 31 May 2018 17:40:13 +0200 Subject: [PATCH] start switch to react-admin --- reactviews/package.json | 8 +- reactviews/src/ActionExtract.js | 6 +- reactviews/src/ActionFlushIP.js | 6 +- reactviews/src/App.js | 30 +- reactviews/src/DashTables.js | 8 +- reactviews/src/DashText.js | 13 +- reactviews/src/DashboardCmp.js | 6 +- reactviews/src/Mapview.js | 7 +- reactviews/src/agent.js | 18 +- reactviews/src/alert.js | 16 +- reactviews/src/authClient.js | 2 +- reactviews/src/authLoginPage.js | 2 +- reactviews/src/boarddocs.js | 4 +- reactviews/src/extract.js | 22 +- reactviews/src/ip.js | 27 +- reactviews/src/myJsonRestServer.js | 4 +- reactviews/src/myTheme.js | 46 +- reactviews/src/survey.js | 22 +- reactviews/yarn.lock | 790 +++++++++++++++++++---------- 19 files changed, 657 insertions(+), 380 deletions(-) diff --git a/reactviews/package.json b/reactviews/package.json index f50a8c8..89c7293 100644 --- a/reactviews/package.json +++ b/reactviews/package.json @@ -3,15 +3,15 @@ "version": "0.1.0", "private": true, "dependencies": { - "admin-on-rest": "1.4.0", - "aor-rich-text-input": "^1.0.2", "chart.js": "^2.7.2", "jwt-decode": "^2.2.0", "leaflet": "^1.3.1", "leaflet.markercluster": "^1.3.0", - "react": "^15.6.2", + "ra-input-rich-text": "^2.0.2", + "react": "^16.4.0", + "react-admin": "^2.0.2", "react-chartjs-2": "^2.7.0", - "react-dom": "^15.6.2", + "react-dom": "^16.4.0", "react-leaflet": "1.1.7", "react-leaflet-markercluster": "^1.1.8", "react-scripts": "^1.1.1", diff --git a/reactviews/src/ActionExtract.js b/reactviews/src/ActionExtract.js index 928fc5a..727cfe2 100644 --- a/reactviews/src/ActionExtract.js +++ b/reactviews/src/ActionExtract.js @@ -1,8 +1,8 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; -import FlatButton from 'material-ui/FlatButton'; -import { showNotification as showNotificationAction } from 'admin-on-rest'; +import { Button } from 'react-admin'; +import { showNotification as showNotificationAction } from 'react-admin'; import { push as pushAction } from 'react-router-redux'; import request from 'superagent'; import { MyConfig } from './MyConfig'; @@ -28,7 +28,7 @@ class ActionExtractButton extends Component { } render() { - return ; + return