spina 2.0.2 → 2.3.0

data/config/routes.rb

@@ -11,24 +11,29 @@ Rails.application.routes.draw do
 end
 
 Spina::Engine.routes.draw do
+  
+  # API
+  namespace :api, path: Spina.config.api_path do
+    resources :pages, only: [:index, :show]
+    resources :navigations, only: [:index, :show]
+    resources :resources, only: [:index, :show] do
+      resources :pages, only: [:index, :show]
+    end
+    resources :images, only: [:show]
+  end
 
   # Backend
   namespace :admin, path: Spina.config.backend_path do
     root to: "pages#index"
 
-    resource :account do
-      member do
-        get :style
-        get :analytics
-        get :social
-      end
-    end
+    resource :account
+    resource :theme, controller: :theme
 
     get "/settings/:plugin", to: "settings#edit", as: :edit_settings
     patch "/settings/:plugin", to: "settings#update", as: :settings
 
     resources :users
-
+    
     # Sessions
     resources :sessions
     get "login" => "sessions#new"
@@ -37,18 +42,25 @@ Spina::Engine.routes.draw do
     # Passwords
     resources :password_resets
 
-    # Media library
-    get 'media_library' => 'images#index', as: "media_library"
-
     resources :pages do
-      get :children, on: :member
+      member do
+        get :edit_content
+        get :edit_template
+        get :children
+      end
+      
+      resource :move, controller: "move_pages"
+
       post :sort, on: :collection
     end
+    resources :parent_pages
+    resource :layout, controller: :layout, only: [:edit, :update]
 
     resources :resources, only: [:show, :edit, :update]
 
     resources :navigations do
       post :sort, on: :member
+      resources :navigation_items
     end
 
     resources :attachments do
@@ -59,25 +71,20 @@ Spina::Engine.routes.draw do
         post 'insert_collection/:page_part_id' => 'attachments#insert_collection', as: :insert_collection
       end
     end
+    resources :rename_files
 
-    resources :media_folders
-
-    resources :images do
-      collection do
-        get 'folder/:id' => 'images#media_folder', as: :media_folder
-        put 'folder/:id' => 'images#add_to_media_folder', as: :add_to_media_folder
-      end
+    resources :media_folders do
+      resources :images
     end
-    get :media_picker, to: 'media_picker#show'
-    post :media_picker, to: 'media_picker#select'
+
+    resources :images
+    
+    resource :media_picker, controller: "media_picker", only: [:show]
   end
 
   # Sitemap
   resource :sitemap
 
-  # Robots.txt
-  get '/robots', to: 'pages#robots', constraints: { format: 'txt' }
-
   unless Spina.config.disable_frontend_routes
     # Frontend
     root to: "pages#homepage"

data/lib/generators/spina/install_generator.rb

@@ -50,7 +50,6 @@ module Spina
       theme = ::Spina::Account.first.theme
       if theme.in? ['default', 'demo']
         template "config/initializers/themes/#{theme}.rb"
-        directory "app/assets/stylesheets/#{theme}"
         directory "app/views/#{theme}"
         directory "app/views/layouts/#{theme}"
       end

data/lib/generators/spina/templates/app/views/default/pages/homepage.html.erb

@@ -0,0 +1,2 @@
+<h1><%= current_page.title %>
+<%= content.html :text %>

data/lib/generators/spina/templates/app/views/default/pages/show.html.erb

@@ -0,0 +1,3 @@
+<h1><%= current_page.title %></h1>
+<%= content.html(:text) %>
+

data/lib/generators/spina/templates/app/views/default/shared/_navigation.html.erb

@@ -0,0 +1,2 @@
+<% presenter = Spina::MenuPresenter.new(Spina::Page.all) %>
+<%= presenter.to_html %>

data/lib/generators/spina/templates/app/views/demo/pages/demo.html.erb

@@ -0,0 +1,25 @@
+<h1><%= current_page.title %></h1>
+<%= content :option %>
+
+<%= content :headline %>
+<%= content.text :headline %>
+<%= content.html :body %>
+
+<% if has_content?(:image) %>
+  <%= content.image_tag :image, resize_to_fill: [100, 100] %>
+<% end %>
+
+<%= current_account.content :line %>
+
+<% repeater current_account.content(:repeater) do |repeater_content| %>
+  <%= repeater_content.content :line %>
+<% end %>
+
+<% images :image_collection do |image| %>
+  <%= content.image_tag image, resize_to_fill: [50, 50] %>
+<% end %>
+
+<% repeater :repeater do |project| %>
+  <%= project.content.html :line %>
+  <%= project.content.image_tag :image, resize_to_fill: [50, 50] %>
+<% end %>

