decidim 0.0.6 → 0.0.7

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

@@ -17,6 +17,7 @@ en:
         destroy: Delete
         edit: Edit
         new: New %{name}
+        preview: Preview
         title: Actions
       admin:
         models:
@@ -78,6 +79,7 @@ en:
             other: "%{count} projects"
         filters:
           category: Category
+          category_prompt: Select a category
           scopes: Scopes
           search: Search
         filters_small_view:
@@ -125,6 +127,9 @@ en:
       destroy:
         error: An error ocurred while canceling your vote
         success: Your vote has been canceled successfully
+    resource_links:
+      included_proposals:
+        project_proposals: 'Proposals included in this project:'
   index:
     confirmed_orders_count: Orders count
   total_budget: Total budget

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

@@ -16,6 +16,7 @@ es:
         destroy: Borrar
         edit: Editar
         new: Nuevo %{name}
+        preview: Previsualizar
         title: Acciones
       admin:
         models:
@@ -71,6 +72,7 @@ es:
             other: "%{count} proyectos"
         filters:
           category: Categoría
+          category_prompt: Selecciona una categoría
           scopes: Ámbitos
           search: Buscar
         filters_small_view:
@@ -118,6 +120,9 @@ es:
       destroy:
         error: Ha habido un error al cancelar tu voto
         success: Tu voto ha sido cancelado correctamente
+    resource_links:
+      included_proposals:
+        project_proposals: 'Propuestas incluidas en este proyecto:'
   index:
     confirmed_orders_count: Número de votos
   total_budget: Presupuesto total

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

@@ -16,6 +16,7 @@ eu:
         destroy: Garbitu
         edit: Editatu
         new: '%{name} berria'
+        preview: Aurreikusi
         title: Ekintzak
       admin:
         models:
@@ -31,6 +32,8 @@ eu:
             title: Editatu proiektua
             update: Eguneratu proiektua
           index:
+            finished_orders: Emandako botoak
+            pending_orders: Emateke dauden botoak
             title: Proiektuak
           new:
             create: Sortu proiektua
@@ -57,7 +60,9 @@ eu:
         budget_summary:
           are_you_sure: Ziur zaude zure botoa ezeztatu nahi duzula?
           assigned: 'Esleituta:'
+          cancel_order: ezabatu ezazu botoa eta hasi berriro
           checked_out:
+            description: 'Jada bozkatu duzu aurrekonturako. Iritziz aldatu baduzu, ezeztatu hemen: %{cancel_link}.'
             title: Botoa zuzen bidali da
           description: Zure aburuz, proiektuetako zeinei esleitu behar diegu aurrekontua? Gutxienez, %{minimum_budget} esleitu nahi dituzun proiektuei, eta bozkatu aurrekontua zehazteko.
           title: Zure esku dago aurrekontua erabakitzea
@@ -67,10 +72,14 @@ eu:
             other: "%{count} proiektu"
         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
         order_progress:
           vote: Bozkatu
         order_selected_projects:
@@ -81,6 +90,9 @@ eu:
           view: Ikusi
         project:
           add: Gehitu
+          count:
+            one: 1 sostengu 
+            other: "%{count} sostengu"
           remove: Kendu
         project_budget_button:
           add: Gehitu
@@ -90,7 +102,17 @@ eu:
           view_all_projects: Ikusi proiektu guztiak
     features:
       budgets:
+        actions:
+          vote: Proiektuaren alde egin
         name: Aurrekontuak
+        settings:
+          global:
+            comments_enabled: Iruzkinak gaituta
+            total_budget: Guztizko aurrekontua
+            vote_threshold_percent: Aurrekontuaren gutxieneko ehunekoa
+          step:
+            comments_blocked: Iruzkinak blokeatuta
+            votes_enabled: Botoak gaituta
     orders:
       checkout:
         error: Errorea gertatu da zure botoa prozesatzean
@@ -98,4 +120,9 @@ eu:
       destroy:
         error: Errorea gertatu da zure botoa ezeztatzean
         success: Zure botua zuzen ezeztatu da
+    resource_links:
+      included_proposals:
+        project_proposals: 'Proiektu honetan jasotako proposamenak:'
+  index:
+    confirmed_orders_count: Boto-kopurua
   total_budget: Guztizko aurrekontua

data/decidim-budgets/spec/features/orders_spec.rb

@@ -233,5 +233,27 @@ describe "Orders", type: :feature do
       expect(page).to have_i18n_content(project.title)
       expect(page).to have_i18n_content(project.description)
     end
