cloudrider 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6967eb055cd609bc20a3084658005853119579c5
-  data.tar.gz: 138e14c5edef36a724e82ced54539805276dac43
+  metadata.gz: 01b101e2344f6cf24a6cefe5e5bddf776b412095
+  data.tar.gz: acb45e6e80c715bc8dc745a6a70f68d601e35bfe
 SHA512:
-  metadata.gz: 7cba9bfd29fb31b84e25b5aa25e2738e7d9b3e1efa72b02ae046ee3b8b7b56bc6086d39f950a041097ac86658a939b43ba7d649c40a5bd1ff8c486d907bc23e6
-  data.tar.gz: 39a235621e0e888b3fda3f2ee58725d19bca277ff7db50ea1ad6c11e34f8c8fdd230efcfbe9727758bec2e6d64fc0388aae28eb375cbb0515e7a99d523c7241d
+  metadata.gz: 2e13b9dc710d32e2c948448b00eae35ac5226731a0721e9a9ea772e501b9b17f02a22a36f7413a44c5ca5737522fc941bc9b3b84b745665cd50a15b4c3b1fcc1
+  data.tar.gz: bfb4d7bf37f3999b5151eca69872443af26aede767236097be62dfa4ac129e16b5b37cc8e2c95249c7d754040c64e87f5060041c863ff0fac9bb90f889b09a36

data/generica/app/assets/javascripts/components/cookie-splash.js.em

@@ -1,2 +1,4 @@
 class Apiv1.CookieSplashComponent extends Ember.Component
-  classNames: ['cookie-splash']
+  classNames: ['cookie-splash']
+  logo: "assets/cookie-splash/california.png"
+  path: "products"

data/generica/app/assets/javascripts/components/preload-billboard.js.em

@@ -1,6 +1,6 @@
 class Apiv1.PreloadBillboardComponent extends Ember.Component
   classNames: ["preload-billboard"]
-
+  alreadyLoaded: false
   +computed Apiv1.ImagePreloader.instance.isLoading
   stillLoading: -> Apiv1.ImagePreloader.instance.get "isLoading"
 
@@ -9,10 +9,12 @@ class Apiv1.PreloadBillboardComponent extends Ember.Component
 
   +observer Apiv1.ImagePreloader.instance.isLoading
   manageWhichToHide: ->
+    return if @alreadyLoaded
     if @stillLoading
       $("#billboard-holder").show()
       $("#everything-else-holder").hide()
     if @finishedLoading
+      @alreadyLoaded = true
       $("#everything-else-holder").show()
       $("#billboard-holder").hide "puff", 750
 

data/generica/app/assets/javascripts/config/router.js.ls

@@ -1,4 +1,6 @@
 Apiv1.Router.map ->
+  @route "about"
+  @route "contacts"
   @resource "products", path: "/products", ->
     @resource "products.product", path: "/product/:product_id", ->
       @route "show"

data/generica/app/assets/javascripts/routes/application_route.js.em

@@ -5,7 +5,7 @@ class Apiv1.ApplicationRoute extends Ember.Route
       outlet: 'modal'
       parentView: 'application'
   modalModelFor: (modalName) ->
-    return @store.createRecord("adminSession") if modalName is "login"
+    @store.createRecord("adminSession") if modalName is "login"
   actions:
     displayModal: (modalName) ->
       $(".modal-background").show()

data/generica/app/assets/javascripts/routes/contacts_route.js.em

@@ -0,0 +1,4 @@
+class Apiv1.ContactsRoute extends Ember.Route
+  model: -> 
+    employees: @store.find("employee", per: 5)
+    message: @store.createRecord("message")

data/generica/app/assets/javascripts/routes/index_route.js.em

@@ -1,5 +1,3 @@
 class Apiv1.IndexRoute extends Ember.Route
   model: -> 
-    products: @store.find("product", per: 3, order: "showcase")
-    employees: @store.find("employee", per: 5)
-    message: @store.createRecord("message")
+    products: @store.find("product", per: 3, order: "showcase")

data/generica/app/assets/javascripts/templates/about.emblem

@@ -0,0 +1,3 @@
+cookie-splash path="about"
+
+introductory-lobby id="about"

data/generica/app/assets/javascripts/templates/components/cookie-splash.emblem

@@ -1,13 +1,13 @@
 .splash-background.standard-container
   .page-intro
     .active-page-title
-      tr-span en="products"
-      img.th.product-icon src="assets/cookie-splash/california.png"
+      tr-span en=path
+      preload-image class="th product-icon" source=logo
 
 .standard-container
   .cookiecrumbs
     .small-6.medium-4.large-3.columns.crumb
