activity_notification 0.0.10 → 1.0.0

data/spec/rails_app/app/views/articles/_form.html.erb

@@ -2,19 +2,23 @@
   <% if @article.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(@article.errors.count, "error") %> prohibited this article from being saved:</h2>
-
       <ul>
-      <% @article.errors.full_messages.each do |message| %>
-        <li><%= message %></li>
-      <% end %>
+        <% @article.errors.full_messages.each do |message| %>
+          <li><%= message %></li>
+        <% end %>
       </ul>
     </div>
   <% end %>
 
-  <%= f.text_field :title %>
-  <%= f.text_area :body %>
-
-  <div class="actions">
-    <%= f.submit %>
+  <div class="input_wrapper">
+    <%= f.text_field :title, placeholder: "title..." %>
+  </div>
+  <div class="textarea_wrapper">
+    <%= f.text_area :body, placeholder: "body..." %>
+  </div>
+  <div class="submit_button_wrapper">
+    <button class="green_button" type="submit">
+      <%= submit_message %>
+    </button>
   </div>
-<% end %>
+<% end %>

data/spec/rails_app/app/views/articles/edit.html.erb

@@ -1,6 +1,8 @@
-<h1>Editing Article</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @article %> |
-<%= link_to 'Back', articles_path %>
+<section>
+  <h1>Editing Article</h1>
+  <%= render partial: 'form', locals: { submit_message: "Update Article" } %>
+  <div class="left_button_wrapper">
+    <%= link_to 'Show', @article, class: "gray_button" %>
+    <%= link_to 'Back', articles_path, class: "gray_button" %>
+  </div>
+</section>

data/spec/rails_app/app/views/articles/index.html.erb

@@ -1,67 +1,59 @@
-<p id="notice"><%= notice %></p>
-
-<h1>Listing Users</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% User.all.each do |user| %>
-      <tr>
-        <td><%= user.email %></td>
-        <td><%= user.name %></td>
-        <td><%= link_to 'Notifications', user_notifications_path(user) %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<h1>Listing Admins</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% Admin.all.each do |admin| %>
-      <tr>
-        <td><%= admin.user.email %></td>
-        <td><%= admin.user.name %></td>
-        <td><%= link_to 'Notifications', admin_notifications_path(admin) %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<h1>Listing Articles</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th colspan="5"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @articles.each do |article| %>
-      <tr>
-        <td><%= article.user.name %></td>
-        <td><%= article.title %></td>
-        <td><%= link_to 'Show', article %></td>
-        <td><%= link_to 'Edit', edit_article_path(article) if user_signed_in? and current_user == article.user %></td>
-        <td><%= link_to 'Destroy', article, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Article', new_article_path %>
+<section>
+  <h1>Listing Users</h1>
+  <% User.all.each do |user| %>
+    <div class="list_wrapper">
+      <div class="list_image"></div>
+      <div class="list_description_wrapper">
+        <p class="list_description">
+          <span><%= user.name %></span> · <%= user.email %><br>
+          <%= link_to 'Notifications', user_notifications_path(user) %>
+        </p>
+      </div>
+    </div>
+  <% end %>
+</section>
+
+<section>
+  <h1>Listing Admins</h1>
+  <% Admin.all.each do |admin| %>
+    <div class="list_wrapper">
+      <div class="list_image"></div>
+      <div class="list_description_wrapper">
+        <p class="list_description">
+          <span><%= admin.user.name %></span> · <%= admin.user.email %><br>
+          <%= link_to 'Notifications', admin_notifications_path(admin) %>
+        </p>
+      </div>
+    </div>
+  <% end %>
+</section>
+
+<section>
+  <div class="create_button_wrapper">
+    <%= link_to 'New Article', new_article_path, class: "create_button green_button" %>
+  </div>
+  <h1>Listing Articles</h1>
+  <% @articles.each do |article| %>
+      <div class="list_wrapper">
+        <div class="list_image large"></div>
+        <div class="list_description_wrapper">
+          <h3 class="list_title">
+            <%= link_to article.title, article %>
+          </h3>
+          <p class="list_description">
+            <span><%= article.user.name %></span> · <%= article.created_at.strftime("%b %d %H:%M") %><br>
+            <%= article.body.truncate(60) if article.body.present? %><br>
+            <%= link_to 'Read', article %>
+          </p>
+          <div class="list_button_wrapper">
+            <% if user_signed_in? and article.author?(current_user) %>
+              <%= link_to 'Edit Article', edit_article_path(article), class: "gray_button" %>
+            <% end %>
+            <% if user_signed_in? and (article.author?(current_user) or current_user.admin?) %>
+              <%= link_to 'Destroy Article', article, method: :delete, data: { confirm: 'Are you sure?' }, class: "gray_button" %>
+            <% end %>
+          </div>
+        </div>
+      </div>
+  <% end %>
+</section>

