archangel 0.3.0 → 0.4.0

data/config/locales/active_record.en.yml

@@ -7,6 +7,9 @@ en:
       archangel/collection:
         one: Collection
         other: Collections
+      archangel/design:
+        one: Design
+        other: Designs
       archangel/entry:
         one: Entry
         other: Entries
@@ -19,9 +22,6 @@ en:
       archangel/site:
         one: Site
         other: Site
-      archangel/template:
-        one: Template
-        other: Templates
       archangel/user:
         one: User
         other: Users
@@ -36,6 +36,13 @@ en:
       archangel/collection:
         name: Name
         slug: Slug
+      archangel/design:
+        content: Content
+        name: Name
+        parent_id: Parent
+        partial: Partial
+      archangel/entry:
+        published_at: Published At
       archangel/field:
         classification: Classification
         label: Label
@@ -47,23 +54,20 @@ en:
         name: Name
       archangel/page:
         content: Content
+        design_id: Design
         homepage: Homepage
         parent_id: Parent
         published_at: Published At
         slug: Slug
-        template_id: Template
         title: Title
       archangel/site:
+        allow_registration: Allow Registration
         logo: Logo
         name: Name
         remove_logo: Remove Logo
         theme: Theme
-      archangel/template:
-        content: Content
-        name: Name
-        parent_id: Parent
-        partial: Partial
       archangel/user:
+        newsletter: Subscribe to newsletter
         avatar: Avatar
         email: Email
         name: Name
@@ -72,6 +76,6 @@ en:
         username: Username
       archangel/widget:
         content: Content
+        design_id: Design
         name: Name
         slug: Slug
-        template_id: Template

data/config/locales/en.yml

@@ -7,60 +7,29 @@ en:
     are_you_sure: Are you sure?
     archangel: Archangel
     assets: Assets
-    available_at: Available At
     avatar: Avatar
     back: Back
     classification:
       boolean: Boolean
+      email: Email
+      integer: Integer
       string: String
-      text: Text
+      url: URL
     close: Close
     collection: Collection
     collections: Collections
     content: Content
     content_type: Content Type
     dashboard: Dashboard
-    datetimepicker:
-      apply: Apply
-      cancel: Cancel
-      custom_range: Custom
-      date_format: "%Y-%m-%d"
-      date_format_js: "YYYY-MM-DD"
-      datetime_format: "%Y-%m-%d %H:%M"
-      datetime_format_js: "YYYY-MM-DD HH:MM"
-      days:
-        sunday: Sun
-        monday: Mon
-        tuesday: Tue
-        wednesday: Wed
-        thursday: Thu
-        friday: Fri
-        saturday: Sat
-      from: From
-      months:
-        january: January
-        february: February
-        march: March
-        april: April
-        may: May
-        june: June
-        july: July
-        august: August
-        september: September
-        october: October
-        november: November
-        december: December
-      separator: " - "
-      time_format: "%H:%M"
-      time_format_js: "HH:MM"
-      to: To
-      week: W
+    designs: Designs
     destroy: Destroy
     duplicate_slug: duplicate slug
     duplicate_field_slug: duplicate slug
     edit: Edit
+    edit_entry_resource: Edit %{resource} Entry
     edit_resource: Edit %{resource}
     email: Email
+    email_invalid: is not a valid email address
     entries: Entries
     error_401: Access is denied due to invalid credentials
     error_404: Page not found. Could not find what was requested
@@ -94,15 +63,17 @@ en:
     metatags: Meta Tags
     name: Name
     new: New
+    new_entry_resource: New %{resource} Entry
     new_resource: New %{resource}
     no_resources: No %{resources} found.
     not_found: Not Found
     partial: Partial
     pages: Pages
-    path: Path
+    permalink: Permalink
     powered_by: Powered by
     profile: Profile
     published: Published
+    published_at: Published At
     remove_entry: Remove Entry
     remove_field: Remove Field
     remove_metatag: Remove Meta Tag
@@ -115,14 +86,10 @@ en:
     site: Site
     slug: Slug
     sort: Sort
-    sortable:
-      success: Sort order has been updated
-    subscribe_to_newsletter: Subscribe to newsletter
-    templates: Templates
     theme: Theme
     title: Title
     toggle_navigation: Toggle navigation
-    unauthorized: Unaruthorized
+    unauthorized: Unauthorized
     username: Username
     users: Users
     website: Website

