activity_notification 1.0.2 → 1.1.0

data/app/controllers/activity_notification/subscriptions_with_devise_controller.rb

@@ -0,0 +1,6 @@
+module ActivityNotification
+  # Controller to manage subscriptions with Devise authentication.
+  class SubscriptionsWithDeviseController < SubscriptionsController
+    include DeviceAuthenticationController
+  end
+end

data/app/mailers/activity_notification/mailer.rb

@@ -21,16 +21,16 @@ if defined?(ActionMailer)
     #
     # @param [Object]              target        Target of batch notification email
     # @param [Array<Notification>] notifications Target notifications to send batch notification email
+    # @param [String]              batch_key     Key of the batch notification email
     # @param [Hash]                options       Options for notification email
     # @option options [String, Symbol] :fallback  (:batch_default) Fallback template to use when MissingTemplate is raised
-    # @option options [String]         :batch_key (nil)            Key of the batch notification email, a key of the first notification will be used if not specified
     # @return [Mail::Message|ActionMailer::DeliveryJob] Email message or its delivery job
-    def send_batch_notification_email(target, notifications, options = {})
+    def send_batch_notification_email(target, notifications, batch_key, options = {})
       options[:fallback] ||= :batch_default
       if options[:fallback] == :none
         options.delete(:fallback)
       end
-      batch_notification_mail(target, notifications, options)
+      batch_notification_mail(target, notifications, batch_key, options)
     end
 
   end

data/app/views/activity_notification/notifications/default/_index.html.erb

@@ -13,6 +13,9 @@
       </p>
       <p class="notification_header_menu">
         <%= link_to "Open all", open_all_notifications_path_for(@target, parameters), method: :post, remote: true %>
+        <% if @target.class.subscription_enabled? %>
+          <%= link_to "Subscriptions", subscriptions_path_for(@target) %>
+        <% end %>
       </p>
     </div>
     <div class="notifications">

data/app/views/activity_notification/notifications/default/index.html.erb

@@ -2,16 +2,14 @@
   <div class="notification_header">
     <h1>Notifications to <%= @target.printable_target_name %> <%= link_to open_all_notifications_path_for(@target, @index_options), method: :post, remote: true do %><span class="notification_count"><span class="<%= 'unopened' if @target.has_unopened_notifications?(@index_options) %>"><%= @target.unopened_notification_count(@index_options) %></span></span><% end %></h1>
   </div>
-  <ul>
-    <div class="notifications">
-      <% if @index_options[:with_group_members] %>
-        <%= render_notification @notifications, fallback: :default_without_grouping, with_group_members: true %>
-      <% else %>
-        <%= render_notification @notifications, fallback: :default %>
-        <%#= render_notification @notifications, fallback: :text %>
-      <% end %>
-    </div>
-  </ul>
+  <div class="notifications">
+    <% if @index_options[:with_group_members] %>
+      <%= render_notification @notifications, fallback: :default_without_grouping, with_group_members: true %>
+    <% else %>
+      <%= render_notification @notifications, fallback: :default %>
+      <%#= render_notification @notifications, fallback: :text %>
+    <% end %>
+  </div>
 </div>
 
 <%#= render_notifications_of @target, fallback: :default, index_content: :with_attributes %>

data/app/views/activity_notification/notifications/default/show.html.erb

@@ -1,2 +1,24 @@
-<h1>Notification for <%= "#{@target.class.to_s.underscore} (#{@target.id})" %></h1>
-<%= render_notification(@notification, fallback: :default) %>
+<div class="notification_wrapper">
+  <div class="notification_header">
+    <h1>Notification to <%= @target.printable_target_name %></h1>
+  </div>
+  <ul>
+    <div class="notifications">
+      <%= render_notification(@notification, fallback: :default) %>
+      <%#= render_notification @notification, fallback: :text %>
+    </div>
+  </ul>
+</div>
+
+<style>
+  .notification_wrapper .notification_header h1 span span{
+    color: #fff;
+    background-color: #e5e5e5;
+    border-radius: 4px;
+    font-size: 12px;
+    padding: 4px 8px;
+  }
+  .notification_wrapper .notification_header h1 span span.unopened{
+    background-color: #f87880;
+  }
+</style>

data/app/views/activity_notification/subscriptions/default/_form.html.erb

