tomify 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af725db32ac310b47ea7eefedfaf879b7b927040
-  data.tar.gz: 80da5c622cdb34254d793df17e2919afcef6c98a
+  metadata.gz: f9da0a49b63fcfccfb5a385fe3c09ce92ce8f426
+  data.tar.gz: fc523774e05c2622f0f442421d190fb859f3a1f4
 SHA512:
-  metadata.gz: 34a9285af9d4e3f98bc13e7173c7c0bf34ef3e932c0321bfa8bf651ad74dd06610ae64c8329675a8b0e72ff08a5cb4b6e2d6ac163f5fdb2e636b4bccd6dc37b4
-  data.tar.gz: edd76bd3edf8f8545c2895a1066187822f42e302a58176cf4374b6e88857d36a6e1e5d4f1ff87147a68802d7243d587767196f955eb21f8ac15bd725555d3771
+  metadata.gz: 2e96cb8c60cdf77201dca2a2977d394b5c64b27891791241d3a2d2b21cd85827a6530087749b6015c30a241a80affd9be4d5bf3ce6260e663594d6c0e1ef8c33
+  data.tar.gz: 290e8c20b5bac654f3d935b02406f41b31d78aed6def226aafd3573b7f076493f47fc3650c61f1b5dd8493c2f0a3c25a42e4f378d7de7fc0c6646dccc1929626

data/app/assets/javascripts/tomify/dynamic/react/components/admin/settings.coffee

