Fix adding fields and markers

Pynee · Jan 6, 2020 · b9fdfe2 · b9fdfe2
1 parent abd1eb3
commit b9fdfe2
Show file tree

Hide file tree

Showing 114 changed files with 102 additions and 16 deletions.
diff --git a/.env b/.env
@@ -0,0 +1 @@
+REACT_APP_API_URL = https://pynetti.duckdns.org
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,23 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/Icon-sources.txt b/Icon-sources.txt
diff --git a/README.md b/README.md
diff --git a/android/.gitignore b/android/.gitignore
diff --git a/android/.idea/codeStyles/Project.xml b/android/.idea/codeStyles/Project.xml
diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml
diff --git a/android/.idea/runConfigurations.xml b/android/.idea/runConfigurations.xml
diff --git a/android/app/.npmignore b/android/app/.npmignore
diff --git a/android/app/build.gradle b/android/app/build.gradle
diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
diff --git a/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java b/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
diff --git a/android/app/src/main/java/io/ionic/starter/MainActivity.java b/android/app/src/main/java/io/ionic/starter/MainActivity.java
diff --git a/android/app/src/main/res/drawable-land-hdpi/splash.png b/android/app/src/main/res/drawable-land-hdpi/splash.png
diff --git a/android/app/src/main/res/drawable-land-mdpi/splash.png b/android/app/src/main/res/drawable-land-mdpi/splash.png
diff --git a/android/app/src/main/res/drawable-land-xhdpi/splash.png b/android/app/src/main/res/drawable-land-xhdpi/splash.png
diff --git a/android/app/src/main/res/drawable-land-xxhdpi/splash.png b/android/app/src/main/res/drawable-land-xxhdpi/splash.png
diff --git a/android/app/src/main/res/drawable-land-xxxhdpi/splash.png b/android/app/src/main/res/drawable-land-xxxhdpi/splash.png
diff --git a/android/app/src/main/res/drawable-port-hdpi/splash.png b/android/app/src/main/res/drawable-port-hdpi/splash.png
diff --git a/android/app/src/main/res/drawable-port-mdpi/splash.png b/android/app/src/main/res/drawable-port-mdpi/splash.png
diff --git a/android/app/src/main/res/drawable-port-xhdpi/splash.png b/android/app/src/main/res/drawable-port-xhdpi/splash.png
diff --git a/android/app/src/main/res/drawable-port-xxhdpi/splash.png b/android/app/src/main/res/drawable-port-xxhdpi/splash.png
diff --git a/android/app/src/main/res/drawable-port-xxxhdpi/splash.png b/android/app/src/main/res/drawable-port-xxxhdpi/splash.png
diff --git a/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/android/app/src/main/res/drawable/ic_launcher_background.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/android/app/src/main/res/drawable/launch_splash.xml b/android/app/src/main/res/drawable/launch_splash.xml
diff --git a/android/app/src/main/res/drawable/splash.png b/android/app/src/main/res/drawable/splash.png
diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
diff --git a/android/app/src/main/res/xml/file_paths.xml b/android/app/src/main/res/xml/file_paths.xml
diff --git a/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java b/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java
diff --git a/android/build.gradle b/android/build.gradle
diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
diff --git a/android/gradle.properties b/android/gradle.properties
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/gradlew b/android/gradlew
diff --git a/android/gradlew.bat b/android/gradlew.bat
diff --git a/android/settings.gradle b/android/settings.gradle
diff --git a/ionic.config.json b/ionic.config.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/public/add.png b/public/add.png
diff --git a/public/assets/icon/favicon.png b/public/assets/icon/favicon.png
diff --git a/public/assets/icon/icon.png b/public/assets/icon/icon.png
diff --git a/public/assets/shapes.svg b/public/assets/shapes.svg
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/public/manifest.json b/public/manifest.json
diff --git a/public/newField.png b/public/newField.png
diff --git a/public/newMarker.png b/public/newMarker.png
diff --git a/public/newPolygon.png b/public/newPolygon.png
diff --git a/public/pinMarker.png b/public/pinMarker.png
diff --git a/public/pinPolygon.png b/public/pinPolygon.png
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/src/App.test.js b/src/App.test.js
diff --git a/src/App.test.tsx b/src/App.test.tsx
diff --git a/src/components/Map/BottomControls.js b/src/components/Map/BottomControls.js
diff --git a/src/components/Map/FieldElements.js b/src/components/Map/FieldElements.js
diff --git a/src/components/Map/MapControls.js b/src/components/Map/MapControls.js
diff --git a/src/components/Map/TopControls.js b/src/components/Map/TopControls.js
diff --git a/src/components/Map/index.js b/src/components/Map/index.js
diff --git a/src/components/SidePanel/Button.js b/src/components/SidePanel/Button.js
diff --git a/src/components/SidePanel/ButtonRow.js b/src/components/SidePanel/ButtonRow.js
@@ -6,13 +6,45 @@ const ButtonRow = () => {
   const dispatch = useDispatch();
   const addBoundaryMode = e => {
     console.log("AddBoundaryMode clicked");
+    dispatch({
+      type: "ADD_BOUNDARY",
+      payload: {
+        text: "Set name",
+        data: "",
+        editing: true,
+        expanded: true,
+        selected: false,
+        checkable: true,
+        cascade: true,
+        child: [],
+        checked: true,
+        indeterminate: false
+      }
+    });
     dispatch({
       type: "SET_CLICKMODE",
       payload: "SETPOLYGON"
     });
   };
   const addMarkerMode = e => {
     console.log("AddMarkerMode clicked");
+    dispatch({
+      type: "ADD_MARKER",
+      payload: {
+        text: "Set name",
+        data: "",
+        editing: true,
+        expanded: true,
+        selected: false,
+        checkable: true,
+        cascade: true,
+        child: [],
+        checked: true,
+        indeterminate: false,
+        lat: 0,
+        lng: 0
+      }
+    });
     dispatch({
       type: "SET_CLICKMODE",
       payload: "SETMARKER"
@@ -30,7 +62,22 @@ const ButtonRow = () => {
         selected: false,
         checkable: true,
         cascade: true,
-        child: [],
+        child: [
+          {
+            text: "Boundary",
+            data: ["14.54 hectares"],
+            checked: true,
+            selected: false
+          },
+          {
+            text: "Markers",
+            data: ["2 items"],
+            selected: false,
+            checked: true,
+            expanded: true,
+            child: []
+          }
+        ],
         checked: true,
         indeterminate: false
       }

diff --git a/src/components/SidePanel/Draggable.js b/src/components/SidePanel/Draggable.js
diff --git a/src/components/SidePanel/Droppable.js b/src/components/SidePanel/Droppable.js
diff --git a/src/components/SidePanel/EditField.js b/src/components/SidePanel/EditField.js
diff --git a/src/components/SidePanel/TreeView.js b/src/components/SidePanel/TreeView.js
@@ -86,6 +86,7 @@ const Treeview = props => {
               parent = parent.parent;
             }
             if (props.node.editing) {
+              handleSelect(props.node);
               return (
                 <InputField
                   className="treeview-inputfield"

diff --git a/src/components/SidePanel/createTree.js b/src/components/SidePanel/createTree.js
diff --git a/src/components/SidePanel/index.js b/src/components/SidePanel/index.js
diff --git a/src/components/UserFileUpload.js b/src/components/UserFileUpload.js
diff --git a/src/index.css b/src/index.css
diff --git a/src/index.tsx b/src/index.tsx
diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts
diff --git a/src/reducers/fieldReducer.js b/src/reducers/fieldReducer.js
@@ -52,30 +52,44 @@ const fieldReducer = (state = initialState.fieldReducer, action) => {
       });
 
     case "UPDATE_NAME":
-      /*       return produce(state, draftState => {
-        console.log(
-          original(draftState.selected.path).reduce(
-            (prev, current, currentIndex) => {
-              console.log(prev, current, currentIndex);
-              const index = prev.findIndex(element => current === element.id);
-              prev = prev[index];
-            },
-            original(draftState.fieldsJSON)
-          )
-        );   });*/
       return produce(state, draftState => {
+        const path = state.selected.path;
         const index = draftState.fieldsJSON.findIndex(
-          field => state.selected[0] === field.id
+          field => path[0] === field.id
         );
-        draftState.fieldsJSON[index].text = action.payload;
-        draftState.fieldsJSON[index].editing = false;
+        console.log(index, path, action.payload);
+        switch (state.selected.type) {
+          case "Markers":
+            const markerIndex =
+              state.fieldsJSON[index].child[1].child.length - 1;
+            console.log(markerIndex);
+            draftState.fieldsJSON[index].child[1].child[markerIndex].text =
+              action.payload;
+            draftState.fieldsJSON[index].child[1].child[
+              markerIndex
+            ].editing = false;
+            return;
+          case "Boundary":
+            return;
+          default:
+            draftState.fieldsJSON[index].text = action.payload;
+            draftState.fieldsJSON[index].editing = false;
+            return;
+        }
       });
     case "UPDATE":
       return produce(state, draftState => {
         action.path.reduce((prev, curr) => {});
       });
     case "ADD_MARKER":
-      return state;
+      return produce(state, draftState => {
+        const index = draftState.fieldsJSON.findIndex(
+          field => state.selected.path[0] === field.id
+        );
+        console.log(index, state.selected.path[0]);
+        draftState.fieldsJSON[index].child[1].child.push(action.payload);
+      });
+
     case "ADD_POLYGON":
       return state;
     case "ADD_POLYGON_VERTEX":

diff --git a/src/reducers/fileReducer.js b/src/reducers/fileReducer.js
diff --git a/src/reducers/rootReducer.js b/src/reducers/rootReducer.js
diff --git a/src/reducers/treeReducer.js b/src/reducers/treeReducer.js
diff --git a/src/reducers/userReducer.js b/src/reducers/userReducer.js
diff --git a/src/routes/App.css b/src/routes/App.css
diff --git a/src/routes/App.tsx b/src/routes/App.tsx
diff --git a/src/routes/Auth.tsx b/src/routes/Auth.tsx
diff --git a/src/routes/Login.css b/src/routes/Login.css
diff --git a/src/routes/PrivateRoute.js b/src/routes/PrivateRoute.js
diff --git a/src/serviceWorker.js b/src/serviceWorker.js
diff --git a/src/serviceWorker.ts b/src/serviceWorker.ts
diff --git a/src/storage/storage.js b/src/storage/storage.js
diff --git a/src/theme.css b/src/theme.css
diff --git a/src/theme/variables.css b/src/theme/variables.css
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/tslint.json b/tslint.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		REACT_APP_API_URL = https://pynetti.duckdns.org