Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate existing buttons to vuetify #379

Open
wants to merge 8 commits into
base: devel
Choose a base branch
from
Open

Migrate existing buttons to vuetify #379

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
324cf51
Changing logout button
guilhermesiqueira Sep 19, 2019
e270c9b
Finishing migration of buttons.
gabrielademoraes Sep 24, 2019
28f93b9
Fixing indentation of the buttons.
gabrielademoraes Oct 15, 2019
82c8cfd
Removing hexadecimal and indenting button code
guilhermesiqueira Oct 15, 2019
26d8ba9
Resolving conflicts
guilhermesiqueira Oct 22, 2019
29dffe7
wrapping vue application with vuetify
guilhermesiqueira Oct 25, 2019
8d555f5
Adding Vuetify Light theme with custom colors.
guilhermesiqueira Oct 25, 2019
513db2f
Removing hardcoded colors
guilhermesiqueira Oct 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/components/Issues/AddIssue.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Add Issue</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Fechar">
<span aria-hidden="true">&times;</span>
</button>
<v-btn text icon type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</v-btn>
</div>
<div class=" row modal-body">
<div class="col">
Expand Down
13 changes: 7 additions & 6 deletions src/components/Issues/EditIssue.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<template>
<div class="edit-sprint">
<button type="button" class="btn btn-info btn-sm falko-button" id="editIssue" data-toggle="modal" v-bind:data-target="`#editIssueModal${selected_issue.number}`" v-on:click="getIssuesInformation()">
<v-btn type="button" class="info btn-sm falko-button" id="editIssue" data-toggle="modal" v-bind:data-target="`#editIssueModal${selected_issue.number}`" v-on:click="getIssuesInformation()" color="#86B1B1">
Edit
</button>
</v-btn>

<div class="modal fade" v-bind:id="`editIssueModal${selected_issue.number}`" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Edit Issue</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Fechar">
<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 row">
<div class="col">
Expand Down Expand Up @@ -43,8 +43,9 @@
</div>
</div>
<div class="modal-footer">
<button type="button" :disabled="errors.has('name') || errors.has('body')" class="btn btn-info btn-md falko-button" v-on:click="editIssue(), setAssignees()" 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('body')" class="info btn-md falko-button"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix this indentation

v-on:click="editIssue(), setAssignees()" data-dismiss="modal" color="#86B1B1">Save</v-btn>
<v-btn type="button" class="info btn-md falko-button-grey" data-dismiss="modal" color="#868e96">Close</v-btn>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Issues/Issues.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<div class="row">
<div class="col-3" id="colIssue">
<edit-issue v-bind:selected_issue="issue"></edit-issue>
<button type="button" v-on:click="closeIssue(issue.number), getIssues()" class="btn btn-primary btn-sm falko-button falko-button-danger" id="close">Close</button>
<v-btn type="button" v-on:click="closeIssue(issue.number), getIssues()" class="primary btn-sm falko-button falko-button-danger" id="close" color="#AA0000">Close</v-btn>
</div>
<div class="col" v-if="issue.body != null" >
<div class="card-text text-muted card-description" v-if="issue.body.length > 20">{{issue.body.substr(0, 28)}}...</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Issues/IssuesGraphic.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-info btn-md falko-button" v-on:click="getIssuesGraphicData" 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 btn-md falko-button" v-on:click="getIssuesGraphicData" data-dismiss="modal" color="#86B1B1">Save</v-btn>
<v-btn type="button" class="info btn-md falko-button-grey" data-dismiss="modal" color="#868e96">Close</v-btn>
</div>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/components/Navbar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<nav class="navbar sticky-top navbar-light bg-light row justify-content-around no-margin">
<link href="https://use.fontawesome.com/releases/v5.0.6/css/all.css" rel="stylesheet">
<div class="col" id="logo">
<a class="navbar-brand falko-brand" v-on:click="goToHome()">
<img src="logo.png" width="50"/>
Expand All @@ -9,7 +10,7 @@
<div class="col-4" align="center" v-if="isLogged()">
</div>
<div class="col" align="end" v-if="this.$route.path != '/' && isLogged()">
<button v-on:click="logout()" class="fa fa-power-off" id="logout"></button>
<button v-on:click="logout()" class="fa fa-sign-out-alt" id="logout"></button>
</div>
</nav>
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Projects/Project.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="card-body text-center">
<div class="row">
<div class="col">
<h1 class="card-title" align="left"><i class="fa fa-github" aria-hidden="true" v-if="isFromProjectGitHub()"></i>&nbsp;{{project.name}}</h1>
<h1 class="card-title" align="left"><i class="fab fa-github" aria-hidden="true" v-if="isFromProjectGitHub()"></i>&nbsp;{{project.name}}</h1>
<h4 class="card-text text-muted" align="left">&nbsp;&nbsp;{{project.description}}</h4>
</div>
<!-- <div>
Expand Down
40 changes: 3 additions & 37 deletions src/components/Retrospective/AddRetrospective.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
</v-btn>
</div>