@@ -0,0 +1,52 @@
+<div class="fields_area">
+  <div class="fields_wrapper">
+    <%= form_for(ActivityNotification::Subscription.new, as: :subscription, url: subscriptions_url_for(target, option_params), data: { remote: true }) do |f| %>
+      <div class="field_wrapper">
+        <div class="field_label">
+          <%= f.label :key, "Notification key" %>
+        </div>
+        <div class="field">
+          <div class="ui text_field">
+            <%= f.text_field :key, placeholder: "Notification key" %>
+          </div>
+        </div>
+      </div>
+
+      <div class="field_wrapper subscribing">
+        <div class="field_label">
+          <label>
+            Notification
+          </label>
+        </div>
+        <div class="field">
+          <div class="ui checkbox">
+            <label>
+              <%= f.check_box :subscribing, { checked: ActivityNotification.config.subscribe_as_default }, 'true', 'false' %>
+              <div class="slider"></div>
+            </label>
+          </div>
+        </div>
+      </div>
+
+      <div class="field_wrapper subscribing_to_email <%= 'hidden' unless ActivityNotification.config.subscribe_as_default %>">
+        <div class="field_label">
+          <label>
+            Email notification
+          </label>
+        </div>
+        <div class="field">
+          <div class="ui checkbox">
+            <label>
+              <%= f.check_box :subscribing_to_email, { checked: ActivityNotification.config.subscribe_as_default }, 'true', 'false' %>
+              <div class="slider"></div>
+            </label>
+          </div>
+        </div>
+      </div>
+
+      <div class="ui button">
+        <button type="submit">Create subscription</button>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/activity_notification/subscriptions/default/_notification_keys.html.erb

@@ -0,0 +1,89 @@
+<% if notification_keys.present? %>
+  <div class="fields_area">
+    <% notification_keys.each do |key| %>
+      <div class="fields_wrapper">
+        <%= form_for(ActivityNotification::Subscription.new, as: :subscription, url: subscriptions_url_for(target, option_params), data: { remote: true }) do |f| %>
+          <%= f.hidden_field :key, value: key %>
+          <div class="fields_title_wrapper">
+            <h3 class="fields_title">
+              <%= key %>
+            </h3>
+            <p>
+              <%= link_to "Notifications", notifications_path_for(target, filtered_by_key: key) %>
+            </p>
+          </div>
+          <div class="field_wrapper subscribing">
+            <div class="field_label">
+              <label>
+                Notification
+              </label>
+            </div>
+
+            <div class="field">
+              <div class="ui checkbox">
+                <label>
+                  <%= f.check_box :subscribing, { checked: ActivityNotification.config.subscribe_as_default }, 'true', 'false' %>
+                  <div class="slider"></div>
+                </label>
+              </div>
+            </div>
+          </div>
+
+          <div class="field_wrapper subscribing_to_email <%= 'hidden' unless ActivityNotification.config.subscribe_as_default %>">
+            <div class="field_label">
+              <label>
+                Email notification
+              </label>
+            </div>
+            <div class="field">
+              <div class="ui checkbox">
+                <label>
+                  <%= f.check_box :subscribing_to_email, { checked: ActivityNotification.config.subscribe_as_default }, 'true', 'false' %>
+                  <div class="slider"></div>
+                </label>
+              </div>
+            </div>
+          </div>
+
+          <div class="ui button">
+            <button type="submit">Configure subscription</button>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+<% else %>
+  <div class="fields_area">
+    <div class="fields_wrapper">
+      No notification keys are available.
+    </div>
+  </div>
+<% end %>
+
+<!--
+<%# if notification_keys.present? %>
+<%# notification_keys.each do |key| %>
+    Key: <%#= key %>
+<%#= form_for(ActivityNotification::Subscription.new, as: :subscription, url: subscriptions_url_for(target, option_params), data: {remote: true}) do |f| %>
+<%#= f.hidden_field :key, value: key %>
+      <div class="field">
+        <%#= f.label :subscribing, "Subscribe to this notification?" %>
+<%#= f.check_box :subscribing, {checked: true}, 'true', 'false' %>
+      </div>
+      <div class="field">
+        <%#= f.label :subscribing_to_email, "Subscribe to this notification email?" %>
+<%#= f.check_box :subscribing_to_email, {checked: true}, 'true', 'false' %>
+      </div>
+      <div class="actions">
+        <%#= f.submit "Save" %>
+      </div>
+    <%# end %>
+<%#= link_to "See notifications", notifications_path_for(target, filtered_by_key: key) %>
+    <br/><br/>
+  <%# end %>
+<%# else %>
+  No notification keys are available.
+<%# end %>
+<br/><br/>
+-->
+

data/app/views/activity_notification/subscriptions/default/_subscription.html.erb

