From eed432d7394081565ff7231cab9702e2ec531d22 Mon Sep 17 00:00:00 2001
From: Rossicler <rossiclerjr@gmail.com>
Date: Tue, 17 Sep 2019 17:22:25 -0300
Subject: [PATCH 01/11] Changed login inputs to vuetify text-fields components

---
 src/components/Authentication/Login.vue | 35 ++++++++++++++-----------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/components/Authentication/Login.vue b/src/components/Authentication/Login.vue
index a562ca21..2dd0b58e 100644
--- a/src/components/Authentication/Login.vue
+++ b/src/components/Authentication/Login.vue
@@ -24,23 +24,22 @@
 
       <form id="loginForm"  @submit.prevent="() => login()" name="wrong-credentials">
         <div class="form-group">
-          <input  type="email"
-          class="form-control"
-          placeholder="Email"
-          name="email"
-          v-model="email"
-          v-validate="'email'" >
-          <p class="text-danger" v-if="errors.has('email')">{{ errors.first('email') }}</p>
+          <v-text-field
+            label="Email"
+            v-model="email"
+            :rules="[rules.required, rules.validEmail], "
+            outlined
+          ></v-text-field>
         </div>
 
         <div class="form-group">
-          <input  type="password"
-          class="form-control"
-          placeholder="Password"
-          name="password"
-          v-model="password"
-          v-validate="'required|min:6'">
-          <p class="text-danger" v-if="errors.has('password')">{{ errors.first('password') }}</p>
+          <v-text-field
+            label="Password"
+            v-model="password"
+            :type="'password'"
+            :rules="[rules.required, rules.min]"
+            outlined
+          ></v-text-field>
         </div>
 
         <div class="text-center">
@@ -64,7 +63,13 @@ export default {
     return {
       email: '',
       password: '',
-      alert: false
+      alert: false,
+      rules: {
+        required: value => !!value || 'Required.',
+        min: v => v.length >= 8 || 'Min 6 characters',
+        emailMatch: () => ('Incorrect email or password'),
+        validEmail: v => /.+@.+/.test(v) || 'E-mail must be valid',
+      }
     };
   },
 

From 242e457188ca9c56e6260ea8e67c216346a736a5 Mon Sep 17 00:00:00 2001
From: Guilherme Siqueira <guilhersiqueira@gmail.com>
Date: Wed, 18 Sep 2019 23:47:36 -0300
Subject: [PATCH 02/11] Update vuetify version from 1.5.14 to 2.0.18 and
 migrating some buttons.

Co-authored-by: gabrielademoraes <gabrielademoraes10@gmail.com>
---
 package.json                                  |  2 +-
 src/components/Authentication/Login.vue       |  8 +++-
 src/components/Authentication/Register.vue    |  2 +-
 src/components/GitHub/GitHubProjects.vue      | 40 ++++++++-----------
 src/components/Issues/AddIssue.vue            |  8 ++--
 src/components/Projects/AddGrades.vue         |  8 ++--
 src/components/Projects/AddProject.vue        |  9 ++---
 src/components/Projects/DeleteProject.vue     |  8 ++--
 src/components/Projects/EditProject.vue       |  8 ++--
 src/components/Projects/Project.vue           |  8 ++--
 src/components/Releases/AddRelease.vue        | 12 +++---
 src/components/Releases/DeleteRelease.vue     |  8 ++--
 src/components/Releases/EditRelease.vue       | 10 +++--
 .../Retrospective/AddRetrospective.vue        | 28 ++++++-------
 .../Retrospective/DeleteRetrospective.vue     |  4 +-
 .../Retrospective/EditRetrospective.vue       |  6 +--
 src/components/Revision/AddRevision.vue       |  6 +--
 src/components/Sprints/AddSprint.vue          | 14 ++++---
 src/components/Sprints/DeleteSprint.vue       |  4 +-
 src/components/Sprints/EditSprint.vue         |  4 +-
 src/components/Users/DeleteUserProfile.vue    |  8 ++--
 src/components/Users/EditUserProfile.vue      |  8 ++--
 src/components/Users/ForgotPassword.vue       |  2 +-
 src/components/Users/UserProfile.vue          |  4 +-
 24 files changed, 109 insertions(+), 110 deletions(-)

diff --git a/package.json b/package.json
index 3f6be7ef..7b017893 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "vue-router": "^2.8.1",
     "vue-windows": "^0.1.3",
     "vuedraggable": "^2.16.0",
-    "vuetify": "^1.5.14",
+    "vuetify": "^2.0.18",
     "vuex": "^3.0.0",
     "vuex-persist": "^0.3.0"
   },
diff --git a/src/components/Authentication/Login.vue b/src/components/Authentication/Login.vue
index a562ca21..ac724d38 100644
--- a/src/components/Authentication/Login.vue
+++ b/src/components/Authentication/Login.vue
@@ -43,8 +43,8 @@
           <p class="text-danger" v-if="errors.has('password')">{{ errors.first('password') }}</p>
         </div>
 
-        <div class="text-center">
-          <button type="submit" class="btn btn-primary falko-button" id="loginButton" >Log In</button>
+        <div class="text-center" left>
+          <v-btn type="submit" class="primary falko-button white--text" id="loginButton" color="#86B1B1">Log in</v-btn>
         </div>
         <div class="text-center">
           <router-link to="/users/forgotpassword"> Forgot your password?</router-link>
@@ -115,4 +115,8 @@ export default {
   font-size: 14px;
   padding-top: 1px;
 }
+
+.button-test {
+  color: #ffffff;
+}
 </style>
diff --git a/src/components/Authentication/Register.vue b/src/components/Authentication/Register.vue
index 2fa7dcea..6f13ca0d 100644
--- a/src/components/Authentication/Register.vue
+++ b/src/components/Authentication/Register.vue
@@ -44,7 +44,7 @@
           <p class="text-danger" v-if="errors.has('form-register.password_confirmation')">{{ errors.first('form-register.password_confirmation') }}</p>
         </div>
         <div class="text-center">
-          <button type="submit" :disabled="disableRegisterButton()" class="btn btn-primary falko-button" id="">Register</button>
+          <v-btn type="submit" :disabled="disableRegisterButton()" class="primary falko-button white--text" id="" color="#86B1B1">Register</v-btn>
           <p class="text-danger" v-if="errors.has('wrong-credentials')">{{ errors.first('wrong-credentials') }}</p>
         </div>
       </form>
diff --git a/src/components/GitHub/GitHubProjects.vue b/src/components/GitHub/GitHubProjects.vue
index c981c90d..535aa759 100644
--- a/src/components/GitHub/GitHubProjects.vue
+++ b/src/components/GitHub/GitHubProjects.vue
@@ -1,14 +1,19 @@
 <template>
   <div class="addgithubrepo">
     <div class="text-center">
-      <button type="button" id="addButton"
-              v-bind:class="buttonClass()"
-              v-bind:disabled="!this.isGitHubAuthenticated"
-              v-on:click="getRepos()"
-              v-bind:data-toggle="buttonDataToggle()" data-target="#githubModal"
+      <v-btn
+        type="button"
+        class="primary falko-button white--text"
+        id="addButton"
+        color="#86B1B1"
+        v-bind:class="buttonClass()"
+        v-bind:disabled="!this.isGitHubAuthenticated"
+        v-on:click="getRepos()"
+        v-bind:data-toggle="buttonDataToggle()"
+        data-target="#githubModal"
       >
         Import GitHub repository
-      </button>
+      </v-btn>
     </div>
     <div class="modal fade" id="githubModal" role="dialog">
       <div class="modal-dialog">
@@ -98,23 +103,12 @@
             </div>
           </div>
           <div class="modal-footer">
-            <button
-              type="button"
-              class="btn btn-primary falko-button"
-              :disabled="disableImportButton()"
-              v-on:click="importGithubProjects"
-              data-dismiss="modal"
-            >
-              Import
-            </button>
-            <button
-              type="button"
-              class="btn btn-secondary falko-button-grey"
-              v-on:click="clean"
-              data-dismiss="modal"
-            >
-              Close
-            </button>
+              <v-btn type="button" :disabled="disableImportButton()" class="primary falko-button white--text" color="#86B1B1" v-on:click="importGithubProjects" data-dismiss="modal">
+                Import
+              </v-btn>
+             <v-btn type="button" class="secondary falko-button white--text" color="#868e96" v-on:click="clean" data-dismiss="modal">
+                Close
+            </v-btn>
           </div>
         </div>
       </div>
diff --git a/src/components/Issues/AddIssue.vue b/src/components/Issues/AddIssue.vue
index 693b6122..78e7f0a4 100644
--- a/src/components/Issues/AddIssue.vue
+++ b/src/components/Issues/AddIssue.vue
@@ -1,9 +1,9 @@
 <template>
 	<div class="">
 		<div class="text-center">
-			<button type="button" class="btn btn-info btn-md falko-button" id="addButton" data-toggle="modal" data-target="#addIssueModal">
+			<v-btn type="button" class="info falko-button white--text" id="addButton" color="#86B1B1" data-toggle="modal" data-target="#addIssueModal">
 				Add Issue
-			</button>
+			</v-btn>
 		</div>
 
 		<div class="modal fade" id ="addIssueModal" role="dialog">
@@ -28,8 +28,8 @@
               </div>
 						</div>
 						<div class="modal-footer">
-							<button type="button" :disabled="errors.has('name') || errors.has('body')" class="btn btn-primary" v-on:click="addIssue()" data-dismiss="modal">Save</button>
-							<button type="button" class="btn btn-secondary" data-dismiss="modal" >Close</button>
+							<v-btn type="button" :disabled="errors.has('name') || errors.has('body')" class="primary falko-button white--text" v-on:click="addIssue()" data-dismiss="modal" color="#86B1B1">Save</v-btn>
+							<v-btn type="button" class="secondary falko-button white--text" color="#868e96" data-dismiss="modal">Close</v-btn>
 						</div>
 				</div>
 			</div>
diff --git a/src/components/Projects/AddGrades.vue b/src/components/Projects/AddGrades.vue
index 7bdad279..2709f0ae 100644
--- a/src/components/Projects/AddGrades.vue
+++ b/src/components/Projects/AddGrades.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <div class="text-center">
-      <button type="button" class="btn btn-info btn-md falko-button" id="addButton" data-toggle="modal" data-target="#addGradeModal">
+      <v-btn type="button" class="info falko-button white--text" id="addButton" color="#86B1B1" data-toggle="modal" data-target="#addGradeModal">
         Grade
-      </button>
+      </v-btn>
     </div>
     <div class="modal fade" id ="addGradeModal" role="dialog">
       <div class="modal-dialog">
@@ -53,8 +53,8 @@
             </div>
           </div>
           <div class="modal-footer">
-            <button type="button" class="btn btn-info btn-md falko-button" v-on:click="addGrades" data-dismiss="modal">Save</button>
-            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
+            <v-btn type="button" class="info falko-button white--text" color="#86B1B1" v-on:click="addGrades" data-dismiss="modal">Save</v-btn>
+            <v-btn type="button" class="info falko-button white--text" color="#868e96" data-dismiss="modal">Close</v-btn>
           </div>
         </div>
       </div>
diff --git a/src/components/Projects/AddProject.vue b/src/components/Projects/AddProject.vue
index 38da4b2d..f86c9ec6 100644
--- a/src/components/Projects/AddProject.vue
+++ b/src/components/Projects/AddProject.vue
@@ -1,9 +1,8 @@
 <template>
   <div class="addproj">
     <div class="text-center">
-      <button type="button" class="btn btn-info btn-md falko-button" id="addButton" data-toggle="modal" data-target="#addProjectModal">
-        Add a Project
-      </button>
+      <v-btn type="button" class="primary falko-button white--text" id="addButton" data-toggle="modal" data-target="#addProjectModal" color="#86B1B1">
+        Add a Project</v-btn>
     </div>
     <div class="modal fade" id ="addProjectModal" role="dialog">
       <div class="modal-dialog">
@@ -32,8 +31,8 @@
             <br>
           </div>
           <div class="modal-footer">
-            <button type="button" :disabled="errors.has('name') || errors.has('description')" class="btn btn-info btn-md falko-button" v-on:click="addProject" data-dismiss="modal">Save</button>
-            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
+            <v-btn type="button" :disabled="errors.has('name') || errors.has('description')" class="primary falko-button white--text" v-on:click="addProject" data-dismiss="modal" color="#86B1B1">Save</v-btn>
+            <v-btn type="button" class="primary falko-button-grey white--text" data-dismiss="modal" color="#868e96">Close</v-btn>
           </div>
         </div>
       </div>
diff --git a/src/components/Projects/DeleteProject.vue b/src/components/Projects/DeleteProject.vue
index c5f77809..ee716b85 100644
--- a/src/components/Projects/DeleteProject.vue
+++ b/src/components/Projects/DeleteProject.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="delproject">
-    <button type="button" class="btn btn-info btn-md falko-button-danger" id="deletebutton" data-toggle="modal" data-target="#myModal">
+    <v-btn type="button" class="info falko-button-danger white--text" id="deletebutton" color="#AA0000" data-toggle="modal" data-target="#myModal">
       Delete
-    </button>
+    </v-btn>
     <div class="modal fade" id ="myModal" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
@@ -18,8 +18,8 @@
             <p><label> Are you sure?</label></p>
           </div>
           <div class="modal-footer" id="deleteFooterModal">
-            <button v-on:click="deleteProject" type="button" class="btn btn-info btn-md falko-button" data-dismiss="modal" >Yes</button>
-            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal">No</button>
+            <v-btn type="button" v-on:click="deleteProject" class="info falko-button white--text" data-dismiss="modal" color="#86B1B1">Yes</v-btn>
+            <v-btn type="button"  class="info falko-button white--text" data-dismiss="modal" color="#868e96">No</v-btn>
           </div>
         </div>
       </div>
diff --git a/src/components/Projects/EditProject.vue b/src/components/Projects/EditProject.vue
index ddd7a517..290f756a 100644
--- a/src/components/Projects/EditProject.vue
+++ b/src/components/Projects/EditProject.vue
@@ -1,8 +1,8 @@
 <template>
   <div class = "editproject">
-    <button type="button" class="btn btn-info btn-md falko-button" id="editbutton" data-toggle="modal" data-target="#editModal" v-on:click="refreshScoreInformation()">
+    <v-btn type="button" class="info falko-button white--text" id="editbutton" color="#86B1B1" data-toggle="modal" data-target="#editModal" v-on:click="refreshScoreInformation()">
       Edit
-    </button>
+    </v-btn>
     <div class="modal fade" id ="editModal" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
@@ -43,8 +43,8 @@
             </div>
           </div>
           <div class="modal-footer" id="editFooterModal">
-            <button type="button" :disabled="errors.has('name') || errors.has('description')" class="btn btn-info btn-md falko-button" v-on:click="editProject" data-dismiss="modal">Save</button>
-            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
+            <v-btn type="button"  :disabled="errors.has('name') || errors.has('description')" class="info falko-button white--text" color="#86B1B1" v-on:click="editProject" data-dismiss="modal">Save</v-btn>
+            <v-btn type="button" class="info falko-button white--text" data-dismiss="modal" color="#868e96">Close</v-btn>
           </div>
         </div>
       </div>
