Skip to content

Commit

Permalink
Merge branch 'release/0.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
LuisAlejandro committed Apr 3, 2020
2 parents 35b6d2d + 0343480 commit 3233778
Show file tree
Hide file tree
Showing 12 changed files with 13,937 additions and 104 deletions.
3 changes: 2 additions & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[bumpversion]
current_version = 0.1.0
current_version = 0.1.1
tag_name = {new_version}
commit = True
tag = True

[bumpversion:file:package.json]

[bumpversion:file:README.md]

2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ assets
optimization-fix-this-file-is-ignored.js
yarn-error.log
.yarnclean
yarn.lock
vendor
Gemfile.lock
.bundle
core
4 changes: 4 additions & 0 deletions .snyk
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.13.5
ignore: {}
patch: {}
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
sudo: required
services: docker
dist: xenial
dist: bionic
group: edge
language: minimal
branches:
only:
- develop
- /^greenkeeper/.*$/
- /^snyk-fix.*$/
- /^dependabot/.*$/
cache:
directories:
- node_modules
Expand All @@ -16,3 +18,4 @@ before_script:
script:
- lando start
- lando yarn run build:pwa
- lando yarn cache dir
12 changes: 10 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,17 @@ ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
ENV PUPPETEER_EXECUTABLE_PATH /usr/bin/google-chrome-stable

RUN apt-get update && \
apt-get install gnupg git sudo libpng-dev libpng-dev build-essential ruby2.5 ruby2.5-dev
apt-get install net-tools netcat-openbsd

RUN ln -s /usr/lib/x86_64-linux-gnu/libruby-2.5.so.2.5 /usr/lib/x86_64-linux-gnu/libruby.so.2.5
RUN route -n | awk '/^0.0.0.0/ {print $2}' > /tmp/host_ip.txt
RUN echo "HEAD /" | nc `cat /tmp/host_ip.txt` 8000 | grep squid-deb-proxy \
&& (echo "Acquire::http::Proxy \"http://$(cat /tmp/host_ip.txt):8000\";" > /etc/apt/apt.conf.d/30proxy) \
|| echo "No squid-deb-proxy detected on docker host"

RUN apt-get update && \
apt-get install gnupg git sudo libpng-dev libpng-dev build-essential \
build-essential autoconf automake gcc \
ruby2.7 ruby2.7-dev python2.7-dev

RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
Expand Down
8 changes: 5 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
source "https://rubygems.org"

gem 'jekyll-paginate-v2', '~> 2.0'
gem 'amp-jekyll', '~> 1.0', '>= 1.0.1'
gem 'octopress-minify-html', '~> 1.3', '>= 1.3.1'
ruby '>= 2.5.0'

gem 'jekyll-paginate-v2', '3.0.0'
gem 'amp-jekyll', '1.0.1'
gem 'octopress-minify-html', '1.3.1'
100 changes: 100 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
amp-jekyll (1.0.1)
fastimage (>= 1.8.0)
jekyll (~> 3.0)
nokogiri (>= 1.6.0)
colorator (1.1.0)
concurrent-ruby (1.1.6)
css_press (0.3.2)
csspool-st (= 3.1.2)
json
csspool-st (3.1.2)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
execjs (2.7.0)
fastimage (2.1.7)
ffi (1.12.2)
forwardable-extended (2.6.0)
html_press (0.8.2)
htmlentities
multi_css (>= 0.1.0)
multi_js (>= 0.1.0)
htmlentities (4.3.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.8.6)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 2.0)
kramdown (~> 1.14)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-paginate-v2 (3.0.0)
jekyll (>= 3.0, < 5.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-watch (2.2.1)
listen (~> 3.0)
json (2.3.0)
kramdown (1.17.0)
liquid (4.0.3)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_portile2 (2.4.0)
multi_css (0.1.0)
css_press
multi_js (0.1.0)
uglifier (~> 2)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
octopress-hooks (2.6.2)
jekyll (>= 2.0)
octopress-minify-html (1.3.1)
html_press (~> 0.8)
jekyll (>= 2.0)
octopress-hooks
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.1)
ffi (~> 1.0)
rouge (3.17.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)

PLATFORMS
ruby

DEPENDENCIES
amp-jekyll (= 1.0.1)
jekyll-paginate-v2 (= 3.0.0)
octopress-minify-html (= 1.3.1)

RUBY VERSION
ruby 2.7.0p0

BUNDLED WITH
2.1.4
141 changes: 111 additions & 30 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,71 +1,152 @@
# Changelog


## 0.2.0 (2018-08-21)
## 0.1.1 (2020-04-03)

### Changes

* Improving gulp tasks. [Luis Alejandro Martínez Faneyth]
* Adding Snyk config. [Luis Alejandro Martínez Faneyth]

* Including configuration for Babel, Jshint y Stylelint on package.json. [REF] Improving Gulp tasks codebase. [Luis Alejandro Martínez Faneyth]
* Updating yarn.lock. [Luis Alejandro Martínez Faneyth]