data/spec/rails_app/app/views/articles/new.html.erb

@@ -1,5 +1,7 @@
-<h1>New Article</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', articles_path %>
+<section>
+  <h1>New Article</h1>
+  <%= render partial: 'form', locals: { submit_message: "Create Article" } %>
+  <div class="left_button_wrapper">
+    <%= link_to 'Back', articles_path, class: "gray_button" %>
+  </div>
+</section>

data/spec/rails_app/app/views/articles/show.html.erb

@@ -1,38 +1,49 @@
-<p id="notice"><%= notice %></p>
-
-<h1><%= @article.title %></h1>
-<p><%= @article.user.name %></p>
-<p><%= @article.body %></p>
-<%= link_to 'Edit', edit_article_path(@article) %> |
-<%= link_to 'Destroy', @article, method: :delete, data: { confirm: 'Are you sure?' } %>
-<%= link_to 'Back', articles_path %>
-
-<h2>Listing Comments</h2>
-
-<table>
-  <thead>
-    <tr>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @article.comments.each do |comment| %>
-      <tr>
-        <td><%= comment.user.name %></td>
-        <td><%= comment.body %></td>
-        <td><%= link_to 'Destroy', comment, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
+<section>
+  <h1><%= @article.title %></h1>
+  <p><%= @article.body %></p>
+  <div class="list_wrapper">
+    <div class="list_image"></div>
+    <div class="list_description_wrapper">
+      <p class="list_description">
+        <span><%= @article.user.name %></span> · <%= @article.created_at.strftime("%b %d %H:%M") %><br>
+      </p>
+      <div class="list_button_wrapper">
+        <%= link_to 'Edit Article', edit_article_path(@article), class: "gray_button" %>
+        <%= link_to 'Destroy Article', @article, method: :delete, data: { confirm: 'Are you sure?' }, class: "gray_button" %>
+      </div>
+    </div>
+  </div>
+  <h2>Listing Comments</h2>
+  <% @article.comments.includes(:user).each do |comment| %>
+    <div class="list_wrapper">
+      <div class="list_image"></div>
+      <div class="list_description_wrapper">
+        <p class="list_description">
+          <span><%= comment.user.name %></span> · <%= comment.created_at.strftime("%b %d %H:%M") %><br>
+          <%= comment.body %>
+        </p>
+        <div class="list_button_wrapper">
+          <% if user_signed_in? and (comment.author?(current_user) or current_user.admin?) %>
+            <%= link_to 'Destroy Comment', comment, method: :delete, data: { confirm: 'Are you sure?' }, class: "gray_button" %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  <% end %>
+  <% if user_signed_in? %>
+    <%= form_for(@comment) do |f| %>
+      <%= f.hidden_field :article_id, value: @article.id %>
+        <div class="textarea_wrapper">
+          <%= f.text_area :body, placeholder: "Write a comment..." %>
+        </div>
+        <div class="submit_button_wrapper">
+          <button class="green_button" type="submit">
+            Create Comment
+          </button>
+      </div>
     <% end %>
-  </tbody>
-</table>
-
-<h2>New Comment</h2>
-<%= form_for(@comment) do |f| %>
-  <%= f.hidden_field :article_id, value: @article.id %>
-  <%= f.text_area :body %>
-
-  <div class="actions">
-    <%= f.submit %>
+  <% end %>
+  <div class="left_button_wrapper">
+    <%= link_to 'Back', articles_path, class: "gray_button" %>
   </div>
-<% end %>
+</section>

data/spec/rails_app/app/views/layouts/_header.html.erb

@@ -1,10 +1,37 @@
-<%= link_to 'Root', root_path %>
-<% if user_signed_in? %>
-  <%= "Login as #{current_user.name}" %>
-  <%= link_to 'Logout', destroy_user_session_path, method: :delete %>
-  <%#= render_notifications_of current_user, fallback: :default, index_content: :simple %>
-  <%= render_notifications_of current_user, fallback: :default, index_content: :with_attributes %>
-  <%#= render_notifications_of current_user, fallback: :default, index_content: :none %>
-<% else %>
-  <%= link_to 'Login', new_user_session_path %>
+<% if notice.present? %>
+  <div class="notice_wrapper">
+    <p class="notice">
+      <%= notice %>
+    </p>
+  </div>
 <% end %>
+
+<header>
+  <div class="header_area">
+    <div class="header_root_wrapper">
+      <%= link_to 'ActivityNotification', root_path %>
+    </div>
+    <div class="header_menu_wrapper">
+      <p>
+        <% if user_signed_in? %>
+          <%= current_user.name %>
+          <%= "(admin)" if current_user.admin? %>
+          <%= link_to 'Logout', destroy_user_session_path, method: :delete %>
+        <% else %>
+          <%= link_to 'Login', new_user_session_path %>
+        <% end %>
+      </p>
+    </div>
+    <div class="header_notification_wrapper">
+      <% if user_signed_in? %>
+        <%= render_notifications_of current_user, fallback: :default, index_content: :with_attributes %>
+      <% end %>
+    </div>
+    <div class="header_menu_wrapper">
+      <p>
+        <%= link_to 'Preview email', "/rails/mailers" %>
+        <%= " · " unless user_signed_in? %>
+      </p>
+    </div>
+  </div>
+</header>