diff --git a/src/components/Projects/Project.vue b/src/components/Projects/Project.vue
index bef0ce99..70e83377 100644
--- a/src/components/Projects/Project.vue
+++ b/src/components/Projects/Project.vue
@@ -16,16 +16,14 @@
                 <div class="row">
                   <div align="center">
                     <router-link v-bind:to="'/projects/'+project.id+'/issues'">
-                      <button type="button" class="btn btn-info btn-md falko-button" v-if="isFromProjectGitHub()">
+                      <v-btn type="button" class="info falko-button white--text" v-if="isFromProjectGitHub()" color="#86B1B1">
                         Backlog
-                      </button>
+                      </v-btn>
                     </router-link>
                   </div>
                   <div align="center">
                     <router-link v-bind:to="'/projects/'+project.id+'/releases'">
-                      <button type="button" class="btn btn-info btn-md falko-button">
-                        Releases
-                      </button>
+                      <v-btn type="button" class="primary falko-button white--text" color="#86B1B1">Releases</v-btn>
                     </router-link>
                   </div>
                   <div align="center">
diff --git a/src/components/Releases/AddRelease.vue b/src/components/Releases/AddRelease.vue
index b486b6fb..4b3a7a19 100644
--- a/src/components/Releases/AddRelease.vue
+++ b/src/components/Releases/AddRelease.vue
@@ -1,16 +1,16 @@
 <template>
   <div>
     <div align="center">
-      <button type="button" class="btn btn-info btn-md falko-button" id="addReleaseButton" data-toggle="modal" data-target="#addReleaseModal" align="center">
-        <div class="row justify-content-center">
-          <div class="col-">
+      <v-btn type="button" class="info falko-button white--text" id="addReleaseButton" data-toggle="modal" data-target="#addReleaseModal" align="center">
+          <div class="row justify-content-center">
+          <div class="col-1">
             <i class="fa fa-lg fa-plus-circle"></i>
           </div>
           <div class="col-5">
             Add Release
           </div>
         </div>
-      </button>
+        </v-btn>
     </div>
 
     <div class="modal fade" id ="addReleaseModal" role="dialog">
@@ -46,8 +46,8 @@
             </div>
           </div>
           <div class="modal-footer">
-            <button type="button" :disabled="errors.has('name') || errors.has('description') || errors.has('Final Date')" class="btn btn-info btn-md falko-button" v-on:click="addRelease()" data-dismiss="modal">Save</button>
-            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
+            <v-btn type="button" :disabled="errors.has('name') || errors.has('description') || errors.has('Final Date')" class="info falko-button white--text" color="#86B1B1" v-on:click="addRelease()" data-dismiss="modal">Save</v-btn>
+            <v-btn type="submit" class="info falko-button white--text" id="loginButton" color="#868e96" data-dismiss="modal">Close</v-btn>
           </div>
         </div>
       </div>
diff --git a/src/components/Releases/DeleteRelease.vue b/src/components/Releases/DeleteRelease.vue
index 31bfba90..13fff8d7 100644
--- a/src/components/Releases/DeleteRelease.vue
+++ b/src/components/Releases/DeleteRelease.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
-    <button type="button" class="btn btn-info btn-md falko-button-danger" v-bind:id="`deleteButton${this.parentRelease}`" data-toggle="modal" v-bind:data-target="`#deleteReleaseModal${this.parentRelease}`">
+    <v-btn type="button" class="info falko-button-danger" v-bind:id="`deleteButton${this.parentRelease}`" data-toggle="modal" v-bind:data-target="`#deleteReleaseModal${this.parentRelease}`" color="#AA0000">
       Delete
-    </button>
+    </v-btn>
     <div class="modal fade" v-bind:id="`deleteReleaseModal${this.parentRelease}`" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
@@ -18,8 +18,8 @@
             <p><label>Are you sure?</label></p>
           </div>
           <div class="modal-footer">
-            <button v-on:click="deleteRelease" type="button" class="btn btn-info btn-md falko-button" data-dismiss="modal" >Yes</button>
-            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal">No</button>
+            <v-btn v-on:click="deleteRelease" type="button" class="info falko-button" data-dismiss="modal" color="#86B1B1">Yes</v-btn>
+            <v-btn type="button" class="info falko-button-grey" data-dismiss="modal" color="#868e96">No</v-btn>
           </div>
         </div>
       </div>
diff --git a/src/components/Releases/EditRelease.vue b/src/components/Releases/EditRelease.vue
index 8fff3773..93a9b9c7 100644
--- a/src/components/Releases/EditRelease.vue
+++ b/src/components/Releases/EditRelease.vue
@@ -1,8 +1,8 @@
 <template>
   <div class = "editproject">
-    <button type="button" class="btn btn-info btn-md falko-button-grey" v-bind:id="`editButton${this.release[1]}`" data-toggle="modal" v-bind:data-target="`#editReleaseModal${this.release[1]}`" v-on:click="getReleaseInformation()">
+    <v-btn type="button" class="info falko-button white--text" color="#868e96" v-bind:id="`editButton${this.release[1]}`" data-toggle="modal" v-bind:data-target="`#editReleaseModal${this.release[1]}`" v-on:click="getReleaseInformation()">
       Edit
-    </button>
+    </v-btn>
 
     <div class="modal fade" v-bind:id="`editReleaseModal${this.release[1]}`" role="dialog">
       <div class="modal-dialog">
@@ -37,8 +37,10 @@
             </div>
           </div>
           <div class="modal-footer">
-            <button type="button" :disabled="errors.has('name') || errors.has('description') || errors.has('Final Date')" class="btn btn-info btn-md falko-button" v-on:click="editRelease()" data-dismiss="modal">Save</button>
-            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
+            <v-btn type="button" :disabled="errors.has('name') || errors.has('description') || errors.has('Final Date')" class="info falko-button white--text" v-on:click="editRelease()" data-dismiss="modal" color="#86B1B1">
+              Save
+            </v-btn>
+            <v-btn type="button" class="info falko-button-grey" data-dismiss="modal" color="#868e96" >Close</v-btn>
           </div>
         </div>
       </div>
diff --git a/src/components/Retrospective/AddRetrospective.vue b/src/components/Retrospective/AddRetrospective.vue
index 99174389..b6d383d0 100644
--- a/src/components/Retrospective/AddRetrospective.vue
+++ b/src/components/Retrospective/AddRetrospective.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <div>
-      <button type="button" class="btn btn-info btn-md falko-button" id="addButton"
-      data-toggle="modal" data-target="#addRetrospectiveModal">
-      Add Retrospective
-      </button>
+      <v-btn type="button" class="info falko-button white--text" id="addButton"
+        data-toggle="modal" data-target="#addRetrospectiveModal" color="#86B1B1">
+        Add Retrospective
+      </v-btn>
     </div>
 
     <div class="row no-margin justify-content-center modal fade" id="addRetrospectiveModal">
@@ -28,15 +28,15 @@
             />
           </div>
           <div class="modal-footer">
-            <button class="btn btn-info btn-md falko-button"
+            <v-btn class="info falko-button white--text"
             v-bind:disabled="FieldsNotFilled" v-on:click="addRetrospective"
-            data-dismiss="modal"
+            data-dismiss="modal" color="#86B1B1"
             >
             Save
-            </button>
-            <button class="btn btn-info btn-md falko-button-grey" data-dismiss="modal">
+            </v-btn>
+            <v-btn class="info falko-button-grey" data-dismiss="modal" color="#868e96">
               Cancel
-            </button>
+            </v-btn>
           </div>
           <div class="row no-margin justify-content-center modal fade" id="addRetrospectiveModal">
             <div class="modal-dialog">
@@ -59,15 +59,15 @@
                   />
                 </div>
                 <div class="modal-footer">
-                  <button class="btn btn-info btn-md falko-button"
+                  <v-btn class="info falko-button"
                   v-bind:disabled="FieldsNotFilled" v-on:click="addRetrospective"
-                  data-dismiss="modal"
+                  data-dismiss="modal" color="#86B1B1"
                   >
                   Save
-                  </button>
-                  <button class="btn btn-info btn-md falko-button-grey" data-dismiss="modal">
+                  </v-btn>
+                  <v-btn class="info falko-button-grey" data-dismiss="modal" color="#868e96">
                     Cancel
-                  </button>
+                  </v-btn>
                 </div>
               </div>
             </div>
diff --git a/src/components/Retrospective/DeleteRetrospective.vue b/src/components/Retrospective/DeleteRetrospective.vue
index 928a085b..dd5a5ca4 100644
--- a/src/components/Retrospective/DeleteRetrospective.vue
+++ b/src/components/Retrospective/DeleteRetrospective.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
-    <button type="button" class="btn btn-info btn-md falko-button-danger" id="deletebutton" data-toggle="modal" data-target="#deleteRetrospectiveModal">
+    <v-btn type="button" class="info falko-button-danger white--text" id="deletebutton" data-toggle="modal" data-target="#deleteRetrospectiveModal" color="#AA0000">
       Delete
-    </button>
+    </v-btn>
 
     <div class="modal fade" id ="deleteRetrospectiveModal" role="dialog">
       <div class="modal-dialog">
diff --git a/src/components/Retrospective/EditRetrospective.vue b/src/components/Retrospective/EditRetrospective.vue
index 7f86c7ea..c35c537d 100644
--- a/src/components/Retrospective/EditRetrospective.vue
+++ b/src/components/Retrospective/EditRetrospective.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <div>
-      <button type="button" class="btn btn-info btn-md falko-button" id="addButton"
-      data-toggle="modal" data-target="#editRetrospectiveModal">
+      <v-btn type="button" class="info falko-button white--text" id="addButton"
+      data-toggle="modal" data-target="#editRetrospectiveModal" color="#86B1B1">
       Edit Retrospective
-      </button>
+      </v-btn>
     </div>
 
     <div class="row no-margin justify-content-center modal fade" id="editRetrospectiveModal">
diff --git a/src/components/Revision/AddRevision.vue b/src/components/Revision/AddRevision.vue
index c3dc34ff..cf5c916e 100644
--- a/src/components/Revision/AddRevision.vue
+++ b/src/components/Revision/AddRevision.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <div>
-      <button type="button" class="btn btn-info btn-md falko-button" id="addButton"
-              data-toggle="modal" data-target="#addRevisionModal">
+      <v-btn type="button" class="info falko-button white--text" id="addButton"
+              data-toggle="modal" data-target="#addRevisionModal" color="#86B1B1">
         Add Revision
-      </button>
+      </v-btn>
     </div>
 
     <div class="row no-margin justify-content-center modal fade" id="addRevisionModal">
diff --git a/src/components/Sprints/AddSprint.vue b/src/components/Sprints/AddSprint.vue
index 9fb1a5a4..47bdf066 100644
--- a/src/components/Sprints/AddSprint.vue
+++ b/src/components/Sprints/AddSprint.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <div>
-      <button type="button" class="btn btn-info btn-md falko-button" id="addButton" data-toggle="modal" data-target="#addSprintModal">
+      <v-btn type="button" class="info falko-button white--text" id="addButton" color="#86B1B1" data-toggle="modal" data-target="#addSprintModal">
         Add a Sprint
-      </button>
+      </v-btn>
     </div>
 
     <div class="modal fade" id="addSprintModal" role="dialog">
@@ -39,11 +39,13 @@
             </div>
           </div>
           <div class="modal-footer">
-            <button type="button" :disabled="errors.has('name') || errors.has('Initial Date') || errors.has('Final Date')" 
-                    class="btn btn-info btn-md falko-button" v-on:click="addSprint" data-dismiss="modal">
+            <v-btn type="button" :disabled="errors.has('name') || errors.has('Initial Date') || errors.has('Final Date')" 
+                    class="info falko-button-grey white--text" color="#86B1B1" v-on:click="addSprint" data-dismiss="modal">
               Save
-            </button>
-            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
+            </v-btn>
+            <v-btn type="button" class="info falko-button-grey white--text" color="#868e96" data-dismiss="modal">
+              Close
+            </v-btn>
           </div>
         </div>
       </div>
diff --git a/src/components/Sprints/DeleteSprint.vue b/src/components/Sprints/DeleteSprint.vue
index 63fc3595..cbef3613 100644
--- a/src/components/Sprints/DeleteSprint.vue
+++ b/src/components/Sprints/DeleteSprint.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="delsprint">
-    <button type="button" class="btn btn-info btn-md falko-button-danger" id="deletebutton" data-toggle="modal" data-target="#deleteSprintModal">
+    <v-btn type="button" class="info falko-button-danger" id="deletebutton" data-toggle="modal" data-target="#deleteSprintModal" color="#AA0000">
       Delete
-    </button>
+    </v-btn>
     <div class="modal fade" id ="deleteSprintModal" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
diff --git a/src/components/Sprints/EditSprint.vue b/src/components/Sprints/EditSprint.vue
index db277958..e6621493 100644
--- a/src/components/Sprints/EditSprint.vue
+++ b/src/components/Sprints/EditSprint.vue
@@ -1,8 +1,8 @@
 <template>
   <div class = "editSprintBody">
-    <button type="button" class="btn btn-info btn-md falko-button" id="editbutton" data-toggle="modal" data-target="#editSprintModal">
+    <v-btn type="button" class="info falko-button" id="editbutton" data-toggle="modal" data-target="#editSprintModal" color="#86B1B1">
       Edit
-    </button>
+    </v-btn>
 
     <div class="modal fade" id ="editSprintModal" role="dialog">
       <div class="modal-dialog">
diff --git a/src/components/Users/DeleteUserProfile.vue b/src/components/Users/DeleteUserProfile.vue
index 832fd39e..f94b1236 100644
--- a/src/components/Users/DeleteUserProfile.vue
+++ b/src/components/Users/DeleteUserProfile.vue
@@ -1,8 +1,8 @@
 <template >
   <div class="delusers">
-    <button type="button" class="btn btn-info btn-md falko-button-danger" id="deletebutton" data-toggle="modal" data-target="#myModal">
+    <v-btn type="button" class="info falko-button-danger white--text" id="deletebutton" color="#AA0000" data-toggle="modal" data-target="#myModal">
       Delete
-    </button>
+    </v-btn>
     <div class="modal fade" id ="myModal" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
@@ -18,8 +18,8 @@
             <p><label> Are you sure?</label></p>
           </div>
           <div class="modal-footer">
-            <button v-on:click="deleteUser" type="button" class="btn btn-info btn-md falko-button" data-dismiss="modal" >Yes</button>
-            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal">No</button>
+            <v-btn type="button" v-on:click="deleteUser" class="info falko-button white--text" data-dismiss="modal" color="#86B1B1">Yes</v-btn>
+            <v-btn type="button"  class="info falko-button white--text" data-dismiss="modal" color="#868e96">No</v-btn>
           </div>
         </div>
       </div>
diff --git a/src/components/Users/EditUserProfile.vue b/src/components/Users/EditUserProfile.vue
index 152d4fbb..ebe3cc77 100644
--- a/src/components/Users/EditUserProfile.vue
+++ b/src/components/Users/EditUserProfile.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="edit-user-profile">
-    <button type="button" class="btn btn-info btn-md falko-button" id="editbutton" data-toggle="modal" data-target="#editModal">
+    <v-btn type="button" class="info falko-button white--text" id="editbutton" color="#86B1B1" data-toggle="modal" data-target="#editModal">
       Edit
