tomify 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57007dacbc53ef0792f799a4dd59ddc0f1fbd1aa
-  data.tar.gz: c599f317a3bd1b022c2b6d3e1a5b108e5abb14a1
+  metadata.gz: 8ad48b3ce738012cd5586f14612a7c57517bde4d
+  data.tar.gz: 1fc96ad471a7221bfdebc6940b09dad8f628d5c1
 SHA512:
-  metadata.gz: 219e26d3ce04cf98995c401ac4264f90932d316080ea2a4cec2427bbfb793302478087037f0c6731129e3cd2cb117ebf0eeb0003156d55803336ec3d7a258c25
-  data.tar.gz: 931fcab4e391dcf69120fa1cbc71d2e460687388cc6be7f13e930f923f9ed6a4b1a29d24f8263b23437394db93081fd7f802dc786d869a95f7855f3108a82e30
+  metadata.gz: 71950755f898ab68dc1eb8254c872ebf9ca23241b50dfce9e236bac9985802142dc0db297cb0e70e752613f73e1356a2917527a379c9ff0387cb731268c6fdbe
+  data.tar.gz: cc9a1edaefeaf2fb3091de2269d2de8d146e6a84ef212898e2663af1a834316db39c0e8caeeeb0b79bd9bf17bf003b9fa6ed6b884bc69b23320388379a904735

data/app/assets/javascripts/tomify/dynamic/global.coffee

@@ -1,12 +1,16 @@
 Store.create "Messages", []
+Store.create "Page", {}
 Store.create "Pages", []
 Store.create "Params", {}
+Store.create "Plugins", []
 Store.create "Settings", []
 Store.create "User", {}
+
 env = Store.create "Env", {}
 env.on "change", ->
   current = Store.find("Env").get()
   Store.find("Messages").set current.messages
+  Store.find("Page").set current.page
   Store.find("Pages").set current.pages
   Store.find("Settings").set current.settings
   Store.find("User").set current.user ? {}
@@ -30,3 +34,4 @@ $ ->
   page = Store.find("Pages").get().find (page) -> page.template == template
   page ?= { path: path ? template }
   if page.root then "/" else "/#{page.path}"
+@addPlugin = (plugin) -> Store.find("Plugins").push plugin

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

@@ -24,6 +24,7 @@ form.add "parent_id", "select", model: "Admin.Page", allowBlank: true
 form.add "sidebar_id", "select", model: "Admin.Sidebar", allowBlank: true
 form.add "active", "checkbox"
 form.add "root", "checkbox", label: "If checked, this page will be available at <a href='/' target='_blank'>#{location.origin}</a>"
+form.add "feedback", "checkbox"
 form.add "rank", "number"
 form.add "name", "text"
 form.add "template", "select", options: <%= Tomify::Page.templates %>

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

@@ -0,0 +1,10 @@
+Component.create "Layout.Plugins",
+  followStores: ["plugins"]
+  render: ->
+    <div>
+      {for plugin, i in @state.plugins
+        Plugin = Component.find plugin
+
+        <Plugin key={i} />
+      }
+    </div>

data/app/assets/javascripts/tomify/dynamic/react/components/public/feedback-button.coffee

@@ -0,0 +1,10 @@
+Component.create "Public.FeedbackButton",
+  followStores: ["page"]
+  render: ->
+    return <div /> unless @state.page.feedback
+
+    <a href="#{path 'feedback'}?page=#{encodeURIComponent(location.href)}" className="feedback-button" title="Feedback">
+      <i className="fa fa-meh-o fa-2x" />
+    </a>
+
+@addPlugin "Public.FeedbackButton"

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

@@ -13,6 +13,7 @@ Component.create "Public.Feedback",
     @form = form.setComponent @
     @follow @model.on "create", @modelCreate
     @model.new()
+    @form.changes.merge page: Store.find("Params").get("page")
   modelCreate: (response) ->
     message type: response.type, text: response.message
     @form.changes.set {} if response.type == "success"

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

@@ -0,0 +1,16 @@
+.feedback-button {
+  width: 50px;
+  height: 50px;
+  position: fixed;
+  bottom: 20px;
+  right: 20px;
+  padding: 11px 0;
+  color: $white;
+  background-color: $brand;
+  border-radius: 50%;
+  text-align: center;
+  &:active, &:focus, &:hover {
+    color: $white;
+    background-color: $brand-primary;
+  }
+}

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

@@ -3,11 +3,10 @@ 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
+      :active, :root, :feedback,
+      :rank, :path, :name,
+      :template, :title, :description,
+      :cover_image, :share_image, :text
     ]
   end
 

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

@@ -6,7 +6,7 @@ class Tomify::Api::Public::FeedbackController < Tomify.controllers.public_api
 
   private
   def permitted_attributes
-    [:name, :email, :subject, :message]
+    [:name, :email, :subject, :message, :page]
   end
 
   def record_params

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

