beerdb-admin 0.1.0 → 0.1.1

data/Manifest.txt

@@ -4,6 +4,10 @@ README.md
 Rakefile
 app/assets/javascripts/beer_db_admin/application.js
 app/assets/stylesheets/beer_db_admin/application.css.scss
+app/assets/stylesheets/beer_db_admin/button.css.scss
+app/assets/stylesheets/beer_db_admin/flash.css.scss
+app/assets/stylesheets/beer_db_admin/navbar.css.scss
+app/assets/stylesheets/beer_db_admin/settings.css.scss
 app/controllers/beer_db_admin/beer_db_admin_controller.rb
 app/controllers/beer_db_admin/beers_controller.rb
 app/controllers/beer_db_admin/bookmarks_controller.rb
@@ -41,6 +45,7 @@ app/views/beer_db_admin/shared/_bookmarks.html.erb
 app/views/beer_db_admin/shared/_breweries_for_country.html.erb
 app/views/beer_db_admin/shared/_breweries_for_region.html.erb
 app/views/beer_db_admin/shared/_brewery_tags.html.erb
+app/views/beer_db_admin/shared/_countries.html.erb
 app/views/beer_db_admin/shared/_tags.html.erb
 app/views/beer_db_admin/tags/index.html.erb
 app/views/beer_db_admin/time/index.html.erb

data/README.md