-    </button>
+    </v-btn>
 
     <div class="modal fade" id ="editModal" role="dialog">
       <div class="modal-dialog">
@@ -24,8 +24,8 @@
             </div>
           </div>
           <div class="modal-footer">
-            <button type="button" class="btn btn-info btn-md falko-button" v-on:click="editUser" data-dismiss="modal">Save</button>
-            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
+            <v-btn type="button" class="info falko-button white--text" color="#86B1B1" v-on:click="editUser" data-dismiss="modal">Save</v-btn>
+            <v-btn type="button" class="info falko-button white--text" color="#868e96" data-dismiss="modal">Close</v-btn>
           </div>
         </div>
       </div>
diff --git a/src/components/Users/ForgotPassword.vue b/src/components/Users/ForgotPassword.vue
index 12d7c0af..233fd304 100644
--- a/src/components/Users/ForgotPassword.vue
+++ b/src/components/Users/ForgotPassword.vue
@@ -14,7 +14,7 @@
                 <span class="text-danger" v-if="errors.has('email')">{{ errors.first('email') }}</span>
               </div>
               <div class="text-center">
-                <button type="submit" class="btn btn-primary falko-button"> Reset password </button>
+                <v-btn type="submit" class="primary falko-button white--text" id="" color="#86B1B1">Reset Password</v-btn>
               </div>
               <div class="text-center">
                 <router-link to='/'> Log-in </router-link>
diff --git a/src/components/Users/UserProfile.vue b/src/components/Users/UserProfile.vue
index fcfe0120..2e384419 100644
--- a/src/components/Users/UserProfile.vue
+++ b/src/components/Users/UserProfile.vue
@@ -22,9 +22,9 @@
           <div class="card-text">
             <div class="row justify-content-center">
               <div class="col-md-7">
-                <button class="falko-button btn btn-primary" v-on:click="setGitHubButtonAction()">
+                <v-btn type="button" class="primary falko-button white--text" color="#86B1B1" v-on:click="setGitHubButtonAction()">
                   {{this.gitHubButtonLabel}}
-                </button>
+                </v-btn>
               </div>
               <div class="col">
                 <edit-user-profile></edit-user-profile>

From 5bf5fb0cb535e3a7743c32d06f0551845f40def5 Mon Sep 17 00:00:00 2001
From: Rossicler <rossiclerjr@gmail.com>
Date: Thu, 19 Sep 2019 14:58:43 -0300
Subject: [PATCH 03/11] Fixed inputs at login form and changed inputs of
 register to Vuetify

---
 src/components/Authentication/Login.vue    |  4 +-
 src/components/Authentication/Register.vue | 65 +++++++++++-----------
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/src/components/Authentication/Login.vue b/src/components/Authentication/Login.vue
index 2dd0b58e..50caa3d2 100644
--- a/src/components/Authentication/Login.vue
+++ b/src/components/Authentication/Login.vue
@@ -27,7 +27,7 @@
           <v-text-field
             label="Email"
             v-model="email"
-            :rules="[rules.required, rules.validEmail], "
+            :rules="[rules.required, rules.validEmail]"
             outlined
           ></v-text-field>
         </div>
@@ -66,7 +66,7 @@ export default {
       alert: false,
       rules: {
         required: value => !!value || 'Required.',
-        min: v => v.length >= 8 || 'Min 6 characters',
+        min: v => v.length >= 6 || 'Min 6 characters',
         emailMatch: () => ('Incorrect email or password'),
         validEmail: v => /.+@.+/.test(v) || 'E-mail must be valid',
       }
diff --git a/src/components/Authentication/Register.vue b/src/components/Authentication/Register.vue
index 2fa7dcea..4db85052 100644
--- a/src/components/Authentication/Register.vue
+++ b/src/components/Authentication/Register.vue
@@ -4,44 +4,39 @@
       <img src="../../assets/logo.png" class="rounded mx-auto d-block img-fluid" id="falkoLogoRegister">
       <form id="registerForm" @submit.prevent="register()"  data-vv-scope="form-register">
         <div class="form-group">
-          <input  type="text"
-                  class="form-control"
-                  aria-describedby="userHelp"
-                  placeholder="Username"
-                  name="username"
-                  v-validate="'required|min:3'"
-                  v-model="username">
-          <p class="text-danger" v-if="errors.has('form-register.username')">{{ errors.first('form-register.username') }}</p>
+          <v-text-field
+            label="Username"
+            v-model="username"
+            :rules="[rules.required, rules.minName]"
+            outlined
+          ></v-text-field>
         </div>
         <div class="form-group">
-          <input  type="email"
-                  class="form-control"
-                  aria-describedby="emailHelp"
-                  name="email"
-                  placeholder="Enter email"
-                  v-model="email"
-                  v-validate="'required|email'">
-          <p class="text-danger" v-if="errors.has('form-register.email')">{{ errors.first('form-register.email') }}</p>
+          <v-text-field
+            label="Enter Email"
+            v-model="email"
+            :rules="[rules.required, rules.validEmail]"
+            outlined
+          ></v-text-field>
           <p class="text-danger" v-if="errors.has('email-taken')">{{ errors.first('email-taken') }}</p>
         </div>
         <div class="form-group">
-          <input  type="password"
-                  class="form-control"
-                  placeholder="Password"
-                  ref="password"
-                  v-model="password"
-                  name="password"
-                  v-validate="'required|min:6'">
-          <p class="text-danger" v-if="errors.has('form-register.password')">{{ errors.first('form-register.password') }}</p>
+          <v-text-field
+            label="Password"
+            v-model="password"
+            :type="'password'"
+            :rules="[rules.required, rules.minPassword]"
+            outlined
+          ></v-text-field>
         </div>
         <div class="form-group">
-          <input  type="password"
-                  class="form-control"
-                  placeholder="Confirm Password"
-                  v-model="password_confirmation"
-                  name="password"
-                  v-validate="'confirmed:password'">
-          <p class="text-danger" v-if="errors.has('form-register.password_confirmation')">{{ errors.first('form-register.password_confirmation') }}</p>
+          <v-text-field
+            label="Confirm Password"
+            v-model="password_confirmation"
+            :type="'password'"
+            :rules="[rules.required, rules.minPassword, rules.confirmPasswordMatch]"
+            outlined
+          ></v-text-field>
         </div>
         <div class="text-center">
           <button type="submit" :disabled="disableRegisterButton()" class="btn btn-primary falko-button" id="">Register</button>
@@ -62,6 +57,14 @@ export default {
       username: '',
       password: '',
       password_confirmation: '',
+      rules: {
+        required: value => !!value || 'Required.',
+        minPassword: v => v.length >= 6 || 'Min 6 characters',
+        minName: v => v.length >= 3 || 'Min 3 characters',
+        emailMatch: () => ('Incorrect email or password'),
+        validEmail: v => /.+@.+/.test(v) || 'E-mail must be valid',
+        confirmPasswordMatch: () => (this.password === this.password_confirmation) || "Passwords doesn't match"
+      }
     };
   },
 

From c639ee375d651273c81f24188ff0da6c8d627384 Mon Sep 17 00:00:00 2001
From: Rossicler <rossiclerjr@gmail.com>
Date: Thu, 19 Sep 2019 15:38:09 -0300
Subject: [PATCH 04/11] Changed inputs to Vuetify of AddIssue, AddProject,
 EditProject, AddRelease and EditUserProfile

---
 src/components/Issues/AddIssue.vue       | 33 +++++++++++++++++-------
 src/components/Projects/AddProject.vue   | 30 +++++++++++----------
 src/components/Projects/EditProject.vue  | 30 +++++++++++----------
 src/components/Releases/AddRelease.vue   | 25 +++++++++++++-----
 src/components/Users/EditUserProfile.vue | 20 +++++++++++---
 5 files changed, 92 insertions(+), 46 deletions(-)

diff --git a/src/components/Issues/AddIssue.vue b/src/components/Issues/AddIssue.vue
index 693b6122..99e81737 100644
--- a/src/components/Issues/AddIssue.vue
+++ b/src/components/Issues/AddIssue.vue
@@ -17,14 +17,26 @@
 						</div>
 						<div class=" row modal-body">
               <div class="col">
-                <p><label>Name</label></p>
-                <p><input type="text" v-model="name" id="issueName" placeholder="Issue Title" name="name" v-validate="'required'">
-									<p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
-								</input><br></p>
-                <p><label>Body</label></p>
-                <input type="text" v-model="body" placeholder="Issue Body..." name="body" v-validate="'required'">
-								<p class="text-danger" v-if="errors.has('body')">{{ errors.first('body') }}</p>
-							</input><br>
+				<v-text-field
+					label="Name"
+					v-model="name"
+					:rules="[rules.required]"
+					outlined
+				></v-text-field>
+				<p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
+				<br>
+				
+				<v-textarea
+					outlined
+					name="input-7-4"
+					v-model="body"
+					label="Issue Body"
+					rows="2"
+					row-height="20"
+					:rules="[rules.required]"
+				></v-textarea>
+				<p class="text-danger" v-if="errors.has('body')">{{ errors.first('body') }}</p>
+				<br>
               </div>
 						</div>
 						<div class="modal-footer">
@@ -46,7 +58,10 @@ export default {
   data () {
     return {
       name: '',
-      body : ''
+	  body : '',
+	  rules: {
+        required: value => !!value || 'Required.',
+      }
     }
 	},
 
diff --git a/src/components/Projects/AddProject.vue b/src/components/Projects/AddProject.vue
index 38da4b2d..2d958667 100644
--- a/src/components/Projects/AddProject.vue
+++ b/src/components/Projects/AddProject.vue
@@ -15,19 +15,20 @@
             </button>
           </div>
           <div class="modal-body" data-vv-scope="modal-project">
-            <p><label>Name</label></p>
-            <p><input type = "text"
-                      name="name"
-                      v-validate="'required'"
-                      v-model="name">
-                <p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
-                <br>
-            </p>
-            <p><label>Description</label></p>
-            <input type = "text"
-                   name = "description"
-                   v-validate="'required'"
-                   v-model="description">
+            <v-text-field
+              label="Name"
+              v-model="name"
+              :rules="[rules.required]"
+              outlined
+            ></v-text-field>
+            <p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
+            <br>
+            <v-text-field
+              label="Description"
+              v-model="description"
+              :rules="[rules.required]"
+              outlined
+            ></v-text-field>
             <p class="text-danger" v-if="errors.has('description')">{{ errors.first('description') }}</p>
             <br>
           </div>
@@ -52,6 +53,9 @@ export default {
     return {
       name: '',
       description: '',
+      rules: {
+        required: value => !!value || 'Required.',
+      }
     };
   },
 
diff --git a/src/components/Projects/EditProject.vue b/src/components/Projects/EditProject.vue
index ddd7a517..5afa514d 100644
--- a/src/components/Projects/EditProject.vue
+++ b/src/components/Projects/EditProject.vue
@@ -16,21 +16,22 @@
             <div class="col">
               <div class="row">
                 <div class="col">
-                  <p><label > Name </label></p>
-                  <p><input type = "text"
-                            name="name"
-                            v-validate="'required'"
-                            v-model="name">
-                      <p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
-                      <br>
-                  </p>
+                    <v-text-field
+                      label="Name"
+                      v-model="name"
+                      :rules="[rules.required]"
+                      outlined
+                    ></v-text-field>
+                    <p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
+                    <br>
                 </div>
                 <div class="col">
-                  <p><label> Description </label></p>
-                  <input type = "text"
-                         name = "description"
-                         v-validate="'required'"
-                         v-model="description">
+                  <v-text-field
+                    label="Description"
+                    v-model="description"
+                    :rules="[rules.required]"
+                    outlined
+                  ></v-text-field>
                   <p class="text-danger" v-if="errors.has('description')">{{ errors.first('description') }}</p>
                   <br>
                 </div>
@@ -69,6 +70,9 @@ export default{
       name: '',
       description: '',
       isScoring: '',
+      rules: {
+        required: value => !!value || 'Required.',
+      }
     };
   },
   computed: {
diff --git a/src/components/Releases/AddRelease.vue b/src/components/Releases/AddRelease.vue
index b486b6fb..6da8b7f7 100644
--- a/src/components/Releases/AddRelease.vue
+++ b/src/components/Releases/AddRelease.vue
@@ -24,21 +24,29 @@
           </div>
           <div class="row modal-body align-content-end">
             <div class="col-6">
-              <label>Name</label>
-              <input type="text" v-model="name" id="releaseName" placeholder="Release Name" name="name" v-validate="'required'">
-                <p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
-              </input>
+              <v-text-field
+                label="Name"
+                v-model="name"
+                :rules="[rules.required]"
+                outlined
+              ></v-text-field>
+              <p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
               <br>
 
-              <label>Description</label>
-              <input type="text" v-model="description" placeholder="Release description..." name="description" v-validate="'required'">
+              <v-text-field
+                label="Release description"
+                v-model="description"
+                :rules="[rules.required]"
+                outlined
+              ></v-text-field>
               <p class="text-danger" v-if="errors.has('description')">{{ errors.first('description') }}</p>
-            </input><br>
+              <br>
             </div>
             <div class="col-6">
               
               <label>Initial Date</label>
               <input type="date" v-model="initialDate" name="Initial Date" ref="Initial Date" min="2" v-validate="'date_format:YYYY-MM-DD'"/><br>
+
               <label>Final Date</label>
               <input type="date" v-model="finalDate" v-bind:min="this.initialDate" name="Final Date" v-validate="'date_format:YYYY-MM-DD|after:Initial Date'">
               <p class="text-danger" v-if="errors.has('Final Date')">{{ errors.first('Final Date') }}</p>
@@ -68,6 +76,9 @@ export default {
       initialDate: '',
       finalDate: '',
       amount_of_sprints: 0,
+      rules: {
+        required: value => !!value || 'Required.',
+      }
     };
   },
   computed: {
diff --git a/src/components/Users/EditUserProfile.vue b/src/components/Users/EditUserProfile.vue
index 152d4fbb..0781aacd 100644
--- a/src/components/Users/EditUserProfile.vue
+++ b/src/components/Users/EditUserProfile.vue
@@ -15,12 +15,20 @@
           </div>
           <div class="row modal-body">
             <div class="col-md-6">
-              <p><label > Name </label></p>
-              <p><input type="text" placeholder="User name..." v-model="name"></input><br></p>
+              <v-text-field
+                label="Username"
+                v-model="name"
+                :rules="[rules.required]"
+                outlined
+              ></v-text-field>
             </div>
             <div class="col-md-6">
-              <p><label> E-mail </label></p>
-              <p><input type="text" placeholder="Email..." v-model="email"></input><br></p>
+              <v-text-field
+                label="Email"
+                v-model="email"
+                :rules="[rules.required, rules.validEmail]"
+                outlined
+              ></v-text-field>
             </div>
           </div>
           <div class="modal-footer">
@@ -45,6 +53,10 @@ export default {
       name: '',
       email: '',
       is_github_authenticated: false,
+      rules: {
+        required: value => !!value || 'Required.',
+        validEmail: v => /.+@.+/.test(v) || 'E-mail must be valid',
+      }
     };
   },
 