-      link-to "index" (query-params anchor="products")
+      link-to "index"
         .show-for-small-only
           i.fa.fa-chevron-left
         .hide-for-small-only.upcase

data/generica/app/assets/javascripts/templates/components/hero-splash/_splash-cta.emblem

@@ -1,7 +1,7 @@
 .splash-cta
   .cta-container
     .small-12.medium-4.columns
-      link-to "index" (query-params anchor="about") class="button expand"
+      link-to "about" class="button expand"
         span.call-to-action.spacebar
           tr-span en="about us"
         i.fa.fa-caret-down

data/generica/app/assets/javascripts/templates/components/site-nav/_material-nav.emblem

@@ -1,5 +1,5 @@
 .row.collapse
-  link-to "index" (query-params anchor="") class="small-3 medium-6 large-9 columns"
+  link-to "index" class="small-3 medium-6 large-9 columns"
     .title-area
       span.hide-for-medium-up
         i.fa.fa-home
@@ -7,8 +7,8 @@
         i.fa.fa-rocket
 
    
-  link-to "index" (query-params anchor="about") class="small-3 medium-2 large-1 columns"
-    .menu-tab
+  link-to "about" class="small-3 medium-2 large-1 columns"
+    .menu-tab 
       span.hide-for-medium-up
         i.fa.fa-info-circle
       span.menu-nav.show-for-medium-up 
@@ -21,7 +21,7 @@
       span.menu-nav.show-for-medium-up 
         tr-span en="products"
 
-  link-to "index" (query-params anchor="contacts") class="small-3 medium-2 large-1 columns"
+  link-to "contacts" class="small-3 medium-2 large-1 columns"
     .menu-tab
       span.hide-for-medium-up
         i.fa.fa-envelope

data/generica/app/assets/javascripts/templates/contacts.emblem

@@ -0,0 +1,3 @@
+cookie-splash path="contacts"
+
+table-booths id="contacts" contacts=model.employees message=model.message

data/generica/app/assets/javascripts/templates/index.emblem

@@ -1,8 +1,3 @@
 hero-splash
 
-introductory-lobby id="about"
-
-products-showcase id="products" products=model.products
-
-table-booths id="contacts" contacts=model.employees message=model.message
-
+products-showcase products=model.products

data/generica/app/varissets/javascripts/routes/index_route.js.em.erb

@@ -0,0 +1,8 @@
+class Apiv1.IndexRoute extends Ember.Route
+  model: -> 
+    products: @store.find("product", per: 3, order: "showcase")
+<% case index_style %>
+<% when :product_first, :about_first %>
+    employees: @store.find("employee", per: 5)
+    message: @store.createRecord("message")
+<% end %>    

data/generica/app/varissets/javascripts/templates/about.emblem.erb

@@ -0,0 +1,3 @@
+cookie-splash path="about"
+
+introductory-lobby id="about"

data/generica/app/varissets/javascripts/templates/components/site-nav.emblem.erb

@@ -5,17 +5,17 @@
     i.fa.fa-home
     span.capitalize.prespace <%= my_company_name %>
 .nav-button
-  link-to "index" (query-params anchor="about") class="side-nav"
+  link-to <%= about_link %> class="side-nav"
     i.fa.fa-info-circle
     span.capitalize.prespace 
       tr-span en="about"
 .nav-button
-  link-to "products.index" class="side-nav"
+  link-to <%= products_link %> class="side-nav"
     i.fa.fa-tags
     span.capitalize.prespace 
       tr-span en="products"
 .nav-button
-  link-to "index" (query-params anchor="contacts") class="side-nav"
+  link-to <%= contacts_link %> class="side-nav"
     i.fa.fa-envelope
     span.capitalize.prespace 
       tr-span en="contacts"
@@ -27,17 +27,17 @@
     .company-name.show-for-medium-up <%= my_company_name %>
 
   section.options-menu
-    link-to "index" (query-params anchor="about") class="menu-tab"
+    link-to <%= about_link %> class="menu-tab"
       .hide-for-medium-up
         i.fa.fa-info-circle
       .menu-nav.show-for-medium-up 
         tr-span en="about"
-    link-to "products.index" class="menu-tab"
+    link-to <%= products_link %> class="menu-tab"
       .hide-for-medium-up
         i.fa.fa-tags
       .menu-nav.show-for-medium-up 
         tr-span en="products"
-    link-to "index" (query-params anchor="contacts") class="menu-tab"
+    link-to <%= contacts_link %> class="menu-tab"
       .hide-for-medium-up
         i.fa.fa-envelope
       .menu-nav.show-for-medium-up 