* Refactoring gulp flow. [REF] Improving Vue app. [Luis Alejandro Martínez Faneyth]
* Updating dependencies. [Luis Alejandro Martínez Faneyth]

### Other
* Changing GAnalytics code, optimizing cache. [Luis Alejandro Martínez Faneyth]

* [DEL] Removing unnecessary files. [ADD] Adding basic vue single file components. [REF] Start working with Buefy and Vue Router. [Luis Alejandro Martínez Faneyth]
* Adjusting metadata. [Luis Alejandro Martínez Faneyth]

* [DEL] Removing Bower as devDependency. [REF] Automating fonts download. [REF] Adding Vue, Vuetify and Animejs to dependencies. [Luis Alejandro Martínez Faneyth]
* Removing unused code. [Luis Alejandro Martínez Faneyth]

* Different optimizations. [Luis Alejandro Martínez Faneyth]

## 0.1.2 (2018-08-13)
* Optimizing js. [Luis Alejandro Martínez Faneyth]

### Fix
* Optimizing performance. [Luis Alejandro Martínez Faneyth]

* Fixing Travis build. [Luis Alejandro Martínez Faneyth]
* Configuring security headers for netlify. [Luis Alejandro Martínez Faneyth]

* Adding yarn to dependencies. [Luis Alejandro Martínez Faneyth]

## 0.1.1 (2018-08-13)
* Removing unused sections. [REF] Improving copies. [Luis Alejandro Martínez Faneyth]

### Changes
* Fixing jquery import. [Luis Alejandro Martínez Faneyth]

* Improving Readme. [Luis Alejandro Martínez Faneyth]

* Modifying .gitignore. [Luis Alejandro Martínez Faneyth]

* Improve Readme. [Luis Alejandro Martínez Faneyth]

* Implementing svg-sprite. [Luis Alejandro Martínez Faneyth]

* Adding David dependency checker to badges. [Luis Alejandro Martínez Faneyth]
* Adding github metadata. [Luis Alejandro Martínez Faneyth]

* Removing badge to trigger greenkeeper build. [REF] Activating deployment task. [Luis Alejandro Martínez Faneyth]
* Fixing syntax errors. [Luis Alejandro Martínez Faneyth]

* Updating to webpack 4. [Luis Alejandro Martínez Faneyth]

* Improving readme. [Luis Alejandro Martínez Faneyth]

* Importing Hunting Bears Theme. [Luis Alejandro Martínez Faneyth]

* Finishing configuring development environment with lando. [Luis Alejandro Martínez Faneyth]

### Fix

* Fixing title. [Luis Alejandro Martínez Faneyth]

* Fixing error in Travis. [Luis Alejandro Martínez Faneyth]

* Fixing error in travis. [Luis Alejandro Martínez Faneyth]

### Other

* Docs(readme): add Greenkeeper badge. [greenkeeper[bot]]
* Fix: package.json to reduce vulnerabilities. [snyk-bot]

* Docs(readme): add Greenkeeper badge. [greenkeeper[bot]]
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-NODESASS-542662
- https://snyk.io/vuln/SNYK-JS-SERIALIZEJAVASCRIPT-536840
- https://snyk.io/vuln/SNYK-JS-YARGSPARSER-560381
- https://snyk.io/vuln/SNYK-JS-YARN-548869

* Chore(travis): whitelist greenkeeper branches. [greenkeeper[bot]]
* Chore(package): update file-loader to version 6.0.0. [greenkeeper[bot]]

* Chore(package): update dependencies. [greenkeeper[bot]]
* Chore(package): update url-loader to version 4.0.0. [greenkeeper[bot]]

* Chore(package): update cross-env to version 7.0.0. [greenkeeper[bot]]

## 0.1.0 (2018-08-13)
* Chore(package): update file-loader to version 5.0.2. [greenkeeper[bot]]

### New
Closes #24

* Adding License, gitchancgelog and bumpversion config. [Luis Alejandro Martínez Faneyth]
* Chore(package): update url-loader to version 3.0.0. [greenkeeper[bot]]

### Changes
* Chore(package): update mini-css-extract-plugin to version 0.9.0. [greenkeeper[bot]]

* Adding Maintainer notes. [REF] Improving readme. [Luis Alejandro Martínez Faneyth]
* Chore(package): update svgo to version 1.3.2. [greenkeeper[bot]]

* Updating code from upstream. [REF] Coding Travis deployment. [Luis Alejandro Martínez Faneyth]
* Chore(package): update webpack to version 4.41.5. [greenkeeper[bot]]

* Changing CNAME to luisalejandro.org. [Luis Alejandro Martínez Faneyth]
* Chore(package): update webpack-pwa-manifest to version 4.1.1. [greenkeeper[bot]]

### Fix
* Chore(package): update @babel/preset-env to version 7.8.2. [greenkeeper[bot]]