@@ -0,0 +1,73 @@
+<div class="fields_wrapper configured">
+  <div class="fields_title_wrapper">
+    <h3 class="fields_title">
+      <%= subscription.key %>
+    </h3>
+
+    <p>
+      <%= link_to "Notifications", notifications_path_for(subscription.target, filtered_by_key: subscription.key) %>
+    </p>
+  </div>
+
+  <div class="field_wrapper subscribing">
+    <div class="field_label">
+      <label>
+        Notification
+      </label>
+    </div>
+    <div class="field">
+      <div class="ui checkbox">
+        <% if subscription.subscribing? %>
+          <%= link_to unsubscribe_path_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", false);$(this).parent().parent().parent().next().slideUp();', method: :post, remote: true do %>
+            <%= check_box :subscribing, "", { checked: true }, 'true', 'false' %>
+            <div class="slider"></div>
+          <% end %>
+        <% else %>
+          <% if ActivityNotification.config.subscribe_as_default %>
+            <%= link_to subscribe_path_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", true);$(this).parent().parent().parent().next().slideDown();$(this).parent().parent().parent().next().find("input").prop("checked", true);', method: :post, remote: true do %>
+              <%= check_box :subscribing, "", { checked: false }, 'true', 'false' %>
+              <div class="slider"></div>
+            <% end %>
+          <% else %>
+            <%= link_to subscribe_path_for(subscription, option_params.merge(with_email_subscription: false)), onclick: '$(this).find("input").prop("checked", true);$(this).parent().parent().parent().next().slideDown();', method: :post, remote: true do %>
+              <%= check_box :subscribing, "", { checked: false }, 'true', 'false' %>
+              <div class="slider"></div>
+            <% end %>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+  <div class="field_wrapper subscribing_to_email <%= 'hidden' unless subscription.subscribing? %>">
+    <div class="field_label">
+      <label>
+        Email notification
+      </label>
+    </div>
+    <div class="field">
+      <div class="ui checkbox">
+        <% if subscription.subscribing_to_email? %>
+          <%= link_to unsubscribe_to_email_url_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", false)', method: :post, remote: true do %>
+            <label>
+              <%= check_box :subscribing_to_email, "", { checked: true }, 'true', 'false' %>
+              <div class="slider"></div>
+            </label>
+          <% end %>
+        <% else %>
+          <%= link_to subscribe_to_email_url_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", true)', method: :post, remote: true do %>
+            <label>
+              <%= check_box :subscribing_to_email, "", { checked: false }, 'true', 'false' %>
+              <div class="slider"></div>
+            </label>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+  <div class="ui button">
+    <%#= link_to "Show", subscription_path_for(subscription, option_params), class: "button" %>
+    <%= link_to "Destroy", subscription_path_for(subscription, option_params), method: :delete, remote: true, data: { confirm: 'Are you sure?' }, class: "button" %>
+  </div>
+</div>

data/app/views/activity_notification/subscriptions/default/_subscriptions.html.erb

@@ -0,0 +1,13 @@
+<% if subscriptions.present? %>
+  <div class="fields_area">
+    <% subscriptions.each do |subscription| %>
+      <%= render 'subscription', subscription: subscription, option_params: option_params %>
+    <% end %>
+  </div>
+<% else %>
+  <div class="fields_area">
+    <div class="fields_wrapper">
+      No subscriptions are available.
+    </div>
+  </div>
+<% end %>

data/app/views/activity_notification/subscriptions/default/create.js.erb

@@ -0,0 +1,5 @@
+$("#subscriptions").html("<%= escape_javascript( render 'subscriptions', subscriptions: @subscriptions, option_params: @index_options ) %>");
+$("#notification_keys").html("<%= escape_javascript( render 'notification_keys', target: @target, notification_keys: @notification_keys, option_params: @index_options ) %>");
+$("#subscription_form").html("<%= escape_javascript( render 'form', target: @target, option_params: @index_options ) %>");
+
+loadSubscription();

data/app/views/activity_notification/subscriptions/default/destroy.js.erb

@@ -0,0 +1,5 @@
+$("#subscriptions").html("<%= escape_javascript( render 'subscriptions', subscriptions: @subscriptions, option_params: @index_options ) %>");
+$("#notification_keys").html("<%= escape_javascript( render 'notification_keys', target: @target, notification_keys: @notification_keys, option_params: @index_options ) %>");
+$("#subscription_form").html("<%= escape_javascript( render 'form', target: @target, option_params: @index_options ) %>");
+
+loadSubscription();

data/app/views/activity_notification/subscriptions/default/index.html.erb