@@ -4,10 +4,13 @@ model.columns = [
   { name: "public", value: (r) -> if r.public then "Yes" else "No" },
   { name: "type", value: (r) -> r.type.split("::").last },
   { name: "value", value: (r) ->
-    type = r.type.split("::").last
-    return "#{r.value}" if type == "Boolean"
-    return "JSON" if type == "Json"
-    r.value
+    return unless r.value?
+    switch type = r.type.split("::").last
+      when "Boolean" then "#{r.value}"
+      when "Uploader"
+        <a href={r.value.url} target="_blank">View</a>
+      when "Json" then "JSON"
+      else r.value
   },
   { name: "updated_at", value: (r) -> r.updated_at.date() },
   { name: "actions", edit: true, destroy: true }
@@ -22,6 +25,7 @@ newForm.add "public", "checkbox"
 newForm.add "name", "text"
 newForm.add "value", "checkbox", if: (record, changes) -> changes.type.split("::").last == "Boolean"
 newForm.add "value", "text", if: (record, changes) -> changes.type.split("::").last == "Text"
+newForm.add "value", "file", if: (record, changes) -> changes.type.split("::").last == "Uploader"
 newForm.add "json", "json", if: (record, changes) -> changes.type.split("::").last == "Json"
 
 editForm = new Form "horizontal"
@@ -29,7 +33,7 @@ editForm.add "public", "checkbox"
 editForm.add "name", "text"
 editForm.add "value", "checkbox", if: (record) -> record.type.split("::").last == "Boolean"
 editForm.add "value", "text", if: (record) -> record.type.split("::").last == "Text"
+editForm.add "value", "file", if: (record) -> record.type.split("::").last == "Uploader"
 editForm.add "json", "json", if: (record) -> record.type.split("::").last == "Json"
-# editForm.add "value", "json", if: (record) -> record.type.split("::").last == "Uploader"
 
 Component.create "Admin.Settings.Index.Container", render: -> <Index.Container name="Admin.Setting" newForm={newForm} editForm={editForm} />

data/app/assets/javascripts/tomify/dynamic/react/components/layout/header.coffee

@@ -2,27 +2,31 @@ Component.create "Layout.Header",
   render: ->
     image = setting "header_image"
     text = setting "header_text"
-    return <div /> unless image && text
+    return <div /> unless image || text
 
-    <div className="navbar navbar-default center header">
-      <div className="container-fluid">
-        <div className="row">
-          <div className="col-lg-8 col-lg-offset-2">
+    image = image && <div className="header-image">
+      <a href="/">
+        <img src={image.url} alt="Logo" />
+      </a>
+    </div>
+
+    text = text && <div className="header-text">
+      <h3>{text}</h3>
+    </div>
+
+    <div className="container-fluid header">
+      <div className="row">
+        <div className="col-md-8 col-md-offset-2">
+          {if image && text
             <div className="row">
-              <div className="col-sm-3">
-                <div className="navbar-header">
-                  <a href="/" class="navbar-brand">
-                    <img src={image.url} alt="Logo" />
-                  </a>
-                </div>
-              </div>
-              <div className="col-sm-9">
-                <div className="navbar-text">
-                  <h3>{text}</h3>
-                </div>
-              </div>
+              <div className="col-sm-3">{image}</div>
+              <div className="col-sm-9">{text}</div>
+            </div>
+          else
+            <div className="header-center">
+              {if image then image else text}
             </div>
-          </div>
+          }
         </div>
       </div>
     </div>

data/app/assets/stylesheets/tomify/_header.scss

@@ -0,0 +1,34 @@
+.header {
+  &.container-fluid {
+    margin-top: 10px;
+    margin-bottom: 10px;
+  }
+  .header-image {
+    display: inline-block;
+    height: 100%;
+    img { height: $header; }
+  }
+  .header-text {
+    line-height: $header;
+    text-align: right;
+    * {
+      margin: 0;
+      line-height: $header;
+    }
+  }
+  .header-center {
+    text-align: center;
+    .header-text { text-align: center; }
+  }
+}
+
+@media screen and (max-width: $screen-sm) {
+  .header {
+    text-align: center;
+    .header-image img {
+      height: auto;
+      max-width: 100%;
+    }
+    .header-text { text-align: center; }
+  }
+}

data/app/assets/stylesheets/tomify/_navbar.scss

@@ -10,7 +10,7 @@
 .navbar.center {
   text-align: center;
 
-  .navbar-brand img { height: 100%; }
+  .navbar-brand { height: 100%; }
 }
 
 .navbar, .alert {

data/app/assets/stylesheets/tomify/_variables.scss

@@ -7,4 +7,6 @@ $brand: $green !default;
 $brand-primary: $blue !default;
 $brand-success: $green !default;
 
+$header: 50px !default;
+
 @import "bootstrap/variables";

data/app/controllers/tomify/api/public/passwords_controller.rb

@@ -1,6 +1,7 @@
 class Tomify::Api::Public::PasswordsController < Tomify.controllers.public_api
   def create
     if user = Tomify.models.user.find_by(email: params[:password][:email])
+      user.activities.create(action: action_name, controller: controller_name)
       Tomify.mailers.user.reset_password(user).deliver_now
       render json: { type: :success, message: "Email Sent" }
     else

data/app/controllers/tomify/api/public/sessions_controller.rb

@@ -4,6 +4,7 @@ class Tomify::Api::Public::SessionsController < Tomify.controllers.public_api
     user = Tomify.models.user.find_by(email: email)
     if user && user.password_digest && user.authenticate(params[:session][:password])
       session[:current_user_id] = user.id
+      current_user.activities.create(action: action_name, controller: controller_name)
       flash[:success] = "Welcome #{current_user.name}!"
       render json: { type: :success }
     else

data/app/controllers/tomify/api/public/subscriptions_controller.rb

@@ -1,6 +1,7 @@
 class Tomify::Api::Public::SubscriptionsController < Tomify.controllers.public_api
   def destroy
     subscription = Tomify.models.subscription.find_or_create_by(email: params[:subscription][:email])
+    subscription.activities.create(action: action_name, controller: controller_name)
     if subscription.update(active: false)
       render json: { type: :success, message: "You have been unsubscribed from #{setting(:name)}" }
     else

data/app/controllers/tomify/api/public/users_controller.rb

@@ -5,6 +5,7 @@ class Tomify::Api::Public::UsersController < Tomify.controllers.public_api
 
   def create
     session[:current_user_id] = Tomify.models.user.create!(record_params).id
+    current_user.activities.create(action: action_name, controller: controller_name)
     render json: { type: :success }, success: "Welcome #{current_user.name}!"
   rescue ActiveRecord::RecordInvalid => e
     render json: { type: :warning, message: e.record.errors.full_messages.join(", ") }
@@ -12,6 +13,7 @@ class Tomify::Api::Public::UsersController < Tomify.controllers.public_api
 
   def update
     current_user.update!(record_params)
+    current_user.activities.create(action: action_name, controller: controller_name)
     render json: { type: :success, message: "Profile Updated" }
   rescue ActiveRecord::RecordInvalid => e
     render json: { type: :warning, message: e.record.errors.full_messages.join(", ") }
@@ -19,6 +21,7 @@ class Tomify::Api::Public::UsersController < Tomify.controllers.public_api
 
   def destroy
     flash[:danger] = "Goodbye #{current_user.name}"
+    current_user.activities.create(action: action_name, controller: controller_name)
     find_record
     destroy_record
     render json: { type: :success }

data/app/controllers/tomify/concerns/default/env_helper.rb

@@ -34,6 +34,6 @@ module Tomify::Concerns::Default::EnvHelper
   end
 
   def public_settings
-    Tomify.models.setting.public.as_json(only: [:name, :value])
+    Tomify.models.setting.where(public: true).as_json(only: [:name, :value])
   end
 end

data/app/models/tomify/activity.rb

@@ -0,0 +1,3 @@
+class Tomify::Activity < Tomify.models.base
+  include Tomify::Concerns::Activity
+end

data/app/models/tomify/concerns/activity.rb

@@ -0,0 +1,13 @@
+module Tomify::Concerns::Activity
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :trackable, polymorphic: true
+
+    default_scope { order(created_at: :desc) }
+  end
+
+  def trackable_kind
+    trackable_type.underscore.titleize
+  end
+end

data/app/models/tomify/concerns/subscription.rb

@@ -2,6 +2,8 @@ module Tomify::Concerns::Subscription
   extend ActiveSupport::Concern
 
   included do
+    has_many :activities, class_name: Tomify.models.activity.to_s, as: :trackable
+
     scope :active, -> { where(active: true) }
     scope :inactive, -> { where(active: false) }
   end

data/app/models/tomify/concerns/user.rb

@@ -3,6 +3,7 @@ module Tomify::Concerns::User
 
   included do
     has_secure_password validations: false
+    has_many :activities, class_name: Tomify.models.activity.to_s, as: :trackable
     has_many :tokens, class_name: Tomify.models.token.to_s, dependent: :destroy
 
     before_validation :format_email

data/app/models/tomify/setting/uploader.rb

@@ -1,6 +1,3 @@
-class Tomify::UploaderSetting < Tomify::Setting
-  mount_uploader :value, Tomify::SettingUploader
-
-  validates_presence_of :json
-  validate :metadata
+class Tomify::Setting::Uploader < Tomify::Setting
+  mount_uploader :value, Tomify.uploaders.setting
 end

data/app/models/tomify/setting.rb

@@ -9,10 +9,6 @@ class Tomify::Setting < Tomify.models.base
   after_commit :update_config
   before_destroy { |record| !record.name.in? self.class.required_settings }
 
-  def self.public
-    where(public: true)
-  end
-
   def self.required_settings
     ["allow_signup", "aws", "name", "email", "timezone"]
   end

data/app/uploaders/tomify/setting_uploader.rb

@@ -1,7 +1,3 @@
 class Tomify::SettingUploader < Tomify.uploaders.base
-  # in uploader
-  # if image
-  #   width ||= 1000000000
-  #   height ||= -1
-  #   resize_to_fill width, height
+  process resize_to_fit: [1000000000, 100]
 end

data/db/migrate/19900000000011_create_activities.rb

@@ -0,0 +1,14 @@
+class CreateActivities < ActiveRecord::Migration[5.0]
+  def change
+    create_table :activities do |t|
+      t.integer :trackable_id,   null: false
+      t.string  :trackable_type, null: false
+      t.string  :action,         null: false
+      t.string  :controller,     null: false
+
+      t.timestamps               null: false
+      t.index [:trackable_id, :trackable_type]
+      t.index [:action, :controller]
+    end
+  end
+end

data/lib/tomify/version.rb

@@ -1,3 +1,3 @@
 module Tomify
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/tomify.rb

@@ -20,6 +20,7 @@ module Tomify
 
   mattr_accessor :models
   self.models = Constantly.new(
+    activity: "Tomify::Activity",
     base: "TomifyRecord",
     page: "Tomify::Page",
     setting: "Tomify::Setting",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomify
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Tom Prats
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-06 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -304,6 +304,7 @@ files:
 - app/assets/stylesheets/_tomify.scss
 - app/assets/stylesheets/tomify/_default.scss
 - app/assets/stylesheets/tomify/_footer.scss
+- app/assets/stylesheets/tomify/_header.scss
 - app/assets/stylesheets/tomify/_navbar.scss
 - app/assets/stylesheets/tomify/_page.scss
 - app/assets/stylesheets/tomify/_pagination.scss
@@ -346,6 +347,8 @@ files:
 - app/helpers/tomify/timezone_helper.rb
 - app/mailers/tomify/user_mailer.rb
 - app/mailers/tomify_mailer.rb
+- app/models/tomify/activity.rb
+- app/models/tomify/concerns/activity.rb
 - app/models/tomify/concerns/page.rb
 - app/models/tomify/concerns/sidebar.rb
 - app/models/tomify/concerns/subscription.rb
@@ -401,6 +404,7 @@ files:
 - db/migrate/19900000000008_add_name_to_tokens.rb
 - db/migrate/19900000000009_add_invited_to_users.rb
 - db/migrate/19900000000010_add_template_to_sidebars.rb
+- db/migrate/19900000000011_create_activities.rb
 - db/seeds.rb
 - lib/generators/tomify/bundle/bundle_generator.rb
 - lib/generators/tomify/bundle/templates/default.js