decidim 0.0.6 → 0.0.7

data/decidim-results/config/locales/ca.yml

@@ -27,6 +27,7 @@ ca:
         destroy: Esborra
         edit: Edita
         new: Nou/va %{name}
+        preview: Previsualitzar
         title: Accions
       admin:
         models:
@@ -60,6 +61,7 @@ ca:
             other: "%{count} resultats"
         filters:
           category: Categoria
+          category_prompt: Selecciona una categoria
           scopes: Àmbits
           search: Cerca
         filters_small_view:

data/decidim-results/config/locales/en.yml

@@ -28,6 +28,7 @@ en:
         destroy: Delete
         edit: Edit
         new: New %{name}
+        preview: Preview
         title: Actions
       admin:
         models:
@@ -61,6 +62,7 @@ en:
             other: "%{count} results"
         filters:
           category: Category
+          category_prompt: Select a category
           scopes: Scopes
           search: Search
         filters_small_view:

data/decidim-results/config/locales/es.yml

@@ -27,6 +27,7 @@ es:
         destroy: Borrar
         edit: Editar
         new: Nuevo/a %{name}
+        preview: Previsualizar
         title: Acciones
       admin:
         models:
@@ -60,6 +61,7 @@ es:
             other: "%{count} resultados"
         filters:
           category: Categoría
+          category_prompt: Selecciona una categoría
           scopes: Ámbitos
           search: Buscar
         filters_small_view:

data/decidim-results/config/locales/eu.yml

@@ -1,19 +1,33 @@
 eu:
+  activemodel:
+    attributes:
+      result:
+        decidim_category_id: Kategoria
+        decidim_scope_id: Esparrua
+        description: Deskribapena
+        proposal_ids: Sartutako proposamenak
+        title: Izenburua
   decidim:
     features:
       results:
         name: Emaitzak
+        settings:
+          global:
+            comments_enabled: Iruzkinak gaituta
+          step:
+            comments_blocked: Iruzkinak blokeatuta
     resource_links:
       included_proposals:
         result_proposals: Emaitza honetan jasotako proposamenak
       meetings_through_proposals:
-        result_meetings: Honekin lotutako topaketak
+        result_meetings: Proposamenarekin lotutako topaketak
     results:
       actions:
         confirm_destroy: Ziur zaude emaitza hau ezabatu nahi duzula?
-        destroy: Garbitu
+        destroy: Ezabatu
         edit: Editatu
         new: '%{name} berria'
+        preview: Aurreikusi
         title: Ekintzak
       admin:
         models:
@@ -43,14 +57,18 @@ eu:
       results:
         count:
           results_count:
-            one: Emaitza bat
+            one: 1 emaitza
             other: "%{count} emaitza"
         filters:
           category: Kategoria
+          category_prompt: Aukeratu kategoria bat
           scopes: Esparruak
           search: Bilatu
         filters_small_view:
+          close_modal: Itxi leihoa
+          filter: Iragazi
           filter_by: 'Iragazi honen arabera:'
+          unfold: Zabaldu
         show:
           stats:
             attendees: Bertaratuak
@@ -58,4 +76,4 @@ eu:
             contributions: Ekarpenak
             meetings: Topaketa-zerrenda
             proposals: Proposamenak
-            votes: Euskarria
+            votes: Sostenguak

data/decidim-results/spec/shared/manage_results_examples.rb

@@ -3,7 +3,7 @@
 RSpec.shared_examples "manage results" do
   it "updates a result" do
     within find("tr", text: translated(result.title)) do
-      click_link "Edit"
+      find("a.action-icon--edit").click
     end
 
     within ".edit_result" do
@@ -18,7 +18,7 @@ RSpec.shared_examples "manage results" do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
@@ -29,9 +29,11 @@ RSpec.shared_examples "manage results" do
 
   context "previewing results" do
     it "allows the user to preview the result" do
