tomify 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9da0a49b63fcfccfb5a385fe3c09ce92ce8f426
-  data.tar.gz: fc523774e05c2622f0f442421d190fb859f3a1f4
+  metadata.gz: d7adedc7c0800596d7cb43f4fa62d73f062c60de
+  data.tar.gz: 22f4e06750d3eff48a100d576de05fc0c6f36368
 SHA512:
-  metadata.gz: 2e96cb8c60cdf77201dca2a2977d394b5c64b27891791241d3a2d2b21cd85827a6530087749b6015c30a241a80affd9be4d5bf3ce6260e663594d6c0e1ef8c33
-  data.tar.gz: 290e8c20b5bac654f3d935b02406f41b31d78aed6def226aafd3573b7f076493f47fc3650c61f1b5dd8493c2f0a3c25a42e4f378d7de7fc0c6646dccc1929626
+  metadata.gz: 4f317a362b20c86647022e24a3bec525f70ff0b724c84df451d1d723d1de61a80e3e92fcb349fa2c2731bfbb8812f203865cd2a25e2fabc3188b531ba2d47651
+  data.tar.gz: ac43203ca348e0da245ed209dba4c2520adbe84c29f988dc5e207cccb4f94406cd43e9a2996c758946d34292c328b0b8ef2df4a5bf46788ad5924d6a10628bc3

data/app/assets/javascripts/tomify/default/array.coffee

@@ -1,4 +1,5 @@
 Object.defineProperties Array.prototype, {
+  compact: { get: -> x for x in @ when x },
   first: { get: -> @[0] },
   last: { get: -> @[@length - 1] }
 }

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

