ish_manager 0.1.8.243 → 0.1.8.247

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9ea7280723a81047ae129c4bc0de3b3c3c0329aeb69f10c260ca8a9f5a159d27
4
- data.tar.gz: 9319e58a879bc865678839607091684c5a529f2ab62788cbedc904ab14bc5e70
3
+ metadata.gz: d2b1f18c818065b7a7bf279360aac3a21655ebce24d54c94c0ed7dd9818b449a
4
+ data.tar.gz: cbc270996bdb1af5c86fadcd913d7698f4a3174b115ac49487d1118c47c37cac
5
5
  SHA512:
6
- metadata.gz: d4ef061a68c19be3792a144506adbc1df91e8cfcf0e234ad3a7476391687a1baf34f46e960bbc7c0df03319b24abfb0a451e7d6b6c2155429363742350d95a84
7
- data.tar.gz: d4049361f28d18b007f4fb042243d4b612e30bba6d81f75223874b76c64f2790147e7abd6fd77f8a4598e23e2a117f63815761d3c510526ad666cfd36713540e
6
+ metadata.gz: 105d0605e77f299cb0acddd9a5e4d5b1f0dba26b523657fbe7b57cdf1f431596649dcbd3316b9fd0b0068afe5d6eaba4998a3dc3a35132d718051e0463dbd544
7
+ data.tar.gz: d9edafb104bc8cbafb54b00b0a8e86f33747d5a70b302500a6a12aa89879f42a82b6923b647541b7b38f4e1bab66bfbaa3497bdff6c3ed1ecd1ec0bef084c561
@@ -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
 
@@ -1,4 +1,8 @@
1
1
 
2
+ .panel-body img.thumb {
3
+ display: inline;
4
+ }
5
+
2
6
  .large-photos .item {
3
7
  border: 1px solid red;
4
8
  display: block;
@@ -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
+ }
@@ -0,0 +1,9 @@
1
+
2
+ .user-profiles--show {
3
+ ul ul {
4
+ margin-left: 1em;
5
+ }
6
+ ul li {
7
+ list-style-type: circle;
8
+ }
9
+ }
@@ -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
- def set_map
61
- @map = ::Gameui::Map.find(params[:map_id] || params[:gameui_marker][:map_id])
62
- end
63
+ def set_map
64
+ @map = ::Gameui::Map.find(params[:map_id] || params[:gameui_marker][:map_id])
65
+ end
63
66
 
64
- def set_marker
65
- @marker = ::Gameui::Marker.find params[:id]
66
- @map = @marker.map
67
- end
67
+ def set_marker
68
+ @marker = ::Gameui::Marker.find params[:id]
69
+ @map = @marker.map
70
+ end
68
71
 
69
- def marker_params
70
- params.require(:gameui_marker).permit!
71
- end
72
+ def marker_params
73
+ params.require(:gameui_marker).permit!
74
+ end
72
75
 
73
76
  end
@@ -3,9 +3,12 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
3
3
 
4
4
  def new
5
5
  @newsitem = Newsitem.new
6
- @sites = Site.list
7
- @cities = City.list
8
- @tags = Tag.list
6
+
7
+ @cities_list = City.list
8
+ @maps_list = ::Gameui::Map.list
9
+ @sites_list = Site.list
10
+ @tags_list = Tag.list
11
+
9
12
  if params[:city_id]
10
13
  @city = City.find params[:city_id]
11
14
  @newsitem.city = @city
@@ -30,6 +33,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
30
33
  @resource ||= Tag.find params[:tag_id] if params[:tag_id]
31
34
  @resource ||= Tag.find params[:newsitem][:tag_id] if !params[:newsitem][:tag_id].blank?
32
35
  @resource ||= IshModels::UserProfile.find params[:newsitem][:user_profile_id] if !params[:newsitem][:user_profile_id].blank?
36
+ @resource ||= ::Gameui::Map.find params[:newsitem][:map_id] if !params[:newsitem][:map_id].blank?
33
37
  @resource.newsitems << @newsitem
34
38
 
35
39
  authorize! :create_newsitem, @resource
@@ -52,7 +56,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
52
56
  else
