From 0b9577fb1be44780d4b0513b2848a985f3a3adfc Mon Sep 17 00:00:00 2001 From: Leonardo Dos Santos Silva Barreiros Date: Fri, 17 Nov 2017 15:33:09 -0200 Subject: [PATCH 01/29] Improving UserProfile Signed-off-by: Leonardo Dos Santos Silva Barreiros --- src/components/Users/UserProfile.vue | 94 ++++++++++++++-------------- 1 file changed, 48 insertions(+), 46 deletions(-) diff --git a/src/components/Users/UserProfile.vue b/src/components/Users/UserProfile.vue index ca0c8b27..f1069113 100644 --- a/src/components/Users/UserProfile.vue +++ b/src/components/Users/UserProfile.vue @@ -1,46 +1,52 @@ - diff --git a/src/components/Stories/Stories.vue b/src/components/Stories/Stories.vue index 25c09559..85296622 100644 --- a/src/components/Stories/Stories.vue +++ b/src/components/Stories/Stories.vue @@ -3,7 +3,7 @@
-
+

Sprint Backlog   

{{issues.length}}

@@ -15,7 +15,7 @@
{{issue.number}}
- +
@@ -42,7 +42,7 @@
{{story.issue_number}}
- +
@@ -68,7 +68,7 @@
{{story.issue_number}}
- +
@@ -108,7 +108,7 @@
{{story.name}}
- Closed + Closed
@@ -265,10 +265,6 @@ export default { } }, - github(number2, github) { - window.location.href = "https://github.com/" + github + "/issues/" + number2; - }, - getProjects() { const headers = { Authorization: this.token }; @@ -315,9 +311,9 @@ export default { } #kanbanCard { - max-width: 15em; box-shadow: 0 2px 4px 0 rgba(0,0,0,0.2); transition: 0.2s; + width: 280px; } #kanbanCard:hover { @@ -327,18 +323,11 @@ export default { } #doneCard { - max-width: 15em; box-shadow: 0 2px 4px 0 rgba(0,0,0,0.2); + width: 280px; transition: 0.2s; } -/*#doneCard:hover { - border-color: #7799A5; - background-color: #AA0000; - box-shadow: 0 4px 12px 0 rgba(0,0,0,0.2); - cursor: pointer; -}*/ - #title { justify-content: center; margin-left:auto; @@ -380,6 +369,7 @@ export default { box-shadow: 5px 0 0 0 rgba(0,0,0,0.1); text-align: center; justify-content: center; + width: 1000px; } *, @@ -404,104 +394,6 @@ p { margin-top: 0; } -/* .card */ - -/*#doneCard span { - -webkit-transition: 0.2s; - -moz-transition: 0.2s; - -o-transition: 0.2s; - transition: 0.2s; - -webkit-transition-delay: 0.2s; - -moz-transition-delay: 0.2s; - -o-transition-delay: 0.2s; - transition-delay: 0.2s; -}*/ - -/*#doneCard:before, -#doneCard:after { - content: ''; - position: absolute; - top: 0.6em; - left: 0; - width: 100%; - text-align: center; - opacity: 0; - -webkit-transition: .2s,opacity .3s; - -moz-transition: .2s,opacity .3s; - -o-transition: .2s,opacity .3s; - transition: .2s,opacity .3s; -}*/ - -/* :before */ - -/*#doneCard:before { - content: attr(data-hover); - -webkit-transform: translate(-100%,0); - -moz-transform: translate(-100%,0); - -ms-transform: translate(-100%,0); - -o-transform: translate(-100%,0); - transform: translate(-100%,0); -}*/ - -/* :after */ - -/*#doneCard:after { - content: attr(data-active); - -webkit-transform: translate(100%,0); - -moz-transform: translate(100%,0); - -ms-transform: translate(100%,0); - -o-transform: translate(100%,0); - transform: translate(100%,0); -}*/ - -/* Span on :hover and :active */ - -/*#doneCard:hover span, -#doneCard:active span { - opacity: 0; - -webkit-transform: scale(0.3); - -moz-transform: scale(0.3); - -ms-transform: scale(0.3); - -o-transform: scale(0.3); - transform: scale(0.3); -}*/ - -/* - We show :before pseudo-element on :hover - and :after pseudo-element on :active -*/ -/* -#doneCard:hover:before, -#doneCard:active:after { - opacity: 1; - color: white; - -webkit-transform: translate(0,0); - -moz-transform: translate(0,0); - -ms-transform: translate(0,0); - -o-transform: translate(0,0); - transform: translate(0,0); - -webkit-transition-delay: .4s; - -moz-transition-delay: .4s; - -o-transition-delay: .4s; - transition-delay: .4s; -}*/ - -/* - We hide :before pseudo-element on :active -*/ - -/*#doneCard:active:before { - -webkit-transform: translate(-100%,0); - -moz-transform: translate(-100%,0); - -ms-transform: translate(-100%,0); - -o-transform: translate(-100%,0); - transform: translate(-100%,0); - -webkit-transition-delay: 0s; - -moz-transition-delay: 0s; - -o-transition-delay: 0s; - transition-delay: 0s; -}*/ - #closed { color: red; } From b03797100ef59c79e87408174962d109815d7d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Cantu=C3=A1ria?= Date: Mon, 4 Dec 2017 16:19:29 -0200 Subject: [PATCH 27/29] Adding date validations to Releases and Sprints Signed-off-by: MatheusRich --- src/components/Releases/Release.vue | 20 ++++++++++---------- src/components/Sprints/AddSprint.vue | 24 ++++++++---------------- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/src/components/Releases/Release.vue b/src/components/Releases/Release.vue index 4fdea4f2..7d68c7e1 100644 --- a/src/components/Releases/Release.vue +++ b/src/components/Releases/Release.vue @@ -8,9 +8,9 @@
  • - {{release.initial_date}} + {{dateConvert(release.initial_date)}} | - {{release.final_date}} + {{dateConvert(release.final_date)}}

    • @@ -57,6 +57,7 @@ export default { release: {}, }; }, + computed: { ...mapState({ token: state => state.auth.token, @@ -66,25 +67,25 @@ export default { mixins: [dateConvert], methods: { - setReleaseDates() { - this.$store.dispatch('setReleaseInitialDate', this.release.initialDate); - this.$store.dispatch('setReleaseFinalDate', this.release.finalDate); - }, - getRelease() { const headers = { Authorization: this.token }; HTTP.get(`releases/${this.$route.params.id}`, { headers }) .then((response) => { this.release = response.data; - this.release.initial_date = this.dateConvert(this.release.initial_date); - this.release.final_date = this.dateConvert(this.release.final_date); + + this.setReleaseDates(); }) .catch((e) => { this.errors.push(e); }); }, + setReleaseDates() { + this.$store.dispatch('setReleaseInitialDate', this.release.initial_date); + this.$store.dispatch('setReleaseFinalDate', this.release.final_date); + }, + refreshRelease() { this.getRelease(); }, @@ -96,7 +97,6 @@ export default { mounted() { this.getRelease(); - this.setReleaseDates(); }, }; diff --git a/src/components/Sprints/AddSprint.vue b/src/components/Sprints/AddSprint.vue index 91205413..76bae086 100644 --- a/src/components/Sprints/AddSprint.vue +++ b/src/components/Sprints/AddSprint.vue @@ -24,9 +24,9 @@

    -


    +


    -


    +


    @@ -51,8 +51,8 @@ export default { return { name: '', description: '', - initialDate: '', - finalDate: '', + sprintInitialDate: '', + sprintFinalDate: '', }; }, @@ -72,30 +72,22 @@ export default { sprint: { name: this.name, description: this.description, - initial_date: this.initialDate, - final_date: this.finalDate, + initial_date: this.sprintInitialDate, + final_date: this.sprintFinalDate, release_id: this.$route.params.id, }, }, { headers }) .then(() => { this.name = ''; this.description = ''; - this.initialDate = ''; - this.finalDate = ''; + this.sprintInitialDate = ''; + this.sprintFinalDate = ''; EventBus.$emit('added-sprint', 1); }) .catch((e) => { this.errors.push(e); }); }, - - sprintInitialFollowingDay() { - this.initialDate.setDate(this.initialDate.getDate() + 1); - }, - - releaseFinalPreviousDay() { - this.releaseFinalDate.setDate(this.releaseFinalDate.getDate() - 1); - }, }, }; From ed1b273c7c836fb18c44332c582245fcd5a3ef6b Mon Sep 17 00:00:00 2001 From: "Signed-off-by: MatheusRich" Date: Mon, 4 Dec 2017 16:26:16 -0200 Subject: [PATCH 28/29] Adding date validations to edit Sprint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Vinícius Cantuária --- src/components/Sprints/EditSprint.vue | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/components/Sprints/EditSprint.vue b/src/components/Sprints/EditSprint.vue index 0abdaffa..f57ff067 100644 --- a/src/components/Sprints/EditSprint.vue +++ b/src/components/Sprints/EditSprint.vue @@ -21,10 +21,10 @@
    -

    -


    +

    +


    -


    +


    @@ -47,13 +47,15 @@ export default{ return { name: '', description: '', - initialDate: '', - finalDate: '', + sprintInitialDate: '', + sprintFinalDate: '', }; }, computed: { ...mapState({ token: state => state.auth.token, + releaseInitialDate: state => state.clientStatus.releaseInitialDate, + releaseFinalDate: state => state.clientStatus.releaseFinalDate, }), }, methods: { @@ -63,8 +65,8 @@ export default{ HTTP.put(`sprints/${this.$route.params.id}`, { name: this.name, description: this.description, - initial_date: this.initialDate, - final_date: this.finalDate, + initial_date: this.sprintInitialDate, + final_date: this.sprintFinalDate, }, { headers }) .then(() => { this.$emit('edited-sprint'); @@ -81,8 +83,8 @@ export default{ .then((response) => { this.name = response.data.name; this.description = response.data.description; - this.initialDate = response.data.initial_date; - this.finalDate = response.data.final_date; + this.sprintInitialDate = response.data.initial_date; + this.sprintFinalDate = response.data.final_date; }) .catch((e) => { this.errors.push(e); From 57b764da46aa2e455a86460f573950d8e22155f6 Mon Sep 17 00:00:00 2001 From: ThalissonMelo Date: Fri, 8 Dec 2017 10:38:17 -0200 Subject: [PATCH 29/29] Fixing request adress in homolog --- build/webpack.prod.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 13bb3f6e..fe3b5016 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -30,7 +30,7 @@ var webpackConfig = merge(baseWebpackConfig, { // http://vuejs.github.io/vue-loader/en/workflow/production.html new webpack.DefinePlugin({ 'process.env': env, - 'API_URL': JSON.stringify('http://45.55.176.99:3000/'), + 'API_URL': JSON.stringify('https://45.55.176.99:3000/'), 'GITHUB_CLIENT_ID': JSON.stringify('cbd5f91719282354f09b') }), new webpack.optimize.UglifyJsPlugin({