Merge pull request #28 from SystemZ/issue-23

Make settings/new project button work

Author: Aylin777

frontend/src/views/Settings.vue

@@ -122,27 +122,34 @@
           </v-btn>
         </v-card-actions>
       </v-card>
-    </v-dialog>
+    </v-dialog> -->
     <v-dialog
-      v-model="addProject"
-      width="500"
+      v-model="showNewProjectDialog"
+      width="600"
       :fullscreen="$vuetify.breakpoint.xsOnly"
     >
       <v-card>
         <v-card-title>
-          Begin new project
+          Start new project
         </v-card-title>
         <v-card-text>
           <v-container>
             <v-row>
-              <v-col cols="12" sm="6" md="4">
-                <v-text-field
-                  label="Project name"
+              <v-col cols="12">
+                <v-textarea
+                  auto-grow
+                  rows="1"
                   required
-                  v-model="newProject"
+                  clearable
+                  counter
+                  maxlength="64"
+                  label="Project name"
+                  prepend-icon="mdi-folder-open"
+                  type="text"
+                  v-model="projectName"
                   :color="inputPrimary"
                 >
-                </v-text-field>
+                </v-textarea>
               </v-col>
             </v-row>
           </v-container>
@@ -153,20 +160,20 @@
           <v-btn
             :color="btnSecondary"
             text
-            @click="addProject = false"
+            @click="showNewProjectDialog = false"
           >
             Cancel
           </v-btn>
           <v-btn
             :dark="componentDark"
             :color="btnPrimary"
-            @click="saveProject"
+            @click="addProject"
           >
             Save
           </v-btn>
         </v-card-actions>
       </v-card>
-    </v-dialog> -->
+    </v-dialog>
 
     <v-row>
       <v-col>
@@ -267,16 +274,14 @@
             <v-tab-item>
               <v-card flat>
                 <v-card-text>
-                  <!-- if disabled then element cannot be dark -->
-                  <!-- :dark="componentDark" -->
-                  <!-- @click="showProjectDialog" -->
                   <v-btn
                     block
                     class="mb-4"
-                    disabled
+                    :dark="componentDark"
                     :color="btnPrimary"
+                    @click="showNewProjectDialog = true"
                   >
-                    Add project
+                    Create new project
                   </v-btn>
                   <v-data-table
                     :headers="projectHeaders"
@@ -311,14 +316,16 @@ export default {
   name: 'settings',
   data () {
     return {
+      // pushing new info
       showNewAccountDialog: false,
       username: '',
       password: '',
       email: '',
       // addDevice: false,
       // newDevice: '',
-      // addProject: false,
-      // newProject: '',
+      showNewProjectDialog: false,
+      projectName: '',
+      // getting table info
       tableLoading: true,
       accounts: [],
       accountHeaders: [
@@ -366,23 +373,13 @@ export default {
     // showDeviceDialog () {
     //   this.addDevice = true
     // },
-    // showProjectDialog () {
-    //   this.addProject = true
-    // },
     // saveDevice () {
     //   if (this.newDevice !== '') {
     //     this.devices.push({'name': this.newDevice})
     //     this.newDevice = ''
     //   }
     //   this.addDevice = false
     // },
-    // saveProject () {
-    //   if (this.newProject !== '') {
-    //     this.projects.push({'title': this.newProject})
-    //     this.newProject = ''
-    //   }
-    //   this.addProject = false
-    // },
     authConfig () {
       return {headers: {Authorization: 'Bearer ' + localStorage.getItem(this.lsToken)}}
     },
@@ -463,6 +460,26 @@ export default {
           }
         })
     },
+    addProject () {
+      axios.post(this.apiUrl + '/api/v1/project', {
+        'name': this.projectName
+      }, this.authConfig())
+        .then((res) => {
+          //clear form
+          this.projectName = ''
+          //close dialog
+          this.showNewProjectDialog = false
+          //get project list
+          this.getProjects()
+        })
+        .catch((err) => {
+          if (err.response.status === 401) {
+            this.$root.$emit('sessionExpired')
+          } else {
+            console.log('something wrong')
+          }
+        })
+    },
   }
 }
 </script>

internal/server/api_projects.go

@@ -2,8 +2,9 @@ package server
 
 import (
 	"encoding/json"
-	"github.com/systemz/hometab/internal/model"
 	"net/http"
+
+	"github.com/systemz/hometab/internal/model"
 )
 
 func ApiProjectList(w http.ResponseWriter, r *http.Request) {
@@ -42,3 +43,35 @@ func ApiProjectList(w http.ResponseWriter, r *http.Request) {
 	w.Write(res)
 
 }
+
+type ApiNewProjectRequest struct {
+	Name    string `json:"name"`
+	GroupId uint   `json:"groupId"`
+}
+
+func ApiNewProject(w http.ResponseWriter, r *http.Request) {
+	// check auth
+	ok, _ := CheckApiAuth(w, r)
+	if !ok {
+		w.WriteHeader(http.StatusUnauthorized)
+		return
+	}
+
+	// FIXME validate
+	decoder := json.NewDecoder(r.Body)
+	var newProject ApiNewProjectRequest
+	decoder.Decode(&newProject)
+
+	// reject if project name is empty
+	if len(newProject.Name) < 1 {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	// create project, default group ID is 0
+	model.CreateProject(newProject.Name, 0)
+
+	// all ok, return project
+	w.WriteHeader(http.StatusOK)
+	w.Write([]byte{})
+}

internal/server/main.go

@@ -74,6 +74,7 @@ func StartWebInterface() {
 	r.HandleFunc("/api/v1/user", ApiUserList).Methods("GET")
 	r.HandleFunc("/api/v1/user", ApiNewUser).Methods("POST")
 	r.HandleFunc("/api/v1/project", ApiProjectList).Methods("GET")
+	r.HandleFunc("/api/v1/project", ApiNewProject).Methods("POST")
 	r.HandleFunc("/api/v1/project/{id}/task", ApiTaskList).Methods("GET")
 	r.HandleFunc("/api/v1/project/{id}/task", ApiTaskCreate).Methods("POST")
 	r.HandleFunc("/api/v1/project/{id}/task", ApiTaskEdit).Methods("PUT")