53
57
  root_path
54
58
  end
55
-
59
+
56
60
  flag = @newsitem.save && @resource.save
57
61
  if flag
58
62
  @resource.touch
@@ -66,7 +70,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
66
70
  render :action => :new
67
71
  end
68
72
  end
69
-
73
+
70
74
  def destroy
71
75
  authorize! :destroy, Newsitem
72
76
  if params[:city_id]
@@ -121,7 +125,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
121
125
  end
122
126
  authorize! :update, @newsitem
123
127
  flag = @newsitem.update_attributes params[:newsitem].permit!
124
-
128
+
125
129
  if flag
126
130
  flash[:notice] = 'Success'
127
131
  else
@@ -130,7 +134,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
130
134
 
131
135
  redirect_to url
132
136
  end
133
-
137
+
134
138
  def edit
135
139
  out = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
136
140
  @galleries_list = [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
@@ -144,7 +148,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
144
148
  @newsitem = @city.newsitems.find( params[:id] )
145
149
  end
146
150
  authorize! :edit, @newsitem
147
-
151
+
148
152
  end
149
153
 
150
154
  def index
@@ -40,15 +40,14 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
40
40
  end
41
41
 
42
42
  def create
43
- @profile = IshModels::UserProfile.new params[:profile].permit!
44
- authorize! :create, @profile
45
- @profile.user = User.find_or_create_by( :email => params[:profile][:email] )
46
- @profile.user.password ||= (0...12).map { rand(100) }.join
47
- if !@profile.user.save
48
- puts! @profile.user.errors.messages
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}"
@@ -37,4 +37,6 @@
37
37
  %a{id: "large_#{photo.id}" }
38
38
  .float-left= button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
39
39
  = link_to "large", photo.photo.url(:large)
40
+ &nbsp;|&nbsp;
41
+ = link_to "original", photo.photo.url(:original)
40
42
  .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }
@@ -12,27 +12,32 @@
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
- .col-md-3
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
- = f.text_field :description
39
+ = f.text_area :description, class: 'tinymce'
40
+
36
41
  .field
37
42
  = f.label :img_path
38
43
  = f.text_field :img_path
@@ -4,5 +4,6 @@
4
4
  .a= button_to '~', edit_map_path(map), method: :get
5
5
  .a <b>#{map.w}x#{map.h}_#{map.slug}</b>
6
6
  .a= button_to '+marker', new_map_marker_path(map), method: :get
7
+ .a= button_to '+newsitem', new_map_newsitem_path(map), method: :get
7
8
  .a= link_to '[api]', api_map_path(map)
8
9
  .a= button_to 'x', map_path(map), method: :delete, data: { confirm: 'Are you sure?' }
@@ -3,17 +3,4 @@
3
3
  %h1 Maps #{link_to '[+]', new_map_path}
4
4
  - @maps.each do |map|
5
5
  .item