+
+    context "with linked proposals" do
+      let(:proposal_feature) do
+        create(:feature, manifest_name: :proposals, participatory_process: project.feature.participatory_process)
+      end
+      let(:proposals) { create_list(:proposal, 3, feature: proposal_feature) }
+
+      before do
+        project.link_resources(proposals, "included_proposals")
+      end
+
+      it "shows related proposals" do
+        visit_feature
+        click_link translated(project.title)
+
+        proposals.each do |proposal|
+          expect(page).to have_content(proposal.title)
+          expect(page).to have_content(proposal.author_name)
+          expect(page).to have_content(proposal.votes.size)
+        end
+      end
+    end
   end
 end

data/decidim-budgets/spec/shared/manage_attachments_examples.rb

@@ -9,7 +9,7 @@ RSpec.shared_examples "manage project attachments" do
     visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
 
     within find("tr", text: translated(project.title)) do
-      click_link "Attachments"
+      find("a.action-icon--attachments").click
     end
   end
 

data/decidim-budgets/spec/shared/manage_projects_examples.rb

@@ -3,7 +3,7 @@
 RSpec.shared_examples "manage projects" do
   it "updates a project" do
     within find("tr", text: translated(project.title)) do
-      click_link "Edit"
+      find("a.action-icon--edit").click
     end
 
     within ".edit_project" do
@@ -18,7 +18,7 @@ RSpec.shared_examples "manage projects" 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 projects" do
 
   context "previewing projects" do
     it "allows the user to preview the project" do
