ish_manager 0.1.8.320 → 0.1.8.322

Sign up to get free protection for your applications and to get access to all the features.
Files changed (38) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/bg/{weather-development.png → weather-bg-development.png} +0 -0
  3. data/app/assets/images/bg/{weather.png → weather-bg.png} +0 -0
  4. data/app/assets/stylesheets/ish_manager/application.scss +8 -6
  5. data/app/assets/stylesheets/ish_manager/galleries.scss +7 -4
  6. data/app/controllers/ish_manager/application_controller.rb +7 -19
  7. data/app/controllers/ish_manager/{unsubscribes_controller.rb → email_unsubscribes_controller.rb} +1 -1
  8. data/app/controllers/ish_manager/galleries_controller.rb +5 -0
  9. data/app/controllers/ish_manager/photos_controller.rb +18 -6
  10. data/app/controllers/ish_manager/{tags_controller.rb → trash/tags_controller.rb} +0 -0
  11. data/app/controllers/ish_manager/{users_controller.rb → trash/users_controller.rb} +0 -0
  12. data/app/controllers/ish_manager/videos_controller.rb +1 -1
  13. data/app/mailers/ish_manager/application_mailer.rb +0 -5
  14. data/app/models/ish_manager/ability.rb +14 -14
  15. data/app/views/ish_manager/application/_main_footer.haml +3 -7
  16. data/app/views/ish_manager/application/_main_header_admin.haml +4 -3
  17. data/app/views/ish_manager/application/_main_header_guy.haml +1 -0
  18. data/app/views/ish_manager/application/_meta.haml +2 -2
  19. data/app/views/ish_manager/application/home.haml +1 -1
  20. data/app/views/ish_manager/application/{_main_header.haml → trash/_main_header.haml} +0 -0
  21. data/app/views/ish_manager/application/{_main_header_manager.haml → trash/_main_header_manager.haml} +0 -0
  22. data/app/views/ish_manager/galleries/_title.haml +5 -2
  23. data/app/views/ish_manager/galleries/show.haml +9 -7
  24. data/app/views/ish_manager/photos/_form.haml +0 -0
  25. data/app/views/ish_manager/photos/index.haml +3 -0
  26. data/app/views/ish_manager/photos/new.haml +0 -0
  27. data/app/views/ish_manager/reports/index.haml +0 -7
  28. data/app/views/ish_manager/user_profiles/_form.haml +0 -4
  29. data/app/views/layouts/ish_manager/application.haml +5 -5
  30. data/config/routes.rb +5 -54
  31. data/lib/ish_manager.rb +1 -0
  32. data/{config → lib}/systemd/system/stockwatcher.service +0 -0
  33. data/{config → lib}/systemd/system/watch_stocks.service +0 -0
  34. data/lib/tasks/{migrate.rake → done/migrate.rake} +0 -0
  35. metadata +29 -15
  36. data/app/assets/stylesheets/ish_manager/tags.scss +0 -7
  37. data/app/models/ish_manager/application_record.rb +0 -7
  38. data/config/systemd/system/README.txt +0 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ac66a26a9fff0be8e482db83b11f2722b4a1f6a7f231883ce400ee6e8d4c0086
4
- data.tar.gz: 1a0dab969757ea87cb5d17529190296124a9e97f74815a63586fcc404cad81c8
3
+ metadata.gz: f685b8fe37214d8a572e315c280446e97c5c4b03cc005d881a167ad41d9fb320
4
+ data.tar.gz: f83dc62a1e6373c87d29918efc457f43a2bc0b997d77d3a23444b9cdace9704c
5
5
  SHA512:
6
- metadata.gz: 7fb00435a7c902e497a334a71dc26a4ece34e127e6be2a3f9f2b7d9cbd90fd2b54a5d117f50e8e458f82d3496f9e00b36ebb8f519bc697f3a749f578aca65e50
7
- data.tar.gz: 2617d260f1498668323bf8b5a36fca1a9fa3e7cb2ca0ff0ccd5c75adbbe8c720e48c2720d967ef0a55e601b3a2806e9bf2a9351fe14e4023664e01a80d241ca2
6
+ metadata.gz: b49d5ef8d417871ce7f82dd62b824756640cd4f77fa838015f6ae8ab5db7b7ef68f6469197bf6f7c811203ca0afe3bd6d2272fb32d8294a92445b40384cf0ee4
7
+ data.tar.gz: a891419ec414ac3fd995c1df5556a769aac1ab1d15ca0ae7fd9f2b1266518bacf7dfee531c7835702b0a29eda5890a2c2a4a419a7aafcad98b1cd93a72940e5c
@@ -4,7 +4,7 @@
4
4
  *= require ish_manager/jquery-ui