data/lib/generators/spina/templates/app/views/demo/pages/homepage.html.erb

@@ -0,0 +1,3 @@
+<h1><%= current_page.title %></h1>
+<%= content.html(:body) %>
+

data/lib/generators/spina/templates/app/views/demo/pages/show.html.erb

@@ -0,0 +1,3 @@
+<h1><%= current_page.title %></h1>
+<%= content.html(:text) %>
+

data/lib/generators/spina/templates/app/views/demo/shared/_languages.html.erb

@@ -0,0 +1,5 @@
+<% if Spina.config.locales.size > 1 %>
+  <div id="languages">
+    <%= Spina.config.locales.map{|l| link_to_unless(l == I18n.locale, l.upcase, root_url(params: {locale: l}))}.join(' / ').html_safe %>
+  </div>
+<% end %>

data/lib/generators/spina/templates/app/views/demo/shared/_navigation.html.erb

@@ -0,0 +1,2 @@
+<% presenter = Spina::MenuPresenter.new(Spina::Page.all) %>
+<%= presenter.to_html %>

data/lib/generators/spina/templates/app/views/layouts/default/application.html.erb

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><%= current_account.name %></title>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <%= render 'default/shared/navigation' %>
+    
+    <%= yield %>
+  </body>
+</html>

data/lib/generators/spina/templates/app/views/layouts/demo/application.html.erb

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><%= current_account.name %></title>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <%= render 'demo/shared/languages' %>
+    <%= render 'demo/shared/navigation' %>
+    
+    <%= yield %>
+  </body>
+</html>

data/lib/generators/spina/templates/config/initializers/mobility.rb

@@ -9,6 +9,7 @@ Mobility.configure do
     cache
     presence
     fallbacks false # default to false, enable if passed fallbacks: true
+    locale_accessors
     default
   end
 end

data/lib/generators/spina/templates/config/initializers/spina.rb

@@ -1,20 +1,60 @@
-Spina.configure do |config|
-  # Set locales
-  config.locales = [:en]
-  # Run `rake spina:update_translations` after you add any new locale.
-
-  # Important Note
-  # ==============
-
-  # You MUST restart your server before changes to this file
-  # will take effect.
+Spina.configure do |config|  
+  # Locales
+  # ===============
+  # All locales your content should be available in.
+  # config.locales = [I18n.default_locale]
 
+  # Backend path
+  # ===============
   # Specify a backend path. Defaults to /admin.
   # config.backend_path = 'admin'
   
+  # Frontend routes
+  # ===============
+  # Uncomment the config below to disable all frontend routes.
+  # You'll have to write your own.
+  # config.disable_frontend_routes = true
+  
+  # Embedded image size
+  # ===============
+  # Images that are inserted in rich text fields are resized automatically.
+  # You can define your desired dimensions here.
+  # config.embedded_image_size = [2000, 2000]
+  
+  # Thumbnail image size
+  # ===============
+  # Thumbnail images for the API are generated using `resize_to_fill`.
+  # config.thumbnail_image_size = [400, 400]
+  
+  # Parent controller
+  # ===============
   # The parent controller all frontend Spina controllers inherit from
   # Defaults to ApplicationController
   # config.frontend_parent_controller = "ApplicationController"
+  
+  # Authentication
+  # ===============
+  # Specify the module that handles authentication
+  # You can swap this out for something like Devise, or you can use your own authentication.
+  # The default is Spina::Authentication::Sessions and includes basic user management
+  # config.authentication = "Spina::Authentication::Sessions"
+  
+  # API
+  # ===============
+  # Set an API key to activate Spina's API. 
+  # It's highly recommended to use Rails credentials to store this API key.
+  # config.api_key = Rails.application.credentials.spina_api_key
+  # config.api_path = 'api'
+  
+  # Background jobs
+  # ===============
+  # By default, all background jobs are queued as :default
+  # config.queues.page_updates = :default
+
+  # Confetti
+  # ===============
+  # For people who don't appreciate confetti, you can disable that here.
+  # config.party_pooper = true
 
   # Pages Options
   # ===============