-      new_window = window_opened_by { click_link translated(result.title) }
+      within find("tr", text: translated(result.title)) do
+        @new_window = window_opened_by { find("a.action-icon--preview").click }
+      end
 
-      within_window new_window do
+      within_window @new_window do
         expect(current_path).to eq decidim_results.result_path(id: result.id, participatory_process_id: participatory_process.id, feature_id: current_feature.id)
         expect(page).to have_content(translated(result.title))
       end
@@ -39,7 +41,7 @@ RSpec.shared_examples "manage results" do
   end
 
   it "creates a new result" do
-    find(".actions .new").click
+    click_link "New Result"
 
     within ".new_result" do
       fill_in_i18n(
@@ -63,7 +65,7 @@ RSpec.shared_examples "manage results" do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
@@ -81,10 +83,10 @@ RSpec.shared_examples "manage results" do
 
     it "deletes a result" do
       within find("tr", text: translated(result2.title)) do
-        click_link "Delete"
+        find("a.action-icon--remove").click
       end
 
-      within ".flash" do
+      within ".callout-wrapper" do
         expect(page).to have_content("successfully")
       end
 

data/decidim-system/config/locales/eu.yml

@@ -1,10 +1,68 @@
 eu:
   decidim:
     system:
+      actions:
+        confirm_destroy: Ziur hau ezabatu nahi duzula?
+        destroy: Ezabatu
+        edit: Editatu
+        new: '%{name} berria'
+        save: Gorde
+        title: Ekintzak
       admins:
         create:
-          success: Admin sortu da
+          error: Errorea gertatu da administratzaile berri bat sortzean.
+          success: Administratzailea zuzen sortu da
+        destroy:
+          success: Administratzailea zuzen sortu da
+        edit:
+          title: Editatu administratzailea
+          update: Eguneratu administratzailea
+        index:
+          title: Administratzaileak
+        new:
+          create: Sortu administratzailea
+          title: Administratzaile berria
+        update:
+          error: Errorea gertatu da administratzaile hau eguneratzean.
+          success: Administratzailea zuzen eguneratu da
+      default_pages:
+        placeholders:
+          content: Mesedez, gehitu eduki adierazgarria orri honetan, kontrol-panela baliatuta.
+          title: 'Izenburu lehenetsia orri honetarako: %{page}'
+      menu:
+        admins: Administratzaileak
+        dashboard: Kontrol-panela
+        organizations: Erakundeak
       models:
         admin:
           fields:
-            email: Emaila
+            created_at: Sortze-data
+            email: Helbide elektronikoa
+          name: Administratzailea
+          validations:
+            email_uniqueness: beste administratzaile bat dago, helbide elektroniko hauxe bera duena
+        organization:
+          actions:
+            save_and_invite: Sortu erakundea eta gonbit egin administratzaileari
+          fields:
+            created_at: Sortze-data
+            name: Izena
+          name: Erakundea
+        page:
+          name: Orria
+      organizations:
+        create:
+          error: Errorea gertatu da erakunde berri bat sortzean.
+          success: Erakundea zuzen sortu da.
+        edit:
+          secondary_hosts_hint: Sartu haietako bakoitza lerro batean
+        index:
+          title: Erakundeak
+        new:
+          secondary_hosts_hint: Sartu haietako bakoitza lerro batean
+          title: Erakunde berria
+        update:
+          error: Errorea gertatu da erakunde hau eguneratzean.
+          success: Erakundea zuzen eguneratu da.
+      titles:
+        dashboard: Kontrol-panela

data/lib/generators/decidim/app_generator.rb

@@ -72,10 +72,6 @@ module Decidim
         SecureRandom.hex(64)
       end
 
-      def app_json
-        template "app.json.erb", "app.json"
-      end
-
       def install
         Decidim::Generators::InstallGenerator.start [
           "--recreate_db=#{options[:recreate_db]}",

data/lib/generators/decidim/install_generator.rb

@@ -33,10 +33,6 @@ module Decidim
       def add_seeds
         append_file("db/seeds.rb", <<-SEEDS_CONTENT)
 # You can remove the 'faker' gem if you don't want Decidim seeds.
-if ENV["HEROKU_APP_NAME"].present?
-  ENV["DECIDIM_HOST"] = ENV["HEROKU_APP_NAME"] + ".herokuapp.com"
-  ENV["SEED"] = "true"
-end
 Decidim.seed!
         SEEDS_CONTENT
       end

data/lib/generators/decidim/templates/README.md.erb

@@ -1,26 +1,26 @@
-# README
+# <%= app_name %>
 
-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
+Citizen Participation and Open Government application.
 
-This README would normally document whatever steps are necessary to get the
-application up and running.
+This is the open-source repository for <%= app_name %>, based on [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
 
-Things you may want to cover:
+## Deploying the app
 
-* Ruby version
+An opinionated guide to deploy this app to Heroku can be found at [https://github.com/codegram/decidim-deploy-heroku](https://github.com/codegram/decidim-deploy-heroku).
 
-* System dependencies
+## Setting up the application
 
-* Configuration
+You will need to do some steps before having the app working properly once you've deployed it:
 
-* Database creation
+1. Open a Rails console in the server: `bundle exec rails console`
+2. Create a System Admin user: 
+```ruby
+user = Decidim::System::Admin.new(email: <email>, password: <password>, password_confirmation: <password>)
+user.save!
+```
+3. Visit `<your app url>/system` and login with your system admin credentials
+4. Create a new organization. Check the locales you want to use for that organization, and select a default locale.
+5. Set the correct default host for the organization, otherwise the app will not work properly. Note that you need to include any subdomain you might be using.
+6. Fill the rest of the form and submit it.
 
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
+You're good to go!

data/package.json

@@ -10,25 +10,39 @@
     "build": "webpack --env.dev",
     "build:prod": "NODE_ENV=production webpack -p --env.prod",
     "start": "webpack --env.dev --watch --progress --color --display-error-details",
+    "prelint": "tslint decidim-*/**/*.ts decidim-*/**/*.tsx",
     "lint": "eslint -c .eslintrc.json --ext .js,.js.es6,.jsx .",
-    "test": "karma start",
-    "test:watch": "yarn test -- --auto-watch --no-single-run",
-    "test:ci": "yarn run lint && yarn test"
+    "test": "jest",
+    "test:watch": "yarn test -- --watch",
+    "test:ci": "yarn run lint && yarn test",
+    "graphql:download_schema": "apollo-codegen download-schema http://localhost:3000/api --output schema.json",
+    "pregraphql:generate_schema_types": "yarn run graphql:download_schema",
+    "graphql:generate_schema_types": "apollo-codegen generate decidim-comments/**/*.graphql --schema schema.json --target typescript --output decidim-comments/app/frontend/support/schema.ts",
+    "postgraphql:generate_schema_types": "rm schema.json"
   },
   "devDependencies": {
+    "@types/classnames": "^0.0.32",
+    "@types/enzyme": "^2.7.5",
+    "@types/es6-promise": "^0.0.32",
+    "@types/faker": "^3.1.32",
+    "@types/jest": "^18.1.1",
+    "@types/jquery": "^2.0.41",
+    "@types/react": "^15.0.12",
+    "@types/react-dom": "^0.14.23",
+    "@types/uuid": "^2.0.29",
+    "awesome-typescript-loader": "^3.0.4",
     "babel-core": "~6.23.1",
     "babel-eslint": "~7.1.1",
+    "babel-jest": "^19.0.0",
     "babel-loader": "~6.3.0",
     "babel-plugin-__coverage__": "~11.0.0",
     "babel-plugin-transform-decorators-legacy": "~1.3.4",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0",
     "babel-preset-airbnb": "~2.2.3",
     "babel-preset-es2015": "~6.22.0",
     "babel-preset-react": "~6.22.0",
     "babel-preset-stage-2": "~6.22.0",
-    "chai": "~3.5.0",
-    "chai-as-promised": "~6.0.0",
-    "chai-enzyme": "~0.6.1",
-    "enzyme": "~2.7.1",
+    "enzyme": "^2.7.1",
     "eslint": "~3.15.0",
     "eslint-loader": "~1.6.1",
     "eslint-plugin-import": "~2.2.0",
@@ -36,39 +50,50 @@
     "eslint-plugin-react": "~6.10.0",
     "expose-loader": "~0.7.1",
     "faker": "~3.1.0",
-    "jasmine-core": "~2.5.2",
+    "jest": "^19.0.2",
     "json-loader": "~0.5.4",
-    "karma": "~1.4.1",
-    "karma-chai": "~0.1.0",
-    "karma-coverage": "~1.1.1",
-    "karma-jasmine": "~1.1.0",
-    "karma-phantomjs-launcher": "~1.0.2",
-    "karma-sinon-chai": "~1.2.4",
-    "karma-sourcemap-loader": "~0.3.7",
-    "karma-webpack": "~2.0.2",
     "progress-bar-webpack-plugin": "~1.9.0",
-    "raw-loader": "~0.5.1",
     "react-addons-test-utils": "~15.4.0",
-    "sinon": "~1.17.6",
-    "sinon-chai": "~2.8.0",
+    "source-map-loader": "^0.1.6",
+    "ts-jest": "^19.0.0",
+    "tslint": "^4.5.1",
+    "tslint-react": "^2.5.0",
+    "typescript": "^2.2.1",
+    "typescript-babel-jest": "^1.0.1",
     "webpack": "~2.2.1",
     "webpack-bundle-analyzer": "~2.3.0",
     "webpack-config-utils": "~2.3.0",
     "webpack-validator": "~2.3.0",
+    "yaml-jest": "^1.0.4",
     "yaml-loader": "~0.4.0"
   },
   "dependencies": {
-    "apollo-client": "^1.0.0-rc.2",
+    "apollo-client": "^1.0.1",
+    "apollo-codegen": "^0.10.8",
     "classnames": "~2.2.5",
     "graphql-anywhere": "~2.2.0",
     "graphql-tag": "^1.3.1",
-    "jquery": "~3.1.1",
+    "jquery": "^3.2.0",
     "moment": "~2.17.1",
     "react": "~15.4.2",
     "react-addons-update": "~15.4.2",
-    "react-apollo": "^1.0.0-rc.2",
+    "react-apollo": "^1.0.0",
     "react-dom": "~15.4.2",
     "react-i18nify": "~1.8.4",
     "uuid": "~3.0.1"
+  },
+  "jest": {
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js"
+    ],
+    "transform": {
+      "^.+\\.(ts|tsx)$": "typescript-babel-jest",
+      "\\.yml$": "yaml-jest",
+      "\\.(gql|graphql)$": "<rootDir>/decidim-comments/app/frontend/support/graphql_transformer.js",
+      ".*": "babel-jest"
+    },
+    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$"
   }
 }

data/tsconfig.json

@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "sourceMap": true,
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "skipLibCheck": true,
+        "module": "commonjs",
+        "target": "es5",
+        "jsx": "react",
+        "moduleResolution": "node"
+    },
+    "includes": [
+        "decidim-comments/app/frontend/**/*.tsx",
+        "decidim-comments/app/frontend/**/*.ts",
+        "webpack.d.ts"
+    ]
+}

data/tslint.json

@@ -0,0 +1,12 @@
+{
+    "extends": ["tslint:recommended", "tslint-react"],
+    "rules": {
+        "no-unused-variable": [true, "react"],
+        "no-unused-expression": true,
+        "no-var-requires": false,
+        "object-literal-sort-keys": false,
+        "interface-name": [true, "never-prefix"],
+        "max-line-length": [false],
+        "jsx-no-multiline-js": false
+    }
+}