@@ -6,6 +6,14 @@ model.columns = [
   { name: "sidebar_id", value: (r) -> r.sidebar?.name ? "None" },
   { name: "name" },
   { name: "path" },
+  { name: "cover_image", value: (r) ->
+    return "None" unless r.cover_image.url
+    <a href={r.cover_image.url} target="_blank">View</a>
+  },
+  { name: "share_image", value: (r) ->
+    return "None" unless r.share_image.url
+    <a href={r.share_image.url} target="_blank">View</a>
+  },
   { name: "updated_at", value: (r) -> r.updated_at.date() },
   { name: "actions", edit: true, destroy: true, view: (r) ->
     <a key="visit" href="/#{r.path}" target="_blank">Visit</a>

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

@@ -4,7 +4,7 @@ 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) ->
-    return unless r.value?
+    return "None" unless r.value?
     switch type = r.type.split("::").last
       when "Boolean" then "#{r.value}"
       when "Uploader"

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

@@ -2,8 +2,12 @@ Component.create "Layout.AdminNavbar",
   followStores: ["user", pages: "Navbar.Admin"]
   componentWillInitialize: ->
     env = Store.find "Env"
-    Store.create "Navbar.Admin", env.get().navbar.admin || []
-    @follow env.on "change", -> pages.set(env.get().navbar.admin)
+    pages = Store.create "Navbar.Admin", env.get().navbar.admin || []
+    @follow env.on "change", -> pages.set env.get().navbar.public
+  link: (page) ->
+    <li key={page.name}>
+      <a href={page.url} target={"_blank" if page.external}>{page.name}</a>
+    </li>
   render: ->
     return <div /> unless @state.user.admin
     <div className="brand-navbar navbar navbar-default center">
@@ -19,9 +23,18 @@ Component.create "Layout.AdminNavbar",
         <div id="admin-navbar" className="navbar-collapse collapse">
           <ul className="nav navbar-nav">
             {for page in @state.pages
-              <li key={page.name}>
-                <a href="/#{page.path}">{page.name}</a>
-              </li>
+              if page.children[0]
+                <li key={page.name} className="dropdown">
+                  <a href="#" className="dropdown-toggle" data-toggle="dropdown">
+                    {page.name} <i className="fa fa-caret-down" />
+                  </a>
+                  <ul className="dropdown-menu">
+                    {@link(page) if page.url}
+                    {@link(child) for child in page.children}
+                  </ul>
+                </li>
+              else
+                @link(page)
             }
           </ul>
         </div>

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

@@ -2,8 +2,8 @@ Component.create "Layout.PublicNavbar",
   followStores: ["user", pages: "Navbar.Public"]
   componentWillInitialize: ->
     env = Store.find "Env"
-    Store.create "Navbar.Public", env.get().navbar.public || []
-    @follow env.on "change", -> pages.set(env.get().navbar.public)
+    pages = Store.create "Navbar.Public", env.get().navbar.public || []
+    @follow env.on "change", -> pages.set env.get().navbar.public
   logout: (e) ->
     e.preventDefault()
     Model.find("Public.Session").destroy().then (response) ->
@@ -11,10 +11,10 @@ Component.create "Layout.PublicNavbar",
       message type: response.type, text: response.message
   link: (page) ->
     <li key={page.name}>
-      <a href="/#{page.path}">{page.name}</a>
+      <a href={page.url} target={"_blank" if page.external}>{page.name}</a>
     </li>
   render: ->
-    root = @state.pages.find (page) -> page.root
+    root = Store.find("Pages").get().find (page) -> page.root
     <div className="navbar navbar-default center">
       <div className="container-fluid">
         <div className="navbar-header">
@@ -27,19 +27,20 @@ Component.create "Layout.PublicNavbar",
         </div>
         <div id="navbar" className="navbar-collapse collapse">
           <ul className="nav navbar-nav">
-            {if @state.user.id
-              @link(name: "Profile", path: "profile")
-            else if setting "allow_signup"
-              @link(name: "Login", path: "session")
+            {if setting "allow_signup"
+              if @state.user.id
+                @link(name: "Login", url: "/session")
+              else
+                @link(name: "Profile", url: "/profile")
             }
-            {for page in @state.pages when page.active
+            {for page in @state.pages
               if page.children[0]
                 <li key={page.name} className="dropdown">
                   <a href="#" className="dropdown-toggle" data-toggle="dropdown">
                     {page.name} <i className="fa fa-caret-down" />
                   </a>
                   <ul className="dropdown-menu">
-                    {@link(page)}
+                    {@link(page) if page.url}
                     {@link(child) for child in page.children}
                   </ul>
                 </li>

data/app/assets/javascripts/tomify/dynamic/react/components/public/profile.coffee

@@ -13,14 +13,12 @@ Component.create "Public.Profile",
     e.preventDefault()
     Model.findOrCreate("Public.User").edit()
   render: ->
-    <div className="container-fluid">
-      <div className="row text-center">
-        <div className="col-md-4 col-md-offset-4">
-          {if @state.edit
-            <Public.Users.Edit />
-          else
-            <Public.Users.Show />
-          }
-        </div>
+    <div className="row text-center">
+      <div className="dynamic-sm">
+        {if @state.edit
+          <Public.Users.Edit />
+        else
+          <Public.Users.Show />
+        }
       </div>
     </div>

data/app/assets/javascripts/tomify/dynamic/react/components/public/sessions/show.coffee

@@ -7,27 +7,25 @@ Component.create "Public.Sessions.Show",
   newPassword: ->
     @setState(newPassword: true)
   render: ->
-    <div className="container-fluid">
-      <div className="row text-center">
-        {if @state.newPassword
-          <div className="col-md-4 col-md-offset-4">
-            <Public.Passwords.New />
-          </div>
-        else if setting "allow_signup"
-          <div className="col-md-8 col-md-offset-2">
-            <div className="row">
-              <div className="col-md-6">
-                <Public.Sessions.New />
-              </div>
-              <div className="col-md-6">
-                <Public.Users.New />
-              </div>
+    <div className="row text-center">
+      {if @state.newPassword
+        <div className="dynamic-sm">
+          <Public.Passwords.New />
+        </div>
+      else if setting "allow_signup"
+        <div className="dynamic-lg">
+          <div className="row">
+            <div className="col-md-6">
+              <Public.Sessions.New />
+            </div>
+            <div className="col-md-6">
+              <Public.Users.New />
             </div>
           </div>
-        else
-          <div className="col-md-4 col-md-offset-4">
-            <Public.Sessions.New />
-          </div>
-        }
-      </div>
+        </div>
+      else
+        <div className="dynamic-sm">
+          <Public.Sessions.New />
+        </div>
+      }
     </div>

data/app/assets/javascripts/tomify/dynamic/react/components/public/subscription.coffee

@@ -13,20 +13,18 @@ Component.create "Public.Subscription",
     e.preventDefault()
     @model.destroy subscription: { email: @state.email }
   render: ->
-    <div className="container-fluid">
-      <div className="row text-center">
-        <div className="col-md-4 col-md-offset-4">
-          <h3>Unsubscribe</h3>
-          {if @state.unsubscribed
-            <p>{@state.message}</p>
-          else
-            <div>
-              <p>
-                By clicking Submit, <strong>{@state.email}</strong> will be no longer recieve the majority of emails from {setting "name"}.
-              </p>
-              <a href="#" onClick={@destroy} className="btn btn-danger" data-confirm="Are you sure?">Submit</a>
-            </div>
-          }
-        </div>
+    <div className="row text-center">
+      <div className="dynamic-sm">
+        <h3>Unsubscribe</h3>
+        {if @state.unsubscribed
+          <p>{@state.message}</p>
+        else
+          <div>
+            <p>
+              By clicking Submit, <strong>{@state.email}</strong> will be no longer recieve the majority of emails from {setting "name"}.
+            </p>
+            <a href="#" onClick={@destroy} className="btn btn-danger" data-confirm="Are you sure?">Submit</a>
+          </div>
+        }
       </div>
     </div>

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

@@ -21,6 +21,39 @@ em { font-size: 24px; }
 .panel-heading {
   h4 {
     display: inline-block;
-    a { margin-left: 10px; }
+    .btn { margin-left: 10px; }
+  }
+}
+
+.with-sidebar {
+  .dynamic-sm {
+    @include make-md-column(8);
+    @include make-md-column-offset(2);
+  }
+
+  .dynamic-md {
+    @include make-md-column(10);
+    @include make-md-column-offset(1);
+  }
+
+  .dynamic-lg {
+    @include make-md-column(12);
+  }
+}
+
+.without-sidebar {
+  .dynamic-sm {
+    @include make-md-column(4);
+    @include make-md-column-offset(4);
+  }
+
+  .dynamic-md {
+    @include make-md-column(6);
+    @include make-md-column-offset(3);
+  }
+
+  .dynamic-lg {
+    @include make-md-column(8);
+    @include make-md-column-offset(2);
   }
 }

data/app/controllers/tomify/api/admin/pages_controller.rb

@@ -1,2 +1,16 @@
 class Tomify::Api::Admin::PagesController < Tomify.controllers.admin_api
+  def permitted_attributes
+    [
+      :parent_id, :sidebar_id,
+      :active, :root, :rank,
+      :path, :name, :template,
+      :title, :description,
+      :cover_image, :share_image,
+      :text
+    ]
+  end
+
+  def serializable_options
+    { include: [:parent, :sidebar] }
+  end
 end

data/app/controllers/tomify/api/admin/settings_controller.rb

@@ -1,2 +1,9 @@
 class Tomify::Api::Admin::SettingsController < Tomify.controllers.admin_api
+  def permitted_attributes
+    [:type, :name, :public, :value, json: {}]
+  end
+
+  def serializable_options
+    { methods: [:type] }
+  end
 end

data/app/controllers/tomify/api/admin/sidebars_controller.rb

@@ -1,2 +1,5 @@
 class Tomify::Api::Admin::SidebarsController < Tomify.controllers.admin_api
+  def permitted_attributes
+    [:active, :name, :heading, :template, :text]
+  end
 end

data/app/controllers/tomify/api/admin/uploads_controller.rb

@@ -1,2 +1,5 @@
 class Tomify::Api::Admin::UploadsController < Tomify.controllers.admin_api
+  def permitted_attributes
+    [:uuid, :name, :file, :size, :content_type]
+  end
 end

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

@@ -1,16 +1,25 @@
 class Tomify::Api::Admin::UsersController < Tomify.controllers.admin_api
   before_action :not_allowed, only: [:update, :destroy]
 
+  def not_allowed
+    find_record
+    if @record.email == "tom@tomify.me" || @record.id == current_user.id
+      render json: { type: :danger, message: "You shall not pass" }
+    end
+  end
+
+  private
+  def permitted_attributes
+    [:admin, :email, :first_name, :last_name]
+  end
+
   def record_params
     attributes = super
     attributes[:invited] = true if action_name == "create"
     attributes
   end
 
-  def not_allowed
-    find_record
-    if @record.email == "tom@tomify.me" || @record.id == current_user.id
-      render json: { type: :danger, message: "You shall not pass" }
-    end
+  def serializable_options
+    { methods: [:name] }
   end
 end

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

@@ -28,6 +28,10 @@ class Tomify::Api::Public::UsersController < Tomify.controllers.public_api
   end
 
   private
+  def permitted_attributes
+    [:email, :first_name, :last_name, :password, :password_confirmation]
+  end
+
   def set_record
     @record = current_user
   end

data/app/controllers/tomify/concerns/api/admin.rb

@@ -2,8 +2,4 @@ module Tomify::Concerns::Api::Admin
   extend ActiveSupport::Concern
 
   include Tomify::Concerns::Api::JSON
-
-  def record_params
-    params.require(model_param).permit(model.admin_params)
-  end
 end

data/app/controllers/tomify/concerns/api/helpers.rb

@@ -1,6 +1,6 @@
 module Tomify::Concerns::Api::Helpers
   def find_records
-    @records ||= model.where(search_params)
+    @records ||= model.where(search_options)
   end
 
   def find_record
@@ -12,27 +12,23 @@ module Tomify::Concerns::Api::Helpers
   end
 
   def update_record
-    @record.update!(record_params)
+    record.update!(record_params)
   end
 
   def destroy_record
-    @record.destroy!
+    record.destroy!
   end
 
-  def record_params
-    params.require(model_param).permit(model.default_params)
-  end
+  # Helpers
+  def date_range(start_date, end_date = nil)
+    start_date = DateTime.strptime(start_date, "%D")
+    end_date = end_date ? DateTime.strptime(end_date, "%D") : DateTime.now
 
-  def search_params
-    @search_params = {}
-    @search_params[:created_at] = date_range(params[:created_at]) if params[:created_at]
-    @search_params[:updated_at] = date_range(params[:updated_at]) if params[:updated_at]
-    @search_params
+    (start_date.beginning_of_day)..(end_date.end_of_day)
   end
 
   def model
-    return @model if @model
-    @model = model_name.constantize rescue nil
+    @model ||= model_name.constantize rescue nil
     @model ||= "Tomify::#{model_name}".constantize
   end
 
@@ -44,10 +40,34 @@ module Tomify::Concerns::Api::Helpers
     @model_param ||= controller_name.chomp("s")
   end
 
-  def date_range(start_date, end_date = nil)
-    start_date = DateTime.strptime(start_date, "%D")
-    end_date = end_date ? DateTime.strptime(end_date, "%D") : DateTime.now
+  def record
+    @record
+  end
 
-    (start_date.beginning_of_day)..(end_date.end_of_day)
+  def records
+    @records
+  end
+
+  def record_params
+    @record_params ||= params.require(model_param).permit(permitted_attributes)
+  end
+
+  def recursive_options(association, base, depth)
+    return base if depth.zero?
+    options = base.dup
+    options[:include] ||= []
+    options[:include] << { association => recursive_options(association, base, depth - 1) }
+    options
+  end
+
+  def search_options
+    @search_options = {}
+    @search_options[:created_at] = date_range(params[:created_at]) if params[:created_at]
+    @search_options[:updated_at] = date_range(params[:updated_at]) if params[:updated_at]
+    @search_options
+  end
+
+  def serializable_options
+    @serializable_options ||= {}
   end
 end

data/app/controllers/tomify/concerns/api/json.rb

@@ -19,23 +19,23 @@ module Tomify::Concerns::Api::JSON
 
   def index
     find_records
-    render json: { type: :success, data: @records }
+    render json: { type: :success, data: data }
   end
 
   def show
     find_record
-    render json: { type: :success, data: @record }
+    render json: { type: :success, data: data }
   end
 
   def create
     create_record
-    render json: { type: :success, data: @record, message: "#{model_name} Created" }
+    render json: { type: :success, data: data, message: "#{model_name} Created" }
   end
 
   def update
     find_record
     update_record
-    render json: { type: :success, data: @record, message: "#{model_name} Updated" }
+    render json: { type: :success, data: data, message: "#{model_name} Updated" }
   end
 
   def destroy
@@ -43,4 +43,9 @@ module Tomify::Concerns::Api::JSON
     destroy_record
     render json: { type: :danger, message: "#{model_name} Deleted" }
   end
+
+  private
+  def data
+    @data ||= (record || records).as_json(serializable_options)
+  end
 end

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

@@ -2,8 +2,4 @@ module Tomify::Concerns::Api::Public
   extend ActiveSupport::Concern
 
   include Tomify::Concerns::Api::JSON
-
-  def record_params
-    params.require(model_param).permit(model.public_params)
-  end
 end

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

@@ -2,38 +2,10 @@ module Tomify::Concerns::Default::EnvHelper
   def js_env
     {
       messages: flash.collect { |key, value| { type: key, text: value }},
-      navbar: {
-        admin: admin_pages,
-        public: public_pages
-      },
-      pages: pages,
-      settings: public_settings,
+      navbar: navbar,
+      pages: Tomify.models.page.for_env,
+      settings: Tomify.models.setting.for_env,
       user: current_user
     }
   end
-
-  def admin_pages
-    [
-      { name: "App", path: "admin/settings" },
-      { name: "Pages", path: "admin/pages" },
-      { name: "Sidebars", path: "admin/sidebars" },
-      { name: "Uploads", path: "admin/uploads" },
-      { name: "Users", path: "admin/users" }
-    ]
-  end
-
-  def pages
-    Tomify.models.page.all.as_json(only: [:active, :name, :path, :root, :template, :parent_id])
-  end
-
-  def public_pages
-    Tomify.models.page.where(parent_id: nil).as_json(
-      only: [:active, :name, :path, :root],
-      include: [children: { only: [:active, :name, :path] }]
-    )
-  end
-
-  def public_settings
-    Tomify.models.setting.where(public: true).as_json(only: [:name, :value])
-  end
 end

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

@@ -0,0 +1,76 @@
+module Tomify::Concerns::Default::NavbarHelper
+  extend ActiveSupport::Concern
+
+  included do
+    class_attribute :_navbar, instance_accessor: false
+    self._navbar = {}
+
+    add_to_navbar :public, Proc.new { Tomify.models.page.for_navbar }
+    add_to_navbar :admin, [
+      { name: "App", path: "admin/settings" },
+      { name: "Pages", path: "admin/pages" },
+      { name: "Sidebars", path: "admin/sidebars" },
+      { name: "Uploads", path: "admin/uploads" },
+      { name: "Users", path: "admin/users" }
+    ]
+  end
+
+  class_methods do
+    def add_to_navbar(type, *pages)
+      self._navbar[type] ||= []
+      pages.each do |item|
+        self._navbar[type] << item
+      end
+    end
+
+    def prepend_to_navbar(type, *pages)
+      self._navbar[type] ||= []
+      pages.each do |item|
+        self._navbar[type].unshift item
+      end
+    end
+  end
+
+  def navbar
+    types = {}
+
+    self.class._navbar.each do |type, pages|
+      types[type] = []
+      pages.each do |item|
+        types[type].concat navbar_pages_from(item)
+      end
+      types[type].flatten!
+    end
+
+    types
+  end
+
+  private
+  def navbar_pages_from(item)
+    case item
+    when Proc
+      navbar_pages_from item.call
+    when Hash
+      navbar_pages_from_hash item
+    when Array
+      navbar_pages_from_array item
+    else
+      []
+    end
+  end
+
+  def navbar_pages_from_hash(hash)
+    hash.symbolize_keys!
+    return [] if hash[:active] == false
+    page = hash.slice(:children, :external, :name, :url)
+    page[:children] = navbar_pages_from page[:children]
+    page[:url] ||= "/#{hash[:path]}" if page[:children].empty?
+    [page]
+  end
+
+  def navbar_pages_from_array(array)
+    pages = []
+    array.each { |item| pages.concat navbar_pages_from(item) }
+    pages
+  end
+end

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

@@ -4,6 +4,7 @@ module Tomify::Concerns::Default
   include Tomify::Concerns::Default::Helper
   include Tomify::Concerns::Default::AuthHelper
   include Tomify::Concerns::Default::EnvHelper
+  include Tomify::Concerns::Default::NavbarHelper
   include Tomify::Concerns::Default::ReactHelper
 
   included do

data/app/helpers/tomify/carrierwave_helper.rb

@@ -4,8 +4,8 @@ module Tomify::CarrierwaveHelper
     return unless settings = Tomify.setting(:aws)
 
     descendants = CarrierWave::Uploader::Base.descendants
-    descendants.push CarrierWave::Uploader::Base
-    descendants.push CarrierWave
+    descendants << CarrierWave::Uploader::Base
+    descendants << CarrierWave
     descendants.each do |klass|
       klass.configure do |config|
         config.fog_provider = "fog/aws"

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

@@ -2,6 +2,9 @@ module Tomify::Concerns::Page
   extend ActiveSupport::Concern
 
   included do
+    mount_uploader :cover_image, Tomify.uploaders.setting
+    mount_uploader :share_image, Tomify.uploaders.setting
+
     belongs_to :sidebar, class_name: Tomify.models.sidebar.to_s, optional: true
     belongs_to :parent, class_name: self.to_s, optional: true
     has_many :children, class_name: self.to_s, foreign_key: :parent_id
@@ -35,21 +38,16 @@ module Tomify::Concerns::Page
       @files.sort_by! { |f| f == "default" ? "" : f } # Default First
     end
 
-    def admin_params
-      [
-        :parent_id, :sidebar_id,
-        :active, :root, :rank,
-        :path, :name, :template,
-        :title, :description,
-        :cover_image, :share_image,
-        :text
-      ]
+    def for_env
+      all.as_json(only: [:active, :name, :path, :root, :template, :parent_id])
     end
-  end
 
-  def serializable_hash(options = nil)
-    options = { include: [:parent, :sidebar] } if options.blank?
-    super(options)
+    def for_navbar
+      where(parent_id: nil).as_json(
+        only: [:active, :name, :path],
+        include: [children: { only: [:active, :name, :path] }]
+      )
+    end
   end
 
   private

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

@@ -10,10 +10,4 @@ module Tomify::Concerns::Sidebar
 
     to_html :text
   end
-
-  class_methods do
-    def admin_params
-      [:active, :name, :heading, :template, :text]
-    end
-  end
 end

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

@@ -17,12 +17,6 @@ module Tomify::Concerns::Upload
     uuid
   end
 
-  class_methods do
-    def admin_params
-      [:uuid, :name, :file, :size, :content_type]
-    end
-  end
-
   private
   def set_model
     self.uuid ||= SecureRandom.uuid

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

@@ -21,16 +21,6 @@ module Tomify::Concerns::User
     scope :admin, -> { where(admin: true) }
   end
 
-  class_methods do
-    def admin_params
-      [:admin, :email, :first_name, :last_name]
-    end
-
-    def public_params
-      [:email, :first_name, :last_name, :password, :password_confirmation]
-    end
-  end
-
   def name
     "#{first_name} #{last_name}"
   end
@@ -43,11 +33,6 @@ module Tomify::Concerns::User
     tokens.find_or_create_by(name: name)
   end
 
-  def serializable_hash(options = nil)
-    options = { methods: [:name] } if options.blank?
-    super options
-  end
-
   private
   def format_email
     self.email = email.try(:strip).try(:downcase)

data/app/models/tomify/setting.rb

@@ -13,13 +13,8 @@ class Tomify::Setting < Tomify.models.base
     ["allow_signup", "aws", "name", "email", "timezone"]
   end
 
-  def self.admin_params
-    [:type, :name, :public, :value, json: {}]
-  end
-
-  def serializable_hash(options = nil)
-    options ||= {}
-    super({ methods: [:type] }.update(options))
+  def self.for_env
+    Tomify.models.setting.where(public: true).as_json(only: [:name, :value])
   end
 
   private

data/app/uploaders/tomify/setting_uploader.rb

@@ -1,3 +1,26 @@
 class Tomify::SettingUploader < Tomify.uploaders.base
-  process resize_to_fit: [1000000000, 100]
+  def self.width
+    Proc.new do |uploader|
+      uploader.setting["width"] || 1000000000
+    end
+  end
+
+  def self.height
+    Proc.new do |uploader|
+      uploader.setting["height"] || 1000000000
+    end
+  end
+
+  process resize_to_fit: [width, height]
+
+  def setting_key
+    [
+      model.class.name.split("::").last.underscore,
+      mounted_as, "dimensions"
+    ].join("_")
+  end
+
+  def setting
+    Tomify.setting(setting_key) || { "width" => width, "height" => height }
+  end
 end

data/app/views/templates/contact.haml

@@ -1,6 +1,6 @@
 .container-fluid
   .row.text-center
-    .col-md-8.col-md-offset-2
+    .dynamic-md
       .page= record.text_to_html
       - if contact_email = setting(:contact_email)
         %p

data/app/views/templates/default.haml

@@ -1,4 +1,4 @@
 .container-fluid
   .row.text-center
-    .col-md-8.col-md-offset-2
+    .dynamic-md
       .page= record.text_to_html

data/app/views/tomify/defaults/_container.haml

@@ -1,5 +1,5 @@
 - sidebar = @page.sidebar if @page&.sidebar&.active
-.container-fluid
+.container-fluid{class: "with#{"out" unless sidebar }-sidebar"}
   .row
     - if sidebar
       .col-md-8= yield

data/app/views/tomify/defaults/_meta.haml

@@ -1,17 +1,20 @@
-%link(rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png")
-%link(rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png")
-%link(rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png")
-%link(rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png")
-%link(rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png")
-%link(rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png")
-%link(rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png")
-%link(rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png")
-%link(rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png")
-%link(rel="icon" type="image/png" sizes="192x192"  href="/android-icon-192x192.png")
-%link(rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png")
-%link(rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png")
-%link(rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png")
-%link(rel="manifest" href="/manifest.json")
-%meta(name="msapplication-TileColor" content="#ffffff")
-%meta(name="msapplication-TileImage" content="/ms-icon-144x144.png")
-%meta(name="theme-color" content="#ffffff")
+- if meta = setting(:meta)
+  - if meta["favicon"] == "ready"
+    %link(rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png")
+    %link(rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png")
+    %link(rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png")
+    %link(rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png")
+    %link(rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png")
+    %link(rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png")
+    %link(rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png")
+    %link(rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png")
+    %link(rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png")
+    %link(rel="icon" type="image/png" sizes="192x192"  href="/android-icon-192x192.png")
+    %link(rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png")
+    %link(rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png")
+    %link(rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png")
+    %meta(name="msapplication-TileColor" content="#ffffff")
+    %meta(name="msapplication-TileImage" content="/ms-icon-144x144.png")
+    %meta(name="theme-color" content="#ffffff")
+  - if meta["manifest"] == "ready"
+    %link(rel="manifest" href="/manifest.json")

data/lib/tomify/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomify
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Tom Prats
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -334,6 +334,7 @@ files:
 - app/controllers/tomify/concerns/default/auth_helper.rb
 - app/controllers/tomify/concerns/default/env_helper.rb
 - app/controllers/tomify/concerns/default/helper.rb
+- app/controllers/tomify/concerns/default/navbar_helper.rb
 - app/controllers/tomify/concerns/default/react_helper.rb
 - app/controllers/tomify/public/controller.rb
 - app/controllers/tomify/public/pages_controller.rb