Merge branch 'dev' of github.com:mapswipe/python-mapswipe-workers into dev

Author: Matthias-Schaub

docs/source/configuration.md

@@ -20,6 +20,14 @@ The python-mapswipe workers use a bunch of services provided by Google Cloud Pla
     * set API restrictions > Restrict Key > Identity Toolkit API and Cloud Functions API
 4. Also make sure to configure the API keys for the App side here.
 
+Then set up a Service Account Key file:
+1. Open [Google Cloud Service Accounts](https://console.cloud.google.com/iam-admin/serviceaccounts)
+2. Create a new Service Account Key file:
+    * set name (e.g. *dev-mapswipe-workers*)
+    * add roles, (e.g. `Storage Admin` and `Firebase Admin`) or use pre-defined role instead (e.g. `Custom Firebase Developer`)
+3. Download Key as file:
+    * select `.json` and save
+
 ## Firebase
 Firebase is a central part of MapSwipe. In our setup we use *Firebase Database*, *Firebase Database Rules* and *Firebase Functions*. In the documentation we will refer to two elements:
 1. `your_project_id`: This is the name of your Firebase project (e.g. *dev-mapswipe*)

manager_dashboard/manager_dashboard/js/project-management.js

@@ -85,6 +85,8 @@ function getProjects(status) {
               btn.innerHTML = "Activate"
             } else if (data.val().status == "active") {
               btn.innerHTML = "Deactivate"
+            } else if (data.val().status == "new") {
+              btn.innerHTML = "Activate"
             }
             td.appendChild(btn)
             tr.appendChild(td)
@@ -131,6 +133,11 @@ function updateIsFeatured(projectId, newStatus) {
 }
 
 function updateTableView() {
+  var newProjects = document.getElementById("new-projects")
+  while (newProjects.firstChild) {
+    newProjects.removeChild(newProjects.firstChild);
+  }
+
   var inactiveProjects = document.getElementById("inactive-projects")
   while (inactiveProjects.firstChild) {
     inactiveProjects.removeChild(inactiveProjects.firstChild);
@@ -141,6 +148,7 @@ function updateTableView() {
     activeProjects.removeChild(activeProjects.firstChild);
   }
 
+  getProjects("new")
   getProjects("active")
   getProjects("inactive")
 }
@@ -157,6 +165,10 @@ function changeProjectStatus() {
     console.log("current status: inactive")
     updateStatus(this.id, "active")
     console.log("new status: active")
+  } else if (this.classList.contains("status-new")) {
+    console.log("current status: new")
+    updateStatus(this.id, "active")
+    console.log("new status: active")
   }
   updateTableView()
 }
@@ -177,5 +189,6 @@ function changeProjectIsFeatured() {
 }
 
 
+getProjects("new")
 getProjects("active")
 getProjects("inactive")

manager_dashboard/manager_dashboard/manage.html

@@ -66,7 +66,11 @@ <h3>Please <a href="index.html">log in</a> first.</h3>
         <!-- manage existing projects -->
         <div class="row justify-content-center" id="project-management" style="display: block">
           <div class="col-md-12">
-            <h2>Active Projects</h2>
+          <h2>New Projects</h2>
+            <div id="new-projects">
+              <div id="new-projects-table"></div>
+            </div>
+          <h2>Active Projects</h2>
             <div id="active-projects">
               <div id="active-projects-table"></div>
             </div>