5
5
  *= require_self
6
6
  *
7
- * includes email contexts:
7
+ * includes email context:
8
8
  *= require ish_manager/email_templates
9
9
  *
10
10
  *= require ish_manager/galleries
@@ -12,7 +12,6 @@
12
12
  *= require ish_manager/markers
13
13
  *= require ish_manager/leads
14
14
  *= require ish_manager/photos
15
- *= require ish_manager/tags
16
15
  *= require ish_manager/user_profiles
17
16
  *= require ish_manager/videos
18
17
  *= require ish_manager/pagination
@@ -203,7 +202,7 @@ textarea.large {
203
202
 
204
203
 
205
204
  .main-header {
206
- background: url('/assets/bg/weather.png');
205
+ background: url('//d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/10/05192823/weather-bg.png');
207
206
 
208
207
  a {
209
208
  background: white;
@@ -239,9 +238,8 @@ textarea.large {
239
238
  }
240
239
  }
241
240
 
242
- .main-header.development,
243
- .main-header.development_production {
244
- background: url('/assets/bg/weather-development.png');
241
+ .main-header.development {
242
+ background: url('//d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/10/05192822/weather-bg-development.png');
245
243
  }
246
244
 
247
245
  .menu-secondary {
@@ -313,6 +311,10 @@ textarea.large {
313
311
 
314
312
  /* W */
315
313
 
314
+ .W0 {
315
+ margin-top: 10px;
316
+ }
317
+
316
318
  .WBordered {
317
319
  border: 1px solid gray;
318
320
  border-radius: 4px;
@@ -5,14 +5,16 @@
5
5
  }
6
6
 
7
7
  .galleries--title {
8
- text-align: center;
8
+ // text-align: center;
9
9
  }
10
10
 
11
11
  .galleries-show {
12
- .row {
13
- display: block;
12
+ > * {
14
13
  border-bottom: 2px solid red;
14
+ }
15
15
 
16
+ > *:last-child {
17
+ border-bottom: none;
16
18
  }
17
19
 
18
20
  .row-large .goto {
@@ -30,7 +32,8 @@
30
32
  // }
31
33
 
32
34
  .row-large .item {
33
- border: 1px solid red;
35
+ // border: 1px solid red;
36
+ border-radius: 20px;
34
37
 
35
38
  display: block;
36
39
  margin-bottom: 1em;
@@ -1,25 +1,12 @@
1
+
1
2
  module IshManager
2
3
  class ApplicationController < ActionController::Base
3
- # protect_from_forgery :with => :exception, :prepend => true
4
+ protect_from_forgery :with => :exception, :prepend => true
4
5
  before_action :set_current_ability
5
6
  before_action :set_changelog
6
7
  check_authorization
7
8
  rescue_from ::CanCan::AccessDenied, :with => :access_denied
8
9
 
9
- def email_test
10
- authorize! :home, IshManager::Ability
11
- IshManager::ApplicationMailer.test_email(' 3dva ').deliver_later
12
-
13
- # wait_until = "2022-05-03T15:09".to_datetime.in_time_zone
14
- # puts! wait_until, 'wait untl'
15
-
16
- # # IshManager::TestEmailJob.set({ wait_until: wait_until }).perform_later
17
- # IshManager::TestEmailJob.perform_later
18
-
19
- flash[:notice] = 'Scheduled delivery.'
20
- redirect_to request.referrer
21
- end
22
-
23
10
  def home
24
11
  authorize! :home, IshManager::Ability
25
12
  render 'home'
@@ -35,16 +22,16 @@ module IshManager
35
22
  end
36
23
 
37
24
  def set_current_ability
38
- @current_ability ||= ::IshManager::Ability.new( current_user )
25
+ @current_profile ||= ::Ish::UserProfile.find_by({ email: current_user.email })
26
+ @current_ability ||= ::IshManager::Ability.new( @current_profile )
39
27
  end
40
28
 
29
+ # @TODO: obsolete, remove _vp_ 2022-10-15
41
30
  def set_lists
42
31
  # alphabetized! : )
43
32
  @galleries_list = Gallery.all.list
44
- @locations_list = ::Gameui::Map.list
45
33
  @maps_list = ::Gameui::Map.list # @TODO: missing nonpublic!
46
34
  @reports_list = Report.all.list
47
- @tags_list = Tag.list
48
35
  @user_profiles_list = Ish::UserProfile.list
49
36
  @videos_list = Video.all.list
50
37
  end
@@ -63,10 +50,11 @@ module IshManager
63
50
  puts a.inspect
64
51
  end
65
52
 
53
+ # @TODO: obsolete, remove _vp_ 2022-10-15
66
54
  def update_profile_pic
67
55
  return unless params[:photo]
68
56
  @photo = Photo.new :photo => params[:photo]
69
- @photo.user_profile = @current_user.profile
57
+ @photo.user_profile = @current_profile
70
58
  flag = @photo.save
71
59
  @resource.profile_photo = @photo
72
60
  flagg = @resource.save
@@ -1,5 +1,5 @@
1
1
 
2
- class ::IshManager::UnsubscribesController < IshManager::ApplicationController
2
+ class ::IshManager::EmailUnsubscribesController < IshManager::ApplicationController
3
3
 
4
4
  layout false
5
5
 
@@ -38,6 +38,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
38
38
 
39
39
  def index
40
40
  authorize! :index, Gallery
41
+ @page_title = 'Galleries'
41
42
  @galleries = Gallery.unscoped.where( ## This must be so for role `guy`. _vp_ 2022-10-03
42
43
  :is_done.in => [false, nil],
43
44
  :is_trash.in => [false, nil],
@@ -70,11 +71,13 @@ class IshManager::GalleriesController < IshManager::ApplicationController
70
71
 
71
72
  def new
72
73
  @gallery = Gallery.new
74
+ @page_title = 'New Gallery'
73
75
  authorize! :new, @gallery
74
76
  end
75
77
 
76
78
  def shared_with_me
77
79
  authorize! :index, Gallery
80
+ @page_title = 'Galleries Shared With Me'
78
81
  @galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false
79
82
  ).order_by( :created_at => :desc
80
83
  ).page( params[:shared_galleries_page] ).per( 10 )
@@ -118,6 +121,8 @@ class IshManager::GalleriesController < IshManager::ApplicationController
118
121
  rescue
119
122
  @gallery = Gallery.unscoped.find params[:id]
120
123
  end
124
+ @page_title = "#{@gallery.name} Gallery"
125
+ @page_description = @gallery.subhead
121
126
  end
122
127
 
123
128
  end
@@ -5,9 +5,7 @@ class IshManager::PhotosController < IshManager::ApplicationController
5
5
  skip_authorization_check :only => [ :j_create ]
6
6
  protect_from_forgery :except => [ :j_create]
7
7
 
8
- def without_gallery
9
- @photos = Photo.unscoped.where( :gallery => nil, :is_trash => false )
10
- end
8
+ ## Alphabetized : )
11
9
 
12
10
  def destroy
13
11
  @photo = Photo.unscoped.find params[:id]
@@ -23,9 +21,9 @@ class IshManager::PhotosController < IshManager::ApplicationController
23
21
  redirect_to request.referrer || root_path
24
22
  end
25
23
 
26
- def show
27
- @photo = Photo.unscoped.find params[:id]
28
- authorize! :show, @photo
24
+ def index
25
+ authorize! :index, Photo
26
+ @photos = Photo.all.page( params[:photos_page] )
29
27
  end
30
28
 
31
29
  def j_create
@@ -63,5 +61,19 @@ class IshManager::PhotosController < IshManager::ApplicationController
63
61
  end
64
62
  end
65
63
 
64
+ def new
65
+ authorize! :new, Photo
66
+ @photo = Photo.new
67
+ end
68
+
69
+ def show
70
+ @photo = Photo.unscoped.find params[:id]
71
+ authorize! :show, @photo
72
+ end
73
+
74
+ def without_gallery
75
+ @photos = Photo.unscoped.where( :gallery => nil, :is_trash => false )
76
+ end
77
+
66
78
  end
67
79
 
@@ -7,7 +7,7 @@ class IshManager::VideosController < IshManager::ApplicationController
7
7
 
8
8
  def create
9
9
  @video = Video.new params[:video].permit(%i| name descr is_public is_trash is_feature x y lang youtube_id
10
- tags site user_profile premium_tier premium_purchases thumb video |)
10
+ site user_profile premium_tier premium_purchases thumb video |)
11
11
  @video.user_profile = current_user.profile
12
12
  if !params[:video][:site_id].blank?
13
13
  @video.site = Site.find params[:video][:site_id]
@@ -25,10 +25,5 @@ module IshManager
25
25
  mail( :to => stock.profile.email, :subject => "IshManager Stock Alert :: #{stock.ticker}" ).deliver
26
26
  end
27
27
 
28
- def test_email s=''
29
- puts! s, "#test_email - delivering"
30
- mail( to: 'piousbox@gmail.com', subject: "Test #{s} :: #{DateTime.now.strftime("%Y-%m-%d %l:%M:%S %P")}" )
31
- end
32
-
33
28
  end
34
29
  end
@@ -2,17 +2,17 @@
2
2
  class IshManager::Ability
3
3
  include ::CanCan::Ability
4
4
 
5
- def initialize user
5
+ def initialize user_profile
6
6
 
7
7
  #
8
8
  # signed in user
9
9
  #
10
- if !user.blank?
10
+ if !user_profile.blank?
11
11
 
12
12
  #
13
13
  # only sudoer... total power
14
14
  #
15
- if user.profile && user.profile.sudoer?
15
+ if user_profile.sudoer?
16
16
  can :manage, :all
17
17
  end
18
18
 
@@ -21,13 +21,13 @@ class IshManager::Ability
21
21
  #
22
22
  # role admin
23
23
  #
24
- if user.profile && [ :admin ].include?( user.profile.role_name )
24
+ if user_profile && [ :admin ].include?( user_profile.role_name )
25
25
 
26
26
  can [ :friends_index, :friends_new ], ::Ish::UserProfile
27
27
 
28
28
  can [ :index, :new, :create, :create_photo ], ::Gallery
29
29
  can [ :edit, :update ], ::Gallery do |g|
30
- !g.is_trash && ( g.is_public || g.user_profile == user.profile )
30
+ !g.is_trash && ( g.is_public || g.user_profile == user_profile )
31
31
  end
32
32
  can [ :edit, :index, :show, :update,
33
33
  :new_marker, :edit_marker, :create_marker, :update_marker,
@@ -39,16 +39,16 @@ class IshManager::Ability
39
39
 
40
40
  can [ :index, :new, :create ], Report
41
41
  can [ :edit, :update, :destroy ], Report do |g|
42
- !g.is_trash && ( g.is_public || g.user_profile == user.profile )
42
+ !g.is_trash && ( g.is_public || g.user_profile == user_profile )
43
43
  end
44
44
 
45
45
  # can [ :manage ], ::Warbler::StockWatch
46
46
 
47
- can [ :index, :new, :create ], ::Tag
47
+ # can [ :index, :new, :create ], ::Tag
48
48
 
49
49
  can [ :index, :new, :create ], ::Video
50
50
  can [ :edit, :update, :destroy ], ::Video do |v|
51
- !v.is_trash && ( v.is_public || v.user_profile == user.profile )
51
+ !v.is_trash && ( v.is_public || v.user_profile == user_profile )
52
52
  end
53
53
 
54
54
  end
@@ -56,7 +56,7 @@ class IshManager::Ability
56
56
  #
57
57
  # role manager
58
58
  #
59
- if user.profile && :manager == user.profile.role_name
59
+ if user_profile && :manager == user_profile.role_name
60
60
 
61
61
  can [ :edit, :index, :show, :update,
62
62
  :new_marker, :edit_marker, :create_marker, :update_marker,
@@ -68,14 +68,14 @@ class IshManager::Ability
68
68
  #
69
69
  # role guy (and manager)
70
70
  #
71
- if user.profile && [ :manager, :guy ].include?( user.profile.role_name )
71
+ if user_profile && [ :manager, :guy ].include?( user_profile.role_name )
72
72
 
73
73
  can [ :index, :new, :create ], ::Gallery
74
74
  can [ :show, :edit, :update, :create_photo ], ::Gallery do |gallery|
75
- gallery.user_profile == user.profile
75
+ gallery.user_profile == user_profile
76
76
  end
77
77
  can [ :show ], ::Gallery do |gallery|
78
- gallery.shared_profiles.include? user.profile
78
+ gallery.shared_profiles.include? user_profile
79
79
  end
80
80
 
81
81
  # can [ :index ], ::Report
@@ -89,7 +89,7 @@ class IshManager::Ability
89
89
  #
90
90
  # anonymous user
91
91
  #
92
- user ||= ::User.new
92
+ user_profile ||= ::Ish::UserProfile.new
93
93
 
94
94
  can [ :open_permission ], IshManager::Ability
95
95
 
@@ -101,7 +101,7 @@ class IshManager::Ability
101
101
  report.is_public
102
102
  end
103
103
 
104
- can [ :new, :create ], Ish::Unsubscribe
104
+ can [ :new, :create ], Ish::EmailUnsubscribe
105
105
 
106
106
  end
107
107
  end
@@ -6,13 +6,9 @@
6
6
  .a
7
7
  .row
8
8
  .col-sm-6
9
- - if @current_user
10
- %ul
11
- %li <b>Email:</b> #{@current_user.email}
12
- %li <b>Role name:</b> #{@current_user.profile&.role_name}
13
- - else
14
- Please log in
15
- = link_to '[+]', main_app.new_user_session_path
9
+ %ul
10
+ %li <b>Email:</b> #{@current_profile.email}
11
+ %li <b>Role name:</b> #{@current_profile.role_name}
16
12
 
17
13
  .col-sm-4
18
14
  \~__^
@@ -36,13 +36,14 @@
36
36
  = text_field_tag :q
37
37
  = link_to '[+]', new_map_path
38
38
 
39
- %li
40
- = link_to 'Tags', tags_path
39
+ -# %li
40
+ -# = link_to 'Tags', tags_path
41
+
41
42
  %ul
42
43
  %li= link_to '+Newsitem', new_newsitem_path
43
44
  -# %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches (old m3)', stock_watches_path
44
45
  -# %li= link_to 'Stock Watches', '/iron_warbler/stock_watches'
45
- %li= link_to 'Users', users_path
46
+ -# %li= link_to 'Users', users_path
46
47
  %li= link_to 'Ish::UserProfiles', user_profiles_path
47
48
  %li
48
49
  = link_to "Ish::ImageAsset's", image_assets_path
@@ -23,3 +23,4 @@
23
23
  = text_field_tag :q
24
24
  = link_to '[+]', new_video_path
25
25
  .c
26
+ %hr
@@ -6,8 +6,8 @@
6
6
  <b>By:</b>
7
7
  = link_to item.user_profile.name, edit_user_profile_path( item.user_profile )
8
8
 
9
- - if item.tags.length > 0
10
- <b>Tags:</b> #{ item.tags.map(&:name).join(', ') }
9
+ -# - if item.tags.length > 0
10
+ -# <b>Tags:</b> #{ item.tags.map(&:name).join(', ') }
11
11
 
12
12
  - if defined?(item.premium_tier) && item.premium_tier > 0
13
13
  <b>Tier:$#{item.premium_tier}</b>
@@ -1,6 +1,6 @@
1
1
 
2
2
  .application-home
3
- Welcome home! Your role is `#{current_user.profile.role_name}`.
3
+ Welcome home
4
4
 
5
5
  .bordered-card
6
6
  = form_tag "https://www.cgtrader.com/free-3d-models", method: :get do
@@ -1,6 +1,7 @@
1
1
 
2
2
  .galleries--title
3
3
  %h2
4
+ Gallery
4
5
  = link_to gallery.name, gallery_path(gallery)
5
6
  (#{gallery.photos.length})
6
7
  = link_to '[~]', edit_gallery_path( gallery )
@@ -9,5 +10,7 @@
9
10
  %i.material-icons visibility
10
11
  - else
11
12
  %i.material-icons visibility_off
12
- slug :: #{gallery.slug}
13
- = render 'meta', :item => gallery
13
+ %ul
14
+ %li slug :: #{gallery.slug}
15
+ %li subhead :: #{gallery.subhead}
16
+ %li= render 'meta', :item => gallery
@@ -3,26 +3,28 @@
3
3
  -#
4
4
 
5
5
  .galleries-show
6
- = render 'title', :gallery => @gallery
6
+ .row
7
+ .col-sm-12.col-md-6
8
+ = render 'title', :gallery => @gallery
9
+ .col-sm-12.col-md-6
10
+ = render 'ish_manager/photos/multinew', :gallery => @gallery
7
11
 
8
- = render 'ish_manager/photos/multinew', :gallery => @gallery
9
-
10
- .row.row-deleted
12
+ .row-deleted
11
13
  %p.collapse-expand#rowDeleted Deleted
12
14
  = render 'ish_manager/photos/index_thumbs', photos: @deleted_photos
13
15
 
14
- .row.row-mini
16
+ .row-mini
15
17
  %p.collapse-expand#rowMinis Mini's
16
18
  .flex-row
17
19
  - @photos.each do |photo|
18
20
  .item
19
21
  = link_to image_tag(photo.photo.url( :mini ), :alt => ''), "#large_#{photo.id}"
20
22
 
21
- .row.row-thumbs
23
+ .row-thumbs
22
24
  %p.collapse-expand#rowThumbs Thumbs
23
25
  = render 'ish_manager/photos/index_thumbs', photos: @photos
24
26
 
25
- .row.row-large
27
+ .row-large
26
28
  %p.collapse-expand#rowLarge Large
27
29
  .a
28
30
  - @photos.each do |photo|
File without changes
@@ -0,0 +1,3 @@
1
+
2
+ = render 'index_thumbs', photos: @photos
3
+
File without changes
@@ -1,9 +1,6 @@
1
1
 
2
2
  -# ish_manager / reports / index
3
3
 
4
- - if @site
5
- = render 'ish_manager/sites/header', :site => @site
6
-
7
4
  .row
8
5
  .large-12.columns
9
6
  %h3
@@ -24,10 +21,6 @@
24
21
  = link_to report.name, report_path( report )
25
22
  %br
26
23
  .gray
27
- - if report.site
28
- Site <b>#{report.site.domain}/#{report.site.lang}</b>
29
- - if report.city
30
- City <b>#{report.city.name}</b>
31
24
  = pp_date report.created_at
32
25
  - if report.photo
33
26
  = image_tag report.photo.photo.url :thumb
@@ -38,10 +38,6 @@
38
38
  = f.label :fb_long_access_token
39
39
  = f.text_field :fb_long_access_token
40
40
 
41
- .input-field
42
- = f.select :bookmarked_location_ids, options_for_select( @locations_list, selected: profile.bookmarked_location_ids), {}, { multiple: true }
43
- %label Bookmarked Locations
44
-
45
41
  = f.submit 'Save', :class => %w(button)
46
42
 
47
43
 
@@ -1,11 +1,11 @@
1
1
  !!!
2
2
  %html
3
3
  %head
4
- %title Ish Manager
4
+ %title #{@page_title} | PiousboxCMS
5
5
  %link{ :rel => 'icon', :href => "/favicon_#{ENV['RAILS_ENV']}.gif" }
6
6
  %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1.0' }
7
7
  %meta{ :charset => 'UTF-8' }
8
- %meta{ :description => 'some description' }
8
+ %meta{ :description => @page_description }
9
9
 
10
10
  = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
11
11
 
@@ -31,11 +31,11 @@
31
31
  = csrf_meta_tags
32
32
  %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action]] }
33
33
  .bg-white
34
- = render :partial => "ish_manager/application/main_header_#{current_user.profile.role_name}"
35
- .container
34
+ = render :partial => "ish_manager/application/main_header_#{@current_profile.role_name}"
35
+ .container.W0
36
36
  - if notice || alert
37
37
  .row
38
- .col.s12
38
+ .col-sm-12
39
39
  - if notice
40
40
  - if notice.class == Array
41
41
  %ul
data/config/routes.rb CHANGED
@@ -1,25 +1,8 @@
1
1
 
2
2
  IshManager::Engine.routes.draw do
3
3
 
4
- post 'email_test', to: 'application#email_test', as: :email_test
5
-
6
4
  root :to => 'application#home'
7
5
 
8
- ## @deprecated: use Locations
9
- resources :cities do
10
- resources :features
11
- resources :newsitems
12
- resources :reports
13
- resources :galleries
14
- resources :videos
15
- resources :events
16
- resources :venues
17
- resources :tags
18
- end
19
- resources :events
20
-
21
- resources :friends
22
-
23
6
  get 'galleries', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
24
7
  get 'galleries/index_titles', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_TITLES }
25
8
  get 'galleries/index_thumbs', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
@@ -61,11 +44,7 @@ IshManager::Engine.routes.draw do
61
44
  #
62
45
  # office, below
63
46
  #
64
- get 'leads', :to => 'leads#index', :defaults => { :is_done => false }, as: :leads
65
- get 'leads/done', :to => 'leads#index', :defaults => { :is_done => true }, :as => :done_leads
66
- resources :leads
67
47
 
68
- resources :meetings
69
48
  resources :email_campaigns, as: :email_campaigns
70
49
 
71
50
  get 'email_contexts/iframe_src/:id', to: 'email_contexts#iframe_src', as: :email_context_iframe
@@ -77,13 +56,13 @@ IshManager::Engine.routes.draw do
77
56
  get 'email_templates/show/:id', to: 'email_templates#show', as: :email_template
78
57
  delete 'email_templates/show/:id', to: 'email_templates#destroy'
79
58
  resources :email_templates
59
+ resources :email_unsubscribes
80
60
 
81
- resources :unsubscribes
82
- resources :sent_emails
83
- #
84
- # office, above
85
- #
61
+ get 'leads', :to => 'leads#index', :defaults => { :is_done => false }, as: :leads
62
+ get 'leads/done', :to => 'leads#index', :defaults => { :is_done => true }, :as => :done_leads
63
+ resources :leads
86
64
 
65
+ resources :meetings
87
66
 
88
67
  resources :newsitems
89
68
 
@@ -92,31 +71,6 @@ IshManager::Engine.routes.draw do
92
71
 
93
72
  resources :reports
94
73
 
95
- ## @deprecated: use Locations
96
- resources :sites do
97
- resources :features
98
- resources :newsitems
99
-
100
- get 'reports', :to => 'sites#reports'
101
- resources :reports
102
-
103
- get 'galleries', :to => 'sites#galleries'
104
-
105
- resources :galleries
106
- resources :videos
107
- resources :tags
108
- end
109
-
110
- resources :tags do
111
- resources :features
112
- resources :newsitems
113
-
114
- resources :reports
115
- resources :galleries
116
- resources :videos
117
- end
118
-
119
- resources :users
120
74
  resources :user_profiles do
121
75
  resources :newsitems
122
76
  end
@@ -124,9 +78,6 @@ IshManager::Engine.routes.draw do
124
78
  # resources :newsitems
125
79
  end
126
80
 
127
- ## @TODO: venues can only be in cities, right?
128
- ## @deprecated: use Locations
129
- resources :venues
130
81
  resources :videos
131
82
 
132
83
  end
data/lib/ish_manager.rb CHANGED
@@ -1,4 +1,5 @@
1
1
 
2
+ require 'aws-sdk'
2
3
  require "ish_manager/engine"
3
4
  require 'haml'
4
5
  require 'cancancan'
File without changes
File without changes
File without changes
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.320
4
+ version: 0.1.8.322
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-10-04 00:00:00.000000000 Z
11
+ date: 2022-10-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk
@@ -24,6 +24,20 @@ dependencies:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
+ - !ruby/object:Gem::Dependency
28
+ name: aws-sdk-s3
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ">="
32
+ - !ruby/object:Gem::Version
33
+ version: '0'
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ">="
39
+ - !ruby/object:Gem::Version
40
+ version: '0'
27
41
  - !ruby/object:Gem::Dependency
28
42
  name: cancancan
29
43
  requirement: !ruby/object:Gem::Requirement
@@ -204,8 +218,8 @@ files:
204
218
  - app/assets/images/bg/confectionary.png
205
219
  - app/assets/images/bg/gplaypattern.png
206
220
  - app/assets/images/bg/triangular.png
207
- - app/assets/images/bg/weather-development.png
208
- - app/assets/images/bg/weather.png
221
+ - app/assets/images/bg/weather-bg-development.png
222
+ - app/assets/images/bg/weather-bg.png
209
223
  - app/assets/images/favicon.gif
210
224
  - app/assets/images/icons/10x10_red-cross.png
211
225
  - app/assets/images/icons/20x20/private.png
@@ -259,7 +273,6 @@ files:
259
273
  - app/assets/stylesheets/ish_manager/markers.scss
260
274
  - app/assets/stylesheets/ish_manager/pagination.scss
261
275
  - app/assets/stylesheets/ish_manager/photos.scss
262
- - app/assets/stylesheets/ish_manager/tags.scss
263
276
  - app/assets/stylesheets/ish_manager/trash/bootstrap.css
264
277
  - app/assets/stylesheets/ish_manager/trash/materialize.css
265
278
  - app/assets/stylesheets/ish_manager/trash/reset.css
@@ -269,6 +282,7 @@ files:
269
282
  - app/controllers/ish_manager/email_campaigns_controller.rb
270
283
  - app/controllers/ish_manager/email_contexts_controller.rb
271
284
  - app/controllers/ish_manager/email_templates_controller.rb
285
+ - app/controllers/ish_manager/email_unsubscribes_controller.rb
272
286
  - app/controllers/ish_manager/galleries_controller.rb
273
287
  - app/controllers/ish_manager/image_assets_controller.rb
274
288
  - app/controllers/ish_manager/invoices_controller.rb
@@ -280,14 +294,13 @@ files:
280
294
  - app/controllers/ish_manager/payments_controller.rb
281
295
  - app/controllers/ish_manager/photos_controller.rb
282
296
  - app/controllers/ish_manager/reports_controller.rb
283
- - app/controllers/ish_manager/tags_controller.rb
284
297
  - app/controllers/ish_manager/trash/cities_controller.rb
285
298
  - app/controllers/ish_manager/trash/orders_controller.rb
286
299
  - app/controllers/ish_manager/trash/sites_controller.rb
300
+ - app/controllers/ish_manager/trash/tags_controller.rb
301
+ - app/controllers/ish_manager/trash/users_controller.rb
287
302
  - app/controllers/ish_manager/trash/venues_controller.rb
288
- - app/controllers/ish_manager/unsubscribes_controller.rb
289
303
  - app/controllers/ish_manager/user_profiles_controller.rb
290
- - app/controllers/ish_manager/users_controller.rb
291
304
  - app/controllers/ish_manager/videos_controller.rb
292
305
  - app/helpers/ish_manager/application_helper.rb
293
306
  - app/helpers/ish_manager/images_helper.rb
@@ -297,20 +310,19 @@ files:
297
310
  - app/mailers/ish_manager/meeting_mailer.rb
298
311
  - app/mailers/ish_manager/office_mailer.rb
299
312
  - app/models/ish_manager/ability.rb
300
- - app/models/ish_manager/application_record.rb
301
313
  - app/views/ish_manager/application/_analytics.html
302
314
  - app/views/ish_manager/application/_debug.haml
303
315
  - app/views/ish_manager/application/_form_errors.haml
304
316
  - app/views/ish_manager/application/_form_nonpublic.haml
305
317
  - app/views/ish_manager/application/_main_footer.haml
306
- - app/views/ish_manager/application/_main_header.haml
307
318
  - app/views/ish_manager/application/_main_header_admin.haml
308
319
  - app/views/ish_manager/application/_main_header_guy.haml
309
- - app/views/ish_manager/application/_main_header_manager.haml
310
320
  - app/views/ish_manager/application/_meta.haml
311
321
  - app/views/ish_manager/application/_profile_pic.haml
312
322
  - app/views/ish_manager/application/_search.haml
313
323
  - app/views/ish_manager/application/home.haml
324
+ - app/views/ish_manager/application/trash/_main_header.haml
325
+ - app/views/ish_manager/application/trash/_main_header_manager.haml
314
326
  - app/views/ish_manager/application_mailer/shared_galleries.html.erb
315
327
  - app/views/ish_manager/application_mailer/welcome.html.erb
316
328
  - app/views/ish_manager/email_campaigns/index.haml
@@ -397,10 +409,13 @@ files:
397
409
  - app/views/ish_manager/office_mailer/render
398
410
  - app/views/ish_manager/office_mailer/test_email.html.haml
399
411
  - app/views/ish_manager/payments/index.haml
412
+ - app/views/ish_manager/photos/_form.haml
400
413
  - app/views/ish_manager/photos/_index_thumbs.haml
401
414
  - app/views/ish_manager/photos/_meta.haml
402
415
  - app/views/ish_manager/photos/_meta_manager.haml
403
416
  - app/views/ish_manager/photos/_multinew.haml
417
+ - app/views/ish_manager/photos/index.haml
418
+ - app/views/ish_manager/photos/new.haml
404
419
  - app/views/ish_manager/photos/show.haml
405
420
  - app/views/ish_manager/photos/without_gallery.haml
406
421
  - app/views/ish_manager/reports/_form.haml
@@ -479,14 +494,13 @@ files:
479
494
  - app/views/layouts/ish_manager/application.haml
480
495
  - app/views/layouts/ish_manager/application.haml-trash
481
496
  - config/routes.rb
482
- - config/systemd/system/README.txt
483
- - config/systemd/system/stockwatcher.service
484
- - config/systemd/system/watch_stocks.service
485
497
  - lib/ish_manager.rb
486
498
  - lib/ish_manager/engine.rb
487
499
  - lib/ish_manager/version.rb
500
+ - lib/systemd/system/stockwatcher.service
501
+ - lib/systemd/system/watch_stocks.service
502
+ - lib/tasks/done/migrate.rake
488
503
  - lib/tasks/ish_manager_tasks.rake
489
- - lib/tasks/migrate.rake
490
504
  homepage: http://wasya.co
491
505
  licenses:
492
506
  - MIT
@@ -1,7 +0,0 @@
1
-
2
- /**
3
- * tags
4
- */
5
- ul.tags ul.tags {
6
- margin-left: 2em;
7
- }
@@ -1,7 +0,0 @@
1
- =begin
2
- module IshManager
3
- class ApplicationRecord < ActiveRecord::Base
4
- self.abstract_class = true
5
- end
6
- end
7
- =end
@@ -1,3 +0,0 @@
1
-
2
- actually /lib/systemd/system/watch_stocks.service
3
-