Merge pull request #1 from seanturner026/update

Merging pull request number 1

Author: seanturner026

src/components/LoginForm.vue

@@ -56,10 +56,7 @@
       ></b-spinner
     ></b-button>
     <b-button
-      v-if="
-        (!new_password_required && login_details.sending == true) ||
-          (new_password_required && login_details.sending == true)
-      "
+      v-if="!new_password_required && login_details.sending == true"
       size="md"
       variant="info"
       @click="loginUser($event)"

src/components/RepoTable.vue

@@ -2,11 +2,7 @@
   <div id="repository-table">
     <b-container fluid="false">
       <b-input-group class="mt-3">
-        <b-button
-          class="button-margin-right"
-          v-b-toggle.repo-add-sidebar
-          md="1"
-          variant="info"
+        <b-button class="button-margin-right" v-b-modal.modal-lg variant="info"
           >Add Repository</b-button
         >
         <b-form-input
@@ -26,12 +22,12 @@
         </b-input-group-append>
       </b-input-group>
     </b-container>
-    <b-sidebar
-      id="repo-add-sidebar"
-      title="Add Repository"
-      backdrop
-      shadow
+    <b-modal
+      id="modal-lg"
+      v-bind:hide-footer="true"
       v-on:hidden="triggerForceRerender"
+      size="lg"
+      title="Add Repository"
     >
       <b-container fluid>
         <h6 style="text-align:left">Provider:</h6>
@@ -41,12 +37,8 @@
               >-- Please select an option --</b-form-select-option
             >
           </template>
-          <b-form-select-option value="github.com"
-            >Github.com</b-form-select-option
-          >
-          <b-form-select-option value="gitlab.com"
-            >Gitlab.com</b-form-select-option
-          >
+          <b-form-select-option value="github">Github</b-form-select-option>
+          <b-form-select-option value="gitlab">Gitlab</b-form-select-option>
         </b-form-select>
         <h6 style="text-align:left" v-if="createRepoProvider == 'gitlab.com'">
           Gitlab Project ID:
@@ -92,7 +84,7 @@
           >
         </div>
       </b-container>
-    </b-sidebar>
+    </b-modal>
     <div>
       <b-card-group
         deck
@@ -112,13 +104,13 @@
             <b-row align-h="center">
               <b-col md="1" align-self="center">
                 <b-img
-                  v-if="repo.repo_provider == 'github.com'"
+                  v-if="repo.repo_provider == 'github'"
                   width="50"
                   height="50"
                   src="@/assets/images/github.png"
                 ></b-img>
                 <b-img
-                  v-if="repo.repo_provider == 'gitlab.com'"
+                  v-if="repo.repo_provider == 'gitlab'"
                   width="50"
                   height="50"
                   src="@/assets/images/gitlab.png"
