Addressing issues 1 + 2, adding demo videos, and adding additional fe…

…atures

LICENSE

@@ -1,11 +1,21 @@
 MIT License
 
-Copyright 2020 Commonwealth of Australia
+Copyright (c) 2020 schimatos
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-The law of the Australian Capital Territory applies to this licence.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

source/.babelrc

@@ -1,9 +1,7 @@
 {
   "presets": [
     "@babel/preset-react",
-    ["@babel/preset-env", {
-      "useBuiltIns": false
-    }]
+    ["@babel/preset-env"]
   ],
   "plugins": [
       ["@babel/plugin-proposal-optional-chaining"],

source/.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:8080",
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}

source/.vscode/tasks.json

@@ -0,0 +1,12 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "echo",
+            "type": "shell",
+            "command": "echo Hello"
+        }
+    ]
+}

source/package.json

@@ -44,7 +44,10 @@
     "react-codemirror2": "^6.0.1",
     "react-dom": "^16.13.1",
     "react-hook-form": "^4.10.2",
+    "react-journey": "^1.1.6",
+    "react-joyride": "^2.2.1",
     "react-native": "^0.61.5",
+    "react-native-copilot": "^2.4.8",
     "react-test-render": "^1.1.2",
     "react-use": "^13.27.1",
     "reactstrap": "^8.4.1",

source/src/client/App.js

@@ -1,37 +1,46 @@
-import React from 'react'
+import React, { useEffect } from 'react'
 import LeftSidebar from './sections/left-sidebar'
 import ActiveraulForm from './forms/activeraul-form/activeraul-form'
 import {useWindowDimensions} from './utils'
 import {AuthProvider, ActiveraulProvider, TargetsProvider, LayoutProvider, TriplestoreProvider, ShaclProvider, HistoryProvider} from './context'
 import _ from 'underscore'
 import Activeraul from './forms/menus/activeraul'
 import Main from './forms/menus/main'
+import { useJourney } from 'react-journey';
+
+export default () => {
+
+    return (
+        <div className='App' style={{padding : '0px', height : '100%'}}>
 
-export default () => (
-    <div className='App' style={{padding : '0px', height : '100%'}}>
         <AuthProvider>
         <LayoutProvider>
         <HistoryProvider>
         <TriplestoreProvider>
 
+
             <Main/>
 
             <ActiveraulProvider>
             <TargetsProvider>
 
                 <ShaclProvider>
 
-                    <LeftSidebar outside={<ActiveraulForm/>} windowDimensions={useWindowDimensions()}/>
+                    <LeftSidebar name='test' outside={<ActiveraulForm/>} windowDimensions={useWindowDimensions()}/>
 
                 </ShaclProvider>
 
                 <Activeraul/>
 
             </TargetsProvider>
             </ActiveraulProvider>
+
+
+        {/* </Joyride> */}
         </TriplestoreProvider>
         </HistoryProvider>
         </LayoutProvider>
         </AuthProvider>
     </div>
-)
+    )
+}

source/src/client/components/sidebar2.js

@@ -1,6 +1,7 @@
-import React, {useState, useEffect} from 'react'
+import React, {useState, useEffect, useRef} from 'react'
 import {Sidebar, Segment, Transition, Button, Header, Container, Table} from 'semantic-ui-react'
 import rightSidebar from '../sections/right-sidebar'
+import { JourneyStep, useJourney  } from 'react-journey';
 
 export default ({direction, width, close, panels, visible, header, pushedContent, outside, panel}) => {
 
@@ -40,6 +41,11 @@ export default ({direction, width, close, panels, visible, header, pushedContent
 
 
     const SidebarComponent = () => {
+
+      const { useStep } = useJourney();
+      const el = useRef(null);
+      useStep(el, 'Once the entity has loaded you are able to see details about it.');
+
         function getWindowDimensions2() {
             const { innerWidth, innerHeight } = window;
             return {
@@ -70,7 +76,11 @@ export default ({direction, width, close, panels, visible, header, pushedContent
         as={Segment.Group}
         horizontal
         animation={'uncover'}
-        children={panel}
+        children={
+        <div ref={el} style={{padding: '0px', margin: '0px', width:'100%', height: '100%'}}>
+          {panel}
+        </div>
+        }
         direction={direction}
         visible={visible}
         width={width}/>)}
@@ -79,7 +89,6 @@ export default ({direction, width, close, panels, visible, header, pushedContent
 
     return (<>
         <Sidebar.Pushable as={Segment} basic style={{padding : '0px', margin : '0px', height : '100%', fixed : 'left'}}>
-
             <SidebarComponent/>
             <Sidebar.Pusher style={{height : '100%', backgroundColor : '#778899'}}>
                 <Segment basic style={{ borderLeft : 'solid grey 0.5px',padding : '0px', backgroundColor : '#778899', width : visible ? `${innerWidth-(474.01)}px` : '100%', align : 'left', height :`${innerHeight-2*42}px`}}>

source/src/client/context/contexts/activeraul-context.js

@@ -24,6 +24,9 @@ const [ActiveraulContext, ActiveraulProvider] = customProvider(reducer, {
     },
     selections : {
 
+    },
+    labels : {
+
     }
 }, 'ActiveraulContext')
 

source/src/client/context/contexts/layout-context.js

@@ -5,7 +5,7 @@ const [LayoutContext, LayoutProvider] = customProvider(reducer, {
     info : true,
     warnings : true,
     propertyDetails : true,
-    selectionsSidebar : false,
+    selectionsSidebar : true,
     creationSidebar : false,
     queries : false,
     optionsType : 'target',