Merge branch 'develop'

.dockerignore

@@ -0,0 +1,4 @@
+node_modules/
+test/
+.gitignore/
+.git/

.gitignore

@@ -18,4 +18,7 @@ selenium-debug.log
 *.sln
 
 .now
-now.json
+now.json
+
+#config/nginx.conf
+#Dockerfile

Dockerfile

@@ -0,0 +1,18 @@
+
+FROM node:9.11-alpine AS build
+
+WORKDIR /app
+COPY . .
+RUN apk update
+RUN apk add --no-cache make gcc g++ python && \
+  yarn install --silent && \
+  apk del make gcc g++ python
+RUN yarn run build
+# RUN ls dist
+
+FROM nginx:stable
+COPY config/nginx.conf /etc/nginx/nginx.conf
+COPY --from=build /app/dist/ /usr/share/nginx/html
+# COPY ./nginx.conf /etc/nginx/conf.d/default.conf
+
+EXPOSE 80

config/nginx.conf

@@ -0,0 +1,44 @@
+# For more information on configuration, see:
+#   * Official English Documentation: http://nginx.org/en/docs/
+#   * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic.
+include /usr/share/nginx/modules/*.conf;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile            on;
+    tcp_nopush          on;
+    tcp_nodelay         on;
+    keepalive_timeout   65;
+    types_hash_max_size 2048;
+
+    include             /etc/nginx/mime.types;
+    default_type        application/octet-stream;
+
+    server {
+        listen       80 default_server;
+        listen       [::]:80 default_server;
+        server_name  _;
+        root         /usr/share/nginx/html;
+
+        location / {
+           try_files $uri $uri/ /index.html;
+        }
+
+    }
+}

src/App.vue

@@ -61,6 +61,12 @@
              color="#c5202e">
     </loading>
 
+    <project-password-modal 
+      :value='showProjectPassModal' 
+      :project='project'>
+    </project-password-modal>
+
+
   </div>
 
 </template>
@@ -72,6 +78,7 @@ import Loading from 'vue-loading-overlay';
 import GDPR from "./components/GDPR.vue";
 import Footer from "./components/Footer.vue"
 import Header from "./components/Header.vue"
+import ProjectPasswordModal from '@/components/Common/ProjectPasswordModal'
 import 'vue-loading-overlay/dist/vue-loading.css';
 
 export default {
@@ -82,7 +89,8 @@ export default {
     Loading,
     GDPR,
     Footer,
-    Header
+    Header,
+    ProjectPasswordModal
   },
   props : {},
   computed: {
@@ -93,7 +101,10 @@ export default {
         isLoadingSpinnerDisplayed: state => state.notification.isLoadingSpinnerDisplayed,
 
         userLogged: state => state.user.logged,
-        userProfile: state => state.user.infos
+        userProfile: state => state.user.infos,
+
+        project: state => state.project.selectedProject,
+        showProjectPassModal : state => state.project.showProjectPassModal
     }),
     language: {
       get() {

src/api/project.js

@@ -174,5 +174,60 @@ export default {
         'X-CSRFToken': csrf
       }
     })
-  }
+  },
+
+  deleteCommentsOptions(comment_id){
+    return axios.get(process.env.BASE_ENDPOINT_URL + 'project/forum/comment/' + comment_id + '/delete', {
+      withCredentials: true,
+      data: {}
+    })
+  },
+
+  deleteComment(csrf,comment_id){
+    return axios.post(process.env.BASE_ENDPOINT_URL + 'project/forum/comment/' + comment_id + '/delete',{}, {
+      withCredentials: true,
+      headers: {
+        'X-CSRFToken': csrf
+      }
+    })
+  },
+
+  updateProjectComment(csrf,projectShortName,comment){
+    console.log(comment)
+    return axios.post(process.env.BASE_ENDPOINT_URL + 'project/' + projectShortName + '/update-comment', {
+      id:comment.id,
+      parentId: comment.parent,
+      content: comment.content
+    }, {
+      withCredentials: true,
+      headers: {
+        'X-CSRFToken': csrf
+      }
+    })
+  },
+
+  setPrivateProjectOptions(projectShortName){
+    return axios.get(process.env.BASE_ENDPOINT_URL + 'project/' + projectShortName + '/password', {
+      withCredentials: true,
+      data: {}
+    })
+  },
+
+  getAccessToProject(csrf,projectShortName,password){
+    return axios.post(process.env.BASE_ENDPOINT_URL + 'project/' + projectShortName + '/password', {
+      password:password
+    }, {
+      withCredentials: true,
+      headers: {
+        'X-CSRFToken': csrf
+      }
+    })
+  },
+
+  isProjectPrivate(project_id){
+    return axios.get(process.env.BASE_ENDPOINT_URL + 'project/' + project_id + '/private', {
+      withCredentials: true,
+      data: {}
+    })
+  },
 }

src/assets/messages.json

@@ -155,7 +155,7 @@
         "name-builder-project-title-error":"You must set a title for your project",
         "name-builder-project-character-exceed":"The title length should not exceed",
 
-        "story-builder-project-tip":"This information will form the home page of your project. After you click CONTINUE, you will be able to edit thsi page only at the end of the creation process.",
+        "story-builder-project-tip":"This information will form the home page of your project. After you click CONTINUE, you will be able to edit this page only at the end of the creation process.",
         "story-builder-project-info":"More about your project.",
         "story-builder-project-info-label-1":"What & why",
         "story-builder-project-info-description-1":"Explain in simple terms what is the purpose of your project, and why it is important.",
@@ -765,6 +765,7 @@
         "forum-add-comment":"Add comment",
         "forum-delete-topic":"Delete topic",
         "forum-delete-comment":"Delete comment",
+        "forum-edit-comment":"Edit comment",
 
         "DOWNLOAD_TASKS_IN_CSV_ERROR": "DOWNLOAD_TASKS_IN_CSV_ERROR",
         "DOWNLOAD_TASK_RUNS_IN_CSV_ERROR": "DOWNLOAD_TASK_RUNS_IN_CSV_ERROR",
@@ -794,7 +795,13 @@
         "new-task-was-imported-successfully":"new task was imported successfully",
         "import-the-selected-files":"Import selected files",
 
-        "modify-draft-modal-content":"This button will delete your Task Presenter design and take you back to Tasks Import (see Step 2 of the '{HowitWorks}' procedure)"
+        "modify-draft-modal-content":"This button will delete your Task Presenter design and take you back to Tasks Import (see Step 2 of the '{HowitWorks}' procedure)",
+
+        "private-project-title":"Private project",
+        "private-project-content":"This is a private project with restricted access. Please contact the project owner for more information.",
+        "access-denied":"Access denied",
+        "project-protect-with-password":"Protect project with password",
+        "private-c":"Private"
 
     },
     "de": {
@@ -1556,6 +1563,7 @@
         "forum-add-comment":"Kommentar hinzufügen",
         "forum-delete-topic":"Thema löschen",
         "forum-delete-comment":"Kommentar löschen",
+        "forum-edit-comment":"Kommentar bearbeiten",
 
         "DOWNLOAD_TASKS_IN_CSV_ERROR": "Fehler beim CSV-Download der Aufgaben",
         "DOWNLOAD_TASK_RUNS_IN_CSV_ERROR": "Fehler beim CSV-Download der Aufgaben-Ausführungen",
@@ -1585,7 +1593,13 @@
         "new-task-was-imported-successfully":"neue Aufgabe wurde erfolgreich importiert",
         "import-the-selected-files":"Importieren Sie die ausgewählten Dateien",
 
-        "modify-draft-modal-content":"Diese Schaltfläche löscht Ihr Task Presenter-Design und bringt Sie zurück zum Aufgabenimport (siehe Schritt 2 der Prozedur '{HowitWorks}')."
+        "modify-draft-modal-content":"Diese Schaltfläche löscht Ihr Task Presenter-Design und bringt Sie zurück zum Aufgabenimport (siehe Schritt 2 der Prozedur '{HowitWorks}').",
+
+        "private-project-title":"Privates Projekt",
+        "private-project-content":"Das ist ein privates Projekt mit eingeschränktem Zugriff. Bitte kontaktieren Sie den Projektbesitzer für weitere Informationen",
+        "access-denied":"Zugriff abgelehnt",
+        "project-protect-with-password":"Projekt mit Passwort schützen",
+        "private-c":"Privat"
 
 
     }