@@ -3,6 +3,7 @@ module Tomify::Concerns::Default::EnvHelper
     {
       messages: flash.collect { |key, value| { type: key, text: value }},
       navbar: navbar,
+      page: page.for_env,
       pages: Tomify.models.page.for_env,
       settings: Tomify.models.setting.for_env,
       user: current_user

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

@@ -8,6 +8,6 @@ module Tomify::Concerns::Default::Helper
   end
 
   def page
-    @page || root_page
+    @page || Tomify.models.page.default
   end
 end

data/app/controllers/tomify/public/pages_controller.rb

@@ -1,4 +1,10 @@
 class Tomify::Public::PagesController < Tomify.controllers.public
+  rescue_from "ActionController::RoutingError" do |e|
+    raise unless request.path[1..-1].in? ["feedback"]
+
+    render component: "Public.#{request.path[1..-1].capitalize}"
+  end
+
   def show
     @page = Tomify.models.page.find_by(path: params[:path]) || not_found
 

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

@@ -26,7 +26,13 @@ module Tomify::Concerns::Page
 
   class_methods do
     def root
-      find_by(root: true) || new(root: true, name: "Home", path: "", template: "default")
+      find_by(root: true) || default
+    end
+
+    def default
+      feedback = Tomify.setting :feedback
+      feedback = feedback.nil? ? true : feedback
+      new(name: "Home", path: "", template: "default", feedback: feedback)
     end
 
     def templates
@@ -39,7 +45,14 @@ module Tomify::Concerns::Page
     end
 
     def for_env
-      all.as_json(only: [:active, :name, :path, :root, :template, :parent_id])
+      all.as_json(env_serializable_options)
+    end
+
+    def env_serializable_options
+      { only: [
+        :active, :feedback, :name, :path,
+        :root, :template, :parent_id
+      ]}
     end
 
     def for_navbar
@@ -50,6 +63,10 @@ module Tomify::Concerns::Page
     end
   end
 
+  def for_env
+    as_json(self.class.env_serializable_options)
+  end
+
   private
   def parent_valid?
     errors.add(:parent_id) if parent && parent.id == id

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

@@ -6,3 +6,4 @@
   = tomify_render_for :footer, :layout
   = tomify_render_for :env, :layout
   = tomify_render_for :analytics, :layout
+  = tomify_render_for :plugins, :layout

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

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

data/db/migrate/19900000000012_create_feedback.rb

@@ -6,6 +6,7 @@ class CreateFeedback < ActiveRecord::Migration[5.0]
       t.string  :email,                    null: false
       t.string  :subject,                  null: false
       t.string  :message,                  null: false
+      t.string  :page
       t.boolean :resolved, default: false, null: false, index: true
 
       t.timestamps

data/db/migrate/19900000000013_add_feedback_button_to_pages.rb

@@ -0,0 +1,5 @@
+class AddFeedbackButtonToPages < ActiveRecord::Migration[5.0]
+  def change
+    add_column :pages, :feedback, :boolean, default: true, null: false
+  end
+end

data/lib/tomify/version.rb

@@ -1,3 +1,3 @@
 module Tomify
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomify
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tom Prats
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -286,9 +286,11 @@ files:
 - app/assets/javascripts/tomify/dynamic/react/components/layout/header.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/layout/messages.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/layout/navbar.coffee
+- app/assets/javascripts/tomify/dynamic/react/components/layout/plugins.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/layout/public_navbar.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/new.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/pagination.coffee
+- app/assets/javascripts/tomify/dynamic/react/components/public/feedback-button.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/public/feedback.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/public/passwords/new.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/public/profile.coffee
@@ -311,6 +313,7 @@ files:
 - app/assets/stylesheets/tomify/_navbar.scss
 - app/assets/stylesheets/tomify/_page.scss
 - app/assets/stylesheets/tomify/_pagination.scss
+- app/assets/stylesheets/tomify/_plugins.scss
 - app/assets/stylesheets/tomify/_variables.scss
 - app/controllers/tomify/admin/controller.rb
 - app/controllers/tomify/admin/feedback_controller.rb
@@ -383,7 +386,6 @@ files:
 - app/uploaders/tomify_uploader.rb
 - app/views/templates/contact.haml
 - app/views/templates/default.haml
-- app/views/templates/feedback.haml
 - app/views/templates/sidebar.haml
 - app/views/tomify/defaults/_body.haml
 - app/views/tomify/defaults/_container.haml
@@ -421,6 +423,7 @@ files:
 - db/migrate/19900000000010_add_template_to_sidebars.rb
 - db/migrate/19900000000011_create_activities.rb
 - db/migrate/19900000000012_create_feedback.rb
+- db/migrate/19900000000013_add_feedback_button_to_pages.rb
 - db/seeds.rb
 - lib/generators/tomify/bundle/bundle_generator.rb
 - lib/generators/tomify/bundle/templates/default.js

data/app/views/templates/feedback.haml

@@ -1 +0,0 @@
-= react_component "Public.Feedback"