data/spec/rails_app/app/views/layouts/application.html.erb

@@ -1,13 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Dummy</title>
-  <%#= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track': true %>
+  <title>ActivityNotification</title>
+  <%= stylesheet_link_tag 'application', media: 'all' %>
+  <%= javascript_include_tag 'application' %>
   <%= csrf_meta_tags %>
 </head>
 <body>
-<%= render 'layouts/header' %>
-<%= yield %>
+  <%= render 'layouts/header' %>
+  <article>
+    <%= yield %>
+  </article>
 </body>
-</html>
+</html>

data/spec/rails_app/config/environments/development.rb

@@ -41,4 +41,13 @@ Rails.application.configure do
 
   # For devise and notification email
   config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+
+  # For notification email preview
+  config.action_mailer.preview_path = "#{Rails.root}/lib/mailer_previews"
+
+  # Configration for bullet
+  config.after_initialize do
+    Bullet.enable = true
+    Bullet.alert = true
+  end
 end

data/spec/rails_app/config/initializers/activity_notification.rb

@@ -23,6 +23,6 @@ ActivityNotification.configure do |config|
   # config.parent_mailer = 'ActionMailer::Base'
 
   # Configure default limit number of opened notifications you can get from opened* scope
-  config.opened_limit = 10
+  config.opened_index_limit = 10
 
 end

data/spec/rails_app/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -17,54 +16,50 @@ ActiveRecord::Schema.define(version: 20160715050433) do
     t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["user_id"], name: "index_admins_on_user_id"
   end
 
-  add_index "admins", ["user_id"], name: "index_admins_on_user_id"
-
   create_table "articles", force: :cascade do |t|
     t.integer  "user_id"
     t.string   "title"
     t.string   "body"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["user_id"], name: "index_articles_on_user_id"
   end
 
-  add_index "articles", ["user_id"], name: "index_articles_on_user_id"
-
   create_table "comments", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "article_id"
     t.string   "body"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["article_id"], name: "index_comments_on_article_id"
+    t.index ["user_id"], name: "index_comments_on_user_id"
   end
 
-  add_index "comments", ["article_id"], name: "index_comments_on_article_id"
-  add_index "comments", ["user_id"], name: "index_comments_on_user_id"
-
   create_table "notifications", force: :cascade do |t|
-    t.integer  "target_id",       null: false
     t.string   "target_type",     null: false
-    t.integer  "notifiable_id",   null: false
+    t.integer  "target_id",       null: false
     t.string   "notifiable_type", null: false
+    t.integer  "notifiable_id",   null: false
     t.string   "key",             null: false
-    t.integer  "group_id"
     t.string   "group_type"
+    t.integer  "group_id"
     t.integer  "group_owner_id"
-    t.integer  "notifier_id"
     t.string   "notifier_type"
+    t.integer  "notifier_id"
     t.text     "parameters"
     t.datetime "opened_at"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["group_owner_id"], name: "index_notifications_on_group_owner_id"
+    t.index ["group_type", "group_id"], name: "index_notifications_on_group_type_and_group_id"
+    t.index ["notifiable_type", "notifiable_id"], name: "index_notifications_on_notifiable_type_and_notifiable_id"
+    t.index ["notifier_type", "notifier_id"], name: "index_notifications_on_notifier_type_and_notifier_id"
+    t.index ["target_type", "target_id"], name: "index_notifications_on_target_type_and_target_id"
   end
 
-  add_index "notifications", ["group_owner_id"], name: "index_notifications_on_group_owner_id"
-  add_index "notifications", ["group_type", "group_id"], name: "index_notifications_on_group_type_and_group_id"
-  add_index "notifications", ["notifiable_type", "notifiable_id"], name: "index_notifications_on_notifiable_type_and_notifiable_id"
-  add_index "notifications", ["notifier_type", "notifier_id"], name: "index_notifications_on_notifier_type_and_notifier_id"
-  add_index "notifications", ["target_type", "target_id"], name: "index_notifications_on_target_type_and_target_id"
-
   create_table "users", force: :cascade do |t|
     t.string   "email",                default: "", null: false
     t.string   "encrypted_password",   default: "", null: false
@@ -74,8 +69,7 @@ ActiveRecord::Schema.define(version: 20160715050433) do
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["email"], name: "index_users_on_email"
   end
 
-  add_index "users", ["email"], name: "index_users_on_email"
-
 end