phcdevworks_portfolio 7.0.0 → 8.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/phcdevworks_portfolio/project/posts_controller.rb +2 -2
  3. data/app/controllers/phcdevworks_portfolio/project/types_controller.rb +1 -1
  4. data/app/models/phcdevworks_portfolio/project/post.rb +2 -2
  5. data/app/models/phcdevworks_portfolio/project/type.rb +1 -1
  6. data/app/views/layouts/phcdevworks_portfolio/components/backend/sidebars/_side_menu.html.erb +28 -28
  7. data/app/views/phcdevworks_portfolio/project/posts/_form.html.erb +15 -15
  8. data/app/views/phcdevworks_portfolio/project/posts/index.html.erb +3 -3
  9. data/app/views/phcdevworks_portfolio/project/types/_form.html.erb +2 -2
  10. data/app/views/phcdevworks_portfolio/project/types/index.html.erb +1 -1
  11. data/db/migrate/20191014112330_create_phcdevworks_portfolio_project_posts.rb +6 -6
  12. data/db/migrate/20191021225316_create_phcdevworks_portfolio_project_types.rb +1 -1
  13. data/lib/phcdevworks_portfolio/version.rb +1 -1
  14. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fd811a31b046c124c0169a388f4ec2b17f5a63ad17f92d6a65e53baf6fee04c8
4
- data.tar.gz: d0b8c3926e291083f678f3666ed74c38e877442934b31f66536495aa17ed5e8f
3
+ metadata.gz: 5fb27c8dc1eb4ea7f7829f86f417cf16b9f4e6d83cdf0b40968fb2eb8a51f236
4
+ data.tar.gz: f1211c994cb9046e3a026ca9359cdfeaee7390ea6122b5d4828a6554dd82f0c0
5
5
  SHA512:
6
- metadata.gz: 816d13e0628608f67459ca16515af9abbd59633c23f942c2d22724c676d069ef5a466d5366775c55c9a1242f4a42fb0669670bf6aba4f81dd0518808bc4105c2
7
- data.tar.gz: 62d6154dec68642e5348d9b698bf79e4948daa9f34f6c875ab6dd4d7a7d14907352c103a12d79b9959595e3d28a092204481067d247008c2302c16f059d2bc69
6
+ metadata.gz: 5fc957f9d2654cee1718aa26e0a0bf756cf9d161873a9c8da1f5b35c9b466c947afdd647be3b7eeca787fefff684beb3f6b1f96568548180f077480901b70747
7
+ data.tar.gz: 10c3d544d85f86145c86a6f9d45e8f9adf38cd970e2c026f4cb1bb54286e49dc12c0c26e9384fcb7435a3444b6f24f60c9f8dc61e2e433329c2d21b8fa37a016
data/app/controllers/phcdevworks_portfolio/project/posts_controller.rb CHANGED
@@ -11,7 +11,7 @@ module PhcdevworksPortfolio
11
11
 
12
12
  # GET /project/posts
13
13
  def index
14
- @project_posts = Project::Post.all.order("post_title ASC")
14
+ @project_posts = Project::Post.all.order("project_post_title ASC")
15
15
  end
16
16
 
17
17
  # GET /project/posts/new
@@ -70,7 +70,7 @@ module PhcdevworksPortfolio
70
70
 
71
71
  # Whitelist
72
72
  def project_post_params
73
- params.require(:project_post).permit(:post_title, :post_description, :post_url, :post_type, :post_status, :post_image, :post_images, :slug, :optimization_id, :user_id, :org_id, category_ids: [], type_ids: [])
73
+ params.require(:project_post).permit(:project_post_title, :project_post_description, :project_post_url, :project_post_type, :project_post_status, :project_post_image, :project_post_images, :slug, :optimization_id, :user_id, :org_id, category_ids: [], type_ids: [])
74
74
  end
75
75
 
76
76
  end
data/app/controllers/phcdevworks_portfolio/project/types_controller.rb CHANGED
@@ -70,7 +70,7 @@ module PhcdevworksPortfolio
70
70
 
71
71
  # Whitelist
72
72
  def project_type_params
73
- params.require(:project_type).permit(:type_name, :slug, :user_id, :org_id)
73
+ params.require(:project_type).permit(:project_type_name, :slug, :user_id, :org_id)
74
74
  end
75
75
 
76
76
  end