data/config/locales/simple_form.en.yml

@@ -9,7 +9,8 @@ en:
       # When using html, text and mark won't be used.
       # html: '<abbr title="required">*</abbr>'
     error_notification:
-      default_message: "Please review the problems below:"
+      default_message: 'Please review the problems below:'
+    # Examples
     # labels:
     #   defaults:
     #     password: 'Password'
@@ -19,16 +20,16 @@ en:
     #     edit:
     #       email: 'E-mail.'
     hints:
-      template:
-        partial: Partial templates can only be used with Widgets
+      design:
+        partial: Partial design can only be used with Widgets
     # include_blanks:
     #   defaults:
     #     age: 'Rather not say'
     prompts:
       page:
+        design: Select design
         parent: Select parent page
-        template: Select template
-      template:
-        parent: Select parent template
+      design:
+        parent: Select parent design
       widget:
-        template: Select template
+        design: Select design

data/config/routes.rb

@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 
 Archangel::Engine.routes.draw do
-  # Pagination
-  concern :paginatable do
-    get "(page/:page)", action: :index, on: :collection, as: ""
-  end
-
   # GET    /account/login
   # POST   /account/login
   # DELETE /account/logout
@@ -37,6 +32,7 @@ Archangel::Engine.routes.draw do
              module: :devise,
              class_name: "Archangel::User",
              controllers: {
+               invitations: "archangel/auth/invitations",
                registrations: "archangel/auth/registrations"
              },
              path: "",
@@ -67,13 +63,9 @@ Archangel::Engine.routes.draw do
     # GET   /backend/site
     # PATCH /backend/site
     # PUT   /backend/site
-    resource :site, only: %i[edit show update] do
-      # GET   /backend/site/sample
-      get :sample
-    end
+    resource :site, only: %i[edit show update]
 
     # GET    /backend/assets
-    # GET    /backend/assets/page/[PAGE]
     # POST   /backend/assets
     # GET    /backend/assets/new
     # GET    /backend/assets/[ID]/edit
@@ -81,13 +73,13 @@ Archangel::Engine.routes.draw do
     # PATCH  /backend/assets/[ID]
     # PUT    /backend/assets/[ID]
     # DELETE /backend/assets/[ID]
-    resources :assets, concerns: %i[paginatable] do
+    resources :assets do
       # POST  /backend/assets/wysiwyg
-      post "wysiwyg", on: :collection
+      # POST  /backend/assets/wysiwyg.json
+      post "wysiwyg", on: :collection, defaults: { format: :json }
     end
 
     # GET    /backend/collections
-    # GET    /backend/collections/page/[PAGE]
     # POST   /backend/collections
     # GET    /backend/collections/new
     # GET    /backend/collections/[SLUG]/edit
@@ -95,9 +87,8 @@ Archangel::Engine.routes.draw do
     # PATCH  /backend/collections/[SLUG]
     # PUT    /backend/collections/[SLUG]
     # DELETE /backend/collections/[SLUG]
-    resources :collections, concerns: %i[paginatable] do
+    resources :collections do
       # GET    /backend/collections/[COLLECTION_SLUG]/entries
-      # GET    /backend/collections/[COLLECTION_SLUG]/entries/page/[PAGE]
       # POST   /backend/collections/[COLLECTION_SLUG]/entries
       # GET    /backend/collections/[COLLECTION_SLUG]/entries/new
       # GET    /backend/collections/[COLLECTION_SLUG]/entries/[ID]/edit
@@ -105,15 +96,24 @@ Archangel::Engine.routes.draw do
       # PATCH  /backend/collections/[COLLECTION_SLUG]/entries/[ID]
       # PUT    /backend/collections/[COLLECTION_SLUG]/entries/[ID]
       # DELETE /backend/collections/[COLLECTION_SLUG]/entries/[ID]
-      resources :entries, concerns: %i[paginatable] do
+      resources :entries do
         # POST  /backend/collections/[COLLECTION_SLUG]/entries/sort
         # POST  /backend/collections/[COLLECTION_SLUG]/entries/sort.json
         post "sort", on: :collection, defaults: { format: :json }
       end
     end
 
+    # GET    /backend/designs
+    # POST   /backend/designs
+    # GET    /backend/designs/new
+    # GET    /backend/designs/[ID]/edit
+    # GET    /backend/designs/[ID]
+    # PATCH  /backend/designs/[ID]
+    # PUT    /backend/designs/[ID]
+    # DELETE /backend/designs/[ID]
+    resources :designs
+
     # GET    /backend/pages