* Fixing Travis build. [Luis Alejandro Martínez Faneyth]
* Chore(package): update @babel/core to version 7.8.0. [greenkeeper[bot]]

### Other
* Chore(package): update http-server to version 0.12.0. [greenkeeper[bot]]

* Chore(package): update style-loader to version 1.0.0. [greenkeeper[bot]]

* Chore(package): update webpack to version 4.41.1. [greenkeeper[bot]]

* Chore(package): update concurrently to version 5.0.0. [greenkeeper[bot]]

* Chore(package): update sass-loader to version 8.0.0. [greenkeeper[bot]]

* Chore(package): update mini-css-extract-plugin to version 0.8.0. [greenkeeper[bot]]

* Chore(package): update eslint-config-airbnb-base to version 14.0.0. [greenkeeper[bot]]

* Add scrollspy to default layout. [Paola Vargas]

* Reverse add anchor to all blog post card, only add to button read more. [Paola Vargas]

* Add anchor tag to blog posts cards. [Paola Vargas]

* Add hovers, efects. Change text in banner. [Paola Vargas]

* Fix blog overflow issue. [Paola Vargas]

* Add slick to blog posts, add responsive details. [Paola Vargas]

* Add images and files. [Paola Vargas]

* Add sections and styles for home page. [Paola Vargas]

* Chore(package): update cross-env to version 6.0.0. [greenkeeper[bot]]

* Chore(package): update eslint-loader to version 3.0.0. [greenkeeper[bot]]

* Chore(package): update rimraf to version 3.0.0. [greenkeeper[bot]]

* Chore(package): update eslint to version 6.2.0. [greenkeeper[bot]]

* Chore(package): update eslint-loader to version 2.2.1. [greenkeeper[bot]]

* Add Gitter badge. [The Gitter Badger]

* Fix: pin eslint-loader to 2.2.0. [greenkeeper[bot]]

* Docs(readme): add Greenkeeper badge. [greenkeeper[bot]]

* Chore(package): update dependencies. [greenkeeper[bot]]

* [DEL] Removing icon. [Luis Alejandro Martínez Faneyth]

* Importing Jekyll-webpack boilerplate. [Luis Alejandro Martínez Faneyth]

* Initial import. [Luis Alejandro Martínez Faneyth]
* Create index.html. [Luis Alejandro Martínez Faneyth]

* Initial commit. [Luis Alejandro Martínez Faneyth]
* Create CNAME. [Luis Alejandro Martínez Faneyth]


4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ destroy:
docker volume prune -f
lando --clear

console:

lando bash

clean:

rm -rf node_modules Gemfile.lock yarn.lock vendor .bundle assets _site yarn-error.log
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@

---

[![](https://img.shields.io/github/release/CollageLabs/collagelabs.org.svg)](https://github.com/CollageLabs/collagelabs.org/releases) [![](https://img.shields.io/travis/CollageLabs/collagelabs.org.svg)](https://travis-ci.org/CollageLabs/collagelabs.org) [![](https://img.shields.io/github/issues-raw/CollageLabs/collagelabs.org/in%20progress.svg?label=in%20progress)](https://github.com/CollageLabs/collagelabs.org/issues?q=is%3Aissue+is%3Aopen+label%3A%22in+progress%22) [![](https://badges.gitter.im/CollageLabs/collagelabs.org.svg)](https://gitter.im/CollageLabs/collagelabs.org) [![](https://cla-assistant.io/readme/badge/CollageLabs/collagelabs.org)](https://cla-assistant.io/CollageLabs/collagelabs.org)

Current version: 0.1.0
[![Github releases](https://img.shields.io/github/release/CollageLabs/collagelabs.org.svg)](https://github.com/CollageLabs/collagelabs.org/releases)
[![Github issues](https://img.shields.io/github/issues/CollageLabs/collagelabs.org)](https://github.com/CollageLabs/collagelabs.org/issues?q=is%3Aopen)
[![Travis CI](https://img.shields.io/travis/CollageLabs/collagelabs.org.svg)](https://travis-ci.com/CollageLabs/collagelabs.org)
[![Codeclimate](https://codeclimate.com/github/CollageLabs/collagelabs.org/badges/gpa.svg)](https://codeclimate.com/github/CollageLabs/collagelabs.org)
[![David](https://david-dm.org/CollageLabs/collagelabs.org/dev-status.svg)](https://david-dm.org/CollageLabs/collagelabs.org)
[![Snyk](https://snyk.io/test/github/CollageLabs/collagelabs.org/badge.svg)](https://snyk.io/test/github/CollageLabs/collagelabs.org)
[![CLA Assistant](https://cla-assistant.io/readme/badge/CollageLabs/collagelabs.org)](https://cla-assistant.io/CollageLabs/collagelabs.org)

Current version: 0.1.1

## How to start hacking this website?

Expand Down
Loading

0 comments on commit 3233778

Please sign in to comment.