@@ -53,21 +53,21 @@
         i.fa.fa-rocket
 
    
-  link-to "index" (query-params anchor="about") class="small-3 medium-2 large-1 columns"
+  link-to <%= about_link %> class="small-3 medium-2 large-1 columns"
     .menu-tab
       span.hide-for-medium-up
         i.fa.fa-info-circle
       span.menu-nav.show-for-medium-up 
         tr-span en="about"
   
-  link-to "products.index" class="small-3 medium-2 large-1 columns"
+  link-to <%= products_link %> class="small-3 medium-2 large-1 columns"
     .menu-tab
       span.hide-for-medium-up
         i.fa.fa-tags
       span.menu-nav.show-for-medium-up 
         tr-span en="products"
 
-  link-to "index" (query-params anchor="contacts") class="small-3 medium-2 large-1 columns"
+  link-to <%= contacts_link %> class="small-3 medium-2 large-1 columns"
     .menu-tab
       span.hide-for-medium-up
         i.fa.fa-envelope

data/generica/app/varissets/javascripts/templates/contacts.emblem.erb

@@ -0,0 +1,3 @@
+cookie-splash path="contacts"
+
+table-booths id="contacts" contacts=model.employees message=model.message

data/generica/app/varissets/javascripts/templates/index.emblem.erb

@@ -1,11 +1,13 @@
 hero-splash
-
-<% if products_first? %>
+<% case index_style %>
+<% when :pages %>
+products-showcase id="products" products=model.products
+<% when :product_first %>
 products-showcase id="products" products=model.products
 introductory-lobby id="about"
-<% else %>
-introductory-lobby id="about"
+table-booths id="contacts" contacts=model.employees
+<% when :about_first %>
 products-showcase id="products" products=model.products
-<% end %>
-
+introductory-lobby id="about"
 table-booths id="contacts" contacts=model.employees
+<% end %>

data/lib/cloudrider/apiv1/about_emblem.rb

@@ -0,0 +1,11 @@
+class Cloudrider::Apiv1::AboutEmblem < Cloudrider::Apiv1::Base
+  class Context
+    attr_accessor :index_style
+  end
+  private
+  def _context
+    Context.new.tap do |c|
+      c.index_style = (@style || :pages).to_sym
+    end
+  end
+end

data/lib/cloudrider/apiv1/contacts_emblem.rb

@@ -0,0 +1,11 @@
+class Cloudrider::Apiv1::ContactsEmblem < Cloudrider::Apiv1::Base
+  class Context
+    def products_first?
+      false
+    end
+  end
+  private
+  def _context
+    Context.new
+  end
+end

data/lib/cloudrider/apiv1/index_emblem.rb

@@ -1,11 +1,11 @@
 class Cloudrider::Apiv1::IndexEmblem < Cloudrider::Apiv1::Base
   class Context
-    def products_first?
-      false
-    end
+    attr_accessor :index_style
   end
   private
   def _context
-    Context.new
+    Context.new.tap do |c|
+      c.index_style = (@style || :pages).to_sym
+    end
   end
 end

data/lib/cloudrider/apiv1/index_route_ember.rb

@@ -0,0 +1,17 @@
+class Cloudrider::Apiv1::IndexRouteEmber < Cloudrider::Apiv1::Base
+  class Context
+    attr_accessor :index_style
+  end
+  private
+  def _folder
+    "app/assets/javascripts/templates/routes"
+  end
+  def _source_folder
+    "app/varissets/javascripts/templates/routes"
+  end
+  def _context
+    Context.new.tap do |c|
+      c.index_style = (@style || :pages).to_sym
+    end
+  end
+end

data/lib/cloudrider/apiv1/site_nav_component.rb

@@ -4,6 +4,33 @@ class Cloudrider::Apiv1::SiteNavComponent < Cloudrider::Apiv1::Base
     def my_company_name
       "Cloudrider"
     end
+
+    def about_link
+      if pages?
+        '"about"'
+      else
+        '"index" (query-params anchor="about")'
+      end
+    end
+
+    def products_link
+      if pages?
+        '"products.index"'
+      else
+        '"index" (query-params anchor="products")'
+    end
+
+    def contacts_link
+      if pages?
+        '"contacts"'
+      else
+        '"index" (query-params anchor="contacts")'
+      end
+    end
+
+    def pages?
+      true
+    end
   end
 
   private

data/lib/cloudrider/application_commander.rb

@@ -52,7 +52,12 @@ class Cloudrider::ApplicationCommander
     [Cloudrider::Apiv1::ProductListingComponent, Cloudrider::Apiv1::ProductListingSass]
   end
   def _index
