decidim 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 421e4c2986ada3aafa0c4252d3fe0e9321cdae00
-  data.tar.gz: c967573fdbb2e3e687c4a98b8af1819b94c3dbe2
+  metadata.gz: 4e9c56c3c5c523b0fb73cb2829124e26f0941c5a
+  data.tar.gz: 7fcec2d679fc0ab79092b496a8bbe21dffba3177
 SHA512:
-  metadata.gz: c1e5e856b1005947e43b1c259c23c8609acbc9c8b58372e1df505ae4ae801f21950bbca6eb448c5fb68e05b557a61c385467d717507d18b8dcdc1f3c42490d0f
-  data.tar.gz: 649f8f7a213df6171e41e0f2506d78f0d5770c78058057abad395d0b3de6c39d3ab022da64e75423bb4382f0bb6184621e65290a8f9fc1a333e371f9dd37c150
+  metadata.gz: a878386ca9e3ff9a9d30df4fed2078b34b416096b53d82e594504bd77e658c77bdd6446478342fe91b49e4170e6f31b4c828af065e1b56165ab029f3b862fab7
+  data.tar.gz: 21d78117f80c05f38657886e9327b3a402a5905a5eb494b9e270ff076ac79419e653efb78eb95a893e8ff072e02cc4a7b86a72215e0d131bc6321c21fd76257b

data/.babelrc

@@ -9,7 +9,8 @@
   "env": {
     "test": {
       "plugins": [
-        ["__coverage__", {"ignore": "*.+(test|stub).*"}]
+        ["__coverage__", {"ignore": "*.+(test|stub).*"}],
+        "transform-es2015-modules-commonjs"
       ]
     }
   }

data/.ruby-version

@@ -1 +1 @@
-2.4.0
+2.4.1

data/.travis.yml

@@ -10,6 +10,7 @@ language: ruby
 branches:
   only:
     - master
+    - revamp_admin
 
 env:
   global:
@@ -31,6 +32,7 @@ env:
     - GEM=decidim-budgets DB=postgres
 
 before_install:
+  - nvm install 7
   # Upgrade PhantomJS
   - "export PATH=$HOME/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin:$PATH"
   - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then rm -rf $HOME/travis_phantomjs; mkdir -p $HOME/travis_phantomjs; fi"
@@ -38,12 +40,8 @@ before_install:
   - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then tar -xvf $HOME/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C $HOME/travis_phantomjs; fi"
   - "phantomjs --version"
   # Repo for newer Node.js versions
-  - curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
   - gem update --system
-  - sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
-  - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-  - sudo apt-get update -qq
-  - sudo apt-get install -y -qq yarn
+  - yarn --ignore-engines
 
 bundler_args: --jobs=3 --retry=3 --deployment --path="$HOME/.bundle"
 
@@ -60,7 +58,7 @@ script:
   - $TRAVIS_BUILD_DIR/run_ci.sh
 
 rvm:
-  - 2.4.0
+  - 2.4.1
 
 notifications:
     email: false

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.4.0
+FROM ruby:2.4.1
 MAINTAINER david.morcillo@codegram.com
 
 ENV APP_HOME /decidim
@@ -7,7 +7,7 @@ RUN curl https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb http://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
 RUN apt-get update
-RUN curl -sL https://deb.nodesource.com/setup_4.x | bash && \
+RUN curl -sL https://deb.nodesource.com/setup_7.x | bash && \
     apt-get install -y nodejs yarn
 
 ADD Gemfile /tmp/Gemfile

data/Gemfile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-ruby "2.4.0"
+ruby "2.4.1"
 
 gemspec path: "."
 gemspec path: "decidim-core"

data/Gemfile.lock

@@ -1,34 +1,34 @@
 PATH
   remote: .
   specs:
