Skip to content

Commit 58bb8ca

Browse files
authored
Merge pull request #7 from virtuagora/3.x
Ready for 3.0.0
2 parents 36aa4f5 + 2eba4af commit 58bb8ca

80 files changed

Lines changed: 4132 additions & 1616 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ VUE_APP_GOOGLE_ANALYTICS_ID=#Changeme
1313
VUE_APP_MAPBOX_TOKEN_MAPTILES=#Changeme
1414
VUE_APP_MAPBOX_TOKEN_GEOLOCATION=#Changeme
1515
VUE_APP_MAPBOX_STYLE=#Changeme
16+
VUE_APP_YOUTUBE_API_KEY=#ChangeMe
1617

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ VUE_APP_BASE_URL_PT=https://creandoredes.org/pt/
1818
VUE_APP_TITLE_ES=Creando Redes!
1919
VUE_APP_TITLE_EN=Making Networks!
2020
VUE_APP_TITLE_PT=Criando Redes!
21-
VUE_APP_MAPBOX_TOKEN=#Changeme
21+
VUE_APP_DESCRIPTION_EN=#ChangeMe
22+
VUE_APP_DESCRIPTION_ES=#ChangeMe
23+
VUE_APP_DESCRIPTION_PT=#ChangeMe
24+
VUE_APP_RECAPTCHA_SITE_KEY=#Changeme
25+
VUE_APP_GOOGLE_ANALYTICS_ID=#Changeme
26+
VUE_APP_MAPBOX_TOKEN_MAPTILES=#Changeme
27+
VUE_APP_MAPBOX_TOKEN_GEOLOCATION=#Changeme
2228
VUE_APP_MAPBOX_STYLE=#Changeme
29+
VUE_APP_YOUTUBE_API_KEY=#ChangeMe
2330
```

package-lock.json

Lines changed: 15 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "creating-networks-front",
3-
"version": "0.2.0",
3+
"version": "0.3.0",
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service serve",

public/youngatlasbook-bg.png

164 KB
Loading

public/youngatlasbook-logo.svg

Lines changed: 952 additions & 0 deletions
Loading

public/youngatlasbook.png

236 KB
Loading

src/assets/sass/_home.scss

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,29 @@
4141
padding: 1rem;
4242
}
4343
}
44+
&.has-background{
45+
background-position: center center;
46+
background-size: cover;
47+
background-repeat: no-repeat;
48+
.has-background-gradient{
49+
background: #faaa35; /* Old browsers */
50+
background: -moz-linear-gradient(
51+
-45deg,
52+
#faaa35 5%,
53+
#f36d2200 94%
54+
); /* FF3.6-15 */
55+
background: -webkit-linear-gradient(
56+
-45deg,
57+
#faaa35 5%,
58+
#f36f2200 94%
59+
); /* Chrome10-25,Safari5.1-6 */
60+
background: linear-gradient(
61+
135deg,
62+
#faaa35 5%,
63+
#f36d2200 94%
64+
); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
65+
}
66+
}
4467
.title,
4568
.subtitle {
4669
color: #fff;
@@ -78,4 +101,15 @@
78101
}
79102
}
80103
}
104+
}
105+
106+
.book-bg{
107+
border-top: 1px solid rgba(255, 255, 255, 0.397);
108+
109+
background-image: url('/youngatlasbook-bg.png');
110+
background-size: cover;
111+
background-position: top, center;
112+
.hero-body{
113+
background: linear-gradient(to bottom, #8c30a367, rgba(0, 0, 0, 0.726));
114+
}
81115
}

src/components/CityPopUp.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@
2727
export default {
2828
props: {
2929
city: {
30-
type: Object
31-
}
30+
type: Object,
31+
},
3232
},
3333
data() {
3434
return {
3535
fetchingCityData: true,
36-
cityData: null
36+
cityData: null,
3737
};
3838
},
3939
methods: {
4040
getCity() {
4141
if (this.cityData == null) {
42-
this.$http.get(`/v1/cities/${this.city.id}`).then(res => {
42+
this.$http.get(`/v1/cities/${this.city.id}`).then((res) => {
4343
this.cityData = res.data.data;
4444
this.fetchingCityData = false;
4545
});
4646
}
47-
}
48-
}
47+
},
48+
},
4949
};
5050
</script>
5151

src/components/CountryPopUp.vue

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<template>
2+
<div class="modal-card" style="width: 100%">
3+
<section class="modal-card-body has-text-centered">
4+
<div class="content">
5+
<p><span class="is-size-4 is-700">{{resource.initiatives}} initiatives</span><br> have or does some work (or activity) in</p>
6+
<h1 class="subtitle is-3 has-text-primary is-marginless">{{resource.name}}</h1>
7+
</div>
8+
<div v-if="!getching">
9+
<p v-for="initiative in initiatives" :key="initiative.id">
10+
<a @click="goToInitiative(initiative.id)">
11+
<i class="fas fa-map-marked-alt has-text-primary"></i>
12+
&nbsp;{{initiative.name}}
13+
</a>
14+
</p>
15+
</div>
16+
<div v-else>
17+
<p>
18+
<i class="fas fa-spin fa-sync"></i>&nbsp;Loading...
19+
</p>
20+
</div>
21+
<br>
22+
<div class="buttons is-centered">
23+
<button class="button is-dark is-small" type="button" @click="$parent.close()">Close</button>
24+
</div>
25+
</section>
26+
</div>
27+
</template>
28+
29+
<script>
30+
export default {
31+
props: {
32+
resource: {
33+
type: Object,
34+
required: true,
35+
},
36+
},
37+
data() {
38+
return {
39+
initiatives: [],
40+
fetching: true
41+
}
42+
},
43+
mounted: function(){
44+
this.getInitiatives()
45+
},
46+
methods: {
47+
getInitiatives() {
48+
this.$http.get(`/v1/initiatives?countries=${this.resource.countryId}`).then((res) => {
49+
this.initiatives = res.data.data;
50+
this.fetching = false
51+
});
52+
},
53+
goToInitiative(id){
54+
this.$parent.close()
55+
this.$router.push({name: 'initiative', params: { id: id }})
56+
}
57+
}
58+
}
59+
</script>

0 commit comments

Comments
 (0)