abbasyadollahi · dependabot · Jul 12, 2018 · Jul 12, 2018 · Jul 12, 2018 · Jul 12, 2018
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,26 @@
-# Compiled class file
+# Mac OS files
+*.DS_Store
+.java-version
+
+# Compiled class files
 *.class
 
-# Log file
+# Log files
 *.log
 
 # Virtual machine crash logs
 hs_err_pid*
 
-# Node Modules
-node_modules/
+# Node modules
+*node_modules/
+
+# Java settings files
+*.project
+*.settings/
+*.gradle/
+
+# VSCode settings
+*.vscode/
+
+# IntelliJ settings
+*.idea/
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,45 @@
+dist: xenial
+matrix:
+  include:
+    -
+      language: node_js
+      node_js:
+        - lts/*
+        - node
+      cache:
+        directories:
+          - node_modules
+      before_install:
+        - cd TreePLE-Web
+      install:
+        - npm install
+      script:
+        - npm run lint
+        - npm run test
+        - npm run build
+      # deploy:
+      #   provider: heroku
+      #   app: treeple-web
+      #   api_key:
+      #     secure: q52c8gOVk6hT9xqzUTxERbDWPvjWJerHxa9wbhd/McB1OwE1OXzXefvG67aIRVrwvOOUT4SbgUlwT/2jfJxSQjDrMo6zliPYAoCp0KRW4JSKPbVF9qSAazVvVE6ncSy6D+ouZ3v9fZJrb8izYh8To5zYsx2lSM0iUAVyGNoFZq3JYxoDB8mwUjd+55JQfwMQI0QkSOAST70Ud78jPGJ863NFxtIaJFO0RtU0LsQJSPh2/n0ALasju10348KXoLh+GUW529Tv2kFWFsQ1r6cf8VJeQNy8oZquL+Hx9TGgFm6yFeX9heFyhNElcvN/LHwYeKmP1Xpm2t+YtEvDI0Hc8if1UnsmFMY8eIxYJ/9SHOvx2CwhNMHuwWKkCITcdyWo0J2A2Qzb7nUUjckwUQUDn813g7viGCADI8ifirQReadCKGvbP6X0UZAf3viaJetEjq1IZyJaMd9GEVFp6zP6yOtLdMft+Qa35fq9p867gjZugav7jux6eVMzELpNgEZ2nPTnzA/PMWbafqXVIFAmvPCcol693TIIaKTmoF/Fos796n1YfujmMUXKiItJoFFXO+QpaUDfEokNc6TVTKZqRcyJJ1eziGPt6gqKMkB9dvgMa53erFhWy2OfLDuQnti2bJXShJNJIzjrei5Ldk5TyJ+7dulA9l7c1/r+JAwcitU=
+      #   on:
+      #     repo: theGirrafish/TreePLE
+    -
+      language: java
+      jdk:
+        - oraclejdk11
+      services:
+        - postgresql
+      before_install:
+        - cd TreePLE-Spring
+        - psql -c 'create database treeple_test;' -U postgres
+      script:
+        - gradle build -x test
+        - gradle test
+      # deploy:
+      #   provider: heroku
+      #   app: treeple-api
+      #   api_key:
+      #     secure: ZCfDPll62mwc7WBir0hvejHfttT3ib4UwRT2Z+j6IW5/uarEvf6RVw/1OAjBXXJWTG5H3OE7J16a/caN1qaT45TXHokUeB4uo1dK59rSExdY7aPwYWnVKAEM91nobm9olsh4E7CtSnHvSxh77sIzmB29ebYFHd0ikF8+/AoUrrvH4Yr3e8RcxLgWiy8cAeVxY9NyHmtpV1JhI3E5P2WfbuqRNwFB4q0zbpN0ZuvVmq83/YxUolDOX4gZqqp89r3vviYShTIgljnzP4j4D0DAPuaCIgrQBx8ajbz0cQh7wkYtR+OlaQpLGhtwOy9Ni0NYPGLzVThkjomozHDjZgHRbgwz311PsDtEbWi0ZF4xWdRLdUS4gSzGseEzG9eqcpDkcF3nMcV0uLBiPEngJqEA2eSPfBGrPrj6qrN9D5YMrFy+btfiptXIG20a3+tHpdm6s3SamGOxNhb9/5iOY7JqTmf1e9OxV198D2hvMNRNL28Wus1Ka7lEgOa9oUfrfo0teniwryUV+NF6jan/NXubrGE6EXAv7AMkUpbuwSm7/Me4bEj9DCF3UQvmbHr6VBbdwduaxH6PfrUsfcnFRcOCmw22S9M3K9ucAJlH//KalV++PFpblwJXFF8K9fixtZeMpkatmkSNvtTQsSG6RHi9Hp9NsOj5JfSk9hLeBw3X33c=
+      #   on:
+      #     repo: theGirrafish/TreePLE
diff --git a/Documents/Deliverables/Deliverable1.pdf b/Documents/Deliverables/Deliverable1.pdf
diff --git a/Documents/Deliverables/Deliverable2.pdf b/Documents/Deliverables/Deliverable2.pdf
diff --git a/Documents/Deliverables/Deliverable3.pdf b/Documents/Deliverables/Deliverable3.pdf
diff --git a/Documents/Deliverables/Deliverable4.pdf b/Documents/Deliverables/Deliverable4.pdf
diff --git a/Documents/Meetings Log/Meeting 1.docx → Documents/Meetings/Meeting1.docx b/Documents/Meetings Log/Meeting 1.docx → Documents/Meetings/Meeting1.docx
diff --git a/Documents/Meetings Log/Meeting 2.docx → Documents/Meetings/Meeting2.docx b/Documents/Meetings Log/Meeting 2.docx → Documents/Meetings/Meeting2.docx
diff --git a/Documents/Meetings Log/Meeting 3.docx → Documents/Meetings/Meeting3.docx b/Documents/Meetings Log/Meeting 3.docx → Documents/Meetings/Meeting3.docx
diff --git a/Documents/Meetings Log/Meeting 4.docx → Documents/Meetings/Meeting4.docx b/Documents/Meetings Log/Meeting 4.docx → Documents/Meetings/Meeting4.docx
diff --git a/Documents/Meetings Log/Meeting 5.docx → Documents/Meetings/Meeting5.docx b/Documents/Meetings Log/Meeting 5.docx → Documents/Meetings/Meeting5.docx
diff --git a/Documents/Meetings Log/Meeting 6.docx → Documents/Meetings/Meeting6.docx b/Documents/Meetings Log/Meeting 6.docx → Documents/Meetings/Meeting6.docx
diff --git a/Documents/Meetings Log/Meeting 7.docx → Documents/Meetings/Meeting7.docx b/Documents/Meetings Log/Meeting 7.docx → Documents/Meetings/Meeting7.docx
diff --git a/Documents/Meetings Log/Meeting 8.docx → Documents/Meetings/Meeting8.docx b/Documents/Meetings Log/Meeting 8.docx → Documents/Meetings/Meeting8.docx
diff --git a/Documents/Work Plan/Work Plan Week 1.docx → Documents/WorkPlans/WorkPlanW1.docx b/Documents/Work Plan/Work Plan Week 1.docx → Documents/WorkPlans/WorkPlanW1.docx
diff --git a/Documents/Work Plan/Work Plan Week 10.docx → Documents/WorkPlans/WorkPlanW10.docx b/Documents/Work Plan/Work Plan Week 10.docx → Documents/WorkPlans/WorkPlanW10.docx
diff --git a/Documents/Work Plan/Work Plan Week 2.docx → Documents/WorkPlans/WorkPlanW2.docx b/Documents/Work Plan/Work Plan Week 2.docx → Documents/WorkPlans/WorkPlanW2.docx
diff --git a/Documents/Work Plan/Work Plan Week 3.docx → Documents/WorkPlans/WorkPlanW3.docx b/Documents/Work Plan/Work Plan Week 3.docx → Documents/WorkPlans/WorkPlanW3.docx
diff --git a/Documents/Work Plan/Work Plan Week 4.docx → Documents/WorkPlans/WorkPlanW4.docx b/Documents/Work Plan/Work Plan Week 4.docx → Documents/WorkPlans/WorkPlanW4.docx
diff --git a/Documents/Work Plan/Work Plan Week 5.docx → Documents/WorkPlans/WorkPlanW5.docx b/Documents/Work Plan/Work Plan Week 5.docx → Documents/WorkPlans/WorkPlanW5.docx
diff --git a/Documents/Work Plan/Work Plan Week 6.docx → Documents/WorkPlans/WorkPlanW6.docx b/Documents/Work Plan/Work Plan Week 6.docx → Documents/WorkPlans/WorkPlanW6.docx
diff --git a/Documents/Work Plan/Work Plan Week 7.docx → Documents/WorkPlans/WorkPlanW7.docx b/Documents/Work Plan/Work Plan Week 7.docx → Documents/WorkPlans/WorkPlanW7.docx
diff --git a/Documents/Work Plan/Work Plan Week 8.docx → Documents/WorkPlans/WorkPlanW8.docx b/Documents/Work Plan/Work Plan Week 8.docx → Documents/WorkPlans/WorkPlanW8.docx
diff --git a/Documents/Work Plan/Work Plan Week 9.docx → Documents/WorkPlans/WorkPlanW9.docx b/Documents/Work Plan/Work Plan Week 9.docx → Documents/WorkPlans/WorkPlanW9.docx
diff --git a/Images/APK.PNG → Images/Android/APK.png b/Images/APK.PNG → Images/Android/APK.png
diff --git a/Images/ChangePass.png → Images/Android/ChangePass.png b/Images/ChangePass.png → Images/Android/ChangePass.png
diff --git a/Images/CreateSpecies.png → Images/Android/CreateSpecies.png b/Images/CreateSpecies.png → Images/Android/CreateSpecies.png
diff --git a/Images/FirstScreen.png → Images/Android/FirstScreen.png b/Images/FirstScreen.png → Images/Android/FirstScreen.png
diff --git a/Images/PlantTree.png → Images/Android/PlantTree.png b/Images/PlantTree.png → Images/Android/PlantTree.png
diff --git a/Images/SignUpResident.png → Images/Android/SignUpResident.png b/Images/SignUpResident.png → Images/Android/SignUpResident.png
diff --git a/Images/SignUpScientist.png → Images/Android/SignUpScientist.png b/Images/SignUpScientist.png → Images/Android/SignUpScientist.png
diff --git a/Images/UpdateTree.png → Images/Android/UpdateTree.png b/Images/UpdateTree.png → Images/Android/UpdateTree.png
diff --git a/Images/ViewTree.png → Images/Android/ViewTree.png b/Images/ViewTree.png → Images/Android/ViewTree.png
diff --git a/Images/CoverageReport.png b/Images/CoverageReport.png
diff --git a/Images/M1.PNG → Images/M1.png b/Images/M1.PNG → Images/M1.png
diff --git a/Images/M2.PNG → Images/M2.png b/Images/M2.PNG → Images/M2.png
diff --git a/Images/M3.PNG → Images/M3.png b/Images/M3.PNG → Images/M3.png
diff --git a/Images/M4.PNG → Images/M4.png b/Images/M4.PNG → Images/M4.png
diff --git a/Images/M5.PNG → Images/M5.png b/Images/M5.PNG → Images/M5.png
diff --git a/Images/treeple_logo.png → Images/TreepleLogo.png b/Images/treeple_logo.png → Images/TreepleLogo.png
diff --git a/Images/WP1.PNG → Images/WP1.png b/Images/WP1.PNG → Images/WP1.png
diff --git a/Images/WP2.PNG → Images/WP2.png b/Images/WP2.PNG → Images/WP2.png
diff --git a/Images/WP3.PNG → Images/WP3.png b/Images/WP3.PNG → Images/WP3.png
diff --git a/Images/WP4.PNG → Images/WP4.png b/Images/WP4.PNG → Images/WP4.png
diff --git a/Images/WP5.PNG → Images/WP5.png b/Images/WP5.PNG → Images/WP5.png
diff --git a/Images/AttributesWeb.PNG → Images/Web/Attributes.png b/Images/AttributesWeb.PNG → Images/Web/Attributes.png
diff --git a/Images/FirstScreenWeb.PNG → Images/Web/FirstScreen.png b/Images/FirstScreenWeb.PNG → Images/Web/FirstScreen.png
diff --git a/Images/ForecastWeb.PNG → Images/Web/Forecast.png b/Images/ForecastWeb.PNG → Images/Web/Forecast.png
diff --git a/Images/HoverWindowWeb.PNG → Images/Web/HoverWindow.png b/Images/HoverWindowWeb.PNG → Images/Web/HoverWindow.png
diff --git a/Images/MunicipalityView.PNG → Images/Web/MunicipalityView.png b/Images/MunicipalityView.PNG → Images/Web/MunicipalityView.png
diff --git a/Images/CreateTreeWeb.PNG → Images/Web/PlantTree.png b/Images/CreateTreeWeb.PNG → Images/Web/PlantTree.png
diff --git a/Images/SSL.png → Images/Web/SSL.png b/Images/SSL.png → Images/Web/SSL.png
diff --git a/Images/SignInWeb.PNG → Images/Web/SignIn.png b/Images/SignInWeb.PNG → Images/Web/SignIn.png
diff --git a/Images/RegisterWeb.PNG → Images/Web/SignUp.png b/Images/RegisterWeb.PNG → Images/Web/SignUp.png
diff --git a/Images/UpdateTreeWeb.PNG → Images/Web/UpdateTree.png b/Images/UpdateTreeWeb.PNG → Images/Web/UpdateTree.png
diff --git a/Images/ViewTreeWeb.PNG → Images/Web/ViewTree.png b/Images/ViewTreeWeb.PNG → Images/Web/ViewTree.png
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 ## TreePLE
 
 As the core functionality, the TreePLE system allows to manage trees in an urban environment.
-TreePLE enables forecasting to analyze sustainability attributes in what-if scenarios to help implement a plan for urban forest management by scientists and urban foresters. See the [wiki](https://github.mcgill.ca/ECSE321-2018-Winter/Project-11/wiki) for additional info.
+TreePLE enables forecasting to analyze sustainability attributes in what-if scenarios to help implement a plan for urban forest management by scientists and urban foresters. See the [wiki](../../wiki) for additional info.
 
 ## Contributors
 
@@ -12,12 +12,12 @@ TreePLE enables forecasting to analyze sustainability attributes in what-if scen
 * Yunus Can Cukran - 260669715
 * Gareth Peters - 260678626
 
-## Notes on creating users
+## Notes on Creating Users
 
 In order to create a user with the role of Scientist, we require an extra password for security purposes. For testing purposes, this password is "i<3tr33s".
 
 ## URLs
 
-Backend: [ecse321-11.ece.mcgill.ca:8080](http://ecse321-11.ece.mcgill.ca:8080)
+Backend: [https://treeple-api.herokuapp.com](https://treeple-api.herokuapp.com)
 
-Web Frontend: [ecse321-11.ece.mcgill.ca:8087](http://ecse321-11.ece.mcgill.ca:8087)
+Web Frontend: [https://treeple-web.herokuapp.com](https://treeple-web.herokuapp.com)
diff --git a/TreePLE-Android/.idea/caches/build_file_checksums.ser b/TreePLE-Android/.idea/caches/build_file_checksums.ser
diff --git a/TreePLE-Android/.idea/codeStyles/Project.xml b/TreePLE-Android/.idea/codeStyles/Project.xml
diff --git a/TreePLE-Android/.idea/gradle.xml b/TreePLE-Android/.idea/gradle.xml
diff --git a/TreePLE-Android/.idea/misc.xml b/TreePLE-Android/.idea/misc.xml
diff --git a/TreePLE-Android/.idea/modules.xml b/TreePLE-Android/.idea/modules.xml
diff --git a/TreePLE-Android/.idea/runConfigurations.xml b/TreePLE-Android/.idea/runConfigurations.xml
diff --git a/TreePLE-Android/.idea/vcs.xml b/TreePLE-Android/.idea/vcs.xml
diff --git a/TreePLE-Android/app/src/main/java/ca/mcgill/ecse321/treeple/utils/VolleyController.java b/TreePLE-Android/app/src/main/java/ca/mcgill/ecse321/treeple/utils/VolleyController.java
@@ -21,7 +21,7 @@ public class VolleyController {
     private Context mContext;
 
     //Backend URL
-    public static final String DEFAULT_BASE_URL = "http://ecse321-11.ece.mcgill.ca:8080/";
+    public static final String DEFAULT_BASE_URL = "https://treeple-api.herokuapp.com/";
 
     private VolleyController(Context context) {
         mContext = context.getApplicationContext();

diff --git a/TreePLE-Android/build.gradle b/TreePLE-Android/build.gradle
@@ -1,17 +1,10 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
-
     repositories {
         google()
         jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.1'
-
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 
@@ -22,7 +15,3 @@ allprojects {
         mavenCentral()
     }
 }
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/TreePLE-Android/deployment/deploy.sh b/TreePLE-Android/deployment/deploy.sh
diff --git a/TreePLE-Android/gradle.properties b/TreePLE-Android/gradle.properties
@@ -1,17 +1,5 @@
 # Project-wide Gradle settings.
 
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
diff --git a/TreePLE-Android/gradle/wrapper/gradle-wrapper.jar b/TreePLE-Android/gradle/wrapper/gradle-wrapper.jar
diff --git a/TreePLE-Android/gradle/wrapper/gradle-wrapper.properties b/TreePLE-Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue Mar 27 00:00:11 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/TreePLE-Android/settings.gradle b/TreePLE-Android/settings.gradle
@@ -1 +1,3 @@
-include ':app'
+include 'app'
+
+rootProject.name='TreePLE-Android'
diff --git a/TreePLE-Spring/.gitignore b/TreePLE-Spring/.gitignore
@@ -1,5 +1,3 @@
-.gradle
-.vscode
 /build/
 /bin/
 /output/
-Original file line number
+Diff line change
@@ -1,5 +1,3 @@
-    .gradle
-    .vscode
     /build/
     /bin/
     /output/
@@ Expand Down @@