Skip to content

Commit

Permalink
[MERGE] updates master
Browse files Browse the repository at this point in the history
Updates master
  • Loading branch information
andre-filho committed Jun 15, 2018
2 parents ba18fca + ebfc72a commit eff8760
Show file tree
Hide file tree
Showing 17 changed files with 413 additions and 148 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ deploy:
skip_cleanup: true
on:
branch: development
after_deploy:
- curl -X POST $PINGOUT_URL/$PINGOUT_UUID/ping
2 changes: 1 addition & 1 deletion semantic-release.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

if [ "${TRAVIS_BRANCH}" == "development" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
if [ "${TRAVIS_BRANCH}" == "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
echo "deploying it"
npx semantic-release
else
Expand Down
3 changes: 1 addition & 2 deletions src/components/Dashboards/createDashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default {
components: {
"sidebar": SideBar
},
data(){
data () {
return {
project: {
Expand Down Expand Up @@ -89,7 +89,6 @@ export default {
beforeMount() {
this.loadUserInfo()
this.getProjectDetail()
},
methods: {
loadUserInfo (){
Expand Down
59 changes: 30 additions & 29 deletions src/components/Landing/Header.vue
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
<template>
<div>
<Navbar/>
<header>
<div class="filter container-fluid text-center">
<h1 class="motto clearfix"> Contribua. Compartilhe. <b>Observ</b>. </h1>
<p class="h3 clearfix">
{{ briefResume }}
</p>
<div class="input-group">
<input
v-model="searchArg"
type="text"
name="search-dashes-field"
class="form-control"
placeholder="Descubra dashboards">
<div class="input-group-append">
<button id="search"
class="btn btn-primary btn-blue">
<p class="d-none d-md-inline-block">
Buscar
</p>
<span class="fa fa-search"/>
</button>
<div>
<Navbar/>
<header>
<div class="filter container-fluid text-center">
<h1 class="motto clearfix"> Contribua. Compartilhe. <b>Observ</b>. </h1>
<p class="h3 clearfix">
{{ briefResume }}
</p>
<div class="input-group">
<input
v-model="searchArg"
type="text"
name="search-dashes-field"
class="form-control"
placeholder="Descubra dashboards">
<div class="input-group-append">
<button
id="search"
class="btn btn-primary btn-blue">
<p class="d-none d-md-inline-block">
Buscar
</p>
<span class="fa fa-search"/>
</button>
</div>
</div>
</div>
</div>
</header>
</div>
</header>
</div>
</template>

<script>
Expand Down Expand Up @@ -55,7 +56,7 @@ export default {
background-size: cover;
color: $text-color;
background-color: #909090;
.filter {
background-size: cover;
Expand Down Expand Up @@ -85,15 +86,15 @@ export default {
.h3 {
padding-bottom: 1.5em;
font-style: italic;
color: #333F;
color: #333F;
}
.input-group {
width: 50vw;
margin-left: auto;
margin-right: auto;
z-index: 105;
input {
color: rgba(169, 18, 219, 0.2);
Expand Down
8 changes: 4 additions & 4 deletions src/components/Landing/LandingPage.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="light-bg">
<Header/>
<div class="container text-center">
<div class="container text-center">
<h4>
O <b>OBSERV</b> é um observatório de dados com interpretação de dados,
geração de indicadores e gráficos.
Expand All @@ -11,10 +11,10 @@
Nosso propósito é te ajudar na visualização
dos indicadores e dados da sua pesquisa ou projeto.
</small>
</h4>
</div>
</h4>
</div>
<!-- add carousel when getter function is complete -->
<Carousel/>
<!-- <Carousel/> -->
<RefBar/>
<About/>
<Footer/>
Expand Down
14 changes: 7 additions & 7 deletions src/components/Projects/CreateProject.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<div class="row">
<button
class="col btn btn-green btn-block btn-lg"
@click="PostProject()">
@click="postProject()">
<span class="fa fa-check"/> Salvar
</button>
<router-link
Expand All @@ -74,7 +74,7 @@
</div>
</div>
<div class="row">
<custom-footer></custom-footer>
<custom-footer/>
</div>
</div>
</div>
Expand Down Expand Up @@ -163,7 +163,7 @@ export default {
},
PostProject () {
postProject () {
this.project.tags = this.selectedTags
this.$http.post("projects/",this.project, {
headers: {
Expand All @@ -173,7 +173,7 @@ export default {
}
).then(result => {
this.projeto = result.data
this.postSucess(result)
this.postSuccess(result)
},
error => {
error.log(error)
Expand All @@ -193,12 +193,12 @@ export default {
})
},
postSucess () {
postSuccess () {
window.alert("Projeto criado com Sucesso")
this.$router.replace("/home")
},
CreateFail () {
createFail () {
window.confirm("Falha na criação do projeto")
},
},
Expand All @@ -213,7 +213,7 @@ export default {
}
form {
background-color: $background-color;
background-color: #eee;
color: $text-color;
padding: 2em;
border-radius: 5px;
Expand Down
168 changes: 166 additions & 2 deletions src/components/Projects/MyProjects.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,177 @@
<template>
<div class="container"/>
<div>
<Navbar/>
<div class="row">
<sidebar class="col-md-2 sidebar"/>
<div class="col col-md-10 content">
<div class="container-fluid">
<header>
<h2>
Meus Projetos
</h2>
<hr>
<ul class="list-inline">
<li
v-for="tag in getTags"
:key="tag.id"
class="list-inline-item">
<span class="badge badge-primary btn-blue">
{{ tag.slug }}
</span>
</li>
</ul>
</header>
<hr>
<div class="container">
<form>
<div class="input-group input-group-sm">
<input
type="text"
class="form-control"
placeholder="Pesquise por seus projetos">
<div class="input-group-append">
<button
class="btn btn-green"
@click="searchProject()">
<span class="fa fa-search"/> Buscar
</button>
</div>
</div>
</form>
</div>
<hr>
<div v-if="getMyProjects.length == 0">
<b-jumbotron
bg-variant="muted"
class="text-muted">
<template
slot="header">
Oooops
</template>
<template
slot="lead">
Me parece que você ainda não possui nenhum projeto...
</template>
<p>
Não se preocupe, você ainda pode criar um projeto e começar sua
jornada conosco!
</p>
<router-link
:to="{ name: 'CreateProject' }"
class="btn btn-blue ml-auto">
<span class="fa fa-plus"/> Novo projeto
</router-link>
</b-jumbotron>
</div>
<section v-else>
<div
v-for="project in getMyProjects"
:key="project.id"
class="row">
<div
class="card col col-md-6">
<h5 class="card-header">
{{ project.name }}
</h5>
<div class="card-body">
<p class="card-text">
{{ project.description }}
</p>
<!-- needs to link to the project -->
<router-link
:to="{ name: 'ProjectDetail' }"
class="btn btn-sm btn-blue mr-auto">
<span class="fa fa-search"/> Visualizar
</router-link>
<button
class="btn btn-danger btn-sm"
@click="deleteProject()">
<span class="fa fa-trash"/> Excluir
</button>
</div>
</div>
</div>
</section>
</div>
<div class="">
<custom-footer/>
</div>
</div>
</div>
</div>
</template>

<script>
import { mapGetters } from "vuex"
import Navbar from "@/components/Utils/Navbar"
import Footer from "@/components/Utils/Footer"
import Sidebar from "@/components/Utils/SideBar"
import bJumbotron from "bootstrap-vue/es/components/jumbotron/jumbotron"
export default {
components: {
Navbar,
"custom-footer": Footer,
"sidebar": Sidebar,
"b-jumbotron":bJumbotron,
},
data () {
return {
tags: "",
project: "",
projects: [],
}
},
computed: {
...mapGetters({
currentUser: "currentUser",
getTags: "getTags",
getProjects: "getProjects",
getMyProjects: "getMyProjects"
})
},
beforeMount () {
this.loadProjects()
this.loadMyProjects()
this.loadTags()
},
methods: {
loadProjects () {
this.$store.dispatch("loadProjects")
},
loadMyProjects () {
this.$store.dispatch("loadMyProjects")
},
loadTags () {
this.$store.dispatch("loadTags")
}
}
}
</script>

<style>
<style lang="scss" scoped>
@import '../styles/base.scss';
.row {
margin-left: 0;
}
section {
margin: 5em auto;
}
.content {
padding-left: 0;
padding-right: 0;
}
.sidebar {
padding-left: 0;
}
</style>
13 changes: 13 additions & 0 deletions src/components/Projects/ProjectForm.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<template>
<div/>
</template>

<script>
export default {
}
</script>

<style lang="scss" scoped>
</style>
Loading

0 comments on commit eff8760

Please sign in to comment.