ish_manager 0.1.8.244 → 0.1.8.248
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/ish_manager/application.css +2 -0
- data/app/assets/stylesheets/ish_manager/galleries.css +4 -0
- data/app/assets/stylesheets/ish_manager/reset.css +96 -0
- data/app/assets/stylesheets/ish_manager/user_profiles.scss +9 -0
- data/app/controllers/ish_manager/maps_controller.rb +8 -0
- data/app/controllers/ish_manager/markers_controller.rb +13 -10
- data/app/controllers/ish_manager/user_profiles_controller.rb +7 -8
- data/app/views/ish_manager/maps/_form.haml +8 -4
- data/app/views/ish_manager/reports/_form.haml +12 -6
- data/app/views/ish_manager/reports/_show_mini.haml +15 -0
- data/app/views/ish_manager/reports/show.haml +2 -2
- data/app/views/ish_manager/user_profiles/index.haml +3 -3
- data/app/views/ish_manager/user_profiles/show.haml +14 -0
- data/app/views/ish_manager/videos/_index.haml +1 -1
- data/app/views/layouts/ish_manager/application.haml +4 -1
- metadata +6 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 38f82f782d8fee6247ee92d440fd9984c2a560e192f877eb9cfffa591f5c8045
|
4
|
+
data.tar.gz: e29fba83dd1c1426c83a4991dbf4968c4affafae2542c6d0cf490cb12aed3344
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 28c18da1165de872522f64252f6e0fdfec5217b5806d4527b7b38717826c39041241521762917f799fe14d320bd08de59fa05ebeb9157286c9792134a1d5e5d9
|
7
|
+
data.tar.gz: 6e984c0cf9031c26bd6f29f86ab9f0f9ad977b22527e848f57c39cb456398ee5fdc5e722cabd75fc163d3e23b9ccb2f81cc604178300312157ea6e13db8f683d
|
@@ -11,12 +11,14 @@
|
|
11
11
|
* It is generally better to create a new file per style scope.
|
12
12
|
*
|
13
13
|
*= require ish_manager/bootstrap
|
14
|
+
*= require ish_manager/reset
|
14
15
|
*= require_self
|
15
16
|
*= require ish_manager/tags
|
16
17
|
*= require ish_manager/maps
|
17
18
|
*= require ish_manager/utils
|
18
19
|
*= require ish_manager/jquery-ui
|
19
20
|
*= require ish_manager/galleries
|
21
|
+
*= require ish_manager/user_profiles
|
20
22
|
*/
|
21
23
|
|
22
24
|
|
@@ -0,0 +1,96 @@
|
|
1
|
+
/* Box sizing rules */
|
2
|
+
*,
|
3
|
+
*::before,
|
4
|
+
*::after {
|
5
|
+
box-sizing: border-box;
|
6
|
+
}
|
7
|
+
|
8
|
+
/* Remove default margin */
|
9
|
+
body,
|
10
|
+
h1,
|
11
|
+
h2,
|
12
|
+
h3,
|
13
|
+
h4,
|
14
|
+
p,
|
15
|
+
figure,
|
16
|
+
blockquote,
|
17
|
+
dl,
|
18
|
+
dd {
|
19
|
+
margin: 0;
|
20
|
+
}
|
21
|
+
|
22
|
+
/* Remove list styles on ul, ol elements with a list role, which suggests default styling will be removed */
|
23
|
+
ul[role='list'],
|
24
|
+
ol[role='list'] {
|
25
|
+
list-style: none;
|
26
|
+
}
|
27
|
+
|
28
|
+
/* Set core root defaults */
|
29
|
+
html:focus-within {
|
30
|
+
scroll-behavior: smooth;
|
31
|
+
}
|
32
|
+
|
33
|
+
/* Set core body defaults */
|
34
|
+
body {
|
35
|
+
min-height: 100vh;
|
36
|
+
text-rendering: optimizeSpeed;
|
37
|
+
line-height: 1.5;
|
38
|
+
}
|
39
|
+
|
40
|
+
/* A elements that don't have a class get default styles */
|
41
|
+
a:not([class]) {
|
42
|
+
text-decoration-skip-ink: auto;
|
43
|
+
}
|
44
|
+
|
45
|
+
/* Make images easier to work with */
|
46
|
+
img,
|
47
|
+
picture {
|
48
|
+
max-width: 100%;
|
49
|
+
display: block;
|
50
|
+
}
|
51
|
+
|
52
|
+
/* Inherit fonts for inputs and buttons */
|
53
|
+
input,
|
54
|
+
button,
|
55
|
+
textarea,
|
56
|
+
select {
|
57
|
+
font: inherit;
|
58
|
+
}
|
59
|
+
|
60
|
+
/* Remove all animations, transitions and smooth scroll for people that prefer not to see them */
|
61
|
+
@media (prefers-reduced-motion: reduce) {
|
62
|
+
html:focus-within {
|
63
|
+
scroll-behavior: auto;
|
64
|
+
}
|
65
|
+
|
66
|
+
*,
|
67
|
+
*::before,
|
68
|
+
*::after {
|
69
|
+
animation-duration: 0.01ms !important;
|
70
|
+
animation-iteration-count: 1 !important;
|
71
|
+
transition-duration: 0.01ms !important;
|
72
|
+
scroll-behavior: auto !important;
|
73
|
+
}
|
74
|
+
}
|
75
|
+
|
76
|
+
|
77
|
+
html, body, div, span, applet, object, iframe,
|
78
|
+
p, blockquote, pre,
|
79
|
+
a, abbr, acronym, address, big, cite, code,
|
80
|
+
del, dfn, em, img, ins, kbd, q, s, samp,
|
81
|
+
small, strike, strong, sub, sup, tt, var,
|
82
|
+
b, u, i, center,
|
83
|
+
dl, dt, dd, ol, ul, li,
|
84
|
+
fieldset, form, label, legend,
|
85
|
+
table, caption, tbody, tfoot, thead, tr, th, td,
|
86
|
+
article, aside, canvas, details, embed,
|
87
|
+
figure, figcaption, footer, header, hgroup,
|
88
|
+
menu, nav, output, ruby, section, summary,
|
89
|
+
time, mark, audio, video {
|
90
|
+
margin: 0;
|
91
|
+
padding: 0;
|
92
|
+
border: 0;
|
93
|
+
font-size: 100%;
|
94
|
+
font: inherit;
|
95
|
+
vertical-align: baseline;
|
96
|
+
}
|
@@ -23,6 +23,9 @@ class IshManager::MapsController < IshManager::ApplicationController
|
|
23
23
|
|
24
24
|
def create
|
25
25
|
@map = ::Gameui::Map.new(map_params)
|
26
|
+
if map_params[:parent_slug].present?
|
27
|
+
@map.parent = ::Gameui::Map.find_by({ slug: map_params[:parent_slug] })
|
28
|
+
end
|
26
29
|
authorize! :create, @map
|
27
30
|
|
28
31
|
respond_to do |format|
|
@@ -37,6 +40,11 @@ class IshManager::MapsController < IshManager::ApplicationController
|
|
37
40
|
def update
|
38
41
|
authorize! :update, @map
|
39
42
|
respond_to do |format|
|
43
|
+
if map_params[:parent_slug].present?
|
44
|
+
@map.parent = ::Gameui::Map.find_by({ slug: map_params[:parent_slug] })
|
45
|
+
else
|
46
|
+
@map.parent = nil
|
47
|
+
end
|
40
48
|
if @map.update(map_params)
|
41
49
|
format.html { redirect_to map_path(@map), notice: 'Map was successfully updated.' }
|
42
50
|
else
|
@@ -27,6 +27,7 @@ class IshManager::MarkersController < IshManager::ApplicationController
|
|
27
27
|
|
28
28
|
respond_to do |format|
|
29
29
|
if @marker.save
|
30
|
+
@marker.map.touch
|
30
31
|
format.html { redirect_to map_path(@map), notice: 'Marker was successfully created.' }
|
31
32
|
else
|
32
33
|
format.html { render :new }
|
@@ -38,6 +39,7 @@ class IshManager::MarkersController < IshManager::ApplicationController
|
|
38
39
|
authorize! :update_marker, @map
|
39
40
|
respond_to do |format|
|
40
41
|
if @marker.update(marker_params)
|
42
|
+
@marker.map.touch
|
41
43
|
format.html { redirect_to maps_path(@map), notice: 'Marker was successfully updated.' }
|
42
44
|
else
|
43
45
|
format.html { render :edit }
|
@@ -49,6 +51,7 @@ class IshManager::MarkersController < IshManager::ApplicationController
|
|
49
51
|
@marker = ::Gameui::Marker.find params[:id]
|
50
52
|
@map = @marker.map
|
51
53
|
authorize! :destroy_marker, @map
|
54
|
+
@marker.map.touch
|
52
55
|
@marker.destroy
|
53
56
|
respond_to do |format|
|
54
57
|
format.html { redirect_to map_path(@map), notice: 'Marker was successfully destroyed.' }
|
@@ -57,17 +60,17 @@ class IshManager::MarkersController < IshManager::ApplicationController
|
|
57
60
|
|
58
61
|
private
|
59
62
|
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
+
def set_map
|
64
|
+
@map = ::Gameui::Map.find(params[:map_id] || params[:gameui_marker][:map_id])
|
65
|
+
end
|
63
66
|
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
67
|
+
def set_marker
|
68
|
+
@marker = ::Gameui::Marker.find params[:id]
|
69
|
+
@map = @marker.map
|
70
|
+
end
|
68
71
|
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
+
def marker_params
|
73
|
+
params.require(:gameui_marker).permit!
|
74
|
+
end
|
72
75
|
|
73
76
|
end
|
@@ -40,15 +40,14 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
|
|
40
40
|
end
|
41
41
|
|
42
42
|
def create
|
43
|
-
@
|
44
|
-
|
45
|
-
@profile
|
46
|
-
@
|
47
|
-
if !@
|
48
|
-
|
49
|
-
raise 'cannot save profile.user'
|
43
|
+
@user = User.find_or_create_by( :email => params[:profile][:email] )
|
44
|
+
@user.password ||= (0...12).map { rand(100) }.join
|
45
|
+
@user.profile = IshModels::UserProfile.new params[:profile].permit!
|
46
|
+
authorize! :create, @user.profile
|
47
|
+
if !@user.save
|
48
|
+
raise "cannot save profile.user: #{@profile.user.errors.full_messages} profile errors: #{@profile.errors.full_messages}"
|
50
49
|
end
|
51
|
-
if @profile.save
|
50
|
+
if @user.profile.save
|
52
51
|
flash[:notice] = "Created profile"
|
53
52
|
else
|
54
53
|
flash[:alert] = "Cannot create profile: #{@profile.errors.messages}"
|
@@ -12,24 +12,28 @@
|
|
12
12
|
- @map.errors.full_messages.each do |message|
|
13
13
|
%li= message
|
14
14
|
|
15
|
-
|
16
15
|
.row
|
16
|
+
.col-md-3
|
17
|
+
.field
|
18
|
+
= f.label :name
|
19
|
+
= f.text_field :name
|
17
20
|
.col-md-3
|
18
21
|
.field
|
19
22
|
= f.label :slug
|
20
23
|
= f.text_field :slug
|
21
|
-
.col-md-3
|
22
24
|
.field
|
23
25
|
= f.label :parent_slug
|
24
26
|
= f.text_field :parent_slug
|
25
|
-
|
27
|
+
|
28
|
+
|
29
|
+
.col-md-2
|
26
30
|
.field
|
27
31
|
= f.label :w
|
28
32
|
= f.number_field :w
|
29
|
-
.col-md-3
|
30
33
|
.field
|
31
34
|
= f.label :h
|
32
35
|
= f.number_field :h
|
36
|
+
|
33
37
|
.field
|
34
38
|
= f.label :description
|
35
39
|
= f.text_area :description, class: 'tinymce'
|
@@ -28,13 +28,10 @@
|
|
28
28
|
%br
|
29
29
|
|
30
30
|
.row
|
31
|
-
.col-md-4
|
32
|
-
%label{} City
|
33
|
-
= select :report, :city_id, @cities_list, :class=>"btn"
|
34
|
-
.col-sm-4
|
35
|
-
= f.label :premium_tier
|
36
|
-
= f.number_field :premium_tier
|
37
31
|
.col-md-4
|
32
|
+
.field
|
33
|
+
%label City
|
34
|
+
= select :report, :city_id, @cities_list, :class=>"btn"
|
38
35
|
.field
|
39
36
|
= f.label :Coordinates
|
40
37
|
.panel.panel-default
|
@@ -48,6 +45,15 @@
|
|
48
45
|
.form-group
|
49
46
|
%label{} Y-coordinate
|
50
47
|
= f.text_field :y, :placeholder => "y", :type => "text", :class=>"form-control"
|
48
|
+
.col-sm-4
|
49
|
+
.field
|
50
|
+
= f.label :premium_tier
|
51
|
+
= f.number_field :premium_tier
|
52
|
+
.field
|
53
|
+
= f.label :user_profile
|
54
|
+
= select :report, :user_profile_id, @user_profiles_list
|
55
|
+
.col-md-4
|
56
|
+
unused
|
51
57
|
|
52
58
|
.row
|
53
59
|
.col-md-6
|
@@ -0,0 +1,15 @@
|
|
1
|
+
|
2
|
+
.manager-reports--show-mini
|
3
|
+
.row
|
4
|
+
.large-12.columns
|
5
|
+
.title
|
6
|
+
= report.name
|
7
|
+
= link_to '[~]', edit_report_path( report )
|
8
|
+
|
9
|
+
.meta
|
10
|
+
On #{report.created_at.to_s.slice(0, 10)}
|
11
|
+
- if report.city
|
12
|
+
In #{link_to report.city.name, city_path( report.city )}
|
13
|
+
|
14
|
+
- if report.subhead.length > 3
|
15
|
+
.subhead= report.subhead
|
@@ -10,9 +10,9 @@
|
|
10
10
|
.row
|
11
11
|
.col-sm-4
|
12
12
|
%ul
|
13
|
-
%li
|
14
|
-
|
15
|
-
|
13
|
+
%li
|
14
|
+
<b>Email:</b> #{link_to profile.email, user_profile_path(profile)}
|
15
|
+
= link_to '[edit]', edit_user_profile_path( profile )
|
16
16
|
%li <b>Name:</b> #{profile.name}
|
17
17
|
%li <b>Role:</b> #{profile.role_name}
|
18
18
|
%li <b>User.email:</b> #{profile.user ? profile.user.email : nil}
|
@@ -0,0 +1,14 @@
|
|
1
|
+
|
2
|
+
.user-profiles--show
|
3
|
+
%ul
|
4
|
+
%li
|
5
|
+
User profile: #{@user_profile.inspect}
|
6
|
+
%li
|
7
|
+
Purchased Items:
|
8
|
+
%ul
|
9
|
+
- @user_profile.premium_purchases.each do |purchase|
|
10
|
+
%li
|
11
|
+
-# = purchase.item_type.constantize.find(purchase.item_id).inspect
|
12
|
+
= render 'ish_manager/reports/show_mini', report: purchase.item_type.constantize.find(purchase.item_id)
|
13
|
+
|
14
|
+
|
@@ -18,7 +18,7 @@
|
|
18
18
|
- if video.youtube_id.present?
|
19
19
|
-## doesn't work with private videos, which are most
|
20
20
|
-# .thumb-youtube= image_tag "https://img.youtube.com/vi/#{video.youtube_id}/1.jpg"
|
21
|
-
= render 'embed_mini', video: video
|
21
|
+
= render 'ish_manager/videos/embed_mini', video: video
|
22
22
|
- else
|
23
23
|
.thumb= image_tag video.thumb.url(:thumb)
|
24
24
|
.a
|
@@ -12,11 +12,14 @@
|
|
12
12
|
%script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
|
13
13
|
= stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
|
14
14
|
= stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
|
15
|
-
|
15
|
+
|
16
16
|
= stylesheet_link_tag "ish_manager/materialize", media: "all"
|
17
|
+
= stylesheet_link_tag "ish_manager/application", media: "all"
|
17
18
|
= stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
|
19
|
+
|
18
20
|
= javascript_include_tag "ish_manager/application"
|
19
21
|
= javascript_include_tag "ish_manager/materialize"
|
22
|
+
|
20
23
|
= csrf_meta_tags
|
21
24
|
%body#application
|
22
25
|
.bg-white
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ish_manager
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.8.
|
4
|
+
version: 0.1.8.248
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- piousbox
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-09-
|
11
|
+
date: 2021-09-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -180,9 +180,11 @@ files:
|
|
180
180
|
- app/assets/stylesheets/ish_manager/jquery-ui.css
|
181
181
|
- app/assets/stylesheets/ish_manager/maps.scss
|
182
182
|
- app/assets/stylesheets/ish_manager/materialize.css
|
183
|
+
- app/assets/stylesheets/ish_manager/reset.css
|
183
184
|
- app/assets/stylesheets/ish_manager/tags.css
|
184
185
|
- app/assets/stylesheets/ish_manager/trash/bootstrap.min.css
|
185
186
|
- app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map
|
187
|
+
- app/assets/stylesheets/ish_manager/user_profiles.scss
|
186
188
|
- app/assets/stylesheets/ish_manager/utils.scss
|
187
189
|
- app/controllers/ish_manager/ally_controller.rb
|
188
190
|
- app/controllers/ish_manager/application_controller.rb
|
@@ -307,6 +309,7 @@ files:
|
|
307
309
|
- app/views/ish_manager/photos/without_gallery.haml
|
308
310
|
- app/views/ish_manager/reports/_form.haml
|
309
311
|
- app/views/ish_manager/reports/_index.haml
|
312
|
+
- app/views/ish_manager/reports/_show_mini.haml
|
310
313
|
- app/views/ish_manager/reports/edit.haml
|
311
314
|
- app/views/ish_manager/reports/index.haml
|
312
315
|
- app/views/ish_manager/reports/new.haml
|
@@ -338,6 +341,7 @@ files:
|
|
338
341
|
- app/views/ish_manager/user_profiles/edit.haml
|
339
342
|
- app/views/ish_manager/user_profiles/index.haml
|
340
343
|
- app/views/ish_manager/user_profiles/new.haml
|
344
|
+
- app/views/ish_manager/user_profiles/show.haml
|
341
345
|
- app/views/ish_manager/users/_index.haml
|
342
346
|
- app/views/ish_manager/venues/_form.haml
|
343
347
|
- app/views/ish_manager/venues/_index.haml
|