-    # GET    /backend/pages/page/[PAGE]
     # POST   /backend/pages
     # GET    /backend/pages/new
     # GET    /backend/pages/[ID]/edit
@@ -121,21 +121,9 @@ Archangel::Engine.routes.draw do
     # PATCH  /backend/pages/[ID]
     # PUT    /backend/pages/[ID]
     # DELETE /backend/pages/[ID]
-    resources :pages, concerns: %i[paginatable]
-
-    # GET    /backend/templates
-    # GET    /backend/templates/page/[PAGE]
-    # POST   /backend/templates
-    # GET    /backend/templates/new
-    # GET    /backend/templates/[ID]/edit
-    # GET    /backend/templates/[ID]
-    # PATCH  /backend/templates/[ID]
-    # PUT    /backend/templates/[ID]
-    # DELETE /backend/templates/[ID]
-    resources :templates, concerns: %i[paginatable]
+    resources :pages
 
     # GET    /backend/users
-    # GET    /backend/users/page/[PAGE]
     # POST   /backend/users
     # GET    /backend/users/new
     # GET    /backend/users/[USERNAME]/edit
@@ -143,10 +131,9 @@ Archangel::Engine.routes.draw do
     # PATCH  /backend/users/[USERNAME]
     # PUT    /backend/users/[USERNAME]
     # DELETE /backend/users/[USERNAME]
-    resources :users, concerns: %i[paginatable]
+    resources :users
 
     # GET    /backend/widgets
-    # GET    /backend/widgets/page/[PAGE]
     # POST   /backend/widgets
     # GET    /backend/widgets/new
     # GET    /backend/widgets/[SLUG]/edit
@@ -154,23 +141,23 @@ Archangel::Engine.routes.draw do
     # PATCH  /backend/widgets/[SLUG]
     # PUT    /backend/widgets/[SLUG]
     # DELETE /backend/widgets/[SLUG]
-    resources :widgets, concerns: %i[paginatable]
+    resources :widgets
 
     # GET /backend
     root to: "dashboards#show"
   end
 
   namespace :frontend, path: Archangel.config.frontend_path do
-    # GET /[PATH]
-    get ":path", to: "pages#show", as: :page,
-                 constraints: {
-                   path: %r{[\w\-\/]+}
-                 }
+    # GET /[PERMALINK]
+    get ":permalink", to: "pages#show", as: :page,
+                      constraints: {
+                        permalink: %r{[\w\-\/]+}
+                      }
 
     # GET /
-    root to: "pages#show"
+    root to: "homepages#show"
   end
 
   # GET /
-  root to: "frontend/pages#show"
+  root to: "frontend/homepages#show"
 end

data/db/migrate/20190408164034_rename_archangel_pages_path_to_permalink.rb

@@ -0,0 +1,5 @@
+class RenameArchangelPagesPathToPermalink < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :archangel_pages, :path, :permalink
+  end
+end

data/db/migrate/20190417194514_add_settings_to_archangel_sites.rb

@@ -0,0 +1,5 @@
+class AddSettingsToArchangelSites < ActiveRecord::Migration[5.2]
+  def change
+    add_column :archangel_sites, :settings, :text
+  end
+end

data/db/migrate/20190418150532_rename_archangel_templates_to_archangel_designs.rb

@@ -0,0 +1,5 @@
+class RenameArchangelTemplatesToArchangelDesigns < ActiveRecord::Migration[5.2]
+  def change
+    rename_table :archangel_templates, :archangel_designs
+  end
+end

data/db/migrate/20190418150533_rename_archangel_pages_template_id_to_design_id.rb

@@ -0,0 +1,5 @@
+class RenameArchangelPagesTemplateIdToDesignId < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :archangel_pages, :template_id, :design_id
+  end
+end

data/db/migrate/20190418150534_rename_archangel_widgets_template_id_to_design_id.rb

@@ -0,0 +1,5 @@
+class RenameArchangelWidgetsTemplateIdToDesignId < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :archangel_widgets, :template_id, :design_id
+  end
+end

data/db/migrate/20190421165525_rename_archangel_entries_available_at_to_published_at.rb