-    decidim (0.0.6)
-      decidim-admin (= 0.0.6)
-      decidim-api (= 0.0.6)
-      decidim-budgets (= 0.0.6)
-      decidim-comments (= 0.0.6)
-      decidim-core (= 0.0.6)
-      decidim-meetings (= 0.0.6)
-      decidim-pages (= 0.0.6)
-      decidim-proposals (= 0.0.6)
-      decidim-results (= 0.0.6)
-      decidim-system (= 0.0.6)
+    decidim (0.0.7)
+      decidim-admin (= 0.0.7)
+      decidim-api (= 0.0.7)
+      decidim-budgets (= 0.0.7)
+      decidim-comments (= 0.0.7)
+      decidim-core (= 0.0.7)
+      decidim-meetings (= 0.0.7)
+      decidim-pages (= 0.0.7)
+      decidim-proposals (= 0.0.7)
+      decidim-results (= 0.0.7)
+      decidim-system (= 0.0.7)
       rails (~> 5.0.2)
       rails-i18n (~> 5.0.2)
-    decidim-budgets (0.0.6)
-      decidim-comments (= 0.0.6)
-      decidim-core (= 0.0.6)
+    decidim-budgets (0.0.7)
+      decidim-comments (= 0.0.7)
+      decidim-core (= 0.0.7)
       kaminari (~> 1.0.0.rc1)
       rectify (~> 0.8)
       searchlight (~> 4.1.0)
-    decidim-proposals (0.0.6)
-      decidim-comments (= 0.0.6)
-      decidim-core (= 0.0.6)
+    decidim-proposals (0.0.7)
+      decidim-comments (= 0.0.7)
+      decidim-core (= 0.0.7)
       kaminari (~> 1.0.1)
       rectify (~> 0.8.0)
       social-share-button (~> 0.9.0)
-    decidim-results (0.0.6)
-      decidim-comments (= 0.0.6)
-      decidim-core (= 0.0.6)
+    decidim-results (0.0.7)
+      decidim-comments (= 0.0.7)
+      decidim-core (= 0.0.7)
       kaminari (~> 1.0.0.rc1)
       rectify (~> 0.8)
       searchlight (~> 4.1.0)
@@ -36,10 +36,10 @@ PATH
 PATH
   remote: decidim-admin
   specs:
-    decidim-admin (0.0.6)
+    decidim-admin (0.0.7)
       active_link_to (~> 1.0.0)
       carrierwave (~> 1.0.0.rc)
-      decidim-core (= 0.0.6)
+      decidim-core (= 0.0.7)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
@@ -52,7 +52,7 @@ PATH
 PATH
   remote: decidim-api
   specs:
-    decidim-api (0.0.6)
+    decidim-api (0.0.7)
       graphiql-rails (~> 1.4.1)
       graphql (~> 1.5.3)
       rack-cors (~> 0.4.0)
@@ -62,21 +62,21 @@ PATH
 PATH
   remote: decidim-comments
   specs:
-    decidim-comments (0.0.6)
-      decidim-core (= 0.0.6)
+    decidim-comments (0.0.7)
+      decidim-core (= 0.0.7)
       jquery-rails (~> 4.0)
       rails (~> 5.0.2)
 
 PATH
   remote: decidim-core
   specs:
-    decidim-core (0.0.6)
+    decidim-core (0.0.7)
       active_link_to (~> 1.0.0)
       autoprefixer-rails (~> 6.7, >= 6.7.4)
       cancancan (~> 1.16.0)
       carrierwave (~> 1.0.0)
       date_validator (~> 0.9.0)
-      decidim-api (= 0.0.6)
+      decidim-api (= 0.0.7)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       file_validators (~> 2.1.0)
@@ -105,21 +105,21 @@ PATH
 PATH
   remote: decidim-dev
   specs:
-    decidim-dev (0.0.6)
+    decidim-dev (0.0.7)
       byebug
       capybara (~> 2.12.0)
       capybara-screenshot (~> 1.0.14)
       codecov (~> 0.1.9)
       database_cleaner (~> 1.5.0)
       db-query-matchers (~> 0.7.0)