@@ -0,0 +1,197 @@
+<div class="subscription_wrapper">
+  <% unless @subscriptions.nil? %>
+    <div class="subscription_header">
+      <h1>Configured subscriptions</h1>
+    </div>
+    <div class="subscriptions" id="subscriptions">
+      <%= render 'subscriptions', subscriptions: @subscriptions, option_params: @index_options %>
+    </div>
+  <% end %>
+
+  <% unless @notification_keys.nil? %>
+    <div class="subscription_header">
+      <h1>Unconfigured notification keys</h1>
+    </div>
+    <div class="notification_keys" id="notification_keys">
+      <%= render 'notification_keys', target: @target, notification_keys: @notification_keys, option_params: @index_options %>
+    </div>
+  <% end %>
+
+  <div class="subscription_header">
+    <h1>Create a new subscription</h1>
+  </div>
+  <div class="subscription_form" id="subscription_form">
+    <%= render 'form', target: @target, option_params: @index_options %>
+  </div>
+</div>
+
+<style>
+  .fields_area {
+    border: 1px solid #e5e5e5;
+    width: 600px;
+    box-sizing: border-box;
+    margin-bottom: 30px;
+  }
+
+  .fields_area .fields_wrapper {
+    position: relative;
+    background-color: #fff;
+    padding: 20px;
+    box-sizing: border-box;
+    border-bottom: 1px solid #e5e5e5;
+  }
+  .fields_area .fields_wrapper.configured {
+    background-color: #f8f9fb;
+  }
+
+  .fields_area .fields_wrapper:last-child {
+    border-bottom: none;
+  }
+
+  .fields_area .fields_wrapper .fields_title_wrapper {
+    margin-bottom: 16px;
+    border-bottom: none;
+  }
+
+  .fields_area .fields_wrapper .fields_title_wrapper .fields_title {
+    font-size: 16px;
+    font-weight: bold;
+  }
+
+  .fields_area .fields_wrapper .fields_title_wrapper p {
+    position: absolute;
+    top: 15px;
+    right: 15px;
+  }
+
+  .fields_area .fields_wrapper .field_wrapper {
+    margin-bottom: 16px;
+  }
+
+  .fields_area .fields_wrapper .field_wrapper:last-child {
+    margin-bottom: 0;
+  }
+
+  .fields_area .fields_wrapper .field_wrapper.hidden {
+    display: none;
+  }
+
+  .fields_area .fields_wrapper .field_wrapper .field_label {
+    margin-bottom: 8px;
+  }
+
+  .fields_area .fields_wrapper .field_wrapper .field_label label {
+    font-size: 14px;
+  }
+
+  .ui label {
+    font-size: 14px;
+  }
+
+  /* button */
+  .ui.button button,
+  .ui.button .button {
+    cursor: pointer;
+    color: #4f4f4f;
+    font-weight: bold;
+    font-size: 12px;
+    padding: 10px 14px;
+    margin-left: 10px;
+    border: 1px solid #e5e5e5;
+    background-color: #fafafa;
+  }
+
+  .ui.button button:first-child,
+  .ui.button .button:first-child {
+    margin-left: 0;
+  }
+
+  .ui.text_field input {
+    margin: 0;
+    outline: 0;
+    padding: 10px;
+    font-size: 14px;
+    border: 1px solid #e5e5e5;
+    border-radius: 3px;
+    box-shadow: 0 0 0 0 transparent inset;
+  }
+
+  /* checkbox */
+  .ui.checkbox {
+    position: relative;
+    left: 300px;
+    margin-top: -26px;
+    width: 40px;
+  }
+
+  .ui.checkbox input {
+    position: absolute;
+    margin-left: -9999px;
+    visibility: hidden;
+  }
+
+  .ui.checkbox .slider {
+    display: block;
+    position: relative;
+    cursor: pointer;
+    outline: none;
+    user-select: none;
+
+    padding: 2px;
+    width: 36px;
+    height: 20px;
+    background-color: #dddddd;
+    border-radius: 20px;
+  }
+
+  .ui.checkbox .slider:before,
+  .ui.checkbox .slider:after {
+    display: block;
+    position: absolute;
+    top: 1px;
+    left: 1px;
+    bottom: 1px;
+    content: "";
+  }
+
+  .ui.checkbox .slider:before {
+    right: 1px;
+    background-color: #f1f1f1;
+    border-radius: 20px;
+    transition: background 0.4s;
+  }
+
+  .ui.checkbox .slider:after {
+    width: 20px;
+    background-color: #fff;
+    border-radius: 100%;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3);
+    transition: margin 0.4s;
+  }
+
+  .ui.checkbox input:checked + .slider:before {
+    background-color: #8ce196;
+  }
+
+  .ui.checkbox input:checked + .slider:after {
+    margin-left: 18px;
+  }
+</style>
+
+<script>
+  loadSubscription();
+  function loadSubscription() {
+    $(".field_wrapper.subscribing").find("input[type='checkbox']").change(function () {
+      $thisFieldWrapper = $(this).parent().parent().parent().parent();
+      if ($(this).prop('checked')) {
+        $thisFieldWrapper.next().slideDown();
+        $thisFieldWrapper.next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_as_default %>);
+      } else {
+        $thisFieldWrapper.next().slideUp();
+        setTimeout(function () {
+          $thisFieldWrapper.next().find("input[type='checkbox']").prop("checked", false);
+        }, 400);
+      }
+    })
+  }
+</script>