Skip to content

Commit

Permalink
Merge pull request #531 from coljs/develop
Browse files Browse the repository at this point in the history
Updates dependencies and fixes minor typos
  • Loading branch information
JenyMzo authored Apr 20, 2021
2 parents 09a6795 + a7e1576 commit a939a2d
Show file tree
Hide file tree
Showing 19 changed files with 5,471 additions and 5,296 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
id: nvm

- name: Setup node
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '${{ steps.nvm.outputs.NVMRC }}'

Expand All @@ -29,7 +29,7 @@ jobs:
npm run generate
- name: Deploy to GitHub Pages 🚀
uses: JamesIves/github-pages-deploy-action@3.5.9
uses: JamesIves/github-pages-deploy-action@4.1.1
with:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
BRANCH: gh-pages
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.18.3
14.16.1
24 changes: 20 additions & 4 deletions assets/data/heroes.js
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ module.exports = {
twitter: 'https://twitter.com/iosamuel',
github: 'https://github.com/iosamuel',
avatar:
'https://pbs.twimg.com/profile_images/1246844314908594178/aOK2G2ah_400x400.jpg',
'https://avatars3.githubusercontent.com/u/1578540?s=460&u=eb310318c03aacbc191e0b6e0dab6654688074c5&v=4',
slides: [
{
direction: 'r',
Expand Down Expand Up @@ -556,7 +556,7 @@ module.exports = {
twitter: 'https://twitter.com/CristianG540',
github: 'https://github.com/CristianG540',
avatar:
'https://pbs.twimg.com/profile_images/464431828313460736/cm2ADMLY_400x400.png',
'https://avatars0.githubusercontent.com/u/1929796?s=460&u=6c4e1d77da89bb6f75f922000d229b55599c5faa&v=4',
slides: [
{
direction: 'r',
Expand Down Expand Up @@ -1124,7 +1124,7 @@ module.exports = {
twitter: 'https://twitter.com/Colada_FF',
github: 'https://github.com/barreracristian',
avatar:
'https://pbs.twimg.com/profile_images/970894815616557056/00uYoiTr_400x400.jpg',
'https://avatars0.githubusercontent.com/u/12430316?s=460&u=cf1889bf4878f987573982b2c261f469fde76471&v=4',
slides: [
{
direction: 'r',
Expand Down Expand Up @@ -1566,7 +1566,7 @@ module.exports = {
twitter: 'https://twitter.com/Kath_Code',
github: 'https://github.com/kathcode',
avatar:
'https://pbs.twimg.com/profile_images/984624523252088833/enaxS6VT_400x400.jpg',
'https://avatars1.githubusercontent.com/u/11249129?s=460&u=401d7007528cb62a7e9e60d63406fb62d84b2b29&v=4',
slides: [
{
direction: 'r',
Expand All @@ -1576,4 +1576,20 @@ module.exports = {
},
],
},
michellinares: {
name: 'Michel Linares',
username: 'xkweb',
twitter: 'https://www.youtube.com/xkweb',
github: 'https://github.com/Michaelxk',
avatar:
'https://avatars1.githubusercontent.com/u/34779991?s=460&u=3b0b5ffa335a953b7dc059a8667692f042c7055c&v=4',
slides: [
{
direction: 'r',
title: 'Sobreviviendo a una entrevista de JavaScript',
url: 'https://slides.com/michaellinares/deck-d69a41',
thumbnail: '',
},
],
},
}
Binary file added assets/img/logos/terminal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion assets/scss/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,9 @@ img {
}
}

.section-bg-green-dark {
footer.section-bg-green-dark {
&:before {
z-index: -1;
background-color: #0E9390;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<template>
<div
id="communityParners-area"
id="communityPartners-area"
class="section section-padding-extra section-bg section-bg-green"
>
<div class="container">
<div class="row">
<div class="col-md-6 col-md-offset-3 text-center">
<div class="section-heading">
<h2 class="section-title">Community Parners</h2>
<h2 class="section-title">Community Partners</h2>
</div>
</div>
</div>
<div class="row">
<div class="fun-facts">
<div
v-for="(community, index) in communityParners"
v-for="(community, index) in communityPartners"
:key="index"
class="col-md-3 text-center"
>
Expand Down Expand Up @@ -58,15 +58,15 @@
<script>
import { faJs } from '@fortawesome/free-brands-svg-icons'
import reactLaConfLogo from '@/assets/img/communityParners/logo-reactlaconf.svg'
import cssConfCoLogo from '@/assets/img/communityParners/logo-cssconfco.svg'
import ngConfCoLogo from '@/assets/img/communityParners/logo-ngConfCo.svg'
import nodeConfCoLogo from '@/assets/img/communityParners/logo-nodeConfCo.jpg'
import reactLaConfLogo from '@/assets/img/communityPartners/logo-reactlaconf.svg'
import cssConfCoLogo from '@/assets/img/communityPartners/logo-cssconfco.svg'
import ngConfCoLogo from '@/assets/img/communityPartners/logo-ngConfCo.svg'
import nodeConfCoLogo from '@/assets/img/communityPartners/logo-nodeConfCo.jpg'
export default {
data() {
return {
communityParners: {
communityPartners: {
reactLaConf: {
name: 'ReactLaConf',
website: 'https://reactlaconf.co/',
Expand Down
2 changes: 1 addition & 1 deletion components/AppMap.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
data-lat="23.75043"
data-lng="90.38844"
data-zoom="16"
style="height: 330px;"
style="height: 330px"
></div>
</div>
</template>
4 changes: 2 additions & 2 deletions components/AppNavBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<li><a @click="scrollSection('sponsors-area')">Sponsors</a></li>
<li><a @click="scrollSection('team-area')">Organizadores</a></li>
<li>
<a @click="scrollSection('communityParners-area')"
>Community Parners</a
<a @click="scrollSection('communityPartners-area')"
>Community Partners</a
>
</li>
<li>
Expand Down
6 changes: 6 additions & 0 deletions components/AppSponsors.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<script>
import teamInternationalLogo from '../assets/img/logos/teaminternational.png'
import yungolLogo from '../assets/img/logos/yungol.png'
import terminal from '../assets/img/logos/terminal.png'
export default {
data() {
return {
Expand Down Expand Up @@ -89,6 +90,11 @@ export default {
logo: '//colombia-dev.org/public/assets/images/condor-logo.svg',
website: '//colombia-dev.org/',
},
Terminal: {
name: 'Terminal',
logo: terminal,
website: '//terminal.io/',
},
},
}
},
Expand Down
Loading

0 comments on commit a939a2d

Please sign in to comment.