@@ -22,6 +62,10 @@ Spina.configure do |config|
   # Note that you might need to remove cached asset after changing this value
   # config.max_page_depth = 5
 
-  # Base css color for Spina
-  config.primary_color = '#6865b4'
+  # Transliterations
+  # ===============
+  # Set provided transliterations for normalizing url slugs
+  # %i( bulgarian cyrillic danish german greek latin macedonian norwegian 
+  #     romanian russian serbian spanish swedish ukrainian vietnamese)
+  # config.transliterations = %i(latin)
 end

data/lib/generators/spina/templates/config/initializers/themes/default.rb

@@ -1,40 +1,62 @@
-::Spina::Theme.register do |theme|
+# Theme configuration file
+# ========================
+# This file is used for all theme configuration.
+# It's where you define everything that's editable in Spina CMS.
 
+Spina::Theme.register do |theme|
+  # All views are namespaced based on the theme's name
   theme.name = 'default'
-  theme.title = 'Default Theme'
-
-  theme.parts = [{
-    name: 'text',
-    title: "Text",
-    part_type: "Spina::Parts::Text"
-  }]
-
-  theme.view_templates = [{
-    name:       'homepage',
-    title:      'Homepage',
-    parts: ['text']
-  }, {
-    name: 'show',
-    title:        'Default',
-    description:  'A simple page',
-    usage:        'Use for your content',
-    parts:   ['text']
-  }]
-
-  theme.custom_pages = [{
-    name:           'homepage',
-    title:          'Homepage',
-    deletable:      false,
-    view_template:  'homepage'
-  }]
-
-  theme.navigations = [{
-    name: 'mobile',
-    label: 'Mobile'
-  }, {
-    name: 'main',
-    label: 'Main navigation',
-    auto_add_pages: true
-  }]
-
+  theme.title = 'Default theme'
+  
+  # Parts 
+  # Define all editable parts you want to use in your view templates
+  # 
+  # Built-in part types:
+  # - Line
+  # - MultiLine
+  # - Text (Rich text editor)
+  # - Image
+  # - ImageCollection
+  # - Attachment
+  # - Option
+  # - Repeater
+  theme.parts = [
+    {name: 'text',  title: "Body", part_type: "Spina::Parts::Text"}
+  ]
+  
+  # View templates
+  # Every page has a view template stored in app/views/my_theme/pages/*
+  # You define which parts you want to enable for every view template
+  # by referencing them from the theme.parts configuration above.
+  theme.view_templates = [
+    {name: 'homepage', title: 'Homepage', parts: %w(text)}, 
+    {name: 'show', title: 'Page', parts: %w(text)}
+  ]
+  
+  # Custom pages
+  # Some pages should not be created by the user, but generated automatically.
+  # By naming them you can reference them in your code.
+  theme.custom_pages = [
+    {name: 'homepage', title: "Homepage", deletable: false, view_template: "homepage"},
+  ]
+  
+  # Navigations (optional)
+  # If your project has multiple navigations, it can be useful to configure multiple
+  # navigations.
+  theme.navigations = [
+    {name: 'main', label: 'Main navigation'}
+  ]
+  
+  # Layout parts (optional)
+  # You can create global content that doesn't belong to one specific page. We call these layout parts.
+  # You only have to reference the name of the parts you want to have here.
+  theme.layout_parts = []
+  
+  # Resources (optional)
+  # Think of resources as a collection of pages. They are managed separately in Spina
+  # allowing you to separate these pages from the 'main' collection of pages.
+  theme.resources = []
+  
+  # Plugins (optional)
+  theme.plugins = []
 end

data/lib/generators/spina/templates/config/initializers/themes/demo.rb

@@ -1,73 +1,72 @@
-::Spina::Theme.register do |theme|
+# Theme configuration file
+# ========================
+# This file is used for all theme configuration.
+# It's where you define everything that's editable in Spina CMS.
 
+Spina::Theme.register do |theme|
+  # All views are namespaced based on the theme's name
   theme.name = 'demo'
   theme.title = 'Demo theme'
 