data/app/models/phcdevworks_portfolio/project/post.rb CHANGED
@@ -8,7 +8,7 @@ module PhcdevworksPortfolio
8
8
  has_paper_trail :class_name => 'PhcdevworksPortfolio::ProjectPostVersions'
9
9
 
10
10
  # Image Upload
11
- has_one_attached :post_image
11
+ has_one_attached :project_post_image
12
12
 
13
13
  # Relationships
14
14
  belongs_to :user, class_name: "PhcdevworksAccounts::User"
@@ -20,7 +20,7 @@ module PhcdevworksPortfolio
20
20
  friendly_id :phcdev_project_post_nice_urls, use: [:slugged, :finders]
21
21
 
22
22
  def phcdev_project_post_nice_urls
23
- [:post_title]
23
+ [:project_post_title]
24
24
  end
25
25
 
26
26
  end
data/app/models/phcdevworks_portfolio/project/type.rb CHANGED
@@ -15,7 +15,7 @@ module PhcdevworksPortfolio
15
15
  friendly_id :phcdev_project_type_nice_urls, use: [:slugged, :finders]
16
16
 
17
17
  def phcdev_project_type_nice_urls
18
- [:type_name]
18
+ [:project_type_name]
19
19
  end
20
20
 
21
21
  end
data/app/views/layouts/phcdevworks_portfolio/components/backend/sidebars/_side_menu.html.erb CHANGED
@@ -112,34 +112,6 @@
112
112
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Tutorials -->
113
113
  <% end %>
114
114
 
115
- <% if defined?phcdevworks_core_modules %>
116
- <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
117
- <li class="nav-header">Core Modules</li>
118
- <li class="has-sub">
119
- <a href="javascript:;">
120
- <b class="caret"></b>
121
- <i class="fad fa-sitemap"></i>
122
- <span>Categories</span>
123
- </a>
124
- <ul class="sub-menu">
125
- <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories") %>"><%= link_to("Category Index", phcdevworks_core_modules.post_categories_path) %></li>
126
- <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories#new") %>"><%= link_to("New Category", phcdevworks_core_modules.new_post_category_path) %></li>
127
- </ul>
128
- </li>
129
- <li class="has-sub">
130
- <a href="javascript:;">
131
- <b class="caret"></b>
132
- <i class="fad fa-analytics"></i>
133
- <span>Marketing</span>
134
- </a>
135
- <ul class="sub-menu">
136
- <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations") %>"><%= link_to("SEO Data Index", phcdevworks_core_modules.marketing_optimizations_path) %></li>
137
- <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations#new") %>"><%= link_to("Add SEO Data", phcdevworks_core_modules.new_marketing_optimization_path) %></li>
138
- </ul>
139
- </li>
140
- <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
141
- <% end %>
142
-
143
115
  <% if defined?phcdevworks_members %>
144
116
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Members -->
145
117
  <li class="nav-header">Membership Manager</li>
@@ -238,6 +210,34 @@
238
210
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks RealEstate -->
239
211
  <% end %>
240
212
 
213
+ <% if defined?phcdevworks_core_modules %>
214
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
215
+ <li class="nav-header">Core Modules</li>
216
+ <li class="has-sub">
217
+ <a href="javascript:;">
218
+ <b class="caret"></b>
219
+ <i class="fad fa-sitemap"></i>
220
+ <span>Categories</span>
221
+ </a>
222
+ <ul class="sub-menu">
223
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories") %>"><%= link_to("Category Index", phcdevworks_core_modules.post_categories_path) %></li>
224
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories#new") %>"><%= link_to("New Category", phcdevworks_core_modules.new_post_category_path) %></li>
225
+ </ul>
226
+ </li>
227
+ <li class="has-sub">
228
+ <a href="javascript:;">
229
+ <b class="caret"></b>
230
+ <i class="fad fa-analytics"></i>
231
+ <span>Marketing</span>
232
+ </a>
233
+ <ul class="sub-menu">
234
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations") %>"><%= link_to("SEO Data Index", phcdevworks_core_modules.marketing_optimizations_path) %></li>
235
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations#new") %>"><%= link_to("Add SEO Data", phcdevworks_core_modules.new_marketing_optimization_path) %></li>
236
+ </ul>
237
+ </li>
238
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
239
+ <% end %>
240
+
241
241
  <% if current_user && current_user.admin? %>
242
242
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->
243
243
  <li class="nav-header">User Administration</li>