@@ -0,0 +1,5 @@
+class RenameArchangelEntriesAvailableAtToPublishedAt < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :archangel_entries, :available_at, :published_at
+  end
+end

data/db/seeds.rb

@@ -29,10 +29,7 @@ def prompt_for_admin_password
 end
 
 # Site
-curent_site = Archangel::Site.first_or_create! do |item|
-  item.name = "Archangel"
-  item.locale = "en"
-end
+curent_site = Archangel::Site.current
 
 # User
 unless curent_site.users.first
@@ -51,74 +48,72 @@ unless curent_site.users.first
     confirmed_at: Time.current
   }
 
-  curent_site.users.create!(attributes)
+  curent_site.users.create(attributes)
 end
 
 # Homepage
 curent_site.pages.published.find_or_create_by(homepage: true) do |item|
-  item.slug = "homepage-#{Time.now.to_i}"
+  item.slug = "homepage-#{Time.current.to_i}"
   item.title = "Welcome to Archangel"
-  item.content = %(
-    <p>Welcome to your new site.</p>
-  )
+  item.content = "<p>Welcome to the site.</p>"
   item.published_at = Time.current
 end
 
-# Page Template
-page_template = curent_site.templates
-                           .find_or_create_by!(partial: false) do |item|
-  item.name = "Example Page Template"
-  item.content = %(
-    <p>I think this is the beginning of a beautiful page template.</p>
-    {{ content_for_layout }}
-    <p>I think this is the end of a beautiful page template.</p>
-  )
+# Page Design
+page_design = curent_site.designs
+                         .find_or_create_by(partial: false) do |item|
+  item.name = "Example Page Design"
+  item.content = <<-DESIGN_CONTENT.strip_heredoc
+    <header>Header of the page</header>
+    <main>
+      {{ content_for_layout }}
+    </main>
+    <footer>Footer of the page</footer>
+  DESIGN_CONTENT
 end
 
 # Page
-curent_site.pages.find_or_create_by!(slug: "example-page",
-                                     template: page_template,
-                                     homepage: false) do |item|
+curent_site.pages.find_or_create_by(slug: "example-page",
+                                    design: page_design,
+                                    homepage: false) do |item|
   item.title = "Example Page"
-  item.content = %(
-    <p>I think this is the content of the page.</p>
-  )
-  item.published_at = Time.now
+  item.content = "<p>This is an example page.</p>"
+  item.published_at = Time.current
 end
 
-# Template
-widget_template = curent_site.templates
-                             .find_or_create_by!(partial: true) do |item|
-  item.name = "Example Widget Template"
-  item.content = %(
-    <p>I think this is the beginning of a beautiful widget template.</p>
-    {{ content_for_layout }}
-    <p>I think this is the end of a beautiful widget template.</p>
-  )
+# Design
+widget_design = curent_site.designs
+                           .find_or_create_by(partial: true) do |item|
+  item.name = "Example Widget Design"
+  item.content = <<-DESIGN_CONTENT.strip_heredoc
+    <aside>
+      <header>Header of the widget</header>
+      <main>
+        {{ content_for_layout }}
+      </main>
+      <footer>Footer of the widget</footer>
+    </aside>
+  DESIGN_CONTENT
 end
 
 # Widget
-curent_site.widgets.find_or_create_by!(slug: "example-widget",
-                                       template: widget_template) do |item|
+curent_site.widgets.find_or_create_by(slug: "example-widget",
+                                      design: widget_design) do |item|
   item.name = "Example Widget"
-  item.content = %(
-    <p>I think this is the content of the widget.</p>
-  )
+  item.content = "<p>This is an example widget.</p>"
 end
 
 # Collection
-collection = curent_site.collections.find_or_create_by!(
+collection = curent_site.collections.find_or_create_by(
   slug: "example-collection"
 ) do |item|
   item.name = "Example Collection"
 end
 
 # Fields
-collection.fields.find_or_create_by!(
-  collection: collection,
-  slug: "field1",
-  required: true
-) do |item|
+collection.fields.find_or_create_by(collection: collection,
+                                    slug: "field1",
+                                    required: false) do |item|
   item.label = "Field 1"
   item.classification = "string"
 end
@@ -126,5 +121,5 @@ end
 # Entry
 collection.entries.find_or_create_by(collection: collection) do |item|
   item.value = { field1: "Value for field 1" }
-  item.available_at = Time.now
+  item.published_at = Time.current
 end