-  theme.layout_parts = ['line', 'body']
+  # Parts 
+  # Define all editable parts you want to use in your view templates
+  # 
+  # Built-in part types:
+  # - Line
+  # - MultiLine
+  # - Text (Rich text editor)
+  # - Image
+  # - ImageCollection
+  # - Attachment
+  # - Option
+  # - Repeater
+  theme.parts = [
+    {name: 'repeater', title: "Repeater", part_type: "Spina::Parts::Repeater", parts: %w(line image headline)}, 
+    {name: 'line', title: "Line", part_type: "Spina::Parts::Line"}, 
+    {name: 'body', title: "Body", part_type: "Spina::Parts::Text"}, 
+    {name: "image_collection", title: "Image collection", part_type: "Spina::Parts::ImageCollection"},
+    {name: 'image', title: "Image", part_type: "Spina::Parts::Image"}, 
+    {name: 'headline', title: "Headline", part_type: "Spina::Parts::Line"}, 
+    {name: 'footer', title: "Footer", part_type: "Spina::Parts::Text"}
+  ]
 
-  # New config
-  theme.parts = [{
-    name: 'repeater',
-    title: "Repeater",
-    part_type: "Spina::Parts::Repeater",
-    parts: ['line', 'image', 'headline', 'image_collection']
-  }, {
-    name: 'line',
-    title: "Line",
-    part_type: "Spina::Parts::Line"
-  }, {
-    name: 'body',
-    title: "Body",
-    part_type: "Spina::Parts::Text"
-  }, {
-    name: "image_collection",
-    title: "Image collection",
-    part_type: "Spina::Parts::ImageCollection"
-  }, {
-    name: 'image',
-    title: "Image",
-    part_type: "Spina::Parts::Image"
-  }, {
-    name: 'headline',
-    title: "Headline",
-    part_type: "Spina::Parts::Line"
-  }, {
-    name: 'footer',
-    title: "Footer",
-    part_type: "Spina::Parts::Text"
-  }]
+  # View templates
+  # Every page has a view template stored in app/views/my_theme/pages/*
+  # You define which parts you want to enable for every view template
+  # by referencing them from the theme.parts configuration above.
+  theme.view_templates = [
+    {name: 'homepage', title: 'Homepage', parts: %w(headline body image_collection)}, 
+    {name: 'show', title: 'Default', parts: %w(body image repeater)}, 
+    {name: 'demo', title: 'Demo', parts: %w(body image_collection image repeater)}
+  ]
 
-  theme.view_templates = [{
-    name: 'homepage',
-    title: 'Homepage',
-    page_parts: [],
-    parts: ['headline', 'body', 'image_collection']
-  }, {
-    name: 'show',
-    title: 'Default',
-    usage: 'Use for your content',
-    page_parts: [],
-    parts: ['body', 'image', 'repeater']
-  }, {
-    name: 'demo',
-    title: 'Demo',
-    description: 'Contains examples of every page part',
-    page_parts: [],
-    parts: ['body', 'image_collection', 'image', 'repeater']
-  }]
-
-  theme.custom_pages = [{
-    name:           'homepage',
-    title:          'Homepage',
-    deletable:      false,
-    view_template:  'homepage'
-  }, {
-    name:           'demo',
-    title:          'Demo',
-    deletable:      true,
-    view_template:  'demo'
-  }]
+  # Custom pages
+  # Some pages should not be created by the user, but generated automatically.
+  # By naming them you can reference them in your code.
+  theme.custom_pages = [
+    {name: 'homepage', title: 'Homepage', deletable: false, view_template: 'homepage'}, 
+    {name: 'demo', title: 'Demo', deletable: true, view_template: 'demo'}
+  ]
+  
+  # Navigations (optional)
+  # If your project has multiple navigations, it can be useful to configure multiple
+  # navigations.
+  theme.navigations = [
+    {name: 'main', label: 'Main navigation'}
+  ]
+  
+  # Layout parts (optional)
+  # You can create global content that doesn't belong to one specific page. We call these layout parts.
+  # You only have to reference the name of the parts you want to have here.
+  theme.layout_parts = []
+  
+  # Resources (optional)
+  # Think of resources as a collection of pages. They are managed separately in Spina
+  # allowing you to separate these pages from the 'main' collection of pages.
+  theme.resources = [
+    {name: 'articles', label: "Articles", view_template: "article", slug: "articles"}
+  ]
 
+  # Plugins (optional)
   theme.plugins = ['reviews']
-
 end