Small fixes (last?)

README.md

@@ -5,7 +5,27 @@
 - Simon
 - Mus ?
 
+## Startup project
+
+- npm install
+- composer install
+- redis-server
+- backend env: 
+    DB_FILE=db2.sqlite
+    FRONTEND_URL=http://localhost:3000
+    REDIS='localhost:6379'
+    SMTP_HOST='smtp.gmail.com'
+    SMTP_USER='youremail'
+    SMTP_PASSWORD='emailpass'
+    SMTP_FROM='youremail'
+    SMTP_PORT=587
+
 ## Needed Pages
+
+- None
+
+
+## Added Pages
 - Homepage
 - Profiel + ACL
     - Eigen prestaties
@@ -18,8 +38,4 @@
 - FacturatiePagina Bedrijsleider
 - Deck + tijdsduur van taken + Delegeren + tags
     - Verschillende decks voor verschillende projecten
-- Pagina voor bedrijfsgegevens
-
-
-## Added Pages
-- None
+- Pagina voor bedrijfsgegevens

backend/lib/Controller/ProjectsController.php

@@ -246,7 +246,7 @@ class ProjectsController
     {
         $db = $this->container->get('db');
 
-        $query = $db->prepare('INSERT INTO task (state_id, user_story_id, project_id, assignee_id, delegee_id, name, description, time) values (:state,1,:project_id,NULL,1,"test", "test new task", 0)'); // add row & column
+        $query = $db->prepare('INSERT INTO task (state_id, user_story_id, project_id, assignee_id, delegee_id, name, description, time) values (:state,1,:project_id,NULL,1,"Title", "Add a description", 0)'); // add row & column
 
         $query->bindValue(':state', $_POST['state_id']);
         $query->bindValue(':project_id', $_POST['project_id']);

frontend/pages/kanban/_id.vue

@@ -19,7 +19,10 @@
           </nuxt-link>
         </div>
       </div>
-      <div class="kanban-container">
+      <div v-if="$fetchState.pending" class="kanban-container-index">
+        <h1>LOADING PROJECT...</h1>
+      </div>
+      <div v-if="!$fetchState.pending" class="kanban-container">
         <div class="project-title">{{ projectTitle }}</div>
         <div class="new"></div>
 
@@ -66,7 +69,7 @@
           </div>
         </div>
       </div>
-      <div class="info-container">
+      <div v-if="!$fetchState.pending" class="info-container">
         <div class="info-title">Edit card</div>
         <div class="info-form-kanban">
           <FormulateForm @submit="saveTask">
@@ -154,6 +157,12 @@ export default {
   mixins: [clickaway],
   components: { Container, Draggable },
   layout: 'nav&foot',
+  async fetch() {
+    await Promise.all([
+      this.fetchMergeStates({ id: this.id }),
+      this.fetchTeamMembers(),
+    ]);
+  },
   data() {
     return {
       id: Number(this.$route.params.id),
@@ -194,6 +203,7 @@ export default {
   },
   methods: {
     ...mapActions(['fetchMergeStates']),
+    ...mapActions(['fetchTeamMembers']),
     filteredU() {
       if (this.user.user_name.length === 0) {
         this.filteredUsers = this.users;
@@ -315,8 +325,7 @@ export default {
       this.projectTitle = Object.values(this.projects).find(
         (obj) => obj.id === Number(this.projectId),
       ).name;
-      this.fetchMergeStates({ id: this.projectId });
-      console.log(this.teamMembers);
+
       this.editTeams = [];
       this.teamMembers.forEach((element) => {
         if (element.team_id === Number(this.projectId)) {

frontend/store/index.js

@@ -287,7 +287,7 @@ export const actions = {
   saveTeam({ commit }, data, id = null) {
     const method = id ? 'PUT' : 'POST';
     const url = id ? '/team/' + id : '/team';
-
+    console.log(data);
     return new Promise((resolve, reject) => {
       this.$axios({
         method,
@@ -295,7 +295,6 @@ export const actions = {
         data,
       })
         .then((response) => {
-          console.log('lol');
           return this.$router.push({
             path: '/teams/',
           });