@@ -329,7 +321,7 @@ export default {
       }
 
       const releaseEvent = {
-        repo_owner: process.env.VUE_APP_GITHUB_OWNER,
+        repo_owner: this.repositories[index].repo_owner,
         repo_name: this.repositories[index].repo_name,
         repo_provider: this.repositories[index].repo_provider,
         branch_base: this.repositories[index].branch_base,
@@ -348,7 +340,6 @@ export default {
     createRepository() {
       console.log("testing createRepository");
       const createRepositoryEvent = {
-        type: "repo",
         repo_provider: this.createRepoProvider,
         repo_name: this.createRepoName,
         repo_owner: this.createRepoOrganization,

src/components/UsersTable.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="users-table">
-    <b-input-group class="mt-3">
+    <b-input-group class="mt-3" style="margin-bottom: 20px">
       <b-form-input
         v-model="invitedUser"
         size="17"
@@ -30,7 +30,7 @@
       :items="users"
       :fields="fields"
     >
-      <template #cell(delete)="row">
+      <template #cell(manage)="row">
         <b-button
           size="sm"
           variant="outline-danger"
@@ -48,7 +48,7 @@ export default {
   data() {
     return {
       sending: false,
-      fields: ["name", "delete"],
+      fields: ["name", "manage"],
       invitedUser: ""
     };
   },

src/router/index.js

@@ -23,7 +23,8 @@ async function listRepositories(to, from, next) {
       console.log(repositories);
       if (repositories.message != "Unauthorized") {
         isAuthenticated = true;
-        const modifiedRespositories = repositories.map(v => ({
+        var repositoriesJSON = JSON.parse(repositories.message);
+        const modifiedRespositories = repositoriesJSON.map(v => ({
           ...v,
           hotfix: false
         }));
@@ -59,9 +60,10 @@ async function listUsers(to, from, next) {
       console.log(users);
       if (users.message != "Unauthorized") {
         isAuthenticated = true;
-        const modifiedUsers = users.map(v => ({
+        var usersJSON = JSON.parse(users.message);
+        const modifiedUsers = usersJSON.map(v => ({
           ...v,
-          delete: true
+          manage: true
         }));
         to.params.users = modifiedUsers;
         next();

src/views/Login.vue

@@ -38,10 +38,11 @@ export default {
         if (data.headers["X-Session-Id"] != null) {
           this.session_id = data.headers["X-Session-Id"];
           this.new_password_required = true;
+        } else {
+          const token = data.headers["Authorization"];
+          this.$cookies.set("Authorization", token);
+          this.$router.push("/repositories");
         }
-        const token = data.headers["Authorization"];
-        this.$cookies.set("Authorization", token);
-        this.$router.push("/repositories");
       } catch (error) {
         console.error(error);
       }

src/views/Repos.vue

@@ -42,11 +42,11 @@ export default {
         createRepositoryEvent.repo_name == "" ||
         createRepositoryEvent.repo_owner == "" ||
         createRepositoryEvent.repo_provider == "" ||
-        (createRepositoryEvent.repo_provider == "gitlab.com" &&
+        (createRepositoryEvent.repo_provider == "gitlab" &&
           createRepositoryEvent.gitlab_repo_id == "")
       ) {
         this.$bvToast.toast(
-          `Unable to add repository, ensure all fields are populated.`,
+          "Unable to add repository, ensure all fields are populated.",
           {
             title: "Error",
             variant: "danger",
@@ -63,7 +63,7 @@ export default {
             this.repositories[i].repo_provider
         ) {
           this.$bvToast.toast(
-            `Unable to add a repository which is already managed.`,
+            "Unable to add a repository which is already managed.",
             {
               title: "Error",
               variant: "danger",
@@ -80,12 +80,20 @@ export default {
             method: "POST",
             body: JSON.stringify(createRepositoryEvent),
             headers: {
-              "Content-type": "application/json; charset=UTF-8",
-              Authorization: this.$cookies.get("Authorization")
+              Authorization: this.$cookies.get("Authorization"),
+              "Content-type": "application/json; charset=UTF-8"
             }
           }
         );
         const data = await response.json();
+        if (response.status != 200) {
+          this.$bvToast.toast(data.message, {
+            title: "Error",
+            variant: "danger",
+            autoHideDelay: 3000
+          });
+          return;
+        }
         console.log(data);
         this.repositories.push(createRepositoryEvent);
         this.$bvToast.toast(
@@ -104,7 +112,7 @@ export default {
     async createRelease(releaseEvent) {
       try {
         console.log(releaseEvent);
-        const provider_route = releaseEvent.repo_provider.split(".com")[0];
+        const provider_route = releaseEvent.repo_provider;
         const response = await fetch(
           process.env.VUE_APP_API_GATEWAY_ENDPOINT +
             "/releases/create/" +
@@ -113,14 +121,27 @@ export default {
             method: "POST",
             body: JSON.stringify(releaseEvent),
             headers: {
-              "Content-type": "application/json; charset=UTF-8",
-              Authorization: this.$cookies.get("Authorization")
+              Authorization: this.$cookies.get("Authorization"),
+              "Content-type": "application/json; charset=UTF-8"
             }
           }
         );
         const data = await response.json();
+        if (response.status != 200) {
+          this.$bvToast.toast(response.message, {
+            title: "Error",
+            variant: "danger",
+            autoHideDelay: 3000
+          });
+          return;
+        }
         console.log(response);
         console.log(data);
+        this.$bvToast.toast(response.message, {
+          title: "Success",
+          variant: "info",
+          autoHideDelay: 3000
+        });
       } catch (error) {
         console.error(error);
       }
@@ -134,12 +155,20 @@ export default {
             method: "POST",
             body: JSON.stringify(deleteRepositoriesEvent),
             headers: {
-              "Content-type": "application/json; charset=UTF-8",
-              Authorization: this.$cookies.get("Authorization")
+              Authorization: this.$cookies.get("Authorization"),
+              "Content-type": "application/json; charset=UTF-8"
             }
           }
         );
         const data = await response.json();
+        if (response.status != 200) {
+          this.$bvToast.toast(response.message, {
+            title: "Error",
+            variant: "danger",
+            autoHideDelay: 3000
+          });
+          return;
+        }
         console.log(data);
         for (let i = 0; i < deleteRepositoriesEvent.repositories.length; i++) {
           console.log(i, deleteRepositoriesEvent.repositories[i]);