-      new_window = window_opened_by { click_link translated(project.title) }
+      within find("tr", text: translated(project.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_budgets.project_path(id: project.id, participatory_process_id: participatory_process.id, feature_id: current_feature.id)
         expect(page).to have_content(translated(project.title))
       end
@@ -61,7 +63,7 @@ RSpec.shared_examples "manage projects" do
   end
 
   it "creates a new project" do
-    find(".actions .new").click
+    click_link "New Project"
 
     within ".new_project" do
       fill_in_i18n(
@@ -86,7 +88,7 @@ RSpec.shared_examples "manage projects" do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
@@ -104,10 +106,10 @@ RSpec.shared_examples "manage projects" do
 
     it "deletes a project" do
       within find("tr", text: translated(project2.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-comments/README.md

@@ -35,6 +35,39 @@ And then execute:
 $ bundle
 ```
 
+## How to contribute
+
+The technology stack used in this module is the following:
+
+For the backend side:
+  - Ruby on Rails
+  - GraphQL
+
+For the frontend side:
+  - Typescript (introduced in #1001)
+  - React
+  - Apollo
+
+The frontend code can be found in the folder `app/frontend` instead of `app/assets`. We are using Webpack to build the React application so we are keeping the React files in a separate folder and then including the `bundle.js` file using sprockets as usual.
+
+#### Developing React components
+
+You need to execute `yarn start` in a separate terminal, in the `decidim` root folder while you are developing this module. When you are finished you can build the project for production like this: `yarn build:prod`. We are checking in the bundle into the repository.
+
+#### Run tests
+
+You can execute `yarn test` to run the javascript test suite or you can run `yarn test:watch` to listen for file changes.
+
+#### GraphQL schema and Typescript
+
+Since we are using Typescript we can generate interfaces and types from our schema using the following command:
+
+```bash
+  yarn run graphql:generate_schema_types
+```
+
+This command will create a file called `app/frontend/support/schema.ts` that can be used to strict type checking in our components.
+
 ## Contributing
 See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
 

data/decidim-comments/app/assets/javascripts/decidim/comments/comments.js.erb

@@ -1,6 +1,8 @@
 // = require_self
 // = require ./bundle
 
+window.DecidimComments = window.DecidimComments || {};
+
 window.DecidimComments = {
   assets: {
     'icons.svg': "<%= asset_path 'decidim/icons.svg' %>"

data/decidim-comments/app/frontend/application/{apollo_client.js → apollo_client.ts}

@@ -1,16 +1,16 @@
-import ApolloClient, { createNetworkInterface } from 'apollo-client';
+import ApolloClient, { createNetworkInterface } from "apollo-client";
 
 // Create a custom network interface for Apollo since our
 // API endpoint is not the default.
 const networkInterface = createNetworkInterface({
-  uri: '/api',
+  uri: "/api",
   opts: {
-    credentials: 'same-origin'
-  }
+    credentials: "same-origin",
+  },
 });
 
 const client = new ApolloClient({
-  networkInterface
+  networkInterface,
 });
 
 export default client;

data/decidim-comments/app/frontend/application/application.component.test.tsx

@@ -0,0 +1,36 @@
+import { shallow } from "enzyme";
+import * as React from "react";
+
+import * as moment from "moment";
+
+import Application from "./application.component";
+
+const { I18n } = require("react-i18nify");
+
+describe("<Application />", () => {
+  afterEach(() => {
+    I18n.setLocale("en");
+  });
+
+  it("should set I18n locale to locale prop", () => {
+    spyOn(I18n, "setLocale");
+    const locale = "ca";
+    shallow(
+      <Application locale={locale}>
+        <div>My application</div>
+      </Application>,
+    );
+    expect(I18n.setLocale).toHaveBeenCalledWith(locale);
+  });
+
+  it("should set moment locale to locale prop", () => {
+    spyOn(moment, "locale");
+    const locale = "ca";
+    shallow(
+      <Application locale={locale}>
+        <div>My application</div>
+      </Application>,
+    );
+    expect(moment.locale).toHaveBeenCalledWith(locale);
+  });
+});

data/decidim-comments/app/frontend/application/application.component.tsx

@@ -0,0 +1,37 @@
+import * as moment        from "moment";
+import * as React         from "react";
+import { ApolloProvider } from "react-apollo";
+
+import apolloClient       from "./apollo_client";
+
+const { I18n } = require("react-i18nify");
+
+interface ApplicationProps {
+  locale: string;
+}
+
+/**
+ * Wrapper component for all React applications using Apollo
+ * @class
+ * @augments Component
+ */
+export default class Application extends React.Component<ApplicationProps, undefined> {
+  constructor(props: ApplicationProps) {
+    const { locale } = props;
+
+    I18n.setLocale(locale);
+    moment.locale(locale);
+
+    super(props);
+  }
+
+  public render() {
+    const { children } = this.props;
+
+    return (
+      <ApolloProvider client={apolloClient}>
+        {children}
+      </ApolloProvider>
+    );
+  }
+}

data/decidim-comments/app/frontend/application/icon.component.test.tsx

@@ -0,0 +1,49 @@
+import { mount, shallow } from "enzyme";
+import * as React from "react";
+
+import { Icon } from "./icon.component";
+
+describe("<Icon /", () => {
+  let userAgent: string;
+
+  beforeEach(() => {
+    window.DecidimComments = {
+      assets: {
+        "icons.svg": "/assets/icons.svg",
+      },
+    };
+
+    userAgent = window.navigator.userAgent;
+  });
+
+  it("renders a simple span with the icon name", () => {
+    const wrapper = shallow(<Icon name="icon-thumb-up" userAgent={userAgent} />);
+    expect(wrapper.find("span").text()).toBe("icon-thumb-up");
+  });
+
+  it("has a default prop iconExtraClassName with value 'icon--before'", () => {
+    const wrapper = mount(<Icon name="icon-thumb-up" userAgent={userAgent} />);
+    expect(wrapper.prop("iconExtraClassName")).toBe("icon--before");
+  });
+
+  it("renders the svg with an extra class defined by iconExtraClassName", () => {
+    const wrapper = mount(<Icon name="icon-thumb-up" userAgent={userAgent} iconExtraClassName="icon--small" />);
+    expect(wrapper.find(".icon--small").exists()).toBeTruthy();
+  });
+
+  describe("if user agent is not PhantomJS neither Node", () => {
+    beforeEach(() => {
+      userAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.98 Safari/537.36";
+    });
+
+    it("should render a svg with class defined by prop className", () => {
+      const wrapper = shallow(<Icon name="icon-thumb-down" userAgent={userAgent} />);
+      expect(wrapper.find("svg.icon-thumb-down").exists()).toBeTruthy();
+    });
+
+    it("should render a svg icon using the 'icons.svg' url and name", () => {
+      const wrapper = shallow(<Icon name="icon-thumb-up" userAgent={userAgent} />);
+      expect(wrapper.find("svg use").prop("xlinkHref")).toBe("/assets/icons.svg#icon-thumb-up");
+    });
+  });
+});

data/decidim-comments/app/frontend/application/icon.component.tsx

@@ -0,0 +1,35 @@
+import * as React from "react";
+import assetUrl   from "../support/asset_url";
+
+interface IconProps {
+  name: string;
+  userAgent: string;
+  iconExtraClassName?: string;
+}
+
+export const Icon: React.SFC<IconProps> = ({ name, userAgent, iconExtraClassName }) => {
+  if (userAgent.match(/PhantomJS/) || userAgent.match(/Node/)) {
+    return <span className={`icon ${iconExtraClassName} ${name}`}>{name}</span>;
+  }
+
+  return (
+    <svg className={`icon ${iconExtraClassName} ${name}`}>
+      <use xmlnsXlink="http://www.w3.org/1999/xlink" xlinkHref={`${assetUrl("icons.svg")}#${name}`} />
+    </svg>
+  );
+};
+
+Icon.defaultProps = {
+  iconExtraClassName: "icon--before",
+};
+
+interface IconWithoutUserAgentProps {
+  name: string;
+  iconExtraClassName?: string;
+}
+
+const IconWithoutUserAgent: React.SFC<IconWithoutUserAgentProps> = ({ name, iconExtraClassName }) => (
+  <Icon name={name} userAgent={navigator.userAgent} iconExtraClassName={iconExtraClassName} />
+);
+
+export default IconWithoutUserAgent;