From 6578aecdbe488839f2f812dae89639c01c7fc99b Mon Sep 17 00:00:00 2001
From: Gabriela Moraes <gabrielademoraes10@gmail.com>
Date: Thu, 19 Sep 2019 16:00:00 -0300
Subject: [PATCH 05/11] Migrating close button to vuetify.

Co-authored-by: guilhermesiqueira <guilhersiqueira@gmail.com>
---
 src/components/Authentication/Login.vue    | 4 ++--
 src/components/GitHub/GitHubProjects.vue   | 4 ++--
 src/components/Projects/AddGrades.vue      | 4 ++--
 src/components/Projects/AddProject.vue     | 4 ++--
 src/components/Projects/DeleteProject.vue  | 4 ++--
 src/components/Projects/EditProject.vue    | 4 ++--
 src/components/Releases/AddRelease.vue     | 4 ++--
 src/components/Releases/DeleteRelease.vue  | 4 ++--
 src/components/Releases/EditRelease.vue    | 4 ++--
 src/components/Sprints/AddSprint.vue       | 4 ++--
 src/components/Users/DeleteUserProfile.vue | 4 ++--
 src/components/Users/EditUserProfile.vue   | 4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/components/Authentication/Login.vue b/src/components/Authentication/Login.vue
index ac724d38..d84b8e9a 100644
--- a/src/components/Authentication/Login.vue
+++ b/src/components/Authentication/Login.vue
@@ -9,7 +9,7 @@
             {{ errors.first('invalid-credentials') }}
           </div>
           <div class="column">
-            <button
+            <v-btn text icon
               type="button"
               class="close"
               data-dismiss="alert"
@@ -17,7 +17,7 @@
               v-on:click="closeAlert()"
             >
               <span aria-hidden="true">&times;</span>
-            </button>
+            </v-btn>
           </div>
         </div>
       </div>
diff --git a/src/components/GitHub/GitHubProjects.vue b/src/components/GitHub/GitHubProjects.vue
index 535aa759..b27c17ef 100644
--- a/src/components/GitHub/GitHubProjects.vue
+++ b/src/components/GitHub/GitHubProjects.vue
@@ -20,9 +20,9 @@
         <div class="modal-content" id="importProjectsModal">
           <div class="modal-header">
             <h4 class="modal-title">Import GitHub Repository</h4>
-            <button type="button" class="close" data-dismiss="modal" v-on:click="clean" aria-label="Close">
+            <v-btn text icon type="button" class="close" data-dismiss="modal" v-on:click="clean" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </button>
+            </v-btn>
           </div>
           <div class="row">
             <div class="col align-self-center margin" v-if="loading" align="center">
diff --git a/src/components/Projects/AddGrades.vue b/src/components/Projects/AddGrades.vue
index 2709f0ae..b4931945 100644
--- a/src/components/Projects/AddGrades.vue
+++ b/src/components/Projects/AddGrades.vue
@@ -10,9 +10,9 @@
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">Add Grades</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </button>
+            </v-btn>
           </div>
           <div class="row modal-body">
             <div class="col-md-4">
diff --git a/src/components/Projects/AddProject.vue b/src/components/Projects/AddProject.vue
index f86c9ec6..4213a67f 100644
--- a/src/components/Projects/AddProject.vue
+++ b/src/components/Projects/AddProject.vue
@@ -9,9 +9,9 @@
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">Add a Project</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </button>
+            </v-btn>
           </div>
           <div class="modal-body" data-vv-scope="modal-project">
             <p><label>Name</label></p>
diff --git a/src/components/Projects/DeleteProject.vue b/src/components/Projects/DeleteProject.vue
index ee716b85..a2456136 100644
--- a/src/components/Projects/DeleteProject.vue
+++ b/src/components/Projects/DeleteProject.vue
@@ -10,9 +10,9 @@
             <div>
               <h4 class="modal-title">Delete Project?</h4>
             </div>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </button>
+            </v-btn>
           </div>
           <div class="modal-body">
             <p><label> Are you sure?</label></p>
diff --git a/src/components/Projects/EditProject.vue b/src/components/Projects/EditProject.vue
index 290f756a..7a8cf2e1 100644
--- a/src/components/Projects/EditProject.vue
+++ b/src/components/Projects/EditProject.vue
@@ -8,9 +8,9 @@
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">Edit Project</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </button>
+            </v-btn>
           </div>
           <div class="row modal-body">
             <div class="col">
diff --git a/src/components/Releases/AddRelease.vue b/src/components/Releases/AddRelease.vue
index 4b3a7a19..0ff4960e 100644
--- a/src/components/Releases/AddRelease.vue
+++ b/src/components/Releases/AddRelease.vue
@@ -18,9 +18,9 @@
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">Add Release</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </button>
+            </v-btn>
           </div>
           <div class="row modal-body align-content-end">
             <div class="col-6">
diff --git a/src/components/Releases/DeleteRelease.vue b/src/components/Releases/DeleteRelease.vue
index 13fff8d7..96b73d9b 100644
--- a/src/components/Releases/DeleteRelease.vue
+++ b/src/components/Releases/DeleteRelease.vue
@@ -10,9 +10,9 @@
             <div>
               <h4 class="modal-title">Delete Project?</h4>
             </div>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </button>
+            </v-btn>
           </div>
           <div class="modal-body">
             <p><label>Are you sure?</label></p>
diff --git a/src/components/Releases/EditRelease.vue b/src/components/Releases/EditRelease.vue
index 93a9b9c7..08f60405 100644
--- a/src/components/Releases/EditRelease.vue
+++ b/src/components/Releases/EditRelease.vue
@@ -9,9 +9,9 @@
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">Edit Release</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </button>
+            </v-btn>
           </div>
           <div class="row modal-body">
             <div class="col-6">
diff --git a/src/components/Sprints/AddSprint.vue b/src/components/Sprints/AddSprint.vue
index 47bdf066..856e91ad 100644
--- a/src/components/Sprints/AddSprint.vue
+++ b/src/components/Sprints/AddSprint.vue
@@ -11,9 +11,9 @@
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">Add a Sprint</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </button>
+            </v-btn>
           </div>
           <div class="row modal-body">
             <div class="col-6">
diff --git a/src/components/Users/DeleteUserProfile.vue b/src/components/Users/DeleteUserProfile.vue
index f94b1236..de7be4fe 100644
--- a/src/components/Users/DeleteUserProfile.vue
+++ b/src/components/Users/DeleteUserProfile.vue
@@ -10,9 +10,9 @@
             <div>
               <h4 class="modal-title">Delete Profile?</h4>
             </div>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </button>
+            </v-btn>
           </div>
           <div class="modal-body">
             <p><label> Are you sure?</label></p>
diff --git a/src/components/Users/EditUserProfile.vue b/src/components/Users/EditUserProfile.vue
index ebe3cc77..8422aa02 100644
--- a/src/components/Users/EditUserProfile.vue
+++ b/src/components/Users/EditUserProfile.vue
@@ -9,9 +9,9 @@
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">Edit User Profile</h4>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </button>
+            </v-btn>
           </div>
           <div class="row modal-body">
             <div class="col-md-6">

From d8b0abbe47b41f12c822e761f69419986b72651e Mon Sep 17 00:00:00 2001
From: Rossicler <rossiclerjr@gmail.com>
Date: Thu, 19 Sep 2019 16:28:52 -0300
Subject: [PATCH 06/11] Changed inputs to vuetify of EditIssue, EditRelease,
 AddRetrospective and EditRetrospective

---
 src/components/Issues/EditIssue.vue           | 36 ++++++++++++-------
 src/components/Releases/EditRelease.vue       | 25 ++++++++-----
 .../Retrospective/AddRetrospective.vue        | 24 ++++++++-----
 .../Retrospective/EditRetrospective.vue       | 12 ++++---
 4 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/src/components/Issues/EditIssue.vue b/src/components/Issues/EditIssue.vue
index c5f1c98d..d3533ed6 100644
--- a/src/components/Issues/EditIssue.vue
+++ b/src/components/Issues/EditIssue.vue
@@ -15,22 +15,29 @@
           </div>
           <div class="modal-body row">
             <div class="col">
-              <p><label> Name </label></p>
-              <input type = "text" v-model="name" placeholder="Name" name="name" v-validate="'required'">
+              <v-text-field
+                label="Name"
+                v-model="name"
+                :rules="[rules.required]"
+                outlined
+              ></v-text-field>
               <p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
-            </input><br>
-              <p><label> Description </label></p>
-              <input type = "text" v-model="body" placeholder="Description" name="body" v-validate="'required'">
+              <br>
+              <v-text-field
+                label="Description"
+                v-model="body"
+                :rules="[rules.required]"
+                outlined
+              ></v-text-field>
               <p class="text-danger" v-if="errors.has('body')">{{ errors.first('body') }}</p>
-            </input><br>
+              <br>
             </div>
             <div class="col">
-                <div class="row justify-content-center">
-                  <p><label> Assignees </label></p>
-                </div>
-                <div class="row">
-                  <input type="text" v-model="search" placeholder="search...">
-                </div>
+              <v-text-field
+                label="Assignees"
+                v-model="search"
+                outlined
+              ></v-text-field>
               <div class="col" v-if="search != ''">
                 <div class="row" v-for="contributor in filteredContribs">
                 <label class="custom-control custom-checkbox">
@@ -66,7 +73,10 @@ export default {
       number: "",
       contributors: [],
       selectedContribs: [],
-      search: ""
+      search: "",
+      rules: {
+        required: value => !!value || 'Required.',
+      }
     }
   },
 
diff --git a/src/components/Releases/EditRelease.vue b/src/components/Releases/EditRelease.vue
index 8fff3773..8a13a128 100644
--- a/src/components/Releases/EditRelease.vue
+++ b/src/components/Releases/EditRelease.vue
@@ -15,16 +15,22 @@
           </div>
           <div class="row modal-body">
             <div class="col-6">
-              <label>Name</label>
-              <input type="text" v-model="name" id="releaseName" placeholder="Release Name" name="name" v-validate="'required'">
-                <p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
-              </input>
+              <v-text-field
+                label="Release Name"
+                v-model="name"
+                :rules="[rules.required]"
+                outlined
+              ></v-text-field>
+              <p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
               <br>
-
-              <label>Description</label>
-              <input type="text" v-model="description" placeholder="Release description..." name="description" v-validate="'required'">
+              <v-text-field
+                label="Release Description"
+                v-model="description"
+                :rules="[rules.required]"
+                outlined
+              ></v-text-field>
               <p class="text-danger" v-if="errors.has('description')">{{ errors.first('description') }}</p>
-            </input><br>
+              <br>
             </div>
             <div class="col-6">
               
@@ -60,6 +66,9 @@ export default {
       description: '',
       initialDate: '',
       finalDate: '',
+      rules: {
+        required: value => !!value || 'Required.',
+      }
     };
   },
   computed: {
diff --git a/src/components/Retrospective/AddRetrospective.vue b/src/components/Retrospective/AddRetrospective.vue
index 99174389..b5fe09b1 100644
--- a/src/components/Retrospective/AddRetrospective.vue
+++ b/src/components/Retrospective/AddRetrospective.vue
@@ -22,10 +22,14 @@
             <list parent="PositivePoints" v-on:listUpdated="updateList"></list>
             <list parent="NegativePoints" v-on:listUpdated="updateList"></list>
             <list parent="Improvements" v-on:listUpdated="updateList"></list>
-            <textarea class="text-justify"
-            placeholder="Input your sprint report..."
-            v-model="sprintReport"
-            />
+            <v-textarea
+              outlined
+              name="input-7-4"
+              v-model="sprintReport"
+              label="Sprint Report"
+              rows="2"
+              row-height="20"
+            ></v-textarea>
           </div>
           <div class="modal-footer">
             <button class="btn btn-info btn-md falko-button"
@@ -53,10 +57,14 @@
                   <list parent="PositivePoints" v-on:listUpdated="updateList"></list>
                   <list parent="NegativePoints" v-on:listUpdated="updateList"></list>
                   <list parent="Improvements" v-on:listUpdated="updateList"></list>
-                  <textarea class="text-justify"
-                  placeholder="Input your sprint report..."
-                  v-model="sprintReport"
-                  />
+                  <v-textarea
+                    outlined
+                    name="input-7-4"
+                    v-model="sprintReport"
+                    label="Sprint Report"
+                    rows="2"
+                    row-height="20"
+                  ></v-textarea>
                 </div>
                 <div class="modal-footer">
                   <button class="btn btn-info btn-md falko-button"
diff --git a/src/components/Retrospective/EditRetrospective.vue b/src/components/Retrospective/EditRetrospective.vue
index 7f86c7ea..6d20ba4a 100644
--- a/src/components/Retrospective/EditRetrospective.vue
+++ b/src/components/Retrospective/EditRetrospective.vue
@@ -22,10 +22,14 @@
             <list parent="PositivePoints" v-on:listUpdated="updateList"></list>
             <list parent="NegativePoints" v-on:listUpdated="updateList"></list>
             <list parent="Improvements" v-on:listUpdated="updateList"></list>
-            <textarea class="text-justify"
-            placeholder="Input your sprint report..."
-            v-model="sprintReport"
-            />
+            <v-textarea
+              outlined
+              name="input-7-4"
+              v-model="sprintReport"
+              label="Sprint Report"
+              rows="2"
+              row-height="20"
+            ></v-textarea>
           </div>
           <div class="modal-footer">
             <button class="btn btn-info btn-md falko-button" v-on:click="editRetrospective()" data-dismiss="modal">Save</button>

From 20bfe59086149cce4d30a95f035a7d6c26bb5116 Mon Sep 17 00:00:00 2001
From: Rossicler <rossiclerjr@gmail.com>
Date: Thu, 19 Sep 2019 16:43:07 -0300
Subject: [PATCH 07/11] Updated version of vuetify

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3f6be7ef..7b017893 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "vue-router": "^2.8.1",
     "vue-windows": "^0.1.3",
     "vuedraggable": "^2.16.0",
-    "vuetify": "^1.5.14",
+    "vuetify": "^2.0.18",
     "vuex": "^3.0.0",
     "vuex-persist": "^0.3.0"
   },

From 48f9c3178faf1865620b47adf5de36522134bfdd Mon Sep 17 00:00:00 2001
From: Rossicler <rossiclerjr@gmail.com>
Date: Thu, 3 Oct 2019 17:34:37 -0300
Subject: [PATCH 08/11] Removed outlined of inputs and fixed label position

---
 package.json                                       |  2 +-
 src/App.vue                                        | 13 +++----------
 src/components/Authentication/Login.vue            | 13 -------------
 src/components/Authentication/Register.vue         |  8 ++------
 src/components/Issues/AddIssue.vue                 |  2 --
 src/components/Issues/EditIssue.vue                |  3 ---
 src/components/Projects/AddProject.vue             |  2 --
 src/components/Projects/EditProject.vue            |  2 --
 src/components/Releases/AddRelease.vue             |  2 --
 src/components/Releases/EditRelease.vue            |  2 --
 src/components/Retrospective/AddRetrospective.vue  |  6 ++----
 src/components/Retrospective/EditRetrospective.vue |  5 ++---
 src/components/Retrospective/List.vue              |  4 ++--
 src/components/Revision/ListRevision.vue           |  4 ++--
 src/components/Users/EditUserProfile.vue           |  2 --
 15 files changed, 14 insertions(+), 56 deletions(-)