<div class="row no-margin justify-content-center modal fade" id="addRetrospectiveModal">
<div class="modal fade" id="addRetrospectiveModal" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h3 class="modal-title">
Add Sprint Retrospective
</h3>
<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">
<list parent="PositivePoints" v-on:listUpdated="updateList"></list>
Expand All @@ -38,40 +38,6 @@
Cancel
</v-btn>
</div>
<div class="row no-margin justify-content-center modal fade" id="addRetrospectiveModal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h3 class="modal-title">
Add Sprint Retrospective
</h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<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"
/>
</div>
<div class="modal-footer">
<v-btn class="info falko-button"
v-bind:disabled="FieldsNotFilled" v-on:click="addRetrospective"
data-dismiss="modal" color="#86B1B1"
>
Save
</v-btn>
<v-btn class="info falko-button-grey" data-dismiss="modal" color="#868e96">
Cancel
</v-btn>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
Expand Down
16 changes: 8 additions & 8 deletions src/components/Revision/AddRevision.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,36 @@
<div>
<div>
<v-btn type="button" class="info falko-button white--text" id="addButton"
data-toggle="modal" data-target="#addRevisionModal" color="#86B1B1">
data-toggle="modal" data-target="#addRevisionModal" color="#86B1B1">
Add Revision
</v-btn>
</div>

<div class="row no-margin justify-content-center modal fade" id="addRevisionModal">
<div class = "modal fade" id="addRevisionModal" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h3 class="modal-title">
Add Sprint Revision
</h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Fechar">
<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">
<listRevision parent="DoneReport" v-on:listUpdated="updateList"></listRevision>
<listRevision parent="UndoneReport" v-on:listUpdated="updateList"></listRevision>
</div>
<div class="modal-footer">
<button class="btn btn-info btn-md falko-button"
<v-btn class="info btn-md falko-button"
v-bind:disabled="FieldsNotFilled" v-on:click="addRevision"
data-dismiss="modal"
>
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>
Expand Down
3 changes: 2 additions & 1 deletion src/components/Sidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<div id="wrapper">
<link href="https://use.fontawesome.com/releases/v5.0.6/css/all.css" rel="stylesheet">
<div id="sidebar-wrapper">
<aside id="sidebar">
<ul id="sidemenu" class="sidebar-nav">
Expand All @@ -14,7 +15,7 @@
<li align="center">
<router-link to="/user">
<a title="User Profile">
<span class="sidebar-icon"><i class=" fa fa-user-circle-o"></i></span>
<span class="sidebar-icon"><i class=" fas fa-user-circle"></i></span>
<span class="sidebar-title"></span>
</a>
</router-link>
Expand Down
8 changes: 4 additions & 4 deletions src/components/Sprints/DeleteSprint.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
<div>
<h4 class="modal-title">Delete Sprint?</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>
</div>
<div class="modal-footer">
<button v-on:click="deleteSprint" 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="deleteSprint" type="button" class="info btn-md falko-button" data-dismiss="modal" color="#86B1B1">Yes</v-btn>
<v-btn type="button" class="info btn-md falko-button-grey" data-dismiss="modal" color="#868e96">No</v-btn>
</div>
</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions src/components/Sprints/EditSprint.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Edit 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">
Expand All @@ -37,11 +37,11 @@
</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">
<v-btn type="button" :disabled="errors.has('name') || errors.has('Initial Date') || errors.has('Final Date')"
class="info btn-md falko-button" v-on:click="editSprint" data-dismiss="modal" color="#86B1B1">
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 btn-md falko-button-grey" data-dismiss="modal" color="#868e96">Close</v-btn>
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/components/Sprints/Metrics.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<template>
<div>
<button class="tablink" id="stories-tab" v-on:click="openMetrics('stories-tab', 'Stories')"><h3>Kanban</h3></button>
<button class="tablink" id="velocity-tab" v-on:click="openMetrics('velocity-tab', 'Velocity')"><h3>Velocity</h3></button>
<button class="tablink" id="burndown-tab" v-on:click="openMetrics('burndown-tab', 'Burndown')"><h3>Burndown</h3></button>
<v-btn class="tablink" id="stories-tab" v-on:click="openMetrics('stories-tab', 'Stories')" color="#E0E8EB"><h3>Kanban</h3></v-btn>
<v-btn class="tablink" id="velocity-tab" v-on:click="openMetrics('velocity-tab', 'Velocity')" color="#E0E8EB"><h3>Velocity</h3></v-btn>
<v-btn class="tablink" id="burndown-tab" v-on:click="openMetrics('burndown-tab', 'Burndown')" color="#E0E8EB"><h3>Burndown</h3></v-btn>

<div id="Velocity" class="tabcontent">
<br><br><br>
Expand Down
8 changes: 4 additions & 4 deletions src/components/Stories/AssignMember.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Assign Member</h4>
<button type="button" class="close" @click="cleanData" 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 text-center">
<div v-if="loading">
Expand All @@ -29,8 +29,8 @@
</ul>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-info btn-md falko-button" v-on:click="assignMembers; cleanData" data-dismiss="modal">Save</button>
<button type="button" class="btn btn-info btn-md falko-button-grey" @click="cleanData" data-dismiss="modal" >Close</button>
<v-btn type="button" class="btn btn-info btn-md falko-button" v-on:click="assignMembers; cleanData" data-dismiss="modal" color="#86B1B1">Save</v-btn>
<v-btn type="button" class="btn btn-info btn-md falko-button-grey" @click="cleanData" data-dismiss="modal" color="#868e96">Close</v-btn>
</div>
</div>
</div>
Expand Down