-      decidim (= 0.0.6)
+      decidim (= 0.0.7)
       factory_girl_rails
       faker (~> 1.7.3)
       i18n-tasks (= 0.9.12)
       launchy
       letter_opener_web (~> 1.3.0)
       listen (~> 3.1.0)
-      poltergeist (~> 1.13.0)
+      poltergeist (~> 1.14.0)
       rails-controller-testing (~> 1.0.1)
       rspec-html-matchers (~> 0.9.1)
       rspec-rails (~> 3.5)
@@ -132,9 +132,9 @@ PATH
 PATH
   remote: decidim-meetings
   specs:
-    decidim-meetings (0.0.6)
+    decidim-meetings (0.0.7)
       date_validator (~> 0.9)
-      decidim-core (= 0.0.6)
+      decidim-core (= 0.0.7)
       httparty (~> 0.14.0)
       jquery-tmpl-rails (~> 1.1.0)
       kaminari (~> 1.0.1)
@@ -144,17 +144,17 @@ PATH
 PATH
   remote: decidim-pages
   specs:
-    decidim-pages (0.0.6)
-      decidim-comments (= 0.0.6)
-      decidim-core (= 0.0.6)
+    decidim-pages (0.0.7)
+      decidim-comments (= 0.0.7)
+      decidim-core (= 0.0.7)
       rectify (~> 0.8.0)
 
 PATH
   remote: decidim-system
   specs:
-    decidim-system (0.0.6)
+    decidim-system (0.0.7)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.0.6)
+      decidim-core (= 0.0.7)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.1)
@@ -207,7 +207,7 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     arel (7.1.4)
     ast (2.3.0)
@@ -272,7 +272,7 @@ GEM
       responders
       warden (~> 1.2.3)
     devise-i18n (1.1.2)
-    devise_invitable (1.7.1)
+    devise_invitable (1.7.2)
       actionmailer (>= 4.1.0)
       devise (>= 4.0.0)
     diff-lcs (1.3)
@@ -312,7 +312,7 @@ GEM
       activesupport (>= 4.1.0)
     graphiql-rails (1.4.1)
       rails
-    graphql (1.5.3)
+    graphql (1.5.5)
     hashdiff (0.3.2)
     hashie (3.5.5)
     high_voltage (3.0.0)
@@ -413,7 +413,7 @@ GEM
     parser (2.4.0.0)
       ast (~> 2.2)
     pg (0.19.0)
