Skip to content

Commit

Permalink
New design with TailwindCSS, contents, and gems (#304)
Browse files Browse the repository at this point in the history
Co-authored-by: Hugoren Martinako <[email protected]>
  • Loading branch information
andreslucena and Crashillo authored Sep 21, 2022
1 parent 4e94a97 commit 29484fa
Show file tree
Hide file tree
Showing 467 changed files with 27,992 additions and 27,617 deletions.
48 changes: 48 additions & 0 deletions .github/.github/workflows/ci_main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: "[CI] Main folder"
on:
push:
branches:
- master
pull_request:
branches-ignore:
- "chore/l10n*"

env:
CI: "true"
RUBY_VERSION: 3.1.1
NODE_VERSION: 16.9.1

concurrency:
group: ${{ github.head_ref || github.ref_name }}
cancel-in-progress: true

jobs:
main:
name: Tests
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- uses: actions/[email protected]
with:
fetch-depth: 1
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true
- uses: actions/setup-node@v1
with:
node-version: ${{ env.NODE_VERSION }}
- name: Get npm cache directory path
id: npm-cache-dir-path
run: echo "::set-output name=dir::$(npm get cache)-main"
- uses: actions/cache@v2
id: npm-cache
with:
path: ${{ steps.npm-cache-dir-path.outputs.dir }}
key: npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
npm-
- name: Install JS dependencies
run: npm ci
- run: bundle exec rspec
name: RSpec
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,11 @@
build/
tmp/
.byebug_history
cache/
source/stylesheets/tailwind.css
node_modules/

# Ignore rubocop rules from decidim
.rubocop-https---raw-githubusercontent-com-decidim-decidim-*

spec/examples.txt
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lts/*
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--require spec_helper
13 changes: 13 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
inherit_from: https://raw.githubusercontent.com/decidim/decidim/develop/.rubocop.yml

AllCops:
Include:
- "**/*.rb"
- "**/*.rake"
- "**/*.ru"
- "**/Gemfile"
- "**/Rakefile"
Exclude:
- "node_modules/**/*"
- "db/schema.rb"
- "vendor/**/*"
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.1
3.1.2
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM ruby:2.7.1
FROM ruby:2.7.4

RUN apt-get update -qq && apt-get install -y \
build-essential \
libpq-dev

RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash - \
&& apt-get install -y nodejs

RUN mkdir /app
Expand All @@ -13,6 +13,7 @@ WORKDIR /app
ADD Gemfile /app/Gemfile
ADD Gemfile.lock /app/Gemfile.lock
RUN bundle install
RUN npm install

ENV LANG C.UTF-8
ENV LANGUAGE C.UTF-8
Expand Down
12 changes: 10 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
source 'https://rubygems.org'

gem 'middleman', '~> 4.3'
gem 'middleman-autoprefixer', '~> 2.7'
gem 'middleman', '~> 4.4'
gem 'middleman-livereload', '~> 3.4'
gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby]
gem 'wdm', '~> 0.1', platforms: [:mswin, :mingw]
gem "rubocop", "~> 1.31"
gem "i18n-tasks", "~> 1.0"

gem 'middleman-blog', '~> 4.0'
gem 'redcarpet', '~> 3.5'
gem 'nokogiri', '~> 1.13.6'
gem 'builder', '~> 3.0'
gem "debug", "~> 1.6"

gem 'middleman-images', '~> 0.2'
gem 'mini_magick', '~> 4.11'
gem 'image_optim', '~> 0.30'

group :test do
gem 'rake', '~> 13.0'
gem 'rspec', '~> 3.11'
gem 'capybara', '~> 3.37'
end
Loading

0 comments on commit 29484fa

Please sign in to comment.