data/app/views/phcdevworks_portfolio/project/posts/_form.html.erb CHANGED
@@ -7,42 +7,42 @@
7
7
 
8
8
  <!-- Form Input Fields -->
9
9
  <div class="form-group field_with_errors">
10
- <%= form.label :post_title, "Project Title" %>
11
- <%= form.text_field :post_title, placeholder: "Project Title", class: "form-control" %>
10
+ <%= form.label :project_post_title, "Project Title" %>
11
+ <%= form.text_field :project_post_title, placeholder: "Project Title", class: "form-control" %>
12
12
  </div>
13
13
 
14
14
  <div class="form-group field_with_errors">
15
- <%= form.label :post_description, "Project Description" %>
16
- <%= form.text_area :post_description, placeholder: "Project Description", class: "form-control editor" %>
15
+ <%= form.label :project_post_description, "Project Description" %>
16
+ <%= form.text_area :project_post_description, placeholder: "Project Description", class: "form-control editor" %>
17
17
  </div>
18
18
 
19
19
  <div class="form-group field_with_errors">
20
- <%= form.label :post_url, "Project URL" %>
21
- <%= form.text_field :post_url, placeholder: "Project URL", class: "form-control" %>
20
+ <%= form.label :project_post_url, "Project URL" %>
21
+ <%= form.text_field :project_post_url, placeholder: "Project URL", class: "form-control" %>
22
22
  </div>
23
23
 
24
24
  <div class="form-group field_with_errors">
25
- <%= form.label :post_status, "Project Status" %>
26
- <%= form.select( :post_status, [["Draft","draft"],["Published","published"],["Review","review"]], {}, {class: "form-control"}) %>
25
+ <%= form.label :project_post_status, "Project Status" %>
26
+ <%= form.select( :project_post_status, [["Draft","draft"],["Published","published"],["Review","review"]], {}, {class: "form-control"}) %>
27
27
  </div>
28
28
 
29
29
  <div class="form-group field_with_errors">
30
- <%= form.label :post_image, "Project Image" %>
31
- <%= form.file_field :post_image, class: "form-control" %>
30
+ <%= form.label :project_post_image, "Project Image" %>
31
+ <%= form.file_field :project_post_image, class: "form-control" %>
32
32
  </div>
33
- <% if form.object.post_image.attached? %>
34
- <%= image_tag main_app.url_for(form.object.post_image), class: "img-responsive img-thumbnail" %>
33
+ <% if form.object.project_post_image.attached? %>
34
+ <%= image_tag main_app.url_for(form.object.project_post_image), class: "img-responsive img-thumbnail" %>
35
35
  <% end %>
36
36
 
37
37
  <div class="form-check">
38
- <%= form.collection_check_boxes :type_ids, PhcdevworksPortfolio::Project::Type.all, :id, :type_name do |project_type| %>
38
+ <%= form.collection_check_boxes :type_ids, PhcdevworksPortfolio::Project::Type.all, :id, :project_type_name do |project_type| %>
39
39
  <%= project_type.check_box class: "form-check-input" %>
40
40
  <%= project_type.label class: "form-check-label" %>
41
41
  <% end %>
42
42
  </div>
43
43
 
44
44
  <div class="form-check">
45
- <%= form.collection_check_boxes :category_ids, PhcdevworksCoreModules::Post::Category.all, :id, :category_name do |post_category| %>
45
+ <%= form.collection_check_boxes :category_ids, PhcdevworksCoreModules::Post::Category.all, :id, :post_category_name do |post_category| %>
46
46
  <%= post_category.check_box class: "form-check-input" %>
47
47
  <%= post_category.label class: "form-check-label" %>
48
48
  <% end %>
@@ -50,7 +50,7 @@
50
50
 
51
51
  <div class="form-group">
52
52
  <label>Attach SEO Data</label>
53
- <%= collection_select(:project_post, :optimization_id, PhcdevworksCoreModules::Marketing::Optimization.order("seo_title"), :id, :seo_title, {}, {class: "form-control"}) %>
53
+ <%= collection_select(:project_post, :optimization_id, PhcdevworksCoreModules::Marketing::Optimization.order("marketing_optimization_page_title"), :id, :marketing_optimization_page_title, {}, {class: "form-control"}) %>
54
54
  </div>
55
55
  <!-- Form Input Fields -->
56
56
 
