beerdb-admin 0.1.1 → 0.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +7 -0
- data/Manifest.txt +57 -60
- data/README.md +4 -3
- data/Rakefile +1 -1
- data/app/assets/stylesheets/beer_db_admin/application.css.scss +4 -11
- data/app/assets/stylesheets/beer_db_admin/navbar.css.scss +3 -18
- data/app/controllers/beer_db_admin/beers_controller.rb +7 -1
- data/app/controllers/beer_db_admin/breweries_controller.rb +6 -0
- data/app/controllers/beer_db_admin/cities_controller.rb +25 -0
- data/app/controllers/beer_db_admin/regions_controller.rb +16 -0
- data/app/helpers/beer_db_admin/application_helper.rb +3 -21
- data/app/helpers/beer_db_admin/link_helper.rb +42 -0
- data/app/helpers/beer_db_admin/part_helper.rb +27 -7
- data/app/helpers/beer_db_admin/routes_helper.rb +17 -0
- data/app/helpers/beer_db_admin/service_helper.rb +69 -0
- data/app/views/beer_db_admin/beers/index.html.erb +14 -33
- data/app/views/beer_db_admin/beers/show.html.erb +7 -69
- data/app/views/beer_db_admin/brands/index.html.erb +11 -18
- data/app/views/beer_db_admin/breweries/_actions.html.erb +53 -0
- data/app/views/beer_db_admin/breweries/index.html.erb +8 -21
- data/app/views/beer_db_admin/breweries/show.html.erb +19 -51
- data/app/views/beer_db_admin/cities/show.html.erb +59 -0
- data/app/views/beer_db_admin/countries/index.html.erb +1 -1
- data/app/views/beer_db_admin/countries/show.html.erb +47 -52
- data/app/views/beer_db_admin/countries/show_pocket.html.erb +2 -2
- data/app/views/beer_db_admin/regions/show.html.erb +85 -0
- data/app/views/beer_db_admin/shared/_beer.html.erb +36 -0
- data/app/views/beer_db_admin/shared/_beers.html.erb +1 -1
- data/app/views/beer_db_admin/shared/_breweries_for_city.html +26 -0
- data/app/views/beer_db_admin/shared/_breweries_for_country.html.erb +2 -1
- data/app/views/beer_db_admin/shared/_breweries_for_region.html.erb +8 -2
- data/app/views/beer_db_admin/shared/_breweries_table_rows.html.erb +32 -0
- data/app/views/beer_db_admin/shared/_breweries_table_rows_for_region.html.erb +47 -0
- data/app/views/beer_db_admin/shared/_countries.html.erb +3 -4
- data/app/views/beer_db_admin/shared/_world_tree.html.erb +26 -0
- data/app/views/layouts/beer_db_admin/beer_db_admin.html.erb +1 -20
- data/config/routes.rb +14 -22
- data/lib/beerdb/admin.rb +3 -3
- data/lib/beerdb/admin/version.rb +1 -1
- metadata +36 -35
- data/app/controllers/beer_db_admin/bookmarks_controller.rb +0 -47
- data/app/controllers/beer_db_admin/drinks_controller.rb +0 -63
- data/app/controllers/beer_db_admin/frontpage_controller.rb +0 -15
- data/app/controllers/beer_db_admin/sessions_controller.rb +0 -53
- data/app/controllers/beer_db_admin/time_controller.rb +0 -12
- data/app/controllers/beer_db_admin/users_controller.rb +0 -66
- data/app/views/beer_db_admin/drinks/_form.html.erb +0 -29
- data/app/views/beer_db_admin/drinks/edit.html.erb +0 -4
- data/app/views/beer_db_admin/drinks/new.html.erb +0 -4
- data/app/views/beer_db_admin/sessions/new.html.erb +0 -54
- data/app/views/beer_db_admin/shared/_bookmarks.html.erb +0 -80
- data/app/views/beer_db_admin/time/index.html.erb +0 -40
- data/app/views/beer_db_admin/users/edit.html.erb +0 -40
- data/app/views/beer_db_admin/users/show.html.erb +0 -39
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
# encoding: utf-8
|
|
2
|
-
|
|
3
|
-
module BeerDbAdmin
|
|
4
|
-
|
|
5
|
-
class FrontpageController < BeerDbAdminController
|
|
6
|
-
|
|
7
|
-
include ApplicationHelper
|
|
8
|
-
|
|
9
|
-
def index
|
|
10
|
-
redirect_to user_path( current_user_id() )
|
|
11
|
-
end
|
|
12
|
-
|
|
13
|
-
end # class FrontpageController
|
|
14
|
-
|
|
15
|
-
end # module BeerDbAdmin
|
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
# encoding: utf-8
|
|
2
|
-
|
|
3
|
-
module BeerDbAdmin
|
|
4
|
-
|
|
5
|
-
class SessionsController < BeerDbAdminController
|
|
6
|
-
|
|
7
|
-
# GET /session/new
|
|
8
|
-
def new
|
|
9
|
-
@user = User.new
|
|
10
|
-
end
|
|
11
|
-
|
|
12
|
-
# POST /session
|
|
13
|
-
def create
|
|
14
|
-
|
|
15
|
-
## remove whitespace and (.-+_) and downcase
|
|
16
|
-
email = params[:user][:email]
|
|
17
|
-
if email.blank?
|
|
18
|
-
key = 'xxx'
|
|
19
|
-
else
|
|
20
|
-
key = email.gsub( /[\s\.\-+_]/, '' ).downcase
|
|
21
|
-
end
|
|
22
|
-
|
|
23
|
-
@user = User.find_by_key( key )
|
|
24
|
-
|
|
25
|
-
if @user.present? && @user.active?
|
|
26
|
-
|
|
27
|
-
session[:user_id] = @user.id
|
|
28
|
-
flash[:notice] = 'Anmeldung erfolgreich.'
|
|
29
|
-
|
|
30
|
-
redirect_to frontpage_path()
|
|
31
|
-
else
|
|
32
|
-
if @user.present?
|
|
33
|
-
if @user.active == false
|
|
34
|
-
flash.now[:error] = 'Konto gesperrt. Tut leid.'
|
|
35
|
-
end
|
|
36
|
-
else
|
|
37
|
-
flash.now[:error] = 'Unbekannte Email. Tut leid.'
|
|
38
|
-
end
|
|
39
|
-
@user = User.new( params[:user] )
|
|
40
|
-
render :action => 'new'
|
|
41
|
-
end
|
|
42
|
-
end
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
# DELETE /session
|
|
46
|
-
def destroy
|
|
47
|
-
session[:user_id] = nil
|
|
48
|
-
flash[:notice] = 'Tschüss.'
|
|
49
|
-
redirect_to signin_path()
|
|
50
|
-
end
|
|
51
|
-
end
|
|
52
|
-
|
|
53
|
-
end # module BeerDbAdmin
|
|
@@ -1,66 +0,0 @@
|
|
|
1
|
-
# encoding: utf-8
|
|
2
|
-
|
|
3
|
-
module BeerDbAdmin
|
|
4
|
-
|
|
5
|
-
class UsersController < BeerDbAdminController
|
|
6
|
-
|
|
7
|
-
include ApplicationHelper # fix: move to ApplcationController current_user etc.
|
|
8
|
-
|
|
9
|
-
def index
|
|
10
|
-
end
|
|
11
|
-
|
|
12
|
-
def show
|
|
13
|
-
@user = User.find( params[:id] )
|
|
14
|
-
end
|
|
15
|
-
|
|
16
|
-
def edit
|
|
17
|
-
@user = User.find( params[:id] )
|
|
18
|
-
end
|
|
19
|
-
|
|
20
|
-
def add_beer
|
|
21
|
-
beer = Beer.find( params[:beer_id])
|
|
22
|
-
# assert that params[:id] == current_user_id
|
|
23
|
-
user = current_user()
|
|
24
|
-
|
|
25
|
-
# check if bookmark exists; if not create it
|
|
26
|
-
bookmark = Bookmark.find_by_bookmarkable_id_and_user_id( beer.id, user.id )
|
|
27
|
-
if bookmark.nil?
|
|
28
|
-
bookmark = Bookmark.new
|
|
29
|
-
bookmark.user_id = user.id
|
|
30
|
-
bookmark.bookmarkable_id = beer.id
|
|
31
|
-
bookmark.bookmarkable_type = 'BeerDb::Models::Beer'
|
|
32
|
-
bookmark.save!
|
|
33
|
-
end
|
|
34
|
-
|
|
35
|
-
flash[:notice] = 'Bookmark erfolgreich gespeichert.'
|
|
36
|
-
|
|
37
|
-
redirect_to :back
|
|
38
|
-
end
|
|
39
|
-
|
|
40
|
-
def add_brewery
|
|
41
|
-
brewery = Brewery.find( params[:brewery_id])
|
|
42
|
-
# assert that params[:id] == current_user_id
|
|
43
|
-
user = current_user()
|
|
44
|
-
|
|
45
|
-
brewery.beers.each do |beer|
|
|
46
|
-
# check if bookmark exists; if not create it
|
|
47
|
-
bookmark = Bookmark.find_by_bookmarkable_id_and_user_id( beer.id, user.id )
|
|
48
|
-
if bookmark.nil?
|
|
49
|
-
bookmark = Bookmark.new
|
|
50
|
-
bookmark.user_id = user.id
|
|
51
|
-
bookmark.bookmarkable_id = beer.id
|
|
52
|
-
bookmark.bookmarkable_type = 'BeerDb::Models::Beer'
|
|
53
|
-
bookmark.save!
|
|
54
|
-
end
|
|
55
|
-
end
|
|
56
|
-
|
|
57
|
-
flash[:notice] = "#{brewery.beers.count} Bookmarks erfolgreich gespeichert."
|
|
58
|
-
|
|
59
|
-
redirect_to :back
|
|
60
|
-
end
|
|
61
|
-
|
|
62
|
-
end # class UsersController
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
end # module BeerDbAdmin
|
|
66
|
-
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
|
|
2
|
-
<%= form_for @drink, :as => :drink do |f| %>
|
|
3
|
-
|
|
4
|
-
<%= f.hidden_field :user_id %>
|
|
5
|
-
<%= f.hidden_field :beer_id %>
|
|
6
|
-
|
|
7
|
-
<table>
|
|
8
|
-
<tr>
|
|
9
|
-
<td valgin='top'>
|
|
10
|
-
<%= f.label :rating, 'Note (1-10)' %><br/>
|
|
11
|
-
<%= f.text_field :rating, size: 1, data: { autofocus: true }, style: 'font-size: 1000%; max-width: 200px;' %>
|
|
12
|
-
</td>
|
|
13
|
-
<td valign='top'>
|
|
14
|
-
|
|
15
|
-
<%= f.label :comments, 'Notizen' %><br/>
|
|
16
|
-
<%= f.text_area :comments, rows: 8, cols: 80 %><br/>
|
|
17
|
-
|
|
18
|
-
<%= f.label :place, 'Wo?' %> (z.B. Dahoam, O'Connors, usw.)<br/>
|
|
19
|
-
<%= f.text_field :place %>
|
|
20
|
-
</td>
|
|
21
|
-
</tr>
|
|
22
|
-
</table>
|
|
23
|
-
|
|
24
|
-
<div>
|
|
25
|
-
<%= f.submit 'Speichern', :class => 'btn-primary' %>
|
|
26
|
-
<%= link_to 'Zurück', :back, :class => 'btn' %>
|
|
27
|
-
</div>
|
|
28
|
-
|
|
29
|
-
<% end %>
|
|
@@ -1,54 +0,0 @@
|
|
|
1
|
-
<h1>Beer Anmeldung</h1>
|
|
2
|
-
|
|
3
|
-
<table>
|
|
4
|
-
<tr>
|
|
5
|
-
<td><!-- begin 1st column -->
|
|
6
|
-
<% if request.host == 'prost.herokuapp.com' || request.host == 'localhost' %>
|
|
7
|
-
<div>
|
|
8
|
-
<b>Welcome.</b> beer.db.admin - A Free, Open Source Beer Rating Service
|
|
9
|
-
in Ruby on Rails.
|
|
10
|
-
|
|
11
|
-
<a href="https://github.com/geraldb/beer.db.admin">More »</a>
|
|
12
|
-
</div>
|
|
13
|
-
<% end %>
|
|
14
|
-
<!-- end 1st column -->
|
|
15
|
-
</td>
|
|
16
|
-
|
|
17
|
-
<td><!-- begin 2nd column -->
|
|
18
|
-
|
|
19
|
-
<!-- NB: namespaced model gets converted to sportsdb_models_user but only want user in params, thus, use as: option -->
|
|
20
|
-
<%= form_for @user, :as => :user, :url => session_path() do |f| %>
|
|
21
|
-
|
|
22
|
-
<div style='padding: 20px; background-color: #F1F1F1;'>
|
|
23
|
-
<div>
|
|
24
|
-
<%= f.label :email, 'Email' %><br/>
|
|
25
|
-
<%= f.text_field :email, :data => { :autofocus => true } %>
|
|
26
|
-
</div>
|
|
27
|
-
|
|
28
|
-
<div style='padding-top: 15px;' >
|
|
29
|
-
<%= f.submit 'Anmelden', :class => 'btn-primary' %>
|
|
30
|
-
</div>
|
|
31
|
-
</div>
|
|
32
|
-
|
|
33
|
-
<% end %>
|
|
34
|
-
|
|
35
|
-
<!-- end 2nd column -->
|
|
36
|
-
</td>
|
|
37
|
-
</tr>
|
|
38
|
-
</table>
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
<div style='color: grey;'>
|
|
44
|
-
<hr>
|
|
45
|
-
<p style='font-size: 12px;'>Version Info</p>
|
|
46
|
-
<table>
|
|
47
|
-
<% Prop.order( 'created_at asc' ).all.each do |prop| %>
|
|
48
|
-
<tr>
|
|
49
|
-
<td style='font-size: 12px;'><%= "#{prop.key}/#{prop.value}" %></td>
|
|
50
|
-
<td style='font-size: 12px;'><%= "(#{prop.created_at})" %></td>
|
|
51
|
-
</tr>
|
|
52
|
-
<% end %>
|
|
53
|
-
</table>
|
|
54
|
-
</div>
|
|
@@ -1,80 +0,0 @@
|
|
|
1
|
-
|
|
2
|
-
<!-- params
|
|
3
|
-
bookmarks (array)
|
|
4
|
-
allow_edits (boolean)
|
|
5
|
-
-->
|
|
6
|
-
|
|
7
|
-
<table>
|
|
8
|
-
<% bookmarks.each do |bookmark| %>
|
|
9
|
-
<tr>
|
|
10
|
-
|
|
11
|
-
<td>
|
|
12
|
-
<!--
|
|
13
|
-
|
|
14
|
-
<% if bookmark.yes? %>
|
|
15
|
-
+1
|
|
16
|
-
<% end %>
|
|
17
|
-
<% if bookmark.no? %>
|
|
18
|
-
-1
|
|
19
|
-
<% end %>
|
|
20
|
-
-->
|
|
21
|
-
<% if bookmark.wish? %>
|
|
22
|
-
∅
|
|
23
|
-
<% else %>
|
|
24
|
-
|
|
25
|
-
<% end %>
|
|
26
|
-
|
|
27
|
-
<%= link_to bookmark.beer.title, beer_path( bookmark.beer.id ) %>
|
|
28
|
-
</td>
|
|
29
|
-
|
|
30
|
-
<% if allow_edits == true %>
|
|
31
|
-
<td>
|
|
32
|
-
<% if bookmark.yes? %>
|
|
33
|
-
<%= link_to raw(content_tag(:del,'+1')), update_bookmark_flag_path( bookmark.id, yes: false ), class: 'btn' %>
|
|
34
|
-
<% else %>
|
|
35
|
-
<%= link_to '+1', update_bookmark_flag_path( bookmark.id, yes: true ), class: 'btn' %>
|
|
36
|
-
<% end %>
|
|
37
|
-
|
|
38
|
-
<% if bookmark.no? %>
|
|
39
|
-
<%= link_to raw(content_tag(:del,'-1')), update_bookmark_flag_path( bookmark.id, no: false ), class: 'btn' %>
|
|
40
|
-
<% else %>
|
|
41
|
-
<%= link_to '-1', update_bookmark_flag_path( bookmark.id, no: true ), class: 'btn' %>
|
|
42
|
-
<% end %>
|
|
43
|
-
</td>
|
|
44
|
-
|
|
45
|
-
<td>
|
|
46
|
-
<% if bookmark.wish? %>
|
|
47
|
-
<%= link_to 'Drink', update_bookmark_flag_path( bookmark.id, wish: false ), class: 'btn' %>
|
|
48
|
-
<% else %>
|
|
49
|
-
<%= link_to 'Wish ∅', update_bookmark_flag_path( bookmark.id, wish: true ), class: 'btn' %>
|
|
50
|
-
<% end %>
|
|
51
|
-
</td>
|
|
52
|
-
|
|
53
|
-
<td>
|
|
54
|
-
<%= link_to 'Neues Rating', new_user_beer_drink_path( bookmark.user_id, bookmark.bookmarkable_id ), class: 'btn' %>
|
|
55
|
-
</td>
|
|
56
|
-
<% end %><!-- if allow_edits -->
|
|
57
|
-
|
|
58
|
-
</tr>
|
|
59
|
-
|
|
60
|
-
<% bookmark.drinks.each do |drink| %>
|
|
61
|
-
<tr>
|
|
62
|
-
<td>
|
|
63
|
-
<span class='drink-rating'><%= drink.rating %></span>
|
|
64
|
-
<span class='drink-comments'>
|
|
65
|
-
<%= drink.comments %>
|
|
66
|
-
</span>
|
|
67
|
-
/
|
|
68
|
-
<span class='drink-place'>
|
|
69
|
-
<%= drink.place %>
|
|
70
|
-
</span>
|
|
71
|
-
</td>
|
|
72
|
-
<% if allow_edits == true %>
|
|
73
|
-
<td>
|
|
74
|
-
<%= link_to 'Bearbeiten', edit_drink_path( drink.id ), class: 'btn' %>
|
|
75
|
-
</td>
|
|
76
|
-
<% end %>
|
|
77
|
-
</tr>
|
|
78
|
-
<% end %>
|
|
79
|
-
<% end %><!-- each bookmark -->
|
|
80
|
-
</table>
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
|
|
2
|
-
<h3><%= Drink.count %> Ratings</h3>
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
<% Drink.order('created_at DESC').all.each do |drink| %>
|
|
6
|
-
|
|
7
|
-
<p>
|
|
8
|
-
<%= link_to drink.user.name, user_path( drink.user.id ) %>
|
|
9
|
-
-
|
|
10
|
-
|
|
11
|
-
<%= link_to drink.beer.title, beer_path( drink.beer.id ) %>
|
|
12
|
-
|
|
13
|
-
<span class='drink-rating'>
|
|
14
|
-
<%= drink.rating %>
|
|
15
|
-
</span>
|
|
16
|
-
|
|
17
|
-
<span class='drink-comments'>
|
|
18
|
-
<%= drink.comments %>
|
|
19
|
-
</span>
|
|
20
|
-
/
|
|
21
|
-
<span class='drink-place'>
|
|
22
|
-
<%= drink.place %>
|
|
23
|
-
</span>
|
|
24
|
-
</p>
|
|
25
|
-
|
|
26
|
-
<% end %>
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
<h3><%= Bookmark.where(yes:true).count %> +1s</h3>
|
|
30
|
-
|
|
31
|
-
<p>
|
|
32
|
-
<% Bookmark.order('created_at DESC').where(yes:true).each_with_index do |bookmark,i| %>
|
|
33
|
-
<% if i > 0 %>
|
|
34
|
-
•
|
|
35
|
-
<% end %>
|
|
36
|
-
<%= link_to bookmark.user.name, user_path( bookmark.user.id ) %>
|
|
37
|
-
- <%= link_to bookmark.beer.title, beer_path( bookmark.beer.id ) %>
|
|
38
|
-
+1
|
|
39
|
-
<% end %>
|
|
40
|
-
</p>
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
<h3><%= @user.name %> -
|
|
4
|
-
<%= @user.bookmarks.count %> Biere,
|
|
5
|
-
<%= @user.drinks.count %> Ratings
|
|
6
|
-
</h3>
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
<p style='background-color: silver;'>
|
|
10
|
-
Top (+1)
|
|
11
|
-
</p>
|
|
12
|
-
|
|
13
|
-
<%= render_bookmarks( @user.bookmarks.where( yes:true, wish:false), edit:true ) %>
|
|
14
|
-
|
|
15
|
-
<p style='background-color: silver;'>
|
|
16
|
-
More
|
|
17
|
-
</p>
|
|
18
|
-
|
|
19
|
-
<%= render_bookmarks( @user.bookmarks.where( yes:false, no:false, wish:false ), edit:true ) %>
|
|
20
|
-
|
|
21
|
-
<p style='background-color: silver;'>
|
|
22
|
-
Blacklist (-1)
|
|
23
|
-
</p>
|
|
24
|
-
|
|
25
|
-
<%= render_bookmarks( @user.bookmarks.where( yes:false, no:true, wish:false ), edit:true ) %>
|
|
26
|
-
|
|
27
|
-
<hr>
|
|
28
|
-
<p>Wishlist</p>
|
|
29
|
-
|
|
30
|
-
<p style='background-color: silver;'>
|
|
31
|
-
Top (+1)
|
|
32
|
-
</p>
|
|
33
|
-
|
|
34
|
-
<%= render_bookmarks( @user.bookmarks.where( yes:true, wish:true), edit:true ) %>
|
|
35
|
-
|
|
36
|
-
<p style='background-color: silver;'>
|
|
37
|
-
More
|
|
38
|
-
</p>
|
|
39
|
-
|
|
40
|
-
<%= render_bookmarks( @user.bookmarks.where( yes:false, wish:true), edit:true ) %>
|
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
|
|
2
|
-
<h3><%= @user.name %> -
|
|
3
|
-
<%= @user.bookmarks.count %> Biere,
|
|
4
|
-
<%= @user.drinks.count %> Ratings
|
|
5
|
-
</h3>
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
<p style='background-color: silver;'>
|
|
9
|
-
Top (+1)
|
|
10
|
-
</p>
|
|
11
|
-
|
|
12
|
-
<%= render_bookmarks( @user.bookmarks.where( yes:true, wish:false) ) %>
|
|
13
|
-
|
|
14
|
-
<p style='background-color: silver;'>
|
|
15
|
-
More
|
|
16
|
-
</p>
|
|
17
|
-
|
|
18
|
-
<%= render_bookmarks( @user.bookmarks.where( yes:false, no:false, wish:false ) ) %>
|
|
19
|
-
|
|
20
|
-
<p style='background-color: silver;'>
|
|
21
|
-
Blacklist (-1)
|
|
22
|
-
</p>
|
|
23
|
-
|
|
24
|
-
<%= render_bookmarks( @user.bookmarks.where( yes:false, no:true, wish:false ) ) %>
|
|
25
|
-
|
|
26
|
-
<hr>
|
|
27
|
-
<p>Wishlist</p>
|
|
28
|
-
|
|
29
|
-
<p style='background-color: silver;'>
|
|
30
|
-
Top (+1)
|
|
31
|
-
</p>
|
|
32
|
-
|
|
33
|
-
<%= render_bookmarks( @user.bookmarks.where( yes:true, wish:true) ) %>
|
|
34
|
-
|
|
35
|
-
<p style='background-color: silver;'>
|
|
36
|
-
More
|
|
37
|
-
</p>
|
|
38
|
-
|
|
39
|
-
<%= render_bookmarks( @user.bookmarks.where( yes:false, wish:true) ) %>
|