-    poltergeist (1.13.0)
+    poltergeist (1.14.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
@@ -500,7 +500,7 @@ GEM
     rspec-repeat (1.0.2)
       rspec (~> 3.0)
     rspec-support (3.5.0)
-    rubocop (0.47.1)
+    rubocop (0.48.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -540,7 +540,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    term-ansicolor (1.4.0)
+    term-ansicolor (1.5.0)
       tins (~> 1.0)
     terminal-table (1.7.3)
       unicode-display_width (~> 1.1.1)
@@ -552,7 +552,7 @@ GEM
     truncato (0.7.9)
       htmlentities (~> 4.3.1)
       nokogiri (~> 1.7.0)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     unicode-display_width (1.1.3)
     url (0.3.2)
@@ -588,14 +588,14 @@ DEPENDENCIES
   decidim-dev!
   decidim-meetings!
   decidim-pages!
-  decidim-proposals (= 0.0.6)
-  decidim-results (= 0.0.6)
+  decidim-proposals (= 0.0.7)
+  decidim-results (= 0.0.7)
   decidim-system!
   rake (~> 12.0.0)
   rspec (~> 3.0)
 
 RUBY VERSION
-   ruby 2.4.0p0
+   ruby 2.4.1p111
 
 BUNDLED WITH
-   1.14.3
+   1.14.6

data/README.md

@@ -33,6 +33,7 @@ Decidim is a participatory democracy framework written on Ruby on Rails original
 - [Install "Decidim" for an organization](#installation-instructions)
 - [Upgrade an already existing "Decidim" installation](#upgrade-instructions)
 - [Use Docker to deploy "Decidim"](#docker-instructions)
+- [Deploying to Heroku](#deploying-to-heroku)
 - [Check current components](#components)
 - [Further configuration](#further-configuration)
 - [Technical tradeoffs](#technical-tradeoffs)
@@ -112,12 +113,16 @@ Also you can run it as a standalone container like this:
 
 Now you have a new Decidim app created at `<app-name>` 🎉
 
+## Deploying to Heroku
+
+Once you've generated the Decidim app you might need to do some changes in order to deploy it to Heroku. You can check [codegram/decidim-deploy-heroku](https://github.com/codegram/decidim-deploy-heroku) for an opinionated example of things to do before deploying to Heroku.
+
 ## How to contribute
 
 In order to develop on decidim, you'll need:
 
 * **PostgreSQL** 9.4+
-* **Ruby** 2.4.0
+* **Ruby** 2.4.1
 * **NodeJS** with **yarn** (JavaScript dependency manager, can be installed with `npm install yarn`)
 * **ImageMagick**
 * **PhantomJS**

data/decidim-admin/app/assets/stylesheets/decidim/admin/_decidim.scss

@@ -0,0 +1,9 @@
+//@import compass
+@import "variables";
+@import "utils/*";
+
+@import "foundation";
+@include foundation-everything();
+@import "decidim/editor";
+
+@import "modules/modules";

data/decidim-admin/app/assets/stylesheets/decidim/admin/_variables.scss

@@ -0,0 +1,7 @@
+// Variables
+
+$brand: #9675ce !default;
+
+$twitter: #55acee !default;
+$facebook: #3b5998 !default;
+$google: #dd4b39 !default;

data/decidim-admin/app/assets/stylesheets/decidim/admin/application.scss

@@ -1,19 +1,2 @@
-@import "foundation_and_overrides";
-@import "layout";
-@import "login";
-@import "sidebar";
-@import "tables";
-@import "actions";
-@import "forms";
-@import "icons";
-@import "email_preview";
-
-@import "decidim/editor";
-@import "decidim/utils/fontface";
-
-@import "foundation";
-@include foundation-everything;
-
-body {
-  font-family: 'Source Sans Pro', sans-serif;
-}
+@import "decidim";
+@import "extra/*";

data/decidim-admin/app/assets/stylesheets/decidim/admin/extra/_categories.scss

@@ -0,0 +1,5 @@
+.extra__table-list__subcategory{
+  td:first-child{
+    padding-left: 20px
+  }
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/extra/_select_multiple.scss

@@ -0,0 +1,3 @@
+select[multiple] {
+  min-height: 100px;
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/extra/_title_bar.scss

@@ -0,0 +1,5 @@
+.title-bar {
+  a.logo {
+    color: #fff;
+  }
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/modules/_action-icon.scss

@@ -0,0 +1,13 @@
+.action-icon:not(:last-child){
+  margin-right: 1rem;
+}
+
+.action-icon.has-tip,
+.simple-has-tip.has-tip{
+  border-bottom: 0;
+  cursor: pointer;
+}
+
+.action-icon.action-icon--remove{
+  color: $alert-color;
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/modules/_buttons.scss

@@ -0,0 +1,44 @@
+/* Foundation button overrides*/
+
+.button{
+  &.small{
+    padding-top: .5rem;
+    padding-bottom: .5rem;
+  }
+  &.tiny{
+    padding-top: .25rem;
+    padding-bottom: .25rem;
+  }
+}
+
+.button.muted{
+  background-color: $medium-gray;
+  &:hover{
+    background-color: darken($medium-gray, 10);
+  }
+}
+
+.button--title{
+  margin-bottom: 0;
+  @include breakpoint(mediumlarge){
+    float: right;
+  }
+}
+
+
+.button--double{
+  .button:not(:last-child){
+    margin-right: 1rem;
+  }
+  @include breakpoint(mediumlarge){
+    display: flex;
+    align-items: center;
+    .button{
+      margin-bottom: 0;
+    }
+  }
+}
+
+.button--simple{
+  margin-bottom: 0;
+}