data/app/views/phcdevworks_portfolio/project/posts/index.html.erb CHANGED
@@ -48,9 +48,9 @@
48
48
  <tbody>
49
49
  <% @project_posts.each do |project_post| %>
50
50
  <tr>
51
- <td><%= project_post.post_title %></td>
52
- <td><%= truncate(project_post.post_description, :length => 80, :escape => false) %></td>
53
- <td><%= project_post.post_status.capitalize %></td>
51
+ <td><%= project_post.project_post_title %></td>
52
+ <td><%= truncate(project_post.project_post_description, :length => 80, :escape => false) %></td>
53
+ <td><%= project_post.project_post_status.capitalize %></td>
54
54
  <td>
55
55
  <div class="btn-group d-flex" role="group">
56
56
  <%= link_to "Update Project", edit_project_post_path(project_post), class: "btn btn-purple btn-xs" %>
data/app/views/phcdevworks_portfolio/project/types/_form.html.erb CHANGED
@@ -7,8 +7,8 @@
7
7
 
8
8
  <!-- Form Input Fields -->
9
9
  <div class="form-group field_with_errors">
10
- <%= form.label :type_name, "Project Type Name" %>
11
- <%= form.text_field :type_name, placeholder: "Project Type", class: "form-control" %>
10
+ <%= form.label :project_type_name, "Project Type Name" %>
11
+ <%= form.text_field :project_type_name, placeholder: "Project Type", class: "form-control" %>
12
12
  </div>
13
13
  <!-- Form Input Fields -->
14
14
 
data/app/views/phcdevworks_portfolio/project/types/index.html.erb CHANGED
@@ -46,7 +46,7 @@
46
46
  <tbody>
47
47
  <% @project_types.each do |project_type| %>
48
48
  <tr>
49
- <td><%= project_type.type_name %></td>
49
+ <td><%= project_type.project_type_name %></td>
50
50
  <td>
51
51
  <div class="btn-group d-flex" role="group">
52
52
  <%= link_to "Update Type Name", edit_project_type_path(project_type), class: "btn btn-purple btn-xs" %>
data/db/migrate/20191014112330_create_phcdevworks_portfolio_project_posts.rb CHANGED
@@ -2,13 +2,13 @@ class CreatePhcdevworksPortfolioProjectPosts < ActiveRecord::Migration[6.0]
2
2
  def change
3
3
  create_table :phcdevworks_portfolio_project_posts do |t|
4
4
 
5
- t.string :post_title
6
- t.text :post_description
5
+ t.string :project_post_title
6
+ t.text :project_post_description
7
7
 
8
- t.string :post_url
9
- t.string :post_status
10
- t.string :post_image
11
- t.string :post_images
8
+ t.string :project_post_url
9
+ t.string :project_post_status
10
+ t.string :project_post_image
11
+ t.string :project_post_images
12
12
 
13
13
  t.string :slug
14
14
  t.string :user_id
data/db/migrate/20191021225316_create_phcdevworks_portfolio_project_types.rb CHANGED
@@ -2,7 +2,7 @@ class CreatePhcdevworksPortfolioProjectTypes < ActiveRecord::Migration[6.0]
2
2
  def change
3
3
  create_table :phcdevworks_portfolio_project_types do |t|
4
4
 
5
- t.string :type_name
5
+ t.string :project_type_name
6
6
 
7
7
  t.string :slug
8
8
  t.string :user_id
data/lib/phcdevworks_portfolio/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module PhcdevworksPortfolio
2
- VERSION = "7.0.0"
2
+ VERSION = "8.0.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phcdevworks_portfolio
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.0.0
4
+ version: 8.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - PHCDevworks
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-07-10 00:00:00.000000000 Z
11
+ date: 2020-07-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -120,14 +120,14 @@ dependencies:
120
120
  requirements:
121
121
  - - "~>"
122
122
  - !ruby/object:Gem::Version
123
- version: '4.0'
123
+ version: '5.0'
124
124
  type: :runtime
125
125
  prerelease: false
126
126
  version_requirements: !ruby/object:Gem::Requirement
127
127
  requirements:
128
128
  - - "~>"
129
129
  - !ruby/object:Gem::Version
130
- version: '4.0'
130
+ version: '5.0'
131
131
  - !ruby/object:Gem::Dependency
132
132
  name: phcdevworks_notifications
133
133
  requirement: !ruby/object:Gem::Requirement