diff --git a/README.md b/README.md index 96643f86..73eda7ea 100644 --- a/README.md +++ b/README.md @@ -1,41 +1,10 @@ # Visualisation Framework +The Data Visualization Framework has been designed and implemented with the vision to support the visualization of diverse data types, in different formats and with various visualizations. Aiming to be extensible in an easy way, its architecture follows a modular design, separating the data storage, the business logic and the front end / User Interface components. +The implemented architecture of the framework is available below: -## Installation +![Visualisation_Framework_Architecture](https://github.com/madgik/VisualisationFramework/blob/master/visualisation_framework_arch.png) -### React Projects +Detailed Documentation for each application and how can exploited can be found at: https://support.d4science.org/projects/aginfraplus_wiki/wiki/D43_-_Open_Science_Visualisation_Technologies -#### Install Dependencies - -yarn install - -#### Run locally - -yarn run start - -#### Build release - -yarn run build - -### Service - -#### Build - -mvn install (root project) - -#### Run locally - -tomcat7:run - -### Portlets - -#### Build - -1. build react project - - copies dist/assets directory to portlet -2. mvn install - - replace manually version numbers in jsp :( -3. copy war to deploy folder - -### Dependencies - -MongoDB on localhost default port \ No newline at end of file +## License +All Components of the Visualisation Framework are licensed under the EUPL V1.1 license. For more information visit: https://joinup.ec.europa.eu/collection/eupl/eupl-text-11-12 diff --git a/data-analytics-network-graph-ui-react/src/App.jsx b/data-analytics-network-graph-ui-react/src/App.jsx index 70390137..a47e6321 100644 --- a/data-analytics-network-graph-ui-react/src/App.jsx +++ b/data-analytics-network-graph-ui-react/src/App.jsx @@ -44,7 +44,6 @@ class App extends React.Component { App.defaultProps = { routing: { baseUrl: 'http://localhost:8081/data-analytics-visualization-service', - // baseUrl: 'http://192.168.32.125:8081/data-analytics-visualization-service', username: 'testTenant' }, size: { diff --git a/data-analytics-visualization-dashboard-react/src/App.jsx b/data-analytics-visualization-dashboard-react/src/App.jsx index 150a001a..05651945 100644 --- a/data-analytics-visualization-dashboard-react/src/App.jsx +++ b/data-analytics-visualization-dashboard-react/src/App.jsx @@ -58,10 +58,10 @@ class App extends React.Component { App.defaultProps = { routing: { - baseUrl: 'http://localhost:8081/data-analytics-visualization-service', - workspaceUrl: 'http://workspace-repository.d4science.org/storagehub/workspace', - workspaceUsername: 'cmitatakis', - workspaceToken: '2a85cb45-5dc1-4d29-a630-919f549e9858-843339462' }, + baseUrl: '', + workspaceUrl: '', + workspaceUsername: '', + workspaceToken: '' }, size: { width: 1000, height: 400 diff --git a/data-analytics-visualization-model/src/main/resources/data-analytics-visualization.properties b/data-analytics-visualization-model/src/main/resources/data-analytics-visualization.properties index 4f76a611..64f2ecf6 100644 --- a/data-analytics-visualization-model/src/main/resources/data-analytics-visualization.properties +++ b/data-analytics-visualization-model/src/main/resources/data-analytics-visualization.properties @@ -1,6 +1,5 @@ -gr.uoa.di.aginfra.data.analytics.visualization.model.persistence.connection=mongodb://localhost:27017 -gr.uoa.di.aginfra.data.analytics.visualization.model.statspersistence.connection=redis://redis:6379 -#gr.uoa.di.aginfra.data.analytics.visualization.model.tempdir=C:\\Users\\cmitatakis\\Desktop\\temp +gr.uoa.di.aginfra.data.analytics.visualization.model.persistence.connection="mongoDB URL" +gr.uoa.di.aginfra.data.analytics.visualization.model.statspersistence.connection="redis" gr.uoa.di.aginfra.data.analytics.visualization.model.default.tempdir=visualization spring.http.multipart.maxFileSize = 25 MB; logging.level.org.apache.http=DEBUG @@ -12,20 +11,16 @@ gr.uoa.di.aginfra.agrodatacubeapi.baseUrl.soiltypes = http://agrodatacube.wur.nl gr.uoa.di.aginfra.agrodatacubeapi.baseUrl.soiltypesV1 = http://agrodatacube.wur.nl/api/v1/rest/soiltypes/ gr.uoa.di.aginfra.agrodatacubeapi.baseUrl.meteodata= http://agrodatacube.wur.nl/api/v2/rest/meteodata -gr.uoa.di.aginfra.agrodatacubeapi.token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3N1ZWR0byI6ImNtaXRhdGFraXNAZGkudW9hLmdyIiwicmVzb3VyY2UiOlsiKiJdLCJyZXF1ZXN0X2xpbWl0IjoyNTAwMCwiYXJlYV9saW1pdCI6MS4wRTgsImV4cCI6MTU4MDQyNTIwMCwiaWF0IjoxNTQ3MjE4NDAyLCJpc3N1ZWRkYXRlIjoxNTQ3MjE4NDAyfQ.wViF3rs4r4S4PWGQllKec967vk6F0Kc_xu6qZ6oGf_c +gr.uoa.di.aginfra.agrodatacubeapi.token = "Agrodatacube token" gr.uoa.di.aginfra.agrodatacubeapi.token.tag = token gr.uoa.di.aginfra.dataminer_url = http://dataminer-prototypes.d4science.org/wps/WebProcessingService #neo4j -spring.data.neo4j.username = devel -spring.data.neo4j.password = g1@D3vE1eNv -spring.data.neo4j.uri =bolt://dl022.madgik.di.uoa.gr:7687 - -#spring.data.neo4j.username = aginfra -#spring.data.neo4j.password = ag1nfr@! -#spring.data.neo4j.uri =bolt://localhost:11001 +spring.data.neo4j.username = "username" +spring.data.neo4j.password = "password" +spring.data.neo4j.uri =bolt:"url to neo4j" #network graph visualization properties node.size.min = 3 diff --git a/visualisation_framework_arch.png b/visualisation_framework_arch.png new file mode 100644 index 00000000..f1f37688 Binary files /dev/null and b/visualisation_framework_arch.png differ