meutel/bouquins-ror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix routes (series is uncountable...), improve design (bootstrap)

Browse Source
This commit is contained in:
Meutel 2015-06-28 18:46:22 +02:00
parent dc750eb188
commit 9ceaf42025
7 changed files with 117 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -2,7 +2,8 @@ source 'https://rubygems.org'
#gem 'magic_multi_connections'
gem 'will_paginate'
#gem 'bootstrap-will_paginate'
gem 'bootstrap-sass'
gem 'bootstrap-will_paginate'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'

10
Gemfile.lock
View File

@ -37,8 +37,16 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.0)
autoprefixer-rails (5.2.1)
execjs
json
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.5.1)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.3.0)
bootstrap-will_paginate (0.0.10)
will_paginate
builder (3.2.2)
byebug (5.0.0)
columnize (= 0.9.0)
@ -143,6 +151,8 @@ PLATFORMS
ruby
DEPENDENCIES
bootstrap-sass
bootstrap-will_paginate
byebug
coffee-rails (~> 4.1.0)
jbuilder (~> 2.0)

70
app/assets/stylesheets/custom.css.scss Normal file
View File

@ -0,0 +1,70 @@
@import "bootstrap-sprockets";
@import "bootstrap";
/* universal */
body {
padding-top: 60px;
}
section {
overflow: auto;
}
textarea {
resize: vertical;
}
.center {
text-align: center;
}
.center h1 {
margin-bottom: 10px;
}
/* typography */
h1, h2, h3, h4, h5, h6 {
line-height: 1;
}
h1 {
font-size: 3em;
letter-spacing: -2px;
margin-bottom: 30px;
text-align: center;
}
h2 {
font-size: 1.2em;
letter-spacing: -1px;
margin-bottom: 30px;
text-align: center;
font-weight: normal;
color: #777;
}
p {
font-size: 1.1em;
line-height: 1.7em;
}
/* header */
#logo {
float: left;
margin-right: 10px;
font-size: 1.7em;
color: #fff;
text-transform: uppercase;
letter-spacing: -1px;
padding-top: 9px;
font-weight: bold;
}
#logo:hover {
color: #fff;
text-decoration: none;
}

15
app/views/layouts/application.html.erb
View File

@ -7,8 +7,19 @@
<%= csrf_meta_tags %>
</head>
<body>
<header class="navbar navbar-fixed-top navbar-inverse">
<div class="container">
<%= link_to "Bouquins", '#', id: "logo" %>
<nav>
<ul class="nav navbar-nav navbar-right">
<li><%= link_to "Home", root_path %></li>
<li><%= link_to "About", about_path %></li>
</ul>
</nav>
</div>
</header>
<div class="container">
<%= yield %>
</div>
</body>
</html>

12
app/views/static_pages/home.html.erb
View File

@ -1,2 +1,10 @@
<h1>Welcome</h1>
<p><%= @books_count %> books in library</p>
<div class="center jumbotron">
<h1>Library</h1>
<h2>Browse <%= @books_count %> books</h2>
<p>
<%= link_to "Books", books_path, class: "btn btn-lg btn-primary" %>
<%= link_to "Authors", authors_path, class: "btn btn-lg btn-primary" %>
<%= link_to "Series", series_path, class: "btn btn-lg btn-primary" %>
</p>
</div>

4
config/initializers/inflections.rb
View File

@ -14,3 +14,7 @@
# ActiveSupport::Inflector.inflections(:en) do |inflect|
# inflect.acronym 'RESTful'
# end
# ActiveSupport::Inflector.inflections(:en) do |inflect|
# inflect.uncountable %w( serie )
# end
ActiveSupport::Inflector.inflections.singular "series", "serie"

13
config/routes.rb
View File

@ -1,11 +1,12 @@
Rails.application.routes.draw do
get 'static_pages/home'
root 'static_pages#home'
get 'about' => 'static_pages#about'
get 'static_pages/about'
resources :books
resources :authors
resources :series
resources :books, only: [ :index, :show ]
resources :authors, only: [ :index, :show ]
resources :series, only: [ :index, :show ]
#get 'series/:id' => 'series#show'
#get 'series' => 'series#index'
# The priority is based upon order of creation: first created -> highest priority.
# See how all your routes lay out with "rake routes".