-    [Cloudrider::Apiv1::IndexEmblem]
+    [
+      Cloudrider::Apiv1::IndexEmblem, 
+      Cloudrider::Apiv1::AboutEmblem, 
+      Cloudrider::Apiv1::ContactsEmblem,
+      Cloudrider::Apiv1::IndexRouteEmber
+    ]
   end
   def _cookie_splash
     [Cloudrider::Apiv1::CookieSplashComponent, Cloudrider::Apiv1::CookieSplashSass]

data/lib/cloudrider/version.rb

@@ -1,3 +1,3 @@
 module Cloudrider
-  VERSION = "0.2.14"
+  VERSION = "0.2.15"
 end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudrider
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - Thomas Chen
@@ -224,10 +224,12 @@ files:
 - generica/app/assets/javascripts/routes/admin/translations/index_route.js.em
 - generica/app/assets/javascripts/routes/admin_route.js.em
 - generica/app/assets/javascripts/routes/application_route.js.em
+- generica/app/assets/javascripts/routes/contacts_route.js.em
 - generica/app/assets/javascripts/routes/index_route.js.em
 - generica/app/assets/javascripts/routes/products/index_route.js.em
 - generica/app/assets/javascripts/routes/products_route.js.em
 - generica/app/assets/javascripts/templates/.gitkeep
+- generica/app/assets/javascripts/templates/about.emblem
 - generica/app/assets/javascripts/templates/admin.emblem
 - generica/app/assets/javascripts/templates/admin/employees/index.emblem
 - generica/app/assets/javascripts/templates/admin/employees/new.emblem
@@ -279,6 +281,7 @@ files:
 - generica/app/assets/javascripts/templates/components/tree-taxon-li.emblem
 - generica/app/assets/javascripts/templates/components/tree-taxon-ul.emblem
 - generica/app/assets/javascripts/templates/components/tree-taxon-wrapper.emblem
+- generica/app/assets/javascripts/templates/contacts.emblem
 - generica/app/assets/javascripts/templates/employees/index.emblem
 - generica/app/assets/javascripts/templates/index.emblem
 - generica/app/assets/javascripts/templates/messages/new.emblem
@@ -384,6 +387,8 @@ files:
 - generica/app/models/apiv1/translation_machine.rb
 - generica/app/models/concerns/.keep
 - generica/app/models/i18n/backend/active_record.rb
+- generica/app/varissets/javascripts/routes/index_route.js.em.erb
+- generica/app/varissets/javascripts/templates/about.emblem.erb
 - generica/app/varissets/javascripts/templates/application.emblem.erb
 - generica/app/varissets/javascripts/templates/components/cookie-splash.emblem.erb
 - generica/app/varissets/javascripts/templates/components/hero-splash.emblem.erb
@@ -395,6 +400,7 @@ files:
 - generica/app/varissets/javascripts/templates/components/site-footer.emblem.erb
 - generica/app/varissets/javascripts/templates/components/site-nav.emblem.erb
 - generica/app/varissets/javascripts/templates/components/table-booths.emblem.erb
+- generica/app/varissets/javascripts/templates/contacts.emblem.erb
 - generica/app/varissets/javascripts/templates/employees/index.emblem.erb
 - generica/app/varissets/javascripts/templates/index.emblem.erb
 - generica/app/varissets/javascripts/templates/messages/new.emblem.erb
@@ -521,15 +527,18 @@ files:
 - generica/vendor/assets/stylesheets/.keep
 - lib/cloudrider.rb
 - lib/cloudrider/apiv1.rb
+- lib/cloudrider/apiv1/about_emblem.rb
 - lib/cloudrider/apiv1/application_emblem.rb
 - lib/cloudrider/apiv1/application_sass.rb
 - lib/cloudrider/apiv1/base.rb
+- lib/cloudrider/apiv1/contacts_emblem.rb
 - lib/cloudrider/apiv1/cookie_splash_component.rb
 - lib/cloudrider/apiv1/cookie_splash_sass.rb
 - lib/cloudrider/apiv1/employees_index_emblem.rb
 - lib/cloudrider/apiv1/hero_splash_component.rb
 - lib/cloudrider/apiv1/hero_splash_sass.rb
 - lib/cloudrider/apiv1/index_emblem.rb
+- lib/cloudrider/apiv1/index_route_ember.rb
 - lib/cloudrider/apiv1/introductory_lobby_component.rb
 - lib/cloudrider/apiv1/introductory_lobby_sass.rb
 - lib/cloudrider/apiv1/messages_new_emblem.rb