@@ -13,9 +13,14 @@ Open beer web admin addon / rails engine
 Try the `beer.db` web admin demo running
 on Heroku [`prost.herokuapp.com`](http://prost.herokuapp.com).
 
+
 ## Usage
 
-TBD
+### Rails
+
+In your routes (`config/routes.rb`) mount the beer.db.admin app; add the line:
+
+    mount BeerDbAdmin::Server, :at => '/db'
 
 
 ## License
@@ -27,3 +32,4 @@ Use it as you please with no restrictions whatsoever.
 
 Send them along to the [Open Beer Database & Friends Forum/Mailing List](http://groups.google.com/group/beerdb).
 Thanks!
+

data/app/assets/stylesheets/beer_db_admin/button.css.scss

@@ -0,0 +1,84 @@
+//////////////////////////////////////
+// button primay (bnt-primary)
+
+.btn-primary
+{
+   display: inline-block;
+   padding: 4px 10px 4px;
+   text-align: center;
+   color: $btn-primary-text;
+   @include linear-gradient(top, $btn-primary-gradient-top,
+                                 $btn-primary-gradient-bottom,
+                                 $fallback: $btn-primary-gradient-fallback);
+   @include border-radius(4px);
+   cursor: pointer;
+   border: 1px solid $btn-primary-border;
+   white-space: nowrap;
+}
+
+
+a {
+  &.btn-primary,
+  &.btn-primary:visited,
+  &.btn-primary:hover
+  {
+    color: $btn-primary-text;
+    text-decoration: none;
+  }
+
+  &.btn-primary:hover
+  {
+    background-color: $btn-primary-hover-background; // note: doesn't work (may be inline w/o background prop??)
+  }
+}
+
+//////////////////////
+// button (btn)
+
+.btn
+{
+   display: inline-block;
+   padding: 4px 10px 4px;
+   text-align: center;
+   color: $btn-text;
+   @include linear-gradient(top, $btn-gradient-top,
+                                 $btn-gradient-bottom,
+                                 $fallback: $btn-gradient-fallback);
+   @include border-radius(4px);
+   cursor: pointer;
+   border: 1px solid $btn-border;
+   white-space: nowrap;
+}
+
+a {
+  &.btn,
+  &.btn:visited,
+  &.btn:hover
+  {
+    color: $btn-text;
+    text-decoration: none;
+  }
+
+  &.btn:hover
+  {
+    background-color: $btn-hover-background; // note: doesn't work (may be inline w/o background prop??)
+  }
+}
+
+/////////////////////
+// color style classes for test page (use like <span class='color btn-primary-gradient-top'></span>)
+    
+
+.btn-primary-text { background-color: $btn-primary-text; }
+.btn-primary-hover-background { background-color: $btn-primary-hover-background; }
+.btn-primary-gradient-top { background-color: $btn-primary-gradient-top; }
+.btn-primary-gradient-bottom { background-color: $btn-primary-gradient-bottom; }
+.btn-primary-gradient-fallback { background-color: $btn-primary-gradient-fallback; }
+.btn-primary-border { background-color: $btn-primary-border; }
+
+.btn-text { background-color: $btn-text; }
+.btn-hover-background { background-color: $btn-hover-background; }
+.btn-gradient-top { background-color: $btn-gradient-top; }
+.btn-gradient-bottom { background-color: $btn-gradient-bottom; }
+.btn-gradient-fallback { background-color: $btn-gradient-fallback; }
+.btn-border { background-color: $btn-border; }

data/app/assets/stylesheets/beer_db_admin/flash.css.scss

@@ -0,0 +1,50 @@
+.flash {
+   padding: 8px 14px; // (1) top,bottom (2) right,left
+   @include border-radius(4px);
+
+   &.error, &.fatal {
+    color: $error-text;
+    background-color: $error-background;
+    border: 1px solid $error-border;
+  }
+
+   &.success {
+     color: $success-text;
+     background-color: $success-background;
+     border: 1px solid $success-border;
+   }
+
+   &.notice, &.info {
+     color: $notice-text;
+     background-color: $notice-background;
+     border: 1px solid $notice-border;
+   }
+   
+   &.warn, &.warning {
+     color: $warning-text;
+     background-color: $warning-background;
+     border: 1px solid $warning-border;
+   }
+}
+
+
+/////////////////////
+// color style classes for test page (use like <span class='color error-background'></span>)
+
+// todo: nest inside color (e.g. color { &.error-text {}} ) ???
+    
+.error-text { background-color: $error-text; }
+.error-background { background-color: $error-background; }
+.error-border { background-color: $error-border; }
+
+.success-text { background-color: $success-text; }
+.success-background { background-color: $success-background; }
+.success-border { background-color: $success-border; }
+
+.notice-text { background-color: $notice-text; }
+.notice-background { background-color: $notice-background; }
+.notice-border { background-color: $notice-border; }
+
+.warning-text { background-color: $warning-text; }
+.warning-background { background-color: $warning-background; }
+.warning-border { background-color: $warning-border; }

data/app/assets/stylesheets/beer_db_admin/navbar.css.scss

@@ -0,0 +1,129 @@
+.navbar {
+    @include linear-gradient(top, $navbar-gradient-top,
+                                  $navbar-gradient-bottom,
+                                  $fallback: $navbar-gradient-fallback);
+
+/* @include linear-gradient(top, blue,
+navy);
+*/
+
+    color: $navbar-text;
+    padding: 10px 20px;
+    /* text-align: right; */
+    margin-bottom: 6px;
+
+     a,
+     a:visited {
+       text-decoration: none;
+       color: $navbar-text;
+     }
+     
+     a:hover {
+       text-decoration: underline;
+       color: $navbar-text;
+     }
+     
+     .signin, .signin *,
+     .signout, .signout * {
+       font-size: $base-font-size*0.80;
+     }
+     
+     .logo {
+        a,a:visited,a:hover {
+           text-decoration: none;
+           color: $navbar-text;
+        }
+    }
+}
+
+
+$admin-navbar-gradient-top: red;
+$admin-navbar-gradient-bottom: maroon;
+$admin-navbar-text: white;
+
+.admin.navbar {
+    @include linear-gradient(top, $admin-navbar-gradient-top, $admin-navbar-gradient-bottom);
+
+/* @include linear-gradient(top, blue,
+navy);
+*/
+
+    color: $admin-navbar-text;
+    padding: 10px 20px;
+    /* text-align: right; */
+    margin-bottom: 6px;
+
+     a,
+     a:visited {
+       text-decoration: none;
+       color: $admin-navbar-text;
+     }
+     
+     a:hover {
+       text-decoration: underline;
+       color: $admin-navbar-text;
+     }
+     
+     .signin, .signin *,
+     .signout, .signout * {
+       font-size: $base-font-size*0.80;
+     }
+     
+     .logo {
+        a,a:visited,a:hover {
+           text-decoration: none;
+           color: $admin-navbar-text;
+        }
+    }
+}
+
+
+$db-navbar-gradient-top: lime;
+$db-navbar-gradient-bottom: green;
+$db-navbar-text: white;
+
+.db.navbar {
+    @include linear-gradient(top, $db-navbar-gradient-top, $db-navbar-gradient-bottom);
+
+/* @include linear-gradient(top, blue,
+navy);
+*/
+
+    color: $db-navbar-text;
+    padding: 10px 20px;
+    /* text-align: right; */
+    margin-bottom: 6px;
+
+     a,
+     a:visited {
+       text-decoration: none;
+       color: $db-navbar-text;
+     }
+     
+     a:hover {
+       text-decoration: underline;
+       color: $db-navbar-text;
+     }
+     
+     .signin, .signin *,
+     .signout, .signout * {
+       font-size: $base-font-size*0.80;
+     }
+     
+     .logo {
+        a,a:visited,a:hover {
+           text-decoration: none;
+           color: $db-navbar-text;
+        }
+    }
+}
+
+
+
+/////////////////////
+// color style classes for test page (use like <span class='color navbar-gradient-top'></span>)
+     
+.navbar-text { background-color: $navbar-text; }
+.navbar-gradient-top { background-color: $navbar-gradient-top; }
+.navbar-gradient-bottom { background-color: $navbar-gradient-bottom; }
+.navbar-gradient-fallback { background-color: $navbar-gradient-fallback; }

data/app/assets/stylesheets/beer_db_admin/settings.css.scss

@@ -0,0 +1,95 @@
+/////////////////////////////////////
+// global settings w/ variables
+//
+// note: for web colors see en.wikipedia.org/wiki/Web_colors
+
+
+$base-font-size: 18px; // was 20px
+$base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+
+
+///////////////////////
+// navbar
+
+$navbar-text: white;
+$navbar-gradient-top: #333;
+$navbar-gradient-bottom: #222;
+$navbar-gradient-fallback: #2C2C2C;
+
+
+//////////////////////////
+// breadcrumb
+
+// todo: fix breadcrumb - use gradient colors (see bootstrap)
+// $breadcrumbText:
+$breadcrumb-background: lightgrey;
+$breadcrumb-border: silver;
+
+
+//////////////////////////
+// buttons
+
+// todo: use bootstrap variable names for btn and btn-primary?
+
+$btn-primary-text: white;
+$btn-primary-hover-background: #04C;
+$btn-primary-gradient-top: #08C;
+$btn-primary-gradient-bottom: #04C;
+$btn-primary-gradient-fallback: #04C;
+$btn-primary-border: rgba(0, 0, 0, 0.1);
+
+$btn-text: #333;
+$btn-hover-background: #E6E6E6;
+$btn-gradient-top: white;
+$btn-gradient-bottom: #E6E6E6;
+$btn-gradient-fallback: #E6E6E6;
+$btn-border: rgba(0, 0, 0, 0.1);
+
+
+///////////////////////
+// misc
+
+$highlight-me-background: yellow;
+
+$focus-background: #F8F50F;
+
+
+
+//////////////////////////////////////////
+// bingo tip colors
+
+$bingo-text: white;
+$bingo-background: green;
+
+$bingoo-text: white;
+$bingoo-background: limegreen; // springgreen?? -- lighter green
+
+$bingooo-text: white;
+$bingooo-background: lime; // lighter lighter green
+
+$missing-text: white;
+$missing-background: orange; // tip missing label
+
+$fail-text: white;
+$fail-background: red;
+
+
+
+////////////////////////////////////
+// flash messages colors
+
+$error-text: #B94A48;
+$error-background: #F2DEDE;
+$error-border: #EED3D7;
+
+$success-text: #468847;
+$success-background: #DFF0D8;
+$success-border: #D6E9C6;
+
+$notice-text: #3A87AD;
+$notice-background: #D9EDF7;
+$notice-border: #BCE8F1;
+
+$warning-text: #C09853;
+$warning-background: #FCF8E3;
+$warning-border: #FBEED5;

data/app/controllers/beer_db_admin/countries_controller.rb

@@ -5,9 +5,10 @@ module BeerDbAdmin
 class CountriesController < BeerDbAdminController
   
   def index
-    @countries = Country.all
+    # list by continent
   end
 
+
   # GET /:key  e.g  /at or /us etc.
   def shortcut
 

data/app/helpers/beer_db_admin/part_helper.rb

@@ -3,6 +3,11 @@
 module BeerDbAdmin
 module PartHelper
 
+  def render_countries( countries, opts={} )
+    render partial: 'beer_db_admin/shared/countries',
+           locals: { countries: countries }
+  end
+
   def render_bookmarks( bookmarks, opts={} )
 
     render partial: 'beer_db_admin/shared/bookmarks',

data/app/views/beer_db_admin/countries/index.html.erb

@@ -1,49 +1,24 @@
 
 <h3>Countries</h3>
 
-<table>
-<% @countries.each do |country| %>
-
-
+<p>
+<% Continent.all.each_with_index do |continent,i| %>
+   <% if i > 0 %>
+      &bull;
+   <% end %>
+    <%= link_to continent.title, "##{continent.key}" %>
+<% end %>
+</p>
 
-<% count = country.beers.count
-   if count > 0 %>
-<tr>
-  <td>
-    <span class='country-key'><%= country.key %></span>
-    <%= image_tag_for_country( country ) %>
-    <%= link_to country.title, short_country_path( country ) %>
-  </td>
-</tr>
 
-<tr>
-  <td>
-    <% country.beers.each_with_index do |beer,i| %>
-       <% if i > 0 %>
-         &bull; 
-       <% end %>
-       <%= link_to beer.title, beer_path( beer.id ) %>
-    <% end %>
-    <span class="beer-count">(<%= count %>)</span>
-  </td>
-</tr>
+<% Continent.all.each do |continent| %>
 
-<% breweries_count = country.breweries.count
-   if breweries_count > 0 %>
-<tr>
-  <td>
-    <% country.breweries.each_with_index do |brewery,i| %>
-       <% if i > 0 %>
-         &bull; 
-       <% end %>
-       <%= brewery.title %>
-    <% end %>
-    <span class="beer-count">(<%= breweries_count %>)</span>
-  </td>
-</tr>
-<% end %>
+<a name="<%= continent.key %>"></a>
+<h4>
+  <%= continent.title %>
+</h4>
 
-<% end %>
-
-<% end %>
-</table>
+<p>
+   <%= render_countries( continent.countries.order(:title) ) %>
+</p>
+<% end %><!-- each continent-->

data/app/views/beer_db_admin/countries/show.html.erb

@@ -6,8 +6,8 @@
 <%= @country.title %> 
 (<%= @country.code %>), 
 
- <%= @country.breweries.count %> Breweries,
- <%= @country.beers.count %> Beers
+ <%= @country.beers.count %> Beers,
+ <%= @country.breweries.count %> Breweries
 </h3>
 
 

data/app/views/beer_db_admin/pages/about.html.erb

@@ -1,2 +1,8 @@
-<h1>Pages#about</h1>
-<p>Find me in app/views/pages/about.html.erb</p>
+
+<h2>What's <code>beer.db</code>?</h2>
+
+<p>
+A free open public domain beer, brewery n brewpub database n schema.
+  <a href="http://openbeer.github.io">More &raquo;</a>
+</p>
+

data/app/views/beer_db_admin/shared/_countries.html.erb

@@ -0,0 +1,51 @@
+
+<% countries.each do |country| %>
+
+<% beers_count     = country.beers.count
+   breweries_count = country.breweries.count %>
+
+<% if beers_count > 0 || breweries_count > 0 %>
+<div>
+  <span class='country-key'><%= country.key %></span>
+    <%= image_tag_for_country( country ) %>
+    <%= link_to country.title, short_country_path( country ) %>
+    (<%= country.code %>)
+
+    <span class='country-key'>
+    -
+    <%= beers_count %> Beers,
+    <%= breweries_count %> Breweries
+    </span>
+</div>
+<% end %>
+
+
+<!-- fix: move to beer partial or similar;
+    not use now, thaus > 10000 -->
+<% if beers_count > 10000 %>
+<div>
+  <% country.beers.each_with_index do |beer,i| %>
+       <% if i > 0 %>
+         &bull; 
+       <% end %>
+       <%= link_to beer.title, beer_path( beer.id ) %>
+    <% end %>
+    <span class="beer-count">(<%= beers_count %>)</span>
+</div>
+<% end %><!-- if beers_count > 0 -->
+
+
+<% if breweries_count > 10000 %>
+<div>
+  <% country.breweries.each_with_index do |brewery,i| %>
+       <% if i > 0 %>
+         &bull; 
+       <% end %>
+       <%= brewery.title %>
+  <% end %>
+  <span class="beer-count">(<%= breweries_count %>)</span>
+</div>
+<% end %><!-- if breweries_count > 0 -->
+
+<% end %><!-- each country -->
+

data/app/views/layouts/beer_db_admin/beer_db_admin.html.erb

@@ -14,7 +14,18 @@
   <tr>
     <!-- left -->
     <td>
-      <span class='logo'><%= link_to '[Logo]', beers_path() %></span> &nbsp;&nbsp;&nbsp;
+      <span class='logo'>
+      
+       <%#= link_to '[Logo]', beers_path() %>
+       open public domain data | beer.db -
+         <%= Beer.count %> beers,
+         <%= Brand.count %> brands,
+         <%= Brewery.count %> breweries
+         in
+         65 countries
+
+      </span> &nbsp;&nbsp;&nbsp;
+      
       <% if content_for? :breadcrumb %>
         <span class='breadcrumb-inline'>
           <%= yield :breadcrumb %>
@@ -46,17 +57,24 @@
   <% end %>
 
   <%= link_to 'Countries', countries_path() %>  &bull;
-  <%= link_to 'Regions', regions_path() %>  &bull;
+ <!--
+ <%= link_to 'Regions', regions_path() %>  &bull;
+   -->
   <%= link_to 'Beers', beers_path() %>  &bull;
   <%= link_to 'Brands', brands_path() %>  &bull;
   <%= link_to 'Breweries', breweries_path() %>  &bull;
   <%= link_to 'Tags', tags_path() %>    &bull;
-  <%= link_to 'Timeline', time_path() %>
-
+  <%= link_to 'Timeline', time_path() %>    &bull;
+  <%= link_to 'About', about_path() %>
 .::.
 
   <!-- fix: use named url_helper for /api -->
-  <%= link_to "Web Service Demo & Docu / HTTP JSON API", '/api' %>
+  <%= link_to "Web Service / HTTP JSON API", '/api' %>
+
+.::.
+
+   <%= link_to 'Update Data (Edit Me!)', 'https://github.com/openbeer/world' %>
+
 </p>
 
 <% end %>

data/config/routes.rb

@@ -42,5 +42,5 @@ BeerDbAdmin::Engine.routes.draw do
   resources :regions
   resources :tags
 
-  root :to => 'beers#index'
+  root :to => 'countries#index'
 end

data/lib/beerdb/admin/version.rb

@@ -1,5 +1,5 @@
 
 module BeerDbAdmin
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &22378212 !ruby/object:Gem::Requirement
+  requirement: &20976972 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *22378212
+  version_requirements: *20976972
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &22377900 !ruby/object:Gem::Requirement
+  requirement: &20976624 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *22377900
+  version_requirements: *20976624
 description: beerdb admin addon - rails engine
 email: beerdb@googlegroups.com
 executables: []
@@ -48,6 +48,10 @@ files:
 - Rakefile
 - app/assets/javascripts/beer_db_admin/application.js
 - app/assets/stylesheets/beer_db_admin/application.css.scss
+- app/assets/stylesheets/beer_db_admin/button.css.scss
+- app/assets/stylesheets/beer_db_admin/flash.css.scss
+- app/assets/stylesheets/beer_db_admin/navbar.css.scss
+- app/assets/stylesheets/beer_db_admin/settings.css.scss
 - app/controllers/beer_db_admin/beer_db_admin_controller.rb
 - app/controllers/beer_db_admin/beers_controller.rb
 - app/controllers/beer_db_admin/bookmarks_controller.rb
@@ -85,6 +89,7 @@ files:
 - app/views/beer_db_admin/shared/_breweries_for_country.html.erb
 - app/views/beer_db_admin/shared/_breweries_for_region.html.erb
 - app/views/beer_db_admin/shared/_brewery_tags.html.erb
+- app/views/beer_db_admin/shared/_countries.html.erb
 - app/views/beer_db_admin/shared/_tags.html.erb
 - app/views/beer_db_admin/tags/index.html.erb
 - app/views/beer_db_admin/time/index.html.erb