From a49414d3a962be367ef057f5cd935172c7c53ccf Mon Sep 17 00:00:00 2001 From: Ali Khalili Date: Wed, 9 Sep 2020 14:07:13 +0200 Subject: [PATCH 1/8] updated animate.css --- components/About.js | 4 ++-- components/Home.js | 2 +- components/admin/UsersList.js | 4 ++-- components/dataset/DatasetPager.js | 4 ++-- components/dataset/Facet.js | 8 ++++---- components/dataset/viewer/BasicResourceList.js | 4 ++-- components/object/AggregateObject.js | 4 ++-- components/object/IndividualObject.js | 2 +- package.json | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/components/About.js b/components/About.js index 81e6a20e..69d8007d 100644 --- a/components/About.js +++ b/components/About.js @@ -30,10 +30,10 @@ class About extends React.Component { tel (+31)-20-598 7731/7718
- Prof.   Frank van Harmelen         + Prof.   Frank van Harmelen        
- Dr.   Ali Khalili                                     + Dr.   Ali Khalili                                    
diff --git a/components/Home.js b/components/Home.js index 0cbf4e58..a533fbc6 100644 --- a/components/Home.js +++ b/components/Home.js @@ -10,7 +10,7 @@ class Home extends React.Component {

Linked Data Reactor (LD-R)

- ld-reactor + ld-reactor Linked Data Reactor (LD-Reactor or LD-R) is a framework to develop reactive and reusable User Interface components for Linked Data applications. LD-Reactor utilizes Facebook's ReactJS components, Flux architecture and Yahoo!'s Fluxible framework for isomorphic Web applications. It also exploits Semantic-UI framework for flexible UI themes. LD-Reactor aims to apply the idea of component-based application development into RDF data model hence enhancing current user interfaces to view, browse and edit Linked Data.
More information is available at ld-r.org.

diff --git a/components/admin/UsersList.js b/components/admin/UsersList.js index 76a0a441..0dcf1ea8 100644 --- a/components/admin/UsersList.js +++ b/components/admin/UsersList.js @@ -92,7 +92,7 @@ class UsersList extends React.Component { if (node.v !== user.id && !parseInt(node.isSuperUser)) { i++; return ( -

+
@@ -132,7 +132,7 @@ class UsersList extends React.Component { : ''}
{this.props.UserStore.msgSent ? -
Your message was successfully sent to all users...
+
Your message was successfully sent to all users...
: parseInt(user.isSuperUser) ?
diff --git a/components/dataset/DatasetPager.js b/components/dataset/DatasetPager.js index b9ce221f..9e850e4a 100644 --- a/components/dataset/DatasetPager.js +++ b/components/dataset/DatasetPager.js @@ -271,7 +271,7 @@ class DatasetPager extends React.Component {
} {!this.state.saveMode ? '' : -
+
@@ -279,7 +279,7 @@ class DatasetPager extends React.Component {
} {!this.state.searchMode ? '' : -
+
diff --git a/components/dataset/Facet.js b/components/dataset/Facet.js index b63412ca..c872fe63 100644 --- a/components/dataset/Facet.js +++ b/components/dataset/Facet.js @@ -429,15 +429,15 @@ class Facet extends React.Component { position: 'relative', overflow: 'auto' }; - let animatedClass= ''; + let animate__animatedClass= ''; if(this.props.spec.property){ - animatedClass = 'animated fadeIn' + animate__animatedClass = 'animate__animated animate__fadeIn' } if(this.state.config && this.state.config.pivotDataset){ - animatedClass = 'animated zoomIn' + animate__animatedClass = 'animate__animated animate__zoomIn' } return ( -
+
{this.state.verticalResized ? diff --git a/components/dataset/viewer/BasicResourceList.js b/components/dataset/viewer/BasicResourceList.js index b1c1495d..aae1343e 100644 --- a/components/dataset/viewer/BasicResourceList.js +++ b/components/dataset/viewer/BasicResourceList.js @@ -198,8 +198,8 @@ class BasicResourceList extends React.Component { geo = node.geo ? node.geo : ''; itemClass = classNames({ 'ui': true, - 'item fadeIn': true, - 'animated': !cloneable + 'item animate__fadeIn': true, + 'animate__animated': !cloneable }); if (!self.props.enableAuthentication) { dbClass = 'black cube icon'; diff --git a/components/object/AggregateObject.js b/components/object/AggregateObject.js index 7ef49afc..9fce6dd5 100644 --- a/components/object/AggregateObject.js +++ b/components/object/AggregateObject.js @@ -131,7 +131,7 @@ class AggregateObjectReactor extends React.Component {
{dataEditType}
-
+
{saveDIV} {(this.state.showDelete ? deleteDIV : '')} {undoDIV} @@ -148,7 +148,7 @@ class AggregateObjectReactor extends React.Component {
{dataViewType}
-
+
{editDIV}
diff --git a/components/object/IndividualObject.js b/components/object/IndividualObject.js index 207307ed..0597065c 100644 --- a/components/object/IndividualObject.js +++ b/components/object/IndividualObject.js @@ -250,7 +250,7 @@ class IndividualObject extends React.Component { {this.props.spec.lang ? {this.getLanguage(this.props.spec.lang)}: null} {this.props.spec.dataType ? : null}
-
+
{detailDIV} {editDIV} {deleteDIV} diff --git a/package.json b/package.json index e541d4bf..e0486191 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ }, "license": "Apache-2.0", "dependencies": { - "animate.css": "^3.7.0", + "animate.css": "^4.1.1", "async": "^3.1.0", "body-parser": "^1.18.3", "camelcase": "^5.0.0", From 8a9d2415d2198ba2b0972648d869a9e4e2d52e65 Mon Sep 17 00:00:00 2001 From: Ali Khalili Date: Wed, 9 Sep 2020 14:10:59 +0200 Subject: [PATCH 2/8] updated camelCase --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e0486191..c63b87e8 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "animate.css": "^4.1.1", "async": "^3.1.0", "body-parser": "^1.18.3", - "camelcase": "^5.0.0", + "camelcase": "^6.0.0", "chroma-js": "^2.0.2", "classnames": "^2.2.6", "codemirror": "^5.40.2", From d23007a2b22068c00614b72c9b406b8711c994b2 Mon Sep 17 00:00:00 2001 From: Ali Khalili Date: Wed, 9 Sep 2020 15:03:49 +0200 Subject: [PATCH 3/8] updated fast-csv --- package.json | 2 +- services/import.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c63b87e8..916c6889 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "express": "^4.16.3", "express-fileupload": "^1.1.6", "express-state": "^2.0.0", - "fast-csv": "^3.4.0", + "fast-csv": "^4.3.2", "flashtext.js": "^1.0.5", "fluxible": "^1.4.0", "fluxible-addons-react": "^0.2.15", diff --git a/services/import.js b/services/import.js index 8bd11e14..08c43264 100644 --- a/services/import.js +++ b/services/import.js @@ -7,7 +7,7 @@ import ImportQuery from './sparql/ImportQuery'; import ImportUtil from './utils/ImportUtil'; import rp from 'request-promise'; //CSV parsing -import csv from 'fast-csv'; +import * as csv from 'fast-csv'; import fs from 'fs'; import path from 'path'; import camelCase from 'camelcase'; @@ -76,6 +76,7 @@ export default { let rows = []; let csvStream = csv.parse(options) .on('data', function(data){ + //console.log(data); counter++; //to limi the number of rows returned if(counter > 10){ From d3b11294a9ae10cfca741547229ed9fb5de7ddf8 Mon Sep 17 00:00:00 2001 From: Ali Khalili Date: Wed, 9 Sep 2020 15:07:11 +0200 Subject: [PATCH 4/8] updated json2csv --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 916c6889..e06a8d2e 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "hogan-express": "^0.5.2", "jqcloud2": "^2.0.3", "jquery": "^3.4.1", - "json2csv": "^4.2.1", + "json2csv": "^5.0.1", "json3": "^3.3.2", "leaflet": "^1.3.4", "log4js": "^6.1.0", From a07a7c33273738365203acf4ad9d964fe4f399b3 Mon Sep 17 00:00:00 2001 From: Ali Khalili Date: Wed, 9 Sep 2020 15:11:13 +0200 Subject: [PATCH 5/8] updated drop-zone --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e06a8d2e..54da80a2 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "rc-calendar": "^9.7.9", "react": "^16.5.2", "react-dom": "^16.5.2", - "react-dropzone": "^10.1.0", + "react-dropzone": "^11.1.0", "react-leaflet": "^2.0.1", "react-loadable": "^5.5.0", "react-markdown": "^4.0.4", From 76c85ca1b533848c4522bf3925d9033b23983a39 Mon Sep 17 00:00:00 2001 From: Ali Khalili Date: Wed, 9 Sep 2020 15:14:43 +0200 Subject: [PATCH 6/8] updated superagent pckg --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 54da80a2..177b02bb 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "serialize-javascript": "^4.0.0", "serve-favicon": "^2.5.0", "simplify-js": "^1.2.3", - "superagent": "^5.0.2", + "superagent": "^6.1.0", "valid-url": "^1.0.9", "wicket": "^1.3.3", "yasgui-yasqe": "^2.11.22" From 0f5352bb8df126b1935eb938c41824e66cf913d2 Mon Sep 17 00:00:00 2001 From: Ali Khalili Date: Wed, 9 Sep 2020 16:38:59 +0200 Subject: [PATCH 7/8] updated webpack plugins --- package.json | 18 ++++++++++-------- webpack/prod.config.js | 25 ++++++++++++++----------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 177b02bb..7b4a443b 100644 --- a/package.json +++ b/package.json @@ -108,23 +108,25 @@ "bundle-loader": "^0.5.6", "clean-webpack-plugin": "^3.0.0", "coveralls": "^3.0.9", - "css-loader": "^3.2.1", + "css-loader": "^4.3.0", "es6-promise": "^4.2.8", "eslint": "^6.7.2", "eslint-plugin-babel": "^5.3.0", "eslint-plugin-react": "^7.17.0", - "extract-text-webpack-plugin": "^4.0.0-beta.0", + "extract-css-chunks-webpack-plugin": "^4.7.5", + "extract-loader": "^5.1.0", + "file-loader": "^6.1.0", "husky": "^3.1.0", "json-loader": "^0.5.7", "nodemon": "^2.0.1", - "postcss-loader": "^3.0.0", - "react-hot-loader": "^4.12.18", + "postcss-loader": "^4.0.1", + "react-hot-loader": "^4.12.21", "shelljs": "^0.8.3", "sloc": "^0.2.1", - "style-loader": "^1.0.1", - "webpack": "^4.41.2", - "webpack-cli": "^3.3.10", - "webpack-dev-server": "^3.9.0", + "style-loader": "^1.2.1", + "webpack": "^4.44.1", + "webpack-cli": "^3.3.12", + "webpack-dev-server": "^3.11.0", "webpack-stats-plugin": "^0.3.0", "webpack-vendor-chunk-plugin": "^1.0.0", "webpack-visualizer-plugin": "^0.1.11" diff --git a/webpack/prod.config.js b/webpack/prod.config.js index 39d9c3f4..3098819f 100644 --- a/webpack/prod.config.js +++ b/webpack/prod.config.js @@ -1,7 +1,7 @@ let webpack = require('webpack'); let path = require('path'); //plugins -const ExtractTextPlugin = require('extract-text-webpack-plugin'); +const ExtractCssChunks = require('extract-css-chunks-webpack-plugin'); const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin; const Visualizer = require('webpack-visualizer-plugin'); @@ -51,11 +51,15 @@ let webpackConfig = { }, { test: /\.css$/, - loader: ExtractTextPlugin.extract({ - fallback: 'style-loader', - use: 'css-loader', - publicPath: '/public/css/' - }) + use: [ + { + loader: ExtractCssChunks.loader, + options: { + publicPath: '/public/css/' + }, + }, + 'css-loader', + ], } ] }, @@ -64,11 +68,10 @@ let webpackConfig = { }, plugins: [ // css files from the extract-text-plugin loader - new ExtractTextPlugin({ - filename: '../css/vendor.bundle.css', - disable: false, - allChunks: true - }), + new ExtractCssChunks({ + filename: '../css/[name].css', + chunkFilename: '../css/vendor.bundle.css', + }), new webpack.DefinePlugin({ 'process.env': { NODE_ENV: JSON.stringify('production'), From ecaecb92fcc29e299f98f0ba8e69f2489c6739dc Mon Sep 17 00:00:00 2001 From: Ali Khalili Date: Wed, 9 Sep 2020 16:42:11 +0200 Subject: [PATCH 8/8] updated eslint --- package.json | 4 ++-- webpack/prod.config.js | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 7b4a443b..2318792d 100644 --- a/package.json +++ b/package.json @@ -110,13 +110,13 @@ "coveralls": "^3.0.9", "css-loader": "^4.3.0", "es6-promise": "^4.2.8", - "eslint": "^6.7.2", + "eslint": "^7.8.1", "eslint-plugin-babel": "^5.3.0", "eslint-plugin-react": "^7.17.0", "extract-css-chunks-webpack-plugin": "^4.7.5", "extract-loader": "^5.1.0", "file-loader": "^6.1.0", - "husky": "^3.1.0", + "husky": "^4.3.0", "json-loader": "^0.5.7", "nodemon": "^2.0.1", "postcss-loader": "^4.0.1", diff --git a/webpack/prod.config.js b/webpack/prod.config.js index 3098819f..ce89a74a 100644 --- a/webpack/prod.config.js +++ b/webpack/prod.config.js @@ -53,13 +53,13 @@ let webpackConfig = { test: /\.css$/, use: [ { - loader: ExtractCssChunks.loader, - options: { - publicPath: '/public/css/' - }, + loader: ExtractCssChunks.loader, + options: { + publicPath: '/public/css/' + }, }, 'css-loader', - ], + ], } ] }, @@ -71,7 +71,7 @@ let webpackConfig = { new ExtractCssChunks({ filename: '../css/[name].css', chunkFilename: '../css/vendor.bundle.css', - }), + }), new webpack.DefinePlugin({ 'process.env': { NODE_ENV: JSON.stringify('production'),