Skip to content

Commit

Permalink
Resolvendo conflitos
Browse files Browse the repository at this point in the history
  • Loading branch information
paulovirote committed Oct 21, 2017
2 parents 1b269ef + 93b7f0c commit 09b9cf7
Show file tree
Hide file tree
Showing 19 changed files with 817 additions and 85 deletions.
3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<link rel="icon" type="image/png" sizes="32x32" href="/static/img/icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/static/img/icons/favicon-16x16.png">
<link href="https://fonts.googleapis.com/css?family=Pacifico" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed:300,300i,400,400i,700,700i" rel="stylesheet">
<link href="https://unpkg.com/vuetify/dist/vuetify.min.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed:300,300i,400,400i,700,700i|Material+Icons" rel="stylesheet">
<!--[if IE]><link rel="shortcut icon" href="/static/img/icons/favicon.ico"><![endif]-->
<!-- Add to home screen for Android and modern mobile browsers -->
<link rel="manifest" href="/static/manifest.json">
Expand Down
63 changes: 57 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/assets/images/account.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 9 additions & 6 deletions src/components/Hello.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template>
<div class="hello">
<div class="wrapper">
<img src="../../static/img/care.png" alt="How Can I Help? Logo" class="logo">
<img src="../../static/robot.svg" alt="How Can I Help? Logo" class="logo">
<h1 class="title">{{ msg }}</h1>

<p class="about"> Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aspernatur, molestiae rerum facilis amet ut reprehenderit minus? Cupiditate minima sint quia voluptas iste maxime eos dolorum quos nostrum eaque accusamus omnis, ab doloribus illum quidem reprehenderit facilis quis. Quia ab praesentium blanditiis dolor similique architecto, deleniti illum vitae pariatur excepturi odio?</p>
<p class="about"> {{ about }} </p>

<router-link :to="{ name: 'SignIn' }">
<a class="button is-primary is-medium login">Login</a>
Expand All @@ -23,7 +23,8 @@ export default {
name: 'hello',
data () {
return {
msg: 'IUVO'
msg: 'IUVO',
about: 'Olá, tudo bem? Com nosso app você poderá pedir ajuda em situações de risco, ajudar pessoas (caso seja do seu interesse) e gerar dados para previnir futuros imprevistos devido mudanças climáticas. Tudo isso atravéz de uma interface amigável que conta com a ajuda de um BOT e machine learning!'
}
}
}
Expand All @@ -41,7 +42,9 @@ h1, h2
font-weight: normal

.title
letter-spacing: 8px
font-size: 50px !important;
letter-spacing: 4px !important;
padding-top: 20px !important;

ul
list-style-type: none
Expand Down Expand Up @@ -84,10 +87,10 @@ a
top: 0
left: 0
opacity: 0.6;
background-image: linear-gradient(to right, #fa709a 0%, #fee140 100%)
background-color: #101010;

.about
padding: 40px 0 50px
padding: 40px 10px 50px
color: rgba(#ffffff, 0.7)

.advice
Expand Down
128 changes: 74 additions & 54 deletions src/components/cards/Card.vue
Original file line number Diff line number Diff line change
@@ -1,75 +1,95 @@
<template>
<div>
<div v-for="project in projects" :key="project.id" class="card">
<div class="card-image">
<figure class="image is-4by3">
<img :src="'./static/img/' + project.image" alt="Image">
</figure>
</div>
<div class="card-content">
<div class="media">
<div class="media-left">
<figure class="image is-48x48">
<img src="../../../static/img/bg-hello-page.jpg" alt="Image">
</figure>
</div>
<div class="media-content">
<p class="title is-4">{{ project.title }}</p>
<p class="subtitle is-6">@projeto</p>
</div>
</div>
<v-layout>
<v-flex xs12 sm6 offset-sm3>
<v-card>
<v-card-media src="/static/help.jpg" height="200px"></v-card-media>
<v-card-title primary-title>
<div>
<h3 class="headline mb-0">{{title}}</h3>
<div class="description">{{ cardText }}</div>
</div>
</v-card-title>
<v-card-actions>
<router-link :to="{ name: 'Help' }">
<v-btn flat color="orange">Ajudar</v-btn>
</router-link>
<router-link :to="{ name: 'SeeMore' }">
<v-btn flat color="orange">Ver Mais</v-btn>
</router-link>
</v-card-actions>
</v-card>

<div class="content">
<v-card>
<v-card-media src="/static/map.png" height="200px"></v-card-media>
<v-card-title primary-title>
<div>
<h3 class="headline mb-0">{{title2}}</h3>
<div class="description">{{ cardText2 }}</div>
</div>
</v-card-title>
<v-card-actions>
<router-link :to="{ name: 'Help' }">
<v-btn flat color="orange">Ajudar</v-btn>
</router-link>
<router-link :to="{ name: 'SeeMore' }">
<v-btn flat color="orange">Ver Mais</v-btn>
</router-link>
</v-card-actions>
</v-card>

{{ project.description }}

<a>@projeto</a>.
<a>#categoria</a>
<a>#categoria</a>
<br>
<small>09:09 AM - 25 Agosto 2017</small>
</div>
</div>
</div>
<v-card>
<v-card-media src="/static/deslizamento.jpeg" height="200px"></v-card-media>
<v-card-title primary-title>
<div>
<h3 class="headline mb-0">{{title3}}</h3>
<div class="description">{{ cardText3 }}</div>
</div>
</v-card-title>
<v-card-actions>
<router-link :to="{ name: 'Help' }">
<v-btn flat color="orange">Ajudar</v-btn>
</router-link>
<router-link :to="{ name: 'SeeMore' }">
<v-btn flat color="orange">Ver Mais</v-btn>
</router-link>
</v-card-actions>
</v-card>
</v-flex>
</v-layout>
</div>
</template>
<script>
import { bulmaComponentGenerator } from 'vue-bulma-components'
import { listProjects } from '../../services/projects/ProjectService'
export default {
name: 'cardComponent',
data() {
data () {
return {
projects: []
title: 'Solicitação de recursos',
cardText: '- 10 telhas',
title2: 'Resgate',
cardText2: 'Enchente',
title3: 'Deslizamento',
cardText3: 'Materiais de construção e de limpeza'
}
},
components: {
box: bulmaComponentGenerator('box'),
},
methods: {
fetchProjects() {
listProjects()
.then(data => {
this.projects = data
})
}
},
mounted() {
this.fetchProjects()
},
computed: {
list() {
return this.projects
}
mounted () {
}
}
</script>
<style>
<style lang="stylus" scoped>
.mb-0
text-align: left
.card
margin-bottom 20px
margin-top 20px
.description
text-align left
</style>

23 changes: 23 additions & 0 deletions src/components/help/Help.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<template>
<div>
</div>
</template>
<script>
export default {
name: 'cardComponent',
data () {
return {
}
},
methods: {
},
mounted () {
}
}
</script>
<style lang="stylus" scoped>
</style>

Loading

0 comments on commit 09b9cf7

Please sign in to comment.