diff --git a/package.json b/package.json
index 7b017893..52b884ac 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "vue-router": "^2.8.1",
     "vue-windows": "^0.1.3",
     "vuedraggable": "^2.16.0",
-    "vuetify": "^2.0.18",
+    "vuetify": "^2.1.1",
     "vuex": "^3.0.0",
     "vuex-persist": "^0.3.0"
   },
diff --git a/src/App.vue b/src/App.vue
index 21fcc1b7..91a9b854 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -41,17 +41,10 @@ export default {
 </script>
 
 <style>
-input {
-  border: none;
-  border-radius: 0;
-  border-bottom: solid #c0c0c0 thin;
-  padding-left: 0;
-  color: #333;
-  width: 100%;  
-}
 
-input:focus {
-  outline: 0;
+.v-label {
+  left: 0px !important;
+  right: auto !important;
 }
 
 #app {
diff --git a/src/components/Authentication/Login.vue b/src/components/Authentication/Login.vue
index 50caa3d2..02855c72 100644
--- a/src/components/Authentication/Login.vue
+++ b/src/components/Authentication/Login.vue
@@ -23,24 +23,18 @@
       </div>
 
       <form id="loginForm"  @submit.prevent="() => login()" name="wrong-credentials">
-        <div class="form-group">
           <v-text-field
             label="Email"
             v-model="email"
             :rules="[rules.required, rules.validEmail]"
-            outlined
           ></v-text-field>
-        </div>
 
-        <div class="form-group">
           <v-text-field
             label="Password"
             v-model="password"
             :type="'password'"
             :rules="[rules.required, rules.min]"
-            outlined
           ></v-text-field>
-        </div>
 
         <div class="text-center">
           <button type="submit" class="btn btn-primary falko-button" id="loginButton" >Log In</button>
@@ -103,13 +97,6 @@ export default {
   max-width: 20em;
 }
 
-#loginForm input {
-  border: none;
-  border-radius: 0;
-  border-bottom: solid #c0c0c0 thin;
-  padding-left: 0;
-}
-
 #falkoLogoLogin {
   width: 11em;
   margin: 2.5em 0;
diff --git a/src/components/Authentication/Register.vue b/src/components/Authentication/Register.vue
index 4db85052..1d69950a 100644
--- a/src/components/Authentication/Register.vue
+++ b/src/components/Authentication/Register.vue
@@ -8,7 +8,6 @@
             label="Username"
             v-model="username"
             :rules="[rules.required, rules.minName]"
-            outlined
           ></v-text-field>
         </div>
         <div class="form-group">
@@ -16,7 +15,6 @@
             label="Enter Email"
             v-model="email"
             :rules="[rules.required, rules.validEmail]"
-            outlined
           ></v-text-field>
           <p class="text-danger" v-if="errors.has('email-taken')">{{ errors.first('email-taken') }}</p>
         </div>
@@ -26,7 +24,6 @@
             v-model="password"
             :type="'password'"
             :rules="[rules.required, rules.minPassword]"
-            outlined
           ></v-text-field>
         </div>
         <div class="form-group">
@@ -35,7 +32,6 @@
             v-model="password_confirmation"
             :type="'password'"
             :rules="[rules.required, rules.minPassword, rules.confirmPasswordMatch]"
-            outlined
           ></v-text-field>
         </div>
         <div class="text-center">
@@ -123,12 +119,12 @@ export default {
   max-width: 20em;
 }
 
-#registerForm input {
+/* #registerForm input {
   border: none;
   border-radius: 0;
   border-bottom: solid #c0c0c0 thin;
   padding-left: 0;
-}
+} */
 
 #falkoLogoRegister {
   width: 11em;
diff --git a/src/components/Issues/AddIssue.vue b/src/components/Issues/AddIssue.vue
index 99e81737..a4ab9c6c 100644
--- a/src/components/Issues/AddIssue.vue
+++ b/src/components/Issues/AddIssue.vue
@@ -21,13 +21,11 @@
 					label="Name"
 					v-model="name"
 					:rules="[rules.required]"
-					outlined
 				></v-text-field>
 				<p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
 				<br>
 				
 				<v-textarea
-					outlined
 					name="input-7-4"
 					v-model="body"
 					label="Issue Body"
diff --git a/src/components/Issues/EditIssue.vue b/src/components/Issues/EditIssue.vue
index d3533ed6..cd22404e 100644
--- a/src/components/Issues/EditIssue.vue
+++ b/src/components/Issues/EditIssue.vue
@@ -19,7 +19,6 @@
                 label="Name"
                 v-model="name"
                 :rules="[rules.required]"
-                outlined
               ></v-text-field>
               <p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
               <br>
@@ -27,7 +26,6 @@
                 label="Description"
                 v-model="body"
                 :rules="[rules.required]"
-                outlined
               ></v-text-field>
               <p class="text-danger" v-if="errors.has('body')">{{ errors.first('body') }}</p>
               <br>
@@ -36,7 +34,6 @@
               <v-text-field
                 label="Assignees"
                 v-model="search"
-                outlined
               ></v-text-field>
               <div class="col" v-if="search != ''">
                 <div class="row" v-for="contributor in filteredContribs">
diff --git a/src/components/Projects/AddProject.vue b/src/components/Projects/AddProject.vue
index 2d958667..a652c3f1 100644
--- a/src/components/Projects/AddProject.vue
+++ b/src/components/Projects/AddProject.vue
@@ -19,7 +19,6 @@
               label="Name"
               v-model="name"
               :rules="[rules.required]"
-              outlined
             ></v-text-field>
             <p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
             <br>
@@ -27,7 +26,6 @@
               label="Description"
               v-model="description"
               :rules="[rules.required]"
-              outlined
             ></v-text-field>
             <p class="text-danger" v-if="errors.has('description')">{{ errors.first('description') }}</p>
             <br>
diff --git a/src/components/Projects/EditProject.vue b/src/components/Projects/EditProject.vue
index 5afa514d..1705e074 100644
--- a/src/components/Projects/EditProject.vue
+++ b/src/components/Projects/EditProject.vue
@@ -20,7 +20,6 @@
                       label="Name"
                       v-model="name"
                       :rules="[rules.required]"
-                      outlined
                     ></v-text-field>
                     <p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
                     <br>
@@ -30,7 +29,6 @@
                     label="Description"
                     v-model="description"
                     :rules="[rules.required]"
-                    outlined
                   ></v-text-field>
                   <p class="text-danger" v-if="errors.has('description')">{{ errors.first('description') }}</p>
                   <br>
diff --git a/src/components/Releases/AddRelease.vue b/src/components/Releases/AddRelease.vue
index 6da8b7f7..d52168d5 100644
--- a/src/components/Releases/AddRelease.vue
+++ b/src/components/Releases/AddRelease.vue
@@ -28,7 +28,6 @@
                 label="Name"
                 v-model="name"
                 :rules="[rules.required]"
-                outlined
               ></v-text-field>
               <p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
               <br>
@@ -37,7 +36,6 @@
                 label="Release description"
                 v-model="description"
                 :rules="[rules.required]"
-                outlined
               ></v-text-field>
               <p class="text-danger" v-if="errors.has('description')">{{ errors.first('description') }}</p>
               <br>
diff --git a/src/components/Releases/EditRelease.vue b/src/components/Releases/EditRelease.vue
index 8a13a128..5269e974 100644
--- a/src/components/Releases/EditRelease.vue
+++ b/src/components/Releases/EditRelease.vue
@@ -19,7 +19,6 @@
                 label="Release Name"
                 v-model="name"
                 :rules="[rules.required]"
-                outlined
               ></v-text-field>
               <p class="text-danger" v-if="errors.has('name')">{{ errors.first('name') }}</p>
               <br>
@@ -27,7 +26,6 @@
                 label="Release Description"
                 v-model="description"
                 :rules="[rules.required]"
-                outlined
               ></v-text-field>
               <p class="text-danger" v-if="errors.has('description')">{{ errors.first('description') }}</p>
               <br>
diff --git a/src/components/Retrospective/AddRetrospective.vue b/src/components/Retrospective/AddRetrospective.vue
index b5fe09b1..48e0b664 100644
--- a/src/components/Retrospective/AddRetrospective.vue
+++ b/src/components/Retrospective/AddRetrospective.vue
@@ -23,7 +23,6 @@
             <list parent="NegativePoints" v-on:listUpdated="updateList"></list>
             <list parent="Improvements" v-on:listUpdated="updateList"></list>
             <v-textarea
-              outlined
               name="input-7-4"
               v-model="sprintReport"
               label="Sprint Report"
@@ -58,7 +57,6 @@
                   <list parent="NegativePoints" v-on:listUpdated="updateList"></list>
                   <list parent="Improvements" v-on:listUpdated="updateList"></list>
                   <v-textarea
-                    outlined
                     name="input-7-4"
                     v-model="sprintReport"
                     label="Sprint Report"
@@ -163,14 +161,14 @@ export default {
 
 <style scoped>
 
-textarea {
+/* textarea {
   width: 100%;
   height: 15em;
   padding: 1em;
   background-color: white;
   border: 1px solid rgba(0, 0, 0, 0.25);
   color: #444;
-}
+} */
 
 input::placeholder {
   color: #777;
diff --git a/src/components/Retrospective/EditRetrospective.vue b/src/components/Retrospective/EditRetrospective.vue
index 6d20ba4a..807dedbf 100644
--- a/src/components/Retrospective/EditRetrospective.vue
+++ b/src/components/Retrospective/EditRetrospective.vue
@@ -23,7 +23,6 @@
             <list parent="NegativePoints" v-on:listUpdated="updateList"></list>
             <list parent="Improvements" v-on:listUpdated="updateList"></list>
             <v-textarea
-              outlined
               name="input-7-4"
               v-model="sprintReport"
               label="Sprint Report"
@@ -109,14 +108,14 @@ export default {
 
 <style scoped>
 
-textarea {
+/* textarea {
   width: 100%;
   height: 15em;
   padding: 1em;
   background-color: white;
   border: 1px solid rgba(0, 0, 0, 0.25);
   color: #444;
-}
+} */
 
 input::placeholder {
   color: #777;
diff --git a/src/components/Retrospective/List.vue b/src/components/Retrospective/List.vue
index a4cf51a2..0fd986c6 100644
--- a/src/components/Retrospective/List.vue
+++ b/src/components/Retrospective/List.vue
@@ -72,13 +72,13 @@ export default {
 </script>
 
 <style scoped>
-input {
+/* input {
   width: 100%;
   padding: 1em;
   background-color: #86B1B1;
   border: none;
   color: white;
-}
+} */
 
 input::placeholder {
   color: rgba(255, 255, 255, 0.7);
diff --git a/src/components/Revision/ListRevision.vue b/src/components/Revision/ListRevision.vue
index 117e34f3..f7e70627 100644
--- a/src/components/Revision/ListRevision.vue
+++ b/src/components/Revision/ListRevision.vue
@@ -66,13 +66,13 @@ export default {
 </script>
 
 <style scoped>
-input {
+/* input {
   width: 100%;
   padding: 1em;
   background-color: #86B1B1;
   border: none;
   color: white;
-}
+} */
 
 input::placeholder {
   color: rgba(255, 255, 255, 0.7);
diff --git a/src/components/Users/EditUserProfile.vue b/src/components/Users/EditUserProfile.vue
index 0781aacd..57d103de 100644
--- a/src/components/Users/EditUserProfile.vue
+++ b/src/components/Users/EditUserProfile.vue
@@ -19,7 +19,6 @@
                 label="Username"
                 v-model="name"
                 :rules="[rules.required]"
-                outlined
               ></v-text-field>
             </div>
             <div class="col-md-6">
@@ -27,7 +26,6 @@
                 label="Email"
                 v-model="email"
                 :rules="[rules.required, rules.validEmail]"
-                outlined
               ></v-text-field>
             </div>
           </div>

From 18145ca2864c2247d4dc005fd3972dbd8d2ca5e1 Mon Sep 17 00:00:00 2001
From: lukassxp <lpalucas.10@gmail.com>
Date: Thu, 10 Oct 2019 15:03:12 -0300
Subject: [PATCH 09/11] Changed inputs to vuetify of addSprint and editSprint

---
 src/components/Sprints/AddSprint.vue  | 122 ++++++++++++++++----------
 src/components/Sprints/EditSprint.vue | 122 +++++++++++++++++---------
 2 files changed, 155 insertions(+), 89 deletions(-)

diff --git a/src/components/Sprints/AddSprint.vue b/src/components/Sprints/AddSprint.vue
index 9fb1a5a4..4bcb82ed 100644
--- a/src/components/Sprints/AddSprint.vue
+++ b/src/components/Sprints/AddSprint.vue
@@ -1,9 +1,13 @@
 <template>
   <div>
     <div>
-      <button type="button" class="btn btn-info btn-md falko-button" id="addButton" data-toggle="modal" data-target="#addSprintModal">
-        Add a Sprint
-      </button>
+      <button
+        type="button"
+        class="btn btn-info btn-md falko-button"
+        id="addButton"
+        data-toggle="modal"
+        data-target="#addSprintModal"
+      >Add a Sprint</button>
     </div>
 
     <div class="modal fade" id="addSprintModal" role="dialog">
@@ -17,33 +21,52 @@
           </div>
           <div class="row modal-body">
             <div class="col-6">
-              <label>Name</label>
-              <input type="text" placeholder="Sprint name..." v-model="name" name="name" v-validate="'required'"/>
+              <v-text-field label="Name" v-model="name" name="name" :rules="[rules.required]" />
 
-              <label>Description</label>
-              <input type="text" placeholder="Sprint description..." v-model="description"/>
+              <v-text-field label="Description" v-model="description" />
             </div>
 
             <div class="col-6">
               <label>Initial Date</label>
-              <input type="date" name="Initial Date" ref="Initial Date" v-model="sprintInitialDate" 
-                     v-bind:min="this.releaseInitialDate" v-bind:max="this.releaseFinalDate"
-                     v-validate="'required|date_format:YYYY-MM-DD|'"
+              <input
+                type="date"
+                name="Initial Date"
+                ref="Initial Date"
+                v-model="sprintInitialDate"
+                v-bind:min="this.releaseInitialDate"
+                v-bind:max="this.releaseFinalDate"
+                v-validate="'required|date_format:YYYY-MM-DD|'"
               />
 
               <label>Final Date</label>
-              <input type="date" name="Final Date" v-model="sprintFinalDate" v-bind:min="this.sprintInitialDate"
-                     v-bind:max="this.releaseFinalDate" required v-validate="'date_format:YYYY-MM-DD|after:Initial Date'"
+              <input
+                type="date"
+                name="Final Date"
+                v-model="sprintFinalDate"
+                v-bind:min="this.sprintInitialDate"
+                v-bind:max="this.releaseFinalDate"
+                required
+                v-validate="'date_format:YYYY-MM-DD|after:Initial Date'"
               />
-              <p class="text-danger" v-if="errors.has('Final Date')">{{ errors.first('Final Date') }}</p>
+              <p
+                class="text-danger"
+                v-if="errors.has('Final Date')"
+              >{{ errors.first('Final Date') }}</p>
             </div>
           </div>
           <div class="modal-footer">
-            <button type="button" :disabled="errors.has('name') || errors.has('Initial Date') || errors.has('Final Date')" 
-                    class="btn btn-info btn-md falko-button" v-on:click="addSprint" data-dismiss="modal">
-              Save
-            </button>
-            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
+            <button
+              type="button"
+              :disabled="errors.has('name') || errors.has('Initial Date') || errors.has('Final Date')"
+              class="btn btn-info btn-md falko-button"
+              v-on:click="addSprint"
+              data-dismiss="modal"
+            >Save</button>
+            <button
+              type="button"
+              class="btn btn-info btn-md falko-button-grey"
+              data-dismiss="modal"
+            >Close</button>
           </div>
         </div>
       </div>
@@ -52,19 +75,22 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
-import { EventBus } from '../../event-bus';
-import { HTTP } from '../../http-common';
+import { mapState } from "vuex";
+import { EventBus } from "../../event-bus";
+import { HTTP } from "../../http-common";
 
 export default {
-  name: 'addSprintBody',
+  name: "addSprintBody",
 
   data() {
     return {
-      name: '',
-      description: '',
-      sprintInitialDate: '',
-      sprintFinalDate: '',
+      rules: {
+        required: value => !!value || "Required."
+      },
+      name: "",
+      description: "",
+      sprintInitialDate: "",
+      sprintFinalDate: ""
     };
   },
 
@@ -73,8 +99,8 @@ export default {
       token: state => state.auth.token,
       releaseId: state => state.clientStatus.releaseId,
       releaseInitialDate: state => state.clientStatus.releaseInitialDate,
-      releaseFinalDate: state => state.clientStatus.releaseFinalDate,
-    }),
+      releaseFinalDate: state => state.clientStatus.releaseFinalDate
+    })
   },
 
   methods: {
@@ -82,27 +108,31 @@ export default {
       const _this = this;
       const headers = { Authorization: this.token };
 
-      HTTP.post(`releases/${this.releaseId}/sprints`, {
-        sprint: {
-          name: this.name,
-          description: this.description,
-          initial_date: this.sprintInitialDate,
-          final_date: this.sprintFinalDate,
-          release_id: this.releaseId,
+      HTTP.post(
+        `releases/${this.releaseId}/sprints`,
+        {
+          sprint: {
+            name: this.name,
+            description: this.description,
+            initial_date: this.sprintInitialDate,
+            final_date: this.sprintFinalDate,
+            release_id: this.releaseId
+          }
         },
-      }, { headers })
+        { headers }
+      )
         .then(() => {
-          this.name = '';
-          this.description = '';
-          this.sprintInitialDate = '';
-          this.sprintFinalDate = '';
-          EventBus.$emit('added-sprint', 1);
+          this.name = "";
+          this.description = "";
+          this.sprintInitialDate = "";
+          this.sprintFinalDate = "";
+          EventBus.$emit("added-sprint", 1);
         })
-        .catch((e) => {
-          _this.errors.add('wrong-credentials', 'Problem with credentials');
+        .catch(e => {
+          _this.errors.add("wrong-credentials", "Problem with credentials");
         });
-    },
-  },
+    }
+  }
 };
 </script>
 
@@ -111,7 +141,7 @@ export default {
   margin-top: 2em;
 }
 
-.modal-body{
+.modal-body {
   position: relative;
   top: 5px;
 }
diff --git a/src/components/Sprints/EditSprint.vue b/src/components/Sprints/EditSprint.vue
index db277958..0ea80986 100644
--- a/src/components/Sprints/EditSprint.vue
+++ b/src/components/Sprints/EditSprint.vue
@@ -1,10 +1,14 @@
 <template>
-  <div class = "editSprintBody">
-    <button type="button" class="btn btn-info btn-md falko-button" id="editbutton" data-toggle="modal" data-target="#editSprintModal">
-      Edit
-    </button>
+  <div class="editSprintBody">
+    <button
+      type="button"
+      class="btn btn-info btn-md falko-button"
+      id="editbutton"
+      data-toggle="modal"
+      data-target="#editSprintModal"
+    >Edit</button>
 
-    <div class="modal fade" id ="editSprintModal" role="dialog">
+    <div class="modal fade" id="editSprintModal" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
           <div class="modal-header">
@@ -15,33 +19,58 @@
           </div>
           <div class="row modal-body">
             <div class="col-6">
-              <label>Name</label>
-              <input type="text" placeholder="Sprint name..." v-model="name" name="name" v-validate="'required'"/>
+              <v-text-field
+                label="Name"
+                type="text"
+                v-model="name"
+                name="name"
+                :rules="[rules.required]"
+              />
 
-              <label>Description</label>
-              <input type="text" placeholder="Sprint description..." v-model="description"/>
+              <v-text-field label="Description" type="text" v-model="description" />
             </div>
 
             <div class="col-6">
               <label>Initial Date</label>
-              <input type="date" name="Initial Date" ref="Initial Date" v-model="sprintInitialDate" 
-                     v-bind:min="this.releaseInitialDate" v-bind:max="this.releaseFinalDate"
-                     v-validate="'required|date_format:YYYY-MM-DD|'"
+              <input
+                type="date"
+                name="Initial Date"
+                ref="Initial Date"
+                v-model="sprintInitialDate"
+                v-bind:min="this.releaseInitialDate"
+                v-bind:max="this.releaseFinalDate"
+                v-validate="'required|date_format:YYYY-MM-DD|'"
               />
 
               <label>Final Date</label>
-              <input type="date" name="Final Date" v-model="sprintFinalDate" v-bind:min="this.sprintInitialDate"
-                     v-bind:max="this.releaseFinalDate" required v-validate="'date_format:YYYY-MM-DD|after:Initial Date'"
+              <input
+                type="date"
+                name="Final Date"
+                v-model="sprintFinalDate"
+                v-bind:min="this.sprintInitialDate"
+                v-bind:max="this.releaseFinalDate"
+                required
+                v-validate="'date_format:YYYY-MM-DD|after:Initial Date'"
               />
-              <p class="text-danger" v-if="errors.has('Final Date')">{{ errors.first('Final Date') }}</p>
+              <p
+                class="text-danger"
+                v-if="errors.has('Final Date')"
+              >{{ errors.first('Final Date') }}</p>
             </div>
           </div>
           <div class="modal-footer">
-            <button type="button" :disabled="errors.has('name') || errors.has('Initial Date') || errors.has('Final Date')" 
-                    class="btn btn-info btn-md falko-button" v-on:click="editSprint" data-dismiss="modal">
-              Save
-            </button>
-            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
+            <button
+              type="button"
+              :disabled="errors.has('name') || errors.has('Initial Date') || errors.has('Final Date')"
+              class="btn btn-info btn-md falko-button"
+              v-on:click="editSprint"
+              data-dismiss="modal"
+            >Save</button>
+            <button
+              type="button"
+              class="btn btn-info btn-md falko-button-grey"
+              data-dismiss="modal"
+            >Close</button>
           </div>
         </div>
       </div>
@@ -50,42 +79,49 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
-import { HTTP } from '../../http-common';
+import { mapState } from "vuex";
+import { HTTP } from "../../http-common";
 
-export default{
-  name: 'editSprintBody',
+export default {
+  name: "editSprintBody",
   data() {
     return {
-      name: '',
-      description: '',
-      sprintInitialDate: '',
-      sprintFinalDate: '',
+      rules: {
+        required: value => !!value || "Required."
+      },
+      name: "",
+      description: "",
+      sprintInitialDate: "",
+      sprintFinalDate: ""
     };
   },
   computed: {
     ...mapState({
       token: state => state.auth.token,
       releaseInitialDate: state => state.clientStatus.releaseInitialDate,
-      releaseFinalDate: state => state.clientStatus.releaseFinalDate,
-    }),
+      releaseFinalDate: state => state.clientStatus.releaseFinalDate
+    })
   },
   methods: {
     editSprint() {
       const _this = this;
       const headers = { Authorization: this.token };
 
-      HTTP.put(`sprints/${this.$route.params.id}`, {
-        name: this.name,
-        description: this.description,
-        initial_date: this.sprintInitialDate,
-        final_date: this.sprintFinalDate,
-      }, { headers })
+      HTTP.put(
+        `sprints/${this.$route.params.id}`,
+        {
+          name: this.name,
+          description: this.description,
+          initial_date: this.sprintInitialDate,
+          final_date: this.sprintFinalDate
+        },
+        { headers }
+      )
         .then(() => {
-          this.$emit('edited-sprint');
+          this.$emit("edited-sprint");
         })
-        .catch((e) => {
-          _this.errors.add('wrong-credentials', 'Problem with credentials');
+        .catch(e => {
+          _this.errors.add("wrong-credentials", "Problem with credentials");
         });
     },
 
@@ -93,20 +129,20 @@ export default{
       const headers = { Authorization: this.token };
 
       HTTP.get(`sprints/${this.$route.params.id}`, { headers })
-        .then((response) => {
+        .then(response => {
           this.name = response.data.name;
           this.description = response.data.description;
           this.sprintInitialDate = response.data.initial_date;
           this.sprintFinalDate = response.data.final_date;
         })
-        .catch((e) => {
+        .catch(e => {
           this.errors.push(e);
         });
-    },
+    }
   },
   created() {
     this.getSprintInformation();
-  },
+  }
 };
 </script>
 

From a1251c8cfa54277b7c44d320733af8f51d556872 Mon Sep 17 00:00:00 2001
From: Rossicler <rossiclerjr@gmail.com>
Date: Thu, 10 Oct 2019 16:40:22 -0300
Subject: [PATCH 10/11] Revert "Resolved conflicts"

This reverts commit 44e7e4f2c73e74c3087170bd4173ec5734e2f7e8.
---
 README.md                                     |  2 +-
 package.json                                  |  2 +-
 src/components/Authentication/Login.vue       | 12 ++---
 src/components/Authentication/Register.vue    |  2 +-
 src/components/GitHub/GitHubProjects.vue      | 44 +++++++++++--------
 src/components/Issues/AddIssue.vue            |  8 ++--
 src/components/Projects/AddGrades.vue         | 12 ++---
 src/components/Projects/AddProject.vue        | 13 +++---
 src/components/Projects/DeleteProject.vue     | 12 ++---
 src/components/Projects/EditProject.vue       | 12 ++---
 src/components/Projects/Project.vue           |  8 ++--
 src/components/Releases/AddRelease.vue        | 16 +++----
 src/components/Releases/DeleteRelease.vue     | 12 ++---
 src/components/Releases/EditRelease.vue       | 14 +++---
 .../Retrospective/AddRetrospective.vue        | 28 ++++++------
 .../Retrospective/DeleteRetrospective.vue     |  4 +-
 .../Retrospective/EditRetrospective.vue       |  6 +--
 src/components/Revision/AddRevision.vue       |  6 +--
 src/components/Sprints/AddSprint.vue          | 33 +++++++++-----
 src/components/Sprints/DeleteSprint.vue       |  4 +-
 src/components/Sprints/EditSprint.vue         | 12 +++--
 src/components/Users/DeleteUserProfile.vue    | 12 ++---
 src/components/Users/EditUserProfile.vue      | 12 ++---
 src/components/Users/ForgotPassword.vue       |  2 +-
 src/components/Users/UserProfile.vue          |  4 +-
 25 files changed, 154 insertions(+), 138 deletions(-)

diff --git a/README.md b/README.md
index a7d4ed5a..50bc1101 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
       <strong>Take a look at the Documentation &raquo</strong>
     </a>
     <br><br>
-    <a href="http://falko.surge.sh/#/">Visit Falko</a>
+    <a href="http://falko.solutions">Visit Falko</a>
     &middot;
     <a href="https://github.com/falko-org/Falko-API">API Repository</a>
     &middot;
diff --git a/package.json b/package.json
index 7b017893..52b884ac 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "vue-router": "^2.8.1",
     "vue-windows": "^0.1.3",
     "vuedraggable": "^2.16.0",
-    "vuetify": "^2.0.18",
+    "vuetify": "^2.1.1",
     "vuex": "^3.0.0",
     "vuex-persist": "^0.3.0"
   },
diff --git a/src/components/Authentication/Login.vue b/src/components/Authentication/Login.vue
index 5822ff48..02855c72 100644
--- a/src/components/Authentication/Login.vue
+++ b/src/components/Authentication/Login.vue
@@ -9,7 +9,7 @@
             {{ errors.first('invalid-credentials') }}
           </div>
           <div class="column">
-            <v-btn text icon
+            <button
               type="button"
               class="close"
               data-dismiss="alert"
@@ -17,7 +17,7 @@
               v-on:click="closeAlert()"
             >
               <span aria-hidden="true">&times;</span>
-            </v-btn>
+            </button>
           </div>
         </div>
       </div>
@@ -36,8 +36,8 @@
             :rules="[rules.required, rules.min]"
           ></v-text-field>
 
-        <div class="text-center" left>
-          <v-btn type="submit" class="primary falko-button white--text" id="loginButton" color="#86B1B1">Log in</v-btn>
+        <div class="text-center">
+          <button type="submit" class="btn btn-primary falko-button" id="loginButton" >Log In</button>
         </div>
         <div class="text-center">
           <router-link to="/users/forgotpassword"> Forgot your password?</router-link>
@@ -107,8 +107,4 @@ export default {
   font-size: 14px;
   padding-top: 1px;
 }
-
-.button-test {
-  color: #ffffff;
-}
 </style>
diff --git a/src/components/Authentication/Register.vue b/src/components/Authentication/Register.vue
index 8437e3e1..4a82abe7 100644
--- a/src/components/Authentication/Register.vue
+++ b/src/components/Authentication/Register.vue
@@ -36,7 +36,7 @@
           ></v-text-field>
         </div>
         <div class="text-center">
-          <v-btn type="submit" :disabled="disableRegisterButton()" class="primary falko-button white--text" id="" color="#86B1B1">Register</v-btn>
+          <button type="submit" :disabled="disableRegisterButton()" class="btn btn-primary falko-button" id="">Register</button>
           <p class="text-danger" v-if="errors.has('wrong-credentials')">{{ errors.first('wrong-credentials') }}</p>
         </div>
       </form>
diff --git a/src/components/GitHub/GitHubProjects.vue b/src/components/GitHub/GitHubProjects.vue
index b27c17ef..c981c90d 100644
--- a/src/components/GitHub/GitHubProjects.vue
+++ b/src/components/GitHub/GitHubProjects.vue
@@ -1,28 +1,23 @@
 <template>
   <div class="addgithubrepo">
     <div class="text-center">
-      <v-btn
-        type="button"
-        class="primary falko-button white--text"
-        id="addButton"
-        color="#86B1B1"
-        v-bind:class="buttonClass()"
-        v-bind:disabled="!this.isGitHubAuthenticated"
-        v-on:click="getRepos()"
-        v-bind:data-toggle="buttonDataToggle()"
-        data-target="#githubModal"
+      <button type="button" id="addButton"
+              v-bind:class="buttonClass()"
+              v-bind:disabled="!this.isGitHubAuthenticated"
+              v-on:click="getRepos()"
+              v-bind:data-toggle="buttonDataToggle()" data-target="#githubModal"
       >
         Import GitHub repository
-      </v-btn>
+      </button>
     </div>
     <div class="modal fade" id="githubModal" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content" id="importProjectsModal">
           <div class="modal-header">
             <h4 class="modal-title">Import GitHub Repository</h4>
-            <v-btn text icon type="button" class="close" data-dismiss="modal" v-on:click="clean" aria-label="Close">
+            <button type="button" class="close" data-dismiss="modal" v-on:click="clean" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </v-btn>
+            </button>
           </div>
           <div class="row">
             <div class="col align-self-center margin" v-if="loading" align="center">
@@ -103,12 +98,23 @@
             </div>
           </div>
           <div class="modal-footer">
-              <v-btn type="button" :disabled="disableImportButton()" class="primary falko-button white--text" color="#86B1B1" v-on:click="importGithubProjects" data-dismiss="modal">
-                Import
-              </v-btn>
-             <v-btn type="button" class="secondary falko-button white--text" color="#868e96" v-on:click="clean" data-dismiss="modal">
-                Close
-            </v-btn>
+            <button
+              type="button"
+              class="btn btn-primary falko-button"
+              :disabled="disableImportButton()"
+              v-on:click="importGithubProjects"
+              data-dismiss="modal"
+            >
+              Import
+            </button>
+            <button
+              type="button"
+              class="btn btn-secondary falko-button-grey"
+              v-on:click="clean"
+              data-dismiss="modal"
+            >
+              Close
+            </button>
           </div>
         </div>
       </div>
diff --git a/src/components/Issues/AddIssue.vue b/src/components/Issues/AddIssue.vue
index 9ff21530..a4ab9c6c 100644
--- a/src/components/Issues/AddIssue.vue
+++ b/src/components/Issues/AddIssue.vue
@@ -1,9 +1,9 @@
 <template>
 	<div class="">
 		<div class="text-center">
-			<v-btn type="button" class="info falko-button white--text" id="addButton" color="#86B1B1" data-toggle="modal" data-target="#addIssueModal">
+			<button type="button" class="btn btn-info btn-md falko-button" id="addButton" data-toggle="modal" data-target="#addIssueModal">
 				Add Issue
-			</v-btn>
+			</button>
 		</div>
 
 		<div class="modal fade" id ="addIssueModal" role="dialog">
@@ -38,8 +38,8 @@
               </div>
 						</div>
 						<div class="modal-footer">
-							<v-btn type="button" :disabled="errors.has('name') || errors.has('body')" class="primary falko-button white--text" v-on:click="addIssue()" data-dismiss="modal" color="#86B1B1">Save</v-btn>
-							<v-btn type="button" class="secondary falko-button white--text" color="#868e96" data-dismiss="modal">Close</v-btn>
+							<button type="button" :disabled="errors.has('name') || errors.has('body')" class="btn btn-primary" v-on:click="addIssue()" data-dismiss="modal">Save</button>
+							<button type="button" class="btn btn-secondary" data-dismiss="modal" >Close</button>
 						</div>
 				</div>
 			</div>
diff --git a/src/components/Projects/AddGrades.vue b/src/components/Projects/AddGrades.vue
index b4931945..7bdad279 100644
--- a/src/components/Projects/AddGrades.vue
+++ b/src/components/Projects/AddGrades.vue
@@ -1,18 +1,18 @@
 <template>
   <div>
     <div class="text-center">
-      <v-btn type="button" class="info falko-button white--text" id="addButton" color="#86B1B1" data-toggle="modal" data-target="#addGradeModal">
+      <button type="button" class="btn btn-info btn-md falko-button" id="addButton" data-toggle="modal" data-target="#addGradeModal">
         Grade
-      </v-btn>
+      </button>
     </div>
     <div class="modal fade" id ="addGradeModal" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">Add Grades</h4>
-            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </v-btn>
+            </button>
           </div>
           <div class="row modal-body">
             <div class="col-md-4">
@@ -53,8 +53,8 @@
             </div>
           </div>
           <div class="modal-footer">
-            <v-btn type="button" class="info falko-button white--text" color="#86B1B1" v-on:click="addGrades" data-dismiss="modal">Save</v-btn>
-            <v-btn type="button" class="info falko-button white--text" color="#868e96" data-dismiss="modal">Close</v-btn>
+            <button type="button" class="btn btn-info btn-md falko-button" v-on:click="addGrades" data-dismiss="modal">Save</button>
+            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
           </div>
         </div>
       </div>
diff --git a/src/components/Projects/AddProject.vue b/src/components/Projects/AddProject.vue
index a8ddfe21..a652c3f1 100644
--- a/src/components/Projects/AddProject.vue
+++ b/src/components/Projects/AddProject.vue
@@ -1,17 +1,18 @@
 <template>
   <div class="addproj">
     <div class="text-center">
-      <v-btn type="button" class="primary falko-button white--text" id="addButton" data-toggle="modal" data-target="#addProjectModal" color="#86B1B1">
-        Add a Project</v-btn>
+      <button type="button" class="btn btn-info btn-md falko-button" id="addButton" data-toggle="modal" data-target="#addProjectModal">
+        Add a Project
+      </button>
     </div>
     <div class="modal fade" id ="addProjectModal" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">Add a Project</h4>
-            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </v-btn>
+            </button>
           </div>
           <div class="modal-body" data-vv-scope="modal-project">
             <v-text-field
@@ -30,8 +31,8 @@
             <br>
           </div>
           <div class="modal-footer">
-            <v-btn type="button" :disabled="errors.has('name') || errors.has('description')" class="primary falko-button white--text" v-on:click="addProject" data-dismiss="modal" color="#86B1B1">Save</v-btn>
-            <v-btn type="button" class="primary falko-button-grey white--text" data-dismiss="modal" color="#868e96">Close</v-btn>
+            <button type="button" :disabled="errors.has('name') || errors.has('description')" class="btn btn-info btn-md falko-button" v-on:click="addProject" data-dismiss="modal">Save</button>
+            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
           </div>
         </div>
       </div>
diff --git a/src/components/Projects/DeleteProject.vue b/src/components/Projects/DeleteProject.vue
index a2456136..c5f77809 100644
--- a/src/components/Projects/DeleteProject.vue
+++ b/src/components/Projects/DeleteProject.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="delproject">
-    <v-btn type="button" class="info falko-button-danger white--text" id="deletebutton" color="#AA0000" data-toggle="modal" data-target="#myModal">
+    <button type="button" class="btn btn-info btn-md falko-button-danger" id="deletebutton" data-toggle="modal" data-target="#myModal">
       Delete
-    </v-btn>
+    </button>
     <div class="modal fade" id ="myModal" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
@@ -10,16 +10,16 @@
             <div>
               <h4 class="modal-title">Delete Project?</h4>
             </div>
-            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </v-btn>
+            </button>
           </div>
           <div class="modal-body">
             <p><label> Are you sure?</label></p>
           </div>
           <div class="modal-footer" id="deleteFooterModal">
-            <v-btn type="button" v-on:click="deleteProject" class="info falko-button white--text" data-dismiss="modal" color="#86B1B1">Yes</v-btn>
-            <v-btn type="button"  class="info falko-button white--text" data-dismiss="modal" color="#868e96">No</v-btn>
+            <button v-on:click="deleteProject" type="button" class="btn btn-info btn-md falko-button" data-dismiss="modal" >Yes</button>
+            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal">No</button>
           </div>
         </div>
       </div>
diff --git a/src/components/Projects/EditProject.vue b/src/components/Projects/EditProject.vue
index 1d8b7179..1705e074 100644
--- a/src/components/Projects/EditProject.vue
+++ b/src/components/Projects/EditProject.vue
@@ -1,16 +1,16 @@
 <template>
   <div class = "editproject">
-    <v-btn type="button" class="info falko-button white--text" id="editbutton" color="#86B1B1" data-toggle="modal" data-target="#editModal" v-on:click="refreshScoreInformation()">
+    <button type="button" class="btn btn-info btn-md falko-button" id="editbutton" data-toggle="modal" data-target="#editModal" v-on:click="refreshScoreInformation()">
       Edit
-    </v-btn>
+    </button>
     <div class="modal fade" id ="editModal" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">Edit Project</h4>
-            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </v-btn>
+            </button>
           </div>
           <div class="row modal-body">
             <div class="col">
@@ -42,8 +42,8 @@
             </div>
           </div>
           <div class="modal-footer" id="editFooterModal">
-            <v-btn type="button"  :disabled="errors.has('name') || errors.has('description')" class="info falko-button white--text" color="#86B1B1" v-on:click="editProject" data-dismiss="modal">Save</v-btn>
-            <v-btn type="button" class="info falko-button white--text" data-dismiss="modal" color="#868e96">Close</v-btn>
+            <button type="button" :disabled="errors.has('name') || errors.has('description')" class="btn btn-info btn-md falko-button" v-on:click="editProject" data-dismiss="modal">Save</button>
+            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
           </div>
         </div>
       </div>
diff --git a/src/components/Projects/Project.vue b/src/components/Projects/Project.vue
index 70e83377..bef0ce99 100644
--- a/src/components/Projects/Project.vue
+++ b/src/components/Projects/Project.vue
@@ -16,14 +16,16 @@
                 <div class="row">
                   <div align="center">
                     <router-link v-bind:to="'/projects/'+project.id+'/issues'">
-                      <v-btn type="button" class="info falko-button white--text" v-if="isFromProjectGitHub()" color="#86B1B1">
+                      <button type="button" class="btn btn-info btn-md falko-button" v-if="isFromProjectGitHub()">
                         Backlog
-                      </v-btn>
+                      </button>
                     </router-link>
                   </div>
                   <div align="center">
                     <router-link v-bind:to="'/projects/'+project.id+'/releases'">
-                      <v-btn type="button" class="primary falko-button white--text" color="#86B1B1">Releases</v-btn>
+                      <button type="button" class="btn btn-info btn-md falko-button">
+                        Releases
+                      </button>
                     </router-link>
                   </div>
                   <div align="center">
diff --git a/src/components/Releases/AddRelease.vue b/src/components/Releases/AddRelease.vue
index c6cde306..d52168d5 100644
--- a/src/components/Releases/AddRelease.vue
+++ b/src/components/Releases/AddRelease.vue
@@ -1,16 +1,16 @@
 <template>
   <div>
     <div align="center">
-      <v-btn type="button" class="info falko-button white--text" id="addReleaseButton" data-toggle="modal" data-target="#addReleaseModal" align="center">
-          <div class="row justify-content-center">
-          <div class="col-1">
+      <button type="button" class="btn btn-info btn-md falko-button" id="addReleaseButton" data-toggle="modal" data-target="#addReleaseModal" align="center">
+        <div class="row justify-content-center">
+          <div class="col-">
             <i class="fa fa-lg fa-plus-circle"></i>
           </div>
           <div class="col-5">
             Add Release
           </div>
         </div>
-        </v-btn>
+      </button>
     </div>
 
     <div class="modal fade" id ="addReleaseModal" role="dialog">
@@ -18,9 +18,9 @@
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">Add Release</h4>
-            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </v-btn>
+            </button>
           </div>
           <div class="row modal-body align-content-end">
             <div class="col-6">
@@ -52,8 +52,8 @@
             </div>
           </div>
           <div class="modal-footer">
-            <v-btn type="button" :disabled="errors.has('name') || errors.has('description') || errors.has('Final Date')" class="info falko-button white--text" color="#86B1B1" v-on:click="addRelease()" data-dismiss="modal">Save</v-btn>
-            <v-btn type="submit" class="info falko-button white--text" id="loginButton" color="#868e96" data-dismiss="modal">Close</v-btn>
+            <button type="button" :disabled="errors.has('name') || errors.has('description') || errors.has('Final Date')" class="btn btn-info btn-md falko-button" v-on:click="addRelease()" data-dismiss="modal">Save</button>
+            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
           </div>
         </div>
       </div>
diff --git a/src/components/Releases/DeleteRelease.vue b/src/components/Releases/DeleteRelease.vue
index 96b73d9b..31bfba90 100644
--- a/src/components/Releases/DeleteRelease.vue
+++ b/src/components/Releases/DeleteRelease.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
-    <v-btn type="button" class="info falko-button-danger" v-bind:id="`deleteButton${this.parentRelease}`" data-toggle="modal" v-bind:data-target="`#deleteReleaseModal${this.parentRelease}`" color="#AA0000">
+    <button type="button" class="btn btn-info btn-md falko-button-danger" v-bind:id="`deleteButton${this.parentRelease}`" data-toggle="modal" v-bind:data-target="`#deleteReleaseModal${this.parentRelease}`">
       Delete
-    </v-btn>
+    </button>
     <div class="modal fade" v-bind:id="`deleteReleaseModal${this.parentRelease}`" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
@@ -10,16 +10,16 @@
             <div>
               <h4 class="modal-title">Delete Project?</h4>
             </div>
-            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </v-btn>
+            </button>
           </div>
           <div class="modal-body">
             <p><label>Are you sure?</label></p>
           </div>
           <div class="modal-footer">
-            <v-btn v-on:click="deleteRelease" type="button" class="info falko-button" data-dismiss="modal" color="#86B1B1">Yes</v-btn>
-            <v-btn type="button" class="info falko-button-grey" data-dismiss="modal" color="#868e96">No</v-btn>
+            <button v-on:click="deleteRelease" type="button" class="btn btn-info btn-md falko-button" data-dismiss="modal" >Yes</button>
+            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal">No</button>
           </div>
         </div>
       </div>
diff --git a/src/components/Releases/EditRelease.vue b/src/components/Releases/EditRelease.vue
index 9fb17e8e..5269e974 100644
--- a/src/components/Releases/EditRelease.vue
+++ b/src/components/Releases/EditRelease.vue
@@ -1,17 +1,17 @@
 <template>
   <div class = "editproject">
-    <v-btn type="button" class="info falko-button white--text" color="#868e96" v-bind:id="`editButton${this.release[1]}`" data-toggle="modal" v-bind:data-target="`#editReleaseModal${this.release[1]}`" v-on:click="getReleaseInformation()">
+    <button type="button" class="btn btn-info btn-md falko-button-grey" v-bind:id="`editButton${this.release[1]}`" data-toggle="modal" v-bind:data-target="`#editReleaseModal${this.release[1]}`" v-on:click="getReleaseInformation()">
       Edit
-    </v-btn>
+    </button>
 
     <div class="modal fade" v-bind:id="`editReleaseModal${this.release[1]}`" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">Edit Release</h4>
-            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </v-btn>
+            </button>
           </div>
           <div class="row modal-body">
             <div class="col-6">
@@ -41,10 +41,8 @@
             </div>
           </div>
           <div class="modal-footer">
-            <v-btn type="button" :disabled="errors.has('name') || errors.has('description') || errors.has('Final Date')" class="info falko-button white--text" v-on:click="editRelease()" data-dismiss="modal" color="#86B1B1">
-              Save
-            </v-btn>
-            <v-btn type="button" class="info falko-button-grey" data-dismiss="modal" color="#868e96" >Close</v-btn>
+            <button type="button" :disabled="errors.has('name') || errors.has('description') || errors.has('Final Date')" class="btn btn-info btn-md falko-button" v-on:click="editRelease()" data-dismiss="modal">Save</button>
+            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
           </div>
         </div>
       </div>
diff --git a/src/components/Retrospective/AddRetrospective.vue b/src/components/Retrospective/AddRetrospective.vue
index ed3e66f5..48e0b664 100644
--- a/src/components/Retrospective/AddRetrospective.vue
+++ b/src/components/Retrospective/AddRetrospective.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <div>
-      <v-btn type="button" class="info falko-button white--text" id="addButton"
-        data-toggle="modal" data-target="#addRetrospectiveModal" color="#86B1B1">
-        Add Retrospective
-      </v-btn>
+      <button type="button" class="btn btn-info btn-md falko-button" id="addButton"
+      data-toggle="modal" data-target="#addRetrospectiveModal">
+      Add Retrospective
+      </button>
     </div>
 
     <div class="row no-margin justify-content-center modal fade" id="addRetrospectiveModal">
@@ -31,15 +31,15 @@
             ></v-textarea>
           </div>
           <div class="modal-footer">
-            <v-btn class="info falko-button white--text"
+            <button class="btn btn-info btn-md falko-button"
             v-bind:disabled="FieldsNotFilled" v-on:click="addRetrospective"
-            data-dismiss="modal" color="#86B1B1"
+            data-dismiss="modal"
             >
             Save
-            </v-btn>
-            <v-btn class="info falko-button-grey" data-dismiss="modal" color="#868e96">
+            </button>
+            <button class="btn btn-info btn-md falko-button-grey" data-dismiss="modal">
               Cancel
-            </v-btn>
+            </button>
           </div>
           <div class="row no-margin justify-content-center modal fade" id="addRetrospectiveModal">
             <div class="modal-dialog">
@@ -65,15 +65,15 @@
                   ></v-textarea>
                 </div>
                 <div class="modal-footer">
-                  <v-btn class="info falko-button"
+                  <button class="btn btn-info btn-md falko-button"
                   v-bind:disabled="FieldsNotFilled" v-on:click="addRetrospective"
-                  data-dismiss="modal" color="#86B1B1"
+                  data-dismiss="modal"
                   >
                   Save
-                  </v-btn>
-                  <v-btn class="info falko-button-grey" data-dismiss="modal" color="#868e96">
+                  </button>
+                  <button class="btn btn-info btn-md falko-button-grey" data-dismiss="modal">
                     Cancel
-                  </v-btn>
+                  </button>
                 </div>
               </div>
             </div>
diff --git a/src/components/Retrospective/DeleteRetrospective.vue b/src/components/Retrospective/DeleteRetrospective.vue
index dd5a5ca4..928a085b 100644
--- a/src/components/Retrospective/DeleteRetrospective.vue
+++ b/src/components/Retrospective/DeleteRetrospective.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
-    <v-btn type="button" class="info falko-button-danger white--text" id="deletebutton" data-toggle="modal" data-target="#deleteRetrospectiveModal" color="#AA0000">
+    <button type="button" class="btn btn-info btn-md falko-button-danger" id="deletebutton" data-toggle="modal" data-target="#deleteRetrospectiveModal">
       Delete
-    </v-btn>
+    </button>
 
     <div class="modal fade" id ="deleteRetrospectiveModal" role="dialog">
       <div class="modal-dialog">
diff --git a/src/components/Retrospective/EditRetrospective.vue b/src/components/Retrospective/EditRetrospective.vue
index 6733dac9..807dedbf 100644
--- a/src/components/Retrospective/EditRetrospective.vue
+++ b/src/components/Retrospective/EditRetrospective.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <div>
-      <v-btn type="button" class="info falko-button white--text" id="addButton"
-      data-toggle="modal" data-target="#editRetrospectiveModal" color="#86B1B1">
+      <button type="button" class="btn btn-info btn-md falko-button" id="addButton"
+      data-toggle="modal" data-target="#editRetrospectiveModal">
       Edit Retrospective
-      </v-btn>
+      </button>
     </div>
 
     <div class="row no-margin justify-content-center modal fade" id="editRetrospectiveModal">
diff --git a/src/components/Revision/AddRevision.vue b/src/components/Revision/AddRevision.vue
index cf5c916e..c3dc34ff 100644
--- a/src/components/Revision/AddRevision.vue
+++ b/src/components/Revision/AddRevision.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <div>
-      <v-btn type="button" class="info falko-button white--text" id="addButton"
-              data-toggle="modal" data-target="#addRevisionModal" color="#86B1B1">
+      <button type="button" class="btn btn-info btn-md falko-button" id="addButton"
+              data-toggle="modal" data-target="#addRevisionModal">
         Add Revision
-      </v-btn>
+      </button>
     </div>
 
     <div class="row no-margin justify-content-center modal fade" id="addRevisionModal">
diff --git a/src/components/Sprints/AddSprint.vue b/src/components/Sprints/AddSprint.vue
index e607f569..4bcb82ed 100644
--- a/src/components/Sprints/AddSprint.vue
+++ b/src/components/Sprints/AddSprint.vue
@@ -1,9 +1,13 @@
 <template>
   <div>
     <div>
-      <v-btn type="button" class="info falko-button white--text" id="addButton" color="#86B1B1" data-toggle="modal" data-target="#addSprintModal">
-        Add a Sprint
-      </v-btn>
+      <button
+        type="button"
+        class="btn btn-info btn-md falko-button"
+        id="addButton"
+        data-toggle="modal"
+        data-target="#addSprintModal"
+      >Add a Sprint</button>
     </div>
 
     <div class="modal fade" id="addSprintModal" role="dialog">
@@ -11,9 +15,9 @@
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">Add a Sprint</h4>
-            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </v-btn>
+            </button>
           </div>
           <div class="row modal-body">
             <div class="col-6">
@@ -51,13 +55,18 @@
             </div>
           </div>
           <div class="modal-footer">
-            <v-btn type="button" :disabled="errors.has('name') || errors.has('Initial Date') || errors.has('Final Date')" 
-                    class="info falko-button-grey white--text" color="#86B1B1" v-on:click="addSprint" data-dismiss="modal">
-              Save
-            </v-btn>
-            <v-btn type="button" class="info falko-button-grey white--text" color="#868e96" data-dismiss="modal">
-              Close
-            </v-btn>
+            <button
+              type="button"
+              :disabled="errors.has('name') || errors.has('Initial Date') || errors.has('Final Date')"
+              class="btn btn-info btn-md falko-button"
+              v-on:click="addSprint"
+              data-dismiss="modal"
+            >Save</button>
+            <button
+              type="button"
+              class="btn btn-info btn-md falko-button-grey"
+              data-dismiss="modal"
+            >Close</button>
           </div>
         </div>
       </div>
diff --git a/src/components/Sprints/DeleteSprint.vue b/src/components/Sprints/DeleteSprint.vue
index cbef3613..63fc3595 100644
--- a/src/components/Sprints/DeleteSprint.vue
+++ b/src/components/Sprints/DeleteSprint.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="delsprint">
-    <v-btn type="button" class="info falko-button-danger" id="deletebutton" data-toggle="modal" data-target="#deleteSprintModal" color="#AA0000">
+    <button type="button" class="btn btn-info btn-md falko-button-danger" id="deletebutton" data-toggle="modal" data-target="#deleteSprintModal">
       Delete
-    </v-btn>
+    </button>
     <div class="modal fade" id ="deleteSprintModal" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
diff --git a/src/components/Sprints/EditSprint.vue b/src/components/Sprints/EditSprint.vue
index a7950932..0ea80986 100644
--- a/src/components/Sprints/EditSprint.vue
+++ b/src/components/Sprints/EditSprint.vue
@@ -1,8 +1,12 @@
 <template>
-  <div class = "editSprintBody">
-    <v-btn type="button" class="info falko-button" id="editbutton" data-toggle="modal" data-target="#editSprintModal" color="#86B1B1">
-      Edit
-    </v-btn>
+  <div class="editSprintBody">
+    <button
+      type="button"
+      class="btn btn-info btn-md falko-button"
+      id="editbutton"
+      data-toggle="modal"
+      data-target="#editSprintModal"
+    >Edit</button>
 
     <div class="modal fade" id="editSprintModal" role="dialog">
       <div class="modal-dialog">
diff --git a/src/components/Users/DeleteUserProfile.vue b/src/components/Users/DeleteUserProfile.vue
index de7be4fe..832fd39e 100644
--- a/src/components/Users/DeleteUserProfile.vue
+++ b/src/components/Users/DeleteUserProfile.vue
@@ -1,8 +1,8 @@
 <template >
   <div class="delusers">
-    <v-btn type="button" class="info falko-button-danger white--text" id="deletebutton" color="#AA0000" data-toggle="modal" data-target="#myModal">
+    <button type="button" class="btn btn-info btn-md falko-button-danger" id="deletebutton" data-toggle="modal" data-target="#myModal">
       Delete
-    </v-btn>
+    </button>
     <div class="modal fade" id ="myModal" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
@@ -10,16 +10,16 @@
             <div>
               <h4 class="modal-title">Delete Profile?</h4>
             </div>
-            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </v-btn>
+            </button>
           </div>
           <div class="modal-body">
             <p><label> Are you sure?</label></p>
           </div>
           <div class="modal-footer">
-            <v-btn type="button" v-on:click="deleteUser" class="info falko-button white--text" data-dismiss="modal" color="#86B1B1">Yes</v-btn>
-            <v-btn type="button"  class="info falko-button white--text" data-dismiss="modal" color="#868e96">No</v-btn>
+            <button v-on:click="deleteUser" type="button" class="btn btn-info btn-md falko-button" data-dismiss="modal" >Yes</button>
+            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal">No</button>
           </div>
         </div>
       </div>
diff --git a/src/components/Users/EditUserProfile.vue b/src/components/Users/EditUserProfile.vue
index e7723f24..57d103de 100644
--- a/src/components/Users/EditUserProfile.vue
+++ b/src/components/Users/EditUserProfile.vue
@@ -1,17 +1,17 @@
 <template>
   <div class="edit-user-profile">
-    <v-btn type="button" class="info falko-button white--text" id="editbutton" color="#86B1B1" data-toggle="modal" data-target="#editModal">
+    <button type="button" class="btn btn-info btn-md falko-button" id="editbutton" data-toggle="modal" data-target="#editModal">
       Edit
-    </v-btn>
+    </button>
 
     <div class="modal fade" id ="editModal" role="dialog">
       <div class="modal-dialog">
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">Edit User Profile</h4>
-            <v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
               <span aria-hidden="true">&times;</span>
-            </v-btn>
+            </button>
           </div>
           <div class="row modal-body">
             <div class="col-md-6">
@@ -30,8 +30,8 @@
             </div>
           </div>
           <div class="modal-footer">
-            <v-btn type="button" class="info falko-button white--text" color="#86B1B1" v-on:click="editUser" data-dismiss="modal">Save</v-btn>
-            <v-btn type="button" class="info falko-button white--text" color="#868e96" data-dismiss="modal">Close</v-btn>
+            <button type="button" class="btn btn-info btn-md falko-button" v-on:click="editUser" data-dismiss="modal">Save</button>
+            <button type="button" class="btn btn-info btn-md falko-button-grey" data-dismiss="modal" >Close</button>
           </div>
         </div>
       </div>
diff --git a/src/components/Users/ForgotPassword.vue b/src/components/Users/ForgotPassword.vue
index 233fd304..12d7c0af 100644
--- a/src/components/Users/ForgotPassword.vue
+++ b/src/components/Users/ForgotPassword.vue
@@ -14,7 +14,7 @@
                 <span class="text-danger" v-if="errors.has('email')">{{ errors.first('email') }}</span>
               </div>
               <div class="text-center">
-                <v-btn type="submit" class="primary falko-button white--text" id="" color="#86B1B1">Reset Password</v-btn>
+                <button type="submit" class="btn btn-primary falko-button"> Reset password </button>
               </div>
               <div class="text-center">
                 <router-link to='/'> Log-in </router-link>
diff --git a/src/components/Users/UserProfile.vue b/src/components/Users/UserProfile.vue
index 2e384419..fcfe0120 100644
--- a/src/components/Users/UserProfile.vue
+++ b/src/components/Users/UserProfile.vue
@@ -22,9 +22,9 @@
           <div class="card-text">
             <div class="row justify-content-center">
               <div class="col-md-7">
-                <v-btn type="button" class="primary falko-button white--text" color="#86B1B1" v-on:click="setGitHubButtonAction()">
+                <button class="falko-button btn btn-primary" v-on:click="setGitHubButtonAction()">
                   {{this.gitHubButtonLabel}}
-                </v-btn>
+                </button>
               </div>
               <div class="col">
                 <edit-user-profile></edit-user-profile>

From 3cbe4aeedfb0973a12d0361ecfacfe1f41f3c83e Mon Sep 17 00:00:00 2001
From: Rossicler <rossiclerjr@gmail.com>
Date: Thu, 17 Oct 2019 13:39:58 -0300
Subject: [PATCH 11/11] Deleted unused code

---
 src/components/Authentication/Register.vue        | 7 -------
 src/components/Retrospective/AddRetrospective.vue | 9 ---------
 src/components/Retrospective/List.vue             | 7 -------
 src/components/Revision/ListRevision.vue          | 7 -------
 4 files changed, 30 deletions(-)

diff --git a/src/components/Authentication/Register.vue b/src/components/Authentication/Register.vue
index 4a82abe7..a5344991 100644
--- a/src/components/Authentication/Register.vue
+++ b/src/components/Authentication/Register.vue
@@ -128,13 +128,6 @@ export default {
   max-width: 20em;
 }
 
-/* #registerForm input {
-  border: none;
-  border-radius: 0;
-  border-bottom: solid #c0c0c0 thin;
-  padding-left: 0;
-} */
-
 #falkoLogoRegister {
   width: 11em;
   margin: 1.3em 0;
diff --git a/src/components/Retrospective/AddRetrospective.vue b/src/components/Retrospective/AddRetrospective.vue
index 48e0b664..ff8b67e9 100644
--- a/src/components/Retrospective/AddRetrospective.vue
+++ b/src/components/Retrospective/AddRetrospective.vue
@@ -161,15 +161,6 @@ export default {
 
 <style scoped>
 
-/* textarea {
-  width: 100%;
-  height: 15em;
-  padding: 1em;
-  background-color: white;
-  border: 1px solid rgba(0, 0, 0, 0.25);
-  color: #444;
-} */
-
 input::placeholder {
   color: #777;
 }
diff --git a/src/components/Retrospective/List.vue b/src/components/Retrospective/List.vue
index 0fd986c6..ee19f6df 100644
--- a/src/components/Retrospective/List.vue
+++ b/src/components/Retrospective/List.vue
@@ -72,13 +72,6 @@ export default {
 </script>
 
 <style scoped>
-/* input {
-  width: 100%;
-  padding: 1em;
-  background-color: #86B1B1;
-  border: none;
-  color: white;
-} */
 
 input::placeholder {
   color: rgba(255, 255, 255, 0.7);
diff --git a/src/components/Revision/ListRevision.vue b/src/components/Revision/ListRevision.vue
index f7e70627..4d567d09 100644
--- a/src/components/Revision/ListRevision.vue
+++ b/src/components/Revision/ListRevision.vue
@@ -66,13 +66,6 @@ export default {
 </script>
 
 <style scoped>
-/* input {
-  width: 100%;
-  padding: 1em;
-  background-color: #86B1B1;
-  border: none;
-  color: white;
-} */
 
 input::placeholder {
   color: rgba(255, 255, 255, 0.7);