ish_manager 0.1.8.320 → 0.1.8.321
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/images/bg/{weather-development.png → weather-bg-development.png} +0 -0
- data/app/assets/images/bg/{weather.png → weather-bg.png} +0 -0
- data/app/assets/stylesheets/ish_manager/application.scss +8 -6
- data/app/assets/stylesheets/ish_manager/galleries.scss +7 -4
- data/app/controllers/ish_manager/application_controller.rb +6 -19
- data/app/controllers/ish_manager/{unsubscribes_controller.rb → email_unsubscribes_controller.rb} +1 -1
- data/app/controllers/ish_manager/galleries_controller.rb +5 -0
- data/app/controllers/ish_manager/photos_controller.rb +18 -6
- data/app/controllers/ish_manager/{tags_controller.rb → trash/tags_controller.rb} +0 -0
- data/app/controllers/ish_manager/{users_controller.rb → trash/users_controller.rb} +0 -0
- data/app/controllers/ish_manager/videos_controller.rb +1 -1
- data/app/mailers/ish_manager/application_mailer.rb +0 -5
- data/app/models/ish_manager/ability.rb +13 -13
- data/app/views/ish_manager/application/_main_footer.haml +3 -7
- data/app/views/ish_manager/application/_main_header_guy.haml +1 -0
- data/app/views/ish_manager/application/home.haml +1 -1
- data/app/views/ish_manager/application/{_main_header.haml → trash/_main_header.haml} +0 -0
- data/app/views/ish_manager/application/{_main_header_manager.haml → trash/_main_header_manager.haml} +0 -0
- data/app/views/ish_manager/galleries/_title.haml +5 -2
- data/app/views/ish_manager/galleries/show.haml +9 -7
- data/app/views/ish_manager/photos/_form.haml +0 -0
- data/app/views/ish_manager/photos/index.haml +3 -0
- data/app/views/ish_manager/photos/new.haml +0 -0
- data/app/views/ish_manager/reports/index.haml +0 -7
- data/app/views/ish_manager/user_profiles/_form.haml +0 -4
- data/app/views/layouts/ish_manager/application.haml +5 -5
- data/config/routes.rb +5 -54
- data/{config → lib}/systemd/system/stockwatcher.service +0 -0
- data/{config → lib}/systemd/system/watch_stocks.service +0 -0
- data/lib/tasks/{migrate.rake → done/migrate.rake} +0 -0
- metadata +15 -15
- data/app/assets/stylesheets/ish_manager/tags.scss +0 -7
- data/app/models/ish_manager/application_record.rb +0 -7
- data/config/systemd/system/README.txt +0 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7b554f3447bbf60499ac307a8efeb764f61f5db98d420ef4d927c5d6eed58ff7
|
4
|
+
data.tar.gz: 1b494df22a16f71380129f99a69a95acde34d52d217afb884f93486b7cc98dbb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 821d34cfce66540bc6ccd23cfd653a8838e1bbabc6701e8caf2f93ff91d6cd5294ceeacd8a04d18af0e1dfb61a3a3b29ebbded4c211c2c8abe98b7883b21dde0
|
7
|
+
data.tar.gz: cfda033dae665b39fe6bc71614ad1ab1620217590ee313529f09e021496f8525a873d947a940846ef6af0606b6a19eaf75196dd34123dbe37f64036bc01d3613
|
File without changes
|
File without changes
|
@@ -4,7 +4,7 @@
|
|
4
4
|
*= require ish_manager/jquery-ui
|
5
5
|
*= require_self
|
6
6
|
*
|
7
|
-
* includes email
|
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('/
|
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
|
-
.
|
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
|
-
|
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,11 @@
|
|
1
1
|
module IshManager
|
2
2
|
class ApplicationController < ActionController::Base
|
3
|
-
|
3
|
+
protect_from_forgery :with => :exception, :prepend => true
|
4
4
|
before_action :set_current_ability
|
5
5
|
before_action :set_changelog
|
6
6
|
check_authorization
|
7
7
|
rescue_from ::CanCan::AccessDenied, :with => :access_denied
|
8
8
|
|
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
9
|
def home
|
24
10
|
authorize! :home, IshManager::Ability
|
25
11
|
render 'home'
|
@@ -35,16 +21,16 @@ module IshManager
|
|
35
21
|
end
|
36
22
|
|
37
23
|
def set_current_ability
|
38
|
-
@
|
24
|
+
@current_profile ||= ::Ish::UserProfile.find_by({ email: current_user.email })
|
25
|
+
@current_ability ||= ::IshManager::Ability.new( @current_profile )
|
39
26
|
end
|
40
27
|
|
28
|
+
# @TODO: obsolete, remove _vp_ 2022-10-15
|
41
29
|
def set_lists
|
42
30
|
# alphabetized! : )
|
43
31
|
@galleries_list = Gallery.all.list
|
44
|
-
@locations_list = ::Gameui::Map.list
|
45
32
|
@maps_list = ::Gameui::Map.list # @TODO: missing nonpublic!
|
46
33
|
@reports_list = Report.all.list
|
47
|
-
@tags_list = Tag.list
|
48
34
|
@user_profiles_list = Ish::UserProfile.list
|
49
35
|
@videos_list = Video.all.list
|
50
36
|
end
|
@@ -63,10 +49,11 @@ module IshManager
|
|
63
49
|
puts a.inspect
|
64
50
|
end
|
65
51
|
|
52
|
+
# @TODO: obsolete, remove _vp_ 2022-10-15
|
66
53
|
def update_profile_pic
|
67
54
|
return unless params[:photo]
|
68
55
|
@photo = Photo.new :photo => params[:photo]
|
69
|
-
@photo.user_profile = @
|
56
|
+
@photo.user_profile = @current_profile
|
70
57
|
flag = @photo.save
|
71
58
|
@resource.profile_photo = @photo
|
72
59
|
flagg = @resource.save
|
@@ -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
|
-
|
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
|
27
|
-
|
28
|
-
|
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
|
|
File without changes
|
File without changes
|
@@ -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
|
-
|
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
|
5
|
+
def initialize user_profile
|
6
6
|
|
7
7
|
#
|
8
8
|
# signed in user
|
9
9
|
#
|
10
|
-
if !
|
10
|
+
if !user_profile.blank?
|
11
11
|
|
12
12
|
#
|
13
13
|
# only sudoer... total power
|
14
14
|
#
|
15
|
-
if
|
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
|
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 ==
|
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,7 +39,7 @@ 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 ==
|
42
|
+
!g.is_trash && ( g.is_public || g.user_profile == user_profile )
|
43
43
|
end
|
44
44
|
|
45
45
|
# can [ :manage ], ::Warbler::StockWatch
|
@@ -48,7 +48,7 @@ class IshManager::Ability
|
|
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 ==
|
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
|
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
|
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 ==
|
75
|
+
gallery.user_profile == user_profile
|
76
76
|
end
|
77
77
|
can [ :show ], ::Gallery do |gallery|
|
78
|
-
gallery.shared_profiles.include?
|
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
|
-
|
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::
|
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
|
-
|
10
|
-
%
|
11
|
-
|
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
|
\~__^
|
File without changes
|
data/app/views/ish_manager/application/{_main_header_manager.haml → trash/_main_header_manager.haml}
RENAMED
File without changes
|
@@ -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
|
-
|
13
|
-
|
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
|
-
|
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
|
-
|
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
|
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
|
23
|
+
.row-thumbs
|
22
24
|
%p.collapse-expand#rowThumbs Thumbs
|
23
25
|
= render 'ish_manager/photos/index_thumbs', photos: @photos
|
24
26
|
|
25
|
-
.row
|
27
|
+
.row-large
|
26
28
|
%p.collapse-expand#rowLarge Large
|
27
29
|
.a
|
28
30
|
- @photos.each do |photo|
|
File without changes
|
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
|
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 =>
|
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_#{
|
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
|
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
|
-
|
82
|
-
|
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
|
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.
|
4
|
+
version: 0.1.8.321
|
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-
|
11
|
+
date: 2022-10-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aws-sdk
|
@@ -204,8 +204,8 @@ files:
|
|
204
204
|
- app/assets/images/bg/confectionary.png
|
205
205
|
- app/assets/images/bg/gplaypattern.png
|
206
206
|
- app/assets/images/bg/triangular.png
|
207
|
-
- app/assets/images/bg/weather-development.png
|
208
|
-
- app/assets/images/bg/weather.png
|
207
|
+
- app/assets/images/bg/weather-bg-development.png
|
208
|
+
- app/assets/images/bg/weather-bg.png
|
209
209
|
- app/assets/images/favicon.gif
|
210
210
|
- app/assets/images/icons/10x10_red-cross.png
|
211
211
|
- app/assets/images/icons/20x20/private.png
|
@@ -259,7 +259,6 @@ files:
|
|
259
259
|
- app/assets/stylesheets/ish_manager/markers.scss
|
260
260
|
- app/assets/stylesheets/ish_manager/pagination.scss
|
261
261
|
- app/assets/stylesheets/ish_manager/photos.scss
|
262
|
-
- app/assets/stylesheets/ish_manager/tags.scss
|
263
262
|
- app/assets/stylesheets/ish_manager/trash/bootstrap.css
|
264
263
|
- app/assets/stylesheets/ish_manager/trash/materialize.css
|
265
264
|
- app/assets/stylesheets/ish_manager/trash/reset.css
|
@@ -269,6 +268,7 @@ files:
|
|
269
268
|
- app/controllers/ish_manager/email_campaigns_controller.rb
|
270
269
|
- app/controllers/ish_manager/email_contexts_controller.rb
|
271
270
|
- app/controllers/ish_manager/email_templates_controller.rb
|
271
|
+
- app/controllers/ish_manager/email_unsubscribes_controller.rb
|
272
272
|
- app/controllers/ish_manager/galleries_controller.rb
|
273
273
|
- app/controllers/ish_manager/image_assets_controller.rb
|
274
274
|
- app/controllers/ish_manager/invoices_controller.rb
|
@@ -280,14 +280,13 @@ files:
|
|
280
280
|
- app/controllers/ish_manager/payments_controller.rb
|
281
281
|
- app/controllers/ish_manager/photos_controller.rb
|
282
282
|
- app/controllers/ish_manager/reports_controller.rb
|
283
|
-
- app/controllers/ish_manager/tags_controller.rb
|
284
283
|
- app/controllers/ish_manager/trash/cities_controller.rb
|
285
284
|
- app/controllers/ish_manager/trash/orders_controller.rb
|
286
285
|
- app/controllers/ish_manager/trash/sites_controller.rb
|
286
|
+
- app/controllers/ish_manager/trash/tags_controller.rb
|
287
|
+
- app/controllers/ish_manager/trash/users_controller.rb
|
287
288
|
- app/controllers/ish_manager/trash/venues_controller.rb
|
288
|
-
- app/controllers/ish_manager/unsubscribes_controller.rb
|
289
289
|
- app/controllers/ish_manager/user_profiles_controller.rb
|
290
|
-
- app/controllers/ish_manager/users_controller.rb
|
291
290
|
- app/controllers/ish_manager/videos_controller.rb
|
292
291
|
- app/helpers/ish_manager/application_helper.rb
|
293
292
|
- app/helpers/ish_manager/images_helper.rb
|
@@ -297,20 +296,19 @@ files:
|
|
297
296
|
- app/mailers/ish_manager/meeting_mailer.rb
|
298
297
|
- app/mailers/ish_manager/office_mailer.rb
|
299
298
|
- app/models/ish_manager/ability.rb
|
300
|
-
- app/models/ish_manager/application_record.rb
|
301
299
|
- app/views/ish_manager/application/_analytics.html
|
302
300
|
- app/views/ish_manager/application/_debug.haml
|
303
301
|
- app/views/ish_manager/application/_form_errors.haml
|
304
302
|
- app/views/ish_manager/application/_form_nonpublic.haml
|
305
303
|
- app/views/ish_manager/application/_main_footer.haml
|
306
|
-
- app/views/ish_manager/application/_main_header.haml
|
307
304
|
- app/views/ish_manager/application/_main_header_admin.haml
|
308
305
|
- app/views/ish_manager/application/_main_header_guy.haml
|
309
|
-
- app/views/ish_manager/application/_main_header_manager.haml
|
310
306
|
- app/views/ish_manager/application/_meta.haml
|
311
307
|
- app/views/ish_manager/application/_profile_pic.haml
|
312
308
|
- app/views/ish_manager/application/_search.haml
|
313
309
|
- app/views/ish_manager/application/home.haml
|
310
|
+
- app/views/ish_manager/application/trash/_main_header.haml
|
311
|
+
- app/views/ish_manager/application/trash/_main_header_manager.haml
|
314
312
|
- app/views/ish_manager/application_mailer/shared_galleries.html.erb
|
315
313
|
- app/views/ish_manager/application_mailer/welcome.html.erb
|
316
314
|
- app/views/ish_manager/email_campaigns/index.haml
|
@@ -397,10 +395,13 @@ files:
|
|
397
395
|
- app/views/ish_manager/office_mailer/render
|
398
396
|
- app/views/ish_manager/office_mailer/test_email.html.haml
|
399
397
|
- app/views/ish_manager/payments/index.haml
|
398
|
+
- app/views/ish_manager/photos/_form.haml
|
400
399
|
- app/views/ish_manager/photos/_index_thumbs.haml
|
401
400
|
- app/views/ish_manager/photos/_meta.haml
|
402
401
|
- app/views/ish_manager/photos/_meta_manager.haml
|
403
402
|
- app/views/ish_manager/photos/_multinew.haml
|
403
|
+
- app/views/ish_manager/photos/index.haml
|
404
|
+
- app/views/ish_manager/photos/new.haml
|
404
405
|
- app/views/ish_manager/photos/show.haml
|
405
406
|
- app/views/ish_manager/photos/without_gallery.haml
|
406
407
|
- app/views/ish_manager/reports/_form.haml
|
@@ -479,14 +480,13 @@ files:
|
|
479
480
|
- app/views/layouts/ish_manager/application.haml
|
480
481
|
- app/views/layouts/ish_manager/application.haml-trash
|
481
482
|
- config/routes.rb
|
482
|
-
- config/systemd/system/README.txt
|
483
|
-
- config/systemd/system/stockwatcher.service
|
484
|
-
- config/systemd/system/watch_stocks.service
|
485
483
|
- lib/ish_manager.rb
|
486
484
|
- lib/ish_manager/engine.rb
|
487
485
|
- lib/ish_manager/version.rb
|
486
|
+
- lib/systemd/system/stockwatcher.service
|
487
|
+
- lib/systemd/system/watch_stocks.service
|
488
|
+
- lib/tasks/done/migrate.rake
|
488
489
|
- lib/tasks/ish_manager_tasks.rake
|
489
|
-
- lib/tasks/migrate.rake
|
490
490
|
homepage: http://wasya.co
|
491
491
|
licenses:
|
492
492
|
- MIT
|