6
- .col
7
- = render 'map_flat_row', map: map
8
- %p= map.description
9
- = image_tag map.img_path, width: 400
10
- .col
11
- .row
12
- .a Markers (#{map.markers.length})
13
- .a #{button_to '+', new_map_marker_path(map), method: :get}
14
- %ul.markers
15
- - map.markers.each do |marker|
16
- %li
17
- = marker.slug
18
- = link_to '[~]', edit_marker_path(marker)
19
-
6
+ = render 'map_meta_row', map: map
@@ -0,0 +1,17 @@
1
+
2
+ .maps-index
3
+ %h1 Maps #{link_to '[+]', new_map_path}
4
+ - @maps.each do |map|
5
+ .item
6
+ .col
7
+ = render 'map_meta_row', map: map
8
+ .col
9
+ .row
10
+ .a Markers (#{map.markers.length})
11
+ .a #{button_to '+', new_map_marker_path(map), method: :get}
12
+ %ul.markers
13
+ - map.markers.each do |marker|
14
+ %li
15
+ = marker.slug
16
+ = link_to '[~]', edit_marker_path(marker)
17
+
@@ -1,13 +1,16 @@
1
1
 
2
2
  .maps-show
3
- = render 'map_flat_row', map: @map
4
- .descr= @map.description
3
+ = render 'map_meta_row', map: @map
4
+ %p.addToggle Description [<>]
5
+ .descr= raw @map.description
5
6
 
7
+ %p.addToggle The Map [<>]
6
8
  .the-map
7
9
  = image_tag @map.img_path, width: @map.w
8
10
  - @map.markers.each do |marker|
9
11
  .marker{ style: "position: absolute; left: #{marker.x}px; top: #{marker.y}px;" }= image_tag marker.img_path
10
12
 
13
+ %p.addToggle Markers (#{@map.markers.count}) [<>]
11
14
  .markers-list
12
15
  - @map.markers.each do |marker|
13
16
  .item
@@ -18,3 +21,9 @@
18
21
  .a= link_to '[api]', api_marker_path(marker)
19
22
  %ul.bullets
20
23
  %li <b>item_type:</b> #{marker.item_type}
24
+
25
+ %p.addToggle Newsitems (#{@map.newsitems.count}) [<>]
26
+ .newsitems-list
27
+ - @map.newsitems.each do |newsitem|
28
+ .item
29
+ = newsitem.inspect
@@ -2,17 +2,21 @@
2
2
  = form_for newsitem, :html => { :multipart => true } do |f|
3
3
  .row
4
4
  .col-sm-6{ style: 'border-right: 1px solid red;' }
5
+ %br
6
+ = f.label :map
7
+ = f.select :map_id, options_for_select( @maps_list, selected:( @map ? @map.id : params[:map_id] || nil ) )
8
+ %br
5
9
  = f.label :site
6
- = f.select :site_id, options_for_select( @sites_list, :selected => ( @site ? @site.id : nil ) )
10
+ = f.select :site_id, options_for_select( @sites_list, :selected => ( @site ? @site.id : params[:site_id] || nil ) )
7
11
  %br
8
12
  = f.label :city
9
- = f.select :city_id, options_for_select( @cities_list, :selected => ( @city ? @city.id : nil ) )
13
+ = f.select :city_id, options_for_select( @cities_list, :selected => ( @city ? @city.id : params[:city_id] || nil ) )
10
14
  %br
11
15
  = f.label :tag
12
- = f.select :tag_id, options_for_select( @tags_list, (@tag||Tag.new).id )
16
+ = f.select :tag_id, options_for_select( @tags_list, selected:( @tag ? @tag.id : params[:tag_id] || nil ) )
13
17
  %br
14
18
  = f.label :user_profile
15
- = f.select :user_profile_id, options_for_select( @user_profiles_list )
19
+ = f.select :user_profile_id, options_for_select( @user_profiles_list, selected: ( @user_profile ? @user_profile.id : params[:user_profile_id] || nil ) )
16
20
 
17
21
  .col-sm-6
18
22
  = f.label :name
@@ -33,7 +37,7 @@
33
37
  = f.label :report
34
38
  = f.select :report_id, options_for_select( @reports_list, :selected => @newsitem.report_id )
35
39
  .a
36
-
40
+
37
41
  .a
38
42
  = f.submit :submit
39
-
43
+
@@ -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
@@ -17,11 +17,11 @@
17
17
 
18
18
  - if @report.subhead.length > 3
19
19
  .subhead= @report.subhead
20
-
20
+
21
21
  .descr
22
22
  - if @report.photo
23
23
  .float-left= image_tag @report.photo.photo.url( :small )
24
24
  = raw @report.descr
25
25
  .c
26
-
26
+
27
27
  .c
@@ -10,9 +10,9 @@
10
10
  .row
11
11
  .col-sm-4
12
12
  %ul
13
- %li= link_to '[edit]', edit_user_profile_path( profile )
14
- %li <b>Email:</b> #{profile.email}
15
- %li <b>username:</b> #{profile.username}
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
+
@@ -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
- = stylesheet_link_tag "ish_manager/application", media: "all"
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
data/config/routes.rb CHANGED
@@ -16,7 +16,7 @@ IshManager::Engine.routes.draw do
16
16
  end
17
17
 
18
18
  resources :covered_calls
19
-
19
+
20
20
  resources :email_templates
21
21
  resources :events
22
22
 
@@ -27,12 +27,12 @@ IshManager::Engine.routes.draw do
27
27
  get 'galleries/index_titles', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_TITLES }
28
28
  get 'galleries/index_thumbs', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
29
29
  get 'galleries/shared', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_THUMBS }
30
- get 'galleries/shared_titles', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_TITLES
30
+ get 'galleries/shared_titles', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_TITLES
31
31
  }, as: :galleries_shared_titles
32
32
  resources :galleries do
33
33
  post 'multiadd', :to => 'photos#j_create', :as => :multiadd
34
34
  end
35
-
35
+
36
36
  resources :invoices do
37
37
  # resources :payments
38
38
  end
@@ -45,6 +45,7 @@ IshManager::Engine.routes.draw do
45
45
  scope 'gameui' do
46
46
  resources 'maps' do
47
47
  resources 'markers'
48
+ resources 'newsitems'
48
49
  end
49
50
  resources 'markers' # redundant
50
51
  end
@@ -59,7 +60,7 @@ IshManager::Engine.routes.draw do
59
60
  resources :photos
60
61
  resources :payments
61
62
  ## profiles, see user_profiles
62
-
63
+
63
64
  resources :reports
64
65
 
65
66
  resources :sites do
@@ -75,7 +76,7 @@ IshManager::Engine.routes.draw do
75
76
  resources :videos
76
77
  resources :tags
77
78
  end
78
-
79
+
79
80
  # resources :stock_actions
80
81
  # resources :stock_options
81
82
  resources :stock_watches
@@ -98,5 +99,5 @@ IshManager::Engine.routes.draw do
98
99
 
99
100
  resources :venues
100
101
  resources :videos
101
-
102
+
102
103
  end
@@ -50,7 +50,7 @@ namespace :ish_manager do
50
50
  end
51
51
  =end
52
52
 
53
- desc 'watch the stocks 2, and trigger actions - not alphavantage, tda now. 2021-08-08'
53
+ desc 'watch the stocks, and trigger actions - not alphavantage, tda now. 2021-08-08'
54
54
  task watch_stocks: :environment do
55
55
  while true
56
56
  stocks = Ish::StockWatch.where( :notification_type => :EMAIL )
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.243
4
+ version: 0.1.8.247
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-08-08 00:00:00.000000000 Z
11
+ date: 2021-09-15 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
@@ -285,9 +287,10 @@ files:
285
287
  - app/views/ish_manager/leads/index.haml
286
288
  - app/views/ish_manager/leads/new.haml
287
289
  - app/views/ish_manager/maps/_form.haml
288
- - app/views/ish_manager/maps/_map_flat_row.haml
290
+ - app/views/ish_manager/maps/_map_meta_row.haml
289
291
  - app/views/ish_manager/maps/edit.haml
290
292
  - app/views/ish_manager/maps/index.haml
293
+ - app/views/ish_manager/maps/index.haml-trash
291
294
  - app/views/ish_manager/maps/new.haml
292
295
  - app/views/ish_manager/maps/show.haml
293
296
  - app/views/ish_manager/markers/_form.haml
@@ -306,6 +309,7 @@ files:
306
309
  - app/views/ish_manager/photos/without_gallery.haml
307
310
  - app/views/ish_manager/reports/_form.haml
308
311
  - app/views/ish_manager/reports/_index.haml
312
+ - app/views/ish_manager/reports/_show_mini.haml
309
313
  - app/views/ish_manager/reports/edit.haml
310
314
  - app/views/ish_manager/reports/index.haml
311
315
  - app/views/ish_manager/reports/new.haml
@@ -337,6 +341,7 @@ files:
337
341
  - app/views/ish_manager/user_profiles/edit.haml
338
342
  - app/views/ish_manager/user_profiles/index.haml
339
343
  - app/views/ish_manager/user_profiles/new.haml
344
+ - app/views/ish_manager/user_profiles/show.haml
340
345
  - app/views/ish_manager/users/_index.haml
341
346
  - app/views/ish_manager/venues/_form.haml
342
347
  - app/views/ish_manager/venues/_index.haml