phcdevworks_core_modules 3.0.0 → 6.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (25) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/phcdevworks_core_modules/marketing/optimizations_controller.rb +2 -2
  3. data/app/controllers/phcdevworks_core_modules/post/categories_controller.rb +2 -2
  4. data/app/models/phcdevworks_core_modules/marketing/optimization.rb +16 -10
  5. data/app/models/phcdevworks_core_modules/marketing_optimization_versions.rb +5 -0
  6. data/app/models/phcdevworks_core_modules/post/category.rb +16 -17
  7. data/app/models/phcdevworks_core_modules/post_category_versions.rb +5 -0
  8. data/app/views/layouts/phcdevworks_core_modules/components/backend/sidebars/_side_menu.html.erb +54 -32
  9. data/app/views/phcdevworks_core_modules/marketing/optimizations/_form.html.erb +37 -35
  10. data/app/views/phcdevworks_core_modules/marketing/optimizations/index.html.erb +5 -5
  11. data/app/views/phcdevworks_core_modules/marketing/optimizations/show.html.erb +23 -18
  12. data/app/views/phcdevworks_core_modules/post/categories/_form.html.erb +3 -3
  13. data/app/views/phcdevworks_core_modules/post/categories/index.html.erb +1 -1
  14. data/app/views/phcdevworks_core_modules/post/categories/show.html.erb +1 -1
  15. data/db/migrate/{20200705225433_create_phcdevworks_core_modules_optimization_versions.rb → 20170517064427_create_phcdevworks_core_modules_post_category_versions.rb} +18 -17
  16. data/db/migrate/20200705223718_create_phcdevworks_core_modules_marketing_optimizations.rb +10 -10
  17. data/db/migrate/20200705225433_create_phcdevworks_core_modules_marketing_optimization_versions.rb +18 -0
  18. data/db/migrate/20200706094820_create_phcdevworks_core_modules_post_categories.rb +3 -3
  19. data/lib/phcdevworks_core_modules.rb +1 -1
  20. data/lib/phcdevworks_core_modules/engine.rb +2 -2
  21. data/lib/phcdevworks_core_modules/version.rb +1 -1
  22. metadata +23 -23
  23. data/app/models/phcdevworks_core_modules/core_category_versions.rb +0 -5
  24. data/app/models/phcdevworks_core_modules/core_optimization_versions.rb +0 -5
  25. data/db/migrate/20170517064427_create_phcdevworks_core_modules_category_versions.rb +0 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 26a1d4b42d4f3a48e06cbb7b2dcfdc8a175af44eef7822c3a60ff431e9bb897f
4
- data.tar.gz: f80048ced8e87031b052ba6207baabbd583d8dc85e4b00c0877f02faf2aa8b0f
3
+ metadata.gz: 443e161d4e9a5046d561dc103e5d11f4e1fb6eb3297ff3e911323dc0ef8888bb
4
+ data.tar.gz: 8fa84c439f6179a8251cfde33e974fc280d36085f3bcfe61f4fd051e2079dff3
5
5
  SHA512:
6
- metadata.gz: ee875e01eca345a2a0db7bcbf19bd2a122151fc57c092e004bc3750ff5bcc1a67689c29c0084c72a42bf48359a36182b798a6cffc94a19827a091ba8e00a1bee
7
- data.tar.gz: 7665795363e0f55ba1f6d3250cfd330e393b71364cb2b5ddb6579d9aca9784e5b335e98e41d3248a8367ff8758ead188f51d0cdf236fc83b31baeaeba1ea48fd
6
+ metadata.gz: 265d3603e8dc8bb6346ca3f9dbf0ed9232e8683484773a0435af1cb4f31d5f0d091ab4b2471652f28fa5319c8b0e9e0cff25f1eacea8bfc8084545e334a4d0c7
7
+ data.tar.gz: '02935d276ff7a652fbc223631496e4c2521a2ad785436a5b49d5e6ff2d7f8a8f58b5aeec1f59997322272c6444000cf8167a11a0682a4f50803e4a7b35823a64'
data/app/controllers/phcdevworks_core_modules/marketing/optimizations_controller.rb CHANGED
@@ -11,7 +11,7 @@ module PhcdevworksCoreModules
11
11
 
12
12
  # GET /marketing/optimizations
13
13
  def index
14
- @marketing_optimizations = Marketing::Optimization.order('seo_title ASC')
14
+ @marketing_optimizations = Marketing::Optimization.order('marketing_optimization_page_title ASC')
15
15
  end
16
16
 
17
17
  # GET /marketing/optimizations/1
@@ -74,7 +74,7 @@ module PhcdevworksCoreModules
74
74
 
75
75
  # Whitelist
76
76
  def marketing_optimization_params
77
- params.require(:marketing_optimization).permit(:seo_title, :seo_description, :seo_open_graph_post_type, :seo_open_graph_url, :seo_open_graph_title, :seo_open_graph_description, :seo_open_graph_image, :seo_twitter_post_type, :seo_twitter_url, :seo_twitter_title, :seo_twitter_description, :seo_twitter_image, :slug, :user_id, :org_id)
77
+ params.require(:marketing_optimization).permit(:marketing_optimization_page_title, :marketing_optimization_page_description, :marketing_optimization_og_title, :marketing_optimization_og_description, :marketing_optimization_og_type, :marketing_optimization_og_url, :marketing_optimization_twitter_title, :marketing_optimization_twitter_description, :marketing_optimization_twitter_type, :marketing_optimization_twitter_url, :marketing_optimization_twitter_image, :marketing_optimization_og_image, :slug, :user_id, :org_id)
78
78
  end
79
79
 
80
80
  end
data/app/controllers/phcdevworks_core_modules/post/categories_controller.rb CHANGED
@@ -11,7 +11,7 @@ module PhcdevworksCoreModules
11
11
 
12
12
  # GET /post/categories
13
13
  def index
14
- @post_categories = Post::Category.order('category_name ASC')
14
+ @post_categories = Post::Category.order('post_category_name ASC')
15
15
  end
16
16
 
17
17
  # GET /post/categories/1
@@ -74,7 +74,7 @@ module PhcdevworksCoreModules
74
74
 
75
75
  # Whitelist
76
76
  def post_category_params
77
- params.require(:post_category).permit(:category_name, :slug, :optimization_id, :user_id, :org_id)
77
+ params.require(:post_category).permit(:post_category_name, :slug, :optimization_id, :user_id, :org_id)
78
78
  end
79
79
 
80
80
  end
data/app/models/phcdevworks_core_modules/marketing/optimization.rb CHANGED
@@ -5,49 +5,55 @@ module PhcdevworksCoreModules
5
5
  extend FriendlyId
6
6
 
7
7
  # Image Upload
8
- has_one_attached :seo_twitter_image
9
- has_one_attached :seo_open_graph_image
8
+ has_one_attached :marketing_optimization_twitter_image
9
+ has_one_attached :marketing_optimization_og_image
10
10
 
11
11
  # Paper Trail Initialize
12
- has_paper_trail :class_name => "PhcdevworksCoreModules::CoreOptimizationVersions"
12
+ has_paper_trail :class_name => "PhcdevworksCoreModules::MarketingOptimizationVersions"
13
13
 
14
14
  # Relationships for Local
15
15
  belongs_to :user, class_name: "PhcdevworksAccounts::User"
16
16
  has_many :categories, class_name: "PhcdevworksCoreModules::Post::Category"
17
-
17
+
18
18
  # Relationships for PHCDevworks Plugins
19
19
  if defined?phcdevworks_members
20
20
  has_many :listings, class_name: "PhcdevworksMembers::Member::Listing"
21
21
  end
22
+
22
23
  if defined?phcdevworks_scripts
23
24
  has_many :listings, class_name: "PhcdevworksScripts::Script::Listing"
24
25
  end
26
+
25
27
  if defined?phcdevworks_press
26
28
  has_many :posts, class_name: "PhcdevworksPress::Article::Post"
29
+ has_many :posts, class_name: "PhcdevworksPress::Review::Post"
30
+ has_many :posts, class_name: "PhcdevworksPress::List::Post"
27
31
  end
32
+
28
33
  if defined?phcdevworks_portfolio
29
34
  has_many :posts, class_name: "PhcdevworksPortfolio::Project::Post"
30
35
  end
36
+
31
37
  if defined?phcdevworks_tutorials
32
38
  has_many :posts, class_name: "PhcdevworksTutorials::Tutorial::Post"
33
39
  has_many :posts, class_name: "PhcdevworksTutorials::Command::Post"
34
40
  end
35
41
 
36
42
  # Form Fields Validation
37
- validates :seo_title,
43
+ validates :marketing_optimization_page_title,
38
44
  presence: true
39
45
 
40
- validates :seo_open_graph_title,
46
+ validates :marketing_optimization_og_title,
41
47
  presence: true
42
48
 
43
- validates :seo_twitter_title,
49
+ validates :marketing_optimization_twitter_title,
44
50
  presence: true
45
51
 
46
52
  # Clean URL Define
47
- friendly_id :phcdev_core_optimization_nice_urls, use: [:slugged, :finders]
53
+ friendly_id :marketing_optimization_nice_urls, use: [:slugged, :finders]
48
54
 
49
- def phcdev_core_optimization_nice_urls
50
- [:seo_title].join("-")
55
+ def marketing_optimization_nice_urls
56
+ [:marketing_optimization_page_title]
51
57
  end
52
58
 
53
59
  end
data/app/models/phcdevworks_core_modules/marketing_optimization_versions.rb ADDED
@@ -0,0 +1,5 @@
1
+ module PhcdevworksCoreModules
2
+ class MarketingOptimizationVersions < PaperTrail::Version
3
+ self.table_name = :phcdevworks_core_modules_marketing_optimization_versions
4
+ end
5
+ end
data/app/models/phcdevworks_core_modules/post/category.rb CHANGED
@@ -4,12 +4,8 @@ module PhcdevworksCoreModules
4
4
  # Clean URL Initialize
5
5
  extend FriendlyId
6
6
 
7
- # Image Upload
8
- has_one_attached :seo_twitter_image
9
- has_one_attached :seo_open_graph_image
10
-
11
7
  # Paper Trail Initialize
12
- has_paper_trail :class_name => "PhcdevworksCoreModules::CoreCategoryVersions"
8
+ has_paper_trail :class_name => "PhcdevworksCoreModules::PostCategoryVersions"
13
9
 
14
10
  # Relationships for Local
15
11
  belongs_to :user, class_name: "PhcdevworksAccounts::User"
@@ -17,28 +13,31 @@ module PhcdevworksCoreModules
17
13
 
18
14
  # Relationships for PHCDevworks Plugins
19
15
  if defined?phcdevworks_press
20
- has_and_belongs_to_many :posts, class_name: "PhcdevworksPress::Article::Post", :join_table => "phcdevworks_press_categories_posts", :dependent => :destroy
16
+ has_and_belongs_to_many :posts, class_name: "PhcdevworksPress::Article::Post", :join_table => "phcdevworks_press_article_categories_posts", :dependent => :destroy
17
+ has_and_belongs_to_many :posts, class_name: "PhcdevworksPress::Review::Post", :join_table => "phcdevworks_press_review_categories_posts", :dependent => :destroy
18
+ has_and_belongs_to_many :posts, class_name: "PhcdevworksPress::List::Post", :join_table => "phcdevworks_press_list_categories_posts", :dependent => :destroy
21
19
  end
20
+
22
21
  if defined?phcdevworks_portfolio
23
- has_and_belongs_to_many :posts, class_name: "PhcdevworksPortfolio::Project::Post", :join_table => "phcdevworks_portfolio_categories_posts", :dependent => :destroy
22
+ has_and_belongs_to_many :posts, class_name: "PhcdevworksPortfolio::Project::Post", :join_table => "phcdevworks_portfolio_project_categories_posts", :dependent => :destroy
24
23
  end
24
+
25
25
  if defined?phcdevworks_tutorials
26
- has_and_belongs_to_many :posts, class_name: "PhcdevworksTutorials::Tutorial::Post", :join_table => "phcdevworks_tutorials_categories_posts", :dependent => :destroy
27
- has_and_belongs_to_many :posts, class_name: "PhcdevworksTutorials::Command::Post", :join_table => "phcdevworks_tutorials_categories_commands", :dependent => :destroy
26
+ has_and_belongs_to_many :posts, class_name: "PhcdevworksTutorials::Tutorial::Post", :join_table => "phcdevworks_tutorials_tutorial_categories_posts", :dependent => :destroy
27
+ has_and_belongs_to_many :posts, class_name: "PhcdevworksTutorials::Command::Post", :join_table => "phcdevworks_tutorials_command_categories_posts", :dependent => :destroy
28
28
  end
29
29
 
30
30
  # Form Fields Validation
31
- validates :category_name,
31
+ validates :post_category_name,
32
32
  presence: true,
33
33
  uniqueness: true
34
-
34
+
35
35
  # Clean URL Define
36
- friendly_id :phcdev_core_category_nice_urls, use: [:slugged, :finders]
37
-
38
- def phcdev_core_category_nice_urls
39
- [:category_name]
36
+ friendly_id :post_category_nice_urls, use: [:slugged, :finders]
37
+
38
+ def post_category_nice_urls
39
+ [:post_category_name]
40
40
  end
41
-
42
-
41
+
43
42
  end
44
43
  end
data/app/models/phcdevworks_core_modules/post_category_versions.rb ADDED
@@ -0,0 +1,5 @@
1
+ module PhcdevworksCoreModules
2
+ class PostCategoryVersions < PaperTrail::Version
3
+ self.table_name = :phcdevworks_core_modules_post_category_versions
4
+ end
5
+ end
data/app/views/layouts/phcdevworks_core_modules/components/backend/sidebars/_side_menu.html.erb CHANGED
@@ -45,18 +45,40 @@
45
45
  <a href="javascript:;">
46
46
  <b class="caret"></b>
47
47
  <i class="fad fa-newspaper"></i>
48
- <span>Article Posts</span>
48
+ <span>Blog Articles</span>
49
49
  </a>
50
50
  <ul class="sub-menu">
51
51
  <li class="<%= phc_menu_active_controller("phcdevworks_press/article/posts") %>"><%= link_to("Article Index", phcdevworks_press.article_posts_path) %></li>
52
- <li class="<%= phc_menu_active_controller("phcdevworks_press/article/posts#new") %>"><%= link_to("New Aritcle", phcdevworks_press.new_article_post_path) %></li>
52
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/article/posts#new") %>"><%= link_to("Add a New Aritcle", phcdevworks_press.new_article_post_path) %></li>
53
+ </ul>
54
+ </li>
55
+ <li class="has-sub">
56
+ <a href="javascript:;">
57
+ <b class="caret"></b>
58
+ <i class="fad fa-star-half"></i>
59
+ <span>Review Articles</span>
60
+ </a>
61
+ <ul class="sub-menu">
62
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/review/posts") %>"><%= link_to("Reviews Index", phcdevworks_press.review_posts_path) %></li>
63
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/review/posts#new") %>"><%= link_to("Add a New Review", phcdevworks_press.new_review_post_path) %></li>
64
+ </ul>
65
+ </li>
66
+ <li class="has-sub">
67
+ <a href="javascript:;">
68
+ <b class="caret"></b>
69
+ <i class="fad fa-th-list"></i>
70
+ <span>List Articles</span>
71
+ </a>
72
+ <ul class="sub-menu">
73
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/list/posts") %>"><%= link_to("Lists Index", phcdevworks_press.list_posts_path) %></li>
74
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/list/posts#new") %>"><%= link_to("Add a New List", phcdevworks_press.new_list_post_path) %></li>
53
75
  </ul>
54
76
  </li>
55
77
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
56
78
  <% end %>
57
79
 
58
80
  <% if defined?phcdevworks_portfolio %>
59
- <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
81
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Portfolio -->
60
82
  <li class="nav-header">Portfolio</li>
61
83
  <li class="has-sub">
62
84
  <a href="javascript:;">
@@ -80,7 +102,7 @@
80
102
  <li class="<%= phc_menu_active_controller("phcdevworks_portfolio/project/posts#new") %>"><%= link_to("New Types", phcdevworks_portfolio.new_project_type_path) %></li>
81
103
  </ul>
82
104
  </li>
83
- <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
105
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Portfolio -->
84
106
  <% end %>
85
107
 
86
108
  <% if defined?phcdevworks_tutorials %>
@@ -112,34 +134,6 @@
112
134
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Tutorials -->
113
135
  <% end %>
114
136
 
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
137
  <% if defined?phcdevworks_members %>
144
138
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Members -->
145
139
  <li class="nav-header">Membership Manager</li>
@@ -238,6 +232,34 @@
238
232
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks RealEstate -->
239
233
  <% end %>
240
234
 
235
+ <% if defined?phcdevworks_core_modules %>
236
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
237
+ <li class="nav-header">Core Modules</li>
238
+ <li class="has-sub">
239
+ <a href="javascript:;">
240
+ <b class="caret"></b>
241
+ <i class="fad fa-sitemap"></i>
242
+ <span>Categories</span>
243
+ </a>
244
+ <ul class="sub-menu">
245
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories") %>"><%= link_to("Category Index", phcdevworks_core_modules.post_categories_path) %></li>
246
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories#new") %>"><%= link_to("New Category", phcdevworks_core_modules.new_post_category_path) %></li>
247
+ </ul>
248
+ </li>
249
+ <li class="has-sub">
250
+ <a href="javascript:;">
251
+ <b class="caret"></b>
252
+ <i class="fad fa-analytics"></i>
253
+ <span>Marketing</span>
254
+ </a>
255
+ <ul class="sub-menu">
256
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations") %>"><%= link_to("SEO Data Index", phcdevworks_core_modules.marketing_optimizations_path) %></li>
257
+ <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>
258
+ </ul>
259
+ </li>
260
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
261
+ <% end %>
262
+
241
263
  <% if current_user && current_user.admin? %>
242
264
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->
243
265
  <li class="nav-header">User Administration</li>
data/app/views/phcdevworks_core_modules/marketing/optimizations/_form.html.erb CHANGED
@@ -7,74 +7,76 @@
7
7
 
8
8
  <!-- Form Input Fields -->
9
9
  <div class="form-group">
10
- <%= form.label :seo_title, "SEO Title" %>
11
- <%= form.text_field :seo_title, class: "form-control" %>
10
+ <%= form.label :marketing_optimization_page_title, "Page Title" %>
11
+ <%= form.text_field :marketing_optimization_page_title, class: "form-control" %>
12
12
  </div>
13
13
 
14
14
  <div class="form-group">
15
- <%= form.label :seo_description, "SEO Description" %>
16
- <%= form.text_area :seo_description, class: "form-control" %>
15
+ <%= form.label :marketing_optimization_page_description, "Page Description" %>
16
+ <%= form.text_area :marketing_optimization_page_description, class: "form-control" %>
17
17
  </div>
18
18
 
19
19
  <div class="form-group">
20
- <%= form.label :seo_open_graph_title, "SEO OG Title" %>
21
- <%= form.text_field :seo_open_graph_title, class: "form-control" %>
20
+ <%= form.label :marketing_optimization_og_title, "Open Graph Title" %>
21
+ <%= form.text_field :marketing_optimization_og_title, class: "form-control" %>
22
22
  </div>
23
23
 
24
24
  <div class="form-group">
25
- <%= form.label :seo_open_graph_description, "SEO OG Description" %>
26
- <%= form.text_field :seo_open_graph_description, class: "form-control" %>
25
+ <%= form.label :marketing_optimization_og_description, "Open Graph Description" %>
26
+ <%= form.text_field :marketing_optimization_og_description, class: "form-control" %>
27
27
  </div>
28
28
 
29
29
  <div class="form-group">
30
- <%= form.label :seo_open_graph_post_type, "SEO OG Type" %>
31
- <%= form.text_field :seo_open_graph_post_type, class: "form-control" %>
30
+ <%= form.label :marketing_optimization_og_type, "Open Graph Type" %>
31
+ <%= form.text_field :marketing_optimization_og_type, class: "form-control" %>
32
+ </div>
33
+
34
+ <div class="form-group">
35
+ <%= form.label :marketing_optimization_og_url, "Open Graph URL" %>
36
+ <%= form.text_field :marketing_optimization_og_url, class: "form-control" %>
32
37
  </div>
33
38
 
34
39
  <div class="form-group field_with_errors">
35
- <%= form.label :seo_open_graph_image, "Featured Image" %>
36
- <%= form.file_field :seo_open_graph_image, class: "form-control" %>
37
- <% if form.object.seo_open_graph_image.attached? %>
38
- <%= image_tag main_app.url_for(form.object.seo_open_graph_image), class: "img-responsive img-thumbnail" %>
39
- <%= form.label :remove_seo_open_graph_image %>
40
- <%= form.check_box :remove_seo_open_graph_image %>
40
+ <%= form.label :marketing_optimization_og_image, "Featured Image" %>
41
+ <%= form.file_field :marketing_optimization_og_image, class: "form-control" %>
42
+ <% if form.object.marketing_optimization_og_image.attached? %>
43
+ <%= image_tag main_app.url_for(form.object.marketing_optimization_og_image), class: "img-responsive img-thumbnail" %>
44
+ <%= form.label :remove_marketing_optimization_og_image %>
45
+ <%= form.check_box :remove_marketing_optimization_og_image %>
41
46
  <% end %>
42
47
  </div>
43
-
48
+
44
49
  <div class="form-group">
45
- <%= form.label :seo_open_graph_url, "SEO OG URL" %>
46
- <%= form.text_field :seo_open_graph_url, class: "form-control" %>
50
+ <%= form.label :marketing_optimization_twitter_title, "Twitter Card Title" %>
51
+ <%= form.text_field :marketing_optimization_twitter_title, class: "form-control" %>
47
52
  </div>
48
53
 
49
54
  <div class="form-group">
50
- <%= form.label :seo_twitter_title, "SEO Twitter Title" %>
51
- <%= form.text_field :seo_twitter_title, class: "form-control" %>
55
+ <%= form.label :marketing_optimization_twitter_description, "Twitter Card Description" %>
56
+ <%= form.text_area :marketing_optimization_twitter_description, class: "form-control" %>
52
57
  </div>
53
58
 
54
59
  <div class="form-group">
55
- <%= form.label :seo_twitter_description, "SEO Twitter Description" %>
56
- <%= form.text_area :seo_twitter_description, class: "form-control" %>
60
+ <%= form.label :marketing_optimization_twitter_type, "Twitter Card Type" %>
61
+ <%= form.text_field :marketing_optimization_twitter_type, class: "form-control" %>
57
62
  </div>
58
63
 
59
64
  <div class="form-group">
60
- <%= form.label :seo_twitter_post_type, "SEO Twitter Type" %>
61
- <%= form.text_field :seo_twitter_post_type, class: "form-control" %>
65
+ <%= form.label :marketing_optimization_twitter_url, "Twitter Card URL" %>
66
+ <%= form.text_field :marketing_optimization_twitter_url, class: "form-control" %>
62
67
  </div>
63
68
 
64
69
  <div class="form-group field_with_errors">
65
- <%= form.label :seo_twitter_image, "Featured Image" %>
66
- <%= form.file_field :seo_twitter_image, class: "form-control" %>
67
- <% if form.object.seo_twitter_image.attached? %>
68
- <%= image_tag main_app.url_for(form.object.seo_twitter_image), class: "img-responsive img-thumbnail" %>
69
- <%= form.label :remove_seo_twitter_image %>
70
- <%= form.check_box :remove_seo_twitter_image %>
70
+ <%= form.label :marketing_optimization_twitter_image, "Featured Image" %>
71
+ <%= form.file_field :marketing_optimization_twitter_image, class: "form-control" %>
72
+ <% if form.object.marketing_optimization_twitter_image.attached? %>
73
+ <%= image_tag main_app.url_for(form.object.marketing_optimization_twitter_image), class: "img-responsive img-thumbnail" %>
74
+ <%= form.label :remove_marketing_optimization_twitter_image %>
75
+ <%= form.check_box :remove_marketing_optimization_twitter_image %>
71
76
  <% end %>
72
77
  </div>
73
78
 
74
- <div class="form-group">
75
- <%= form.label :seo_twitter_url, "SEO Twitter URL" %>
76
- <%= form.text_field :seo_twitter_url, class: "form-control" %>
77
- </div>
79
+
78
80
  <!-- Form Input Fields -->
79
81
 
80
82
  <!-- Form Submition Button -->
data/app/views/phcdevworks_core_modules/marketing/optimizations/index.html.erb CHANGED
@@ -50,11 +50,11 @@
50
50
  <tbody>
51
51
  <% @marketing_optimizations.each do |marketing_optimization| %>
52
52
  <tr>
53
- <td><%= marketing_optimization.seo_title %></td>
54
- <td><%= marketing_optimization.seo_open_graph_title %></td>
55
- <td><%= marketing_optimization.seo_open_graph_post_type %></td>
56
- <td><%= marketing_optimization.seo_twitter_title %></td>
57
- <td><%= marketing_optimization.seo_twitter_post_type %></td>
53
+ <td><%= marketing_optimization.marketing_optimization_page_title %></td>
54
+ <td><%= marketing_optimization.marketing_optimization_og_title %></td>
55
+ <td><%= marketing_optimization.marketing_optimization_og_type %></td>
56
+ <td><%= marketing_optimization.marketing_optimization_twitter_title %></td>
57
+ <td><%= marketing_optimization.marketing_optimization_twitter_type %></td>
58
58
  <td>
59
59
  <div class="btn-group d-flex" role="group">
60
60
  <%= link_to "SEO Details", marketing_optimization, class: "btn btn-purple btn-xs" %>
data/app/views/phcdevworks_core_modules/marketing/optimizations/show.html.erb CHANGED
@@ -1,48 +1,53 @@
1
1
  <p id="notice"><%= notice %></p>
2
2
 
3
3
  <p>
4
- <strong>Seo title:</strong>
5
- <%= @marketing_optimization.seo_title %>
4
+ <strong>Page Title:</strong>
5
+ <%= @marketing_optimization.marketing_optimization_page_title %>
6
6
  </p>
7
7
 
8
8
  <p>
9
- <strong>Seo description:</strong>
10
- <%= @marketing_optimization.seo_description %>
9
+ <strong>Page Description:</strong>
10
+ <%= @marketing_optimization.marketing_optimization_page_description %>
11
11
  </p>
12
12
 
13
13
  <p>
14
- <strong>Seo open graph type:</strong>
15
- <%= @marketing_optimization.seo_open_graph_type %>
14
+ <strong>Open Graph Title:</strong>
15
+ <%= @marketing_optimization.marketing_optimization_og_title %>
16
16
  </p>
17
17
 
18
18
  <p>
19
- <strong>Seo open graph url:</strong>
20
- <%= @marketing_optimization.seo_open_graph_url %>
19
+ <strong>Open Graph Description:</strong>
20
+ <%= @marketing_optimization.marketing_optimization_og_description %>
21
21
  </p>
22
22
 
23
23
  <p>
24
- <strong>Seo open graph title:</strong>
25
- <%= @marketing_optimization.seo_open_graph_title %>
24
+ <strong>Open Graph Type:</strong>
25
+ <%= @marketing_optimization.marketing_optimization_og_type %>
26
26
  </p>
27
27
 
28
28
  <p>
29
- <strong>Seo open graph description:</strong>
30
- <%= @marketing_optimization.seo_open_graph_description %>
29
+ <strong>Open Graph URL:</strong>
30
+ <%= @marketing_optimization.marketing_optimization_og_url %>
31
31
  </p>
32
32
 
33
33
  <p>
34
- <strong>Seo twitter url:</strong>
35
- <%= @marketing_optimization.seo_twitter_url %>
34
+ <strong>Twitter Title:</strong>
35
+ <%= @marketing_optimization.marketing_optimization_twitter_title %>
36
36
  </p>
37
37
 
38
38
  <p>
39
- <strong>Seo twitter title:</strong>
40
- <%= @marketing_optimization.seo_twitter_title %>
39
+ <strong>Twitter Description:</strong>
40
+ <%= @marketing_optimization.marketing_optimization_twitter_description %>
41
41
  </p>
42
42
 
43
43
  <p>
44
- <strong>Seo twitter description:</strong>
45
- <%= @marketing_optimization.seo_twitter_description %>
44
+ <strong>Twitter Type:</strong>
45
+ <%= @marketing_optimization.marketing_optimization_twitter_type %>
46
+ </p>
47
+
48
+ <p>
49
+ <strong>Twitter URL:</strong>
50
+ <%= @marketing_optimization.marketing_optimization_twitter_url %>
46
51
  </p>
47
52
 
48
53
  <%= link_to 'Edit', edit_marketing_optimization_path(@marketing_optimization) %> |
data/app/views/phcdevworks_core_modules/post/categories/_form.html.erb CHANGED
@@ -7,13 +7,13 @@
7
7
 
8
8
  <!-- Form Input Fields -->
9
9
  <div class="form-group">
10
- <%= form.label :category_name, "Category Name" %>
11
- <%= form.text_field :category_name, class: "form-control" %>
10
+ <%= form.label :post_category_name, "Category Name" %>
11
+ <%= form.text_field :post_category_name, class: "form-control" %>
12
12
  </div>
13
13
 
14
14
  <div class="form-group">
15
15
  <label>Attach SEO Data</label>
16
- <%= collection_select(:post_category, :optimization_id, PhcdevworksCoreModules::Marketing::Optimization.order("seo_title"), :id, :seo_title, {}, {class: "form-control"}) %>
16
+ <%= collection_select(:post_category, :optimization_id, PhcdevworksCoreModules::Marketing::Optimization.order("marketing_optimization_page_title"), :id, :marketing_optimization_page_title, {}, {class: "form-control"}) %>
17
17
  </div>
18
18
  <!-- Form Input Fields -->
19
19
 
data/app/views/phcdevworks_core_modules/post/categories/index.html.erb CHANGED
@@ -46,7 +46,7 @@
46
46
  <tbody>
47
47
  <% @post_categories.each do |post_category| %>
48
48
  <tr>
49
- <td><%= post_category.category_name %></td>
49
+ <td><%= post_category.post_category_name %></td>
50
50
  <td>
51
51
  <div class="btn-group d-flex" role="group">
52
52
  <%= link_to "Category Details", post_category, class: "btn btn-purple btn-xs" %>
data/app/views/phcdevworks_core_modules/post/categories/show.html.erb CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  <p>
4
4
  <strong>Post cat:</strong>
5
- <%= @post_category.post_cat %>
5
+ <%= @post_category.post_category_name %>
6
6
  </p>
7
7
 
8
8
  <%= link_to 'Edit', edit_post_category_path(@post_category) %> |
data/db/migrate/{20200705225433_create_phcdevworks_core_modules_optimization_versions.rb → 20170517064427_create_phcdevworks_core_modules_post_category_versions.rb} RENAMED
@@ -1,17 +1,18 @@
1
- class CreatePhcdevworksCoreModulesOptimizationVersions < ActiveRecord::Migration[6.0]
2
- TEXT_BYTES = 1_073_741_823
3
- def change
4
-
5
- create_table :phcdevworks_core_modules_optimization_versions do |t|
6
- t.string :item_type, {:null=>false}
7
- t.integer :item_id, null: false
8
- t.string :event, null: false
9
- t.string :whodunnit
10
- t.text :object, limit: TEXT_BYTES
11
- t.datetime :created_at
12
- end
13
-
14
- add_index :phcdevworks_core_modules_optimization_versions, %i(item_type item_id), :name => 'core_optimize_versions'
15
-
16
- end
17
- end
1
+ class CreatePhcdevworksCoreModulesPostCategoryVersions < ActiveRecord::Migration[6.0]
2
+ TEXT_BYTES = 1_073_741_823
3
+ def change
4
+ create_table :phcdevworks_core_modules_post_category_versions do |t|
5
+
6
+ t.string :item_type, {:null=>false}
7
+ t.integer :item_id, null: false
8
+ t.string :event, null: false
9
+ t.string :whodunnit
10
+ t.text :object, limit: TEXT_BYTES
11
+ t.datetime :created_at
12
+
13
+ end
14
+
15
+ add_index :phcdevworks_core_modules_post_category_versions, %i(item_type item_id), :name => 'post_category_versions'
16
+
17
+ end
18
+ end
data/db/migrate/20200705223718_create_phcdevworks_core_modules_marketing_optimizations.rb CHANGED
@@ -2,18 +2,18 @@ class CreatePhcdevworksCoreModulesMarketingOptimizations < ActiveRecord::Migrati
2
2
  def change
3
3
  create_table :phcdevworks_core_modules_marketing_optimizations do |t|
4
4
 
5
- t.string :seo_title
6
- t.text :seo_description
5
+ t.string :marketing_optimization_page_title
6
+ t.text :marketing_optimization_page_description
7
7
 
8
- t.string :seo_open_graph_post_type
9
- t.string :seo_open_graph_url
10
- t.string :seo_open_graph_title
11
- t.text :seo_open_graph_description
8
+ t.string :marketing_optimization_og_title
9
+ t.text :marketing_optimization_og_description
10
+ t.string :marketing_optimization_og_type
11
+ t.string :marketing_optimization_og_url
12
12
 
13
- t.string :seo_twitter_post_type
14
- t.string :seo_twitter_url
15
- t.string :seo_twitter_title
16
- t.text :seo_twitter_description
13
+ t.string :marketing_optimization_twitter_title
14
+ t.text :marketing_optimization_twitter_description
15
+ t.string :marketing_optimization_twitter_type
16
+ t.string :marketing_optimization_twitter_url
17
17
 
18
18
  t.string :slug
19
19
  t.string :user_id
data/db/migrate/20200705225433_create_phcdevworks_core_modules_marketing_optimization_versions.rb ADDED
@@ -0,0 +1,18 @@
1
+ class CreatePhcdevworksCoreModulesMarketingOptimizationVersions < ActiveRecord::Migration[6.0]
2
+ TEXT_BYTES = 1_073_741_823
3
+ def change
4
+ create_table :phcdevworks_core_modules_marketing_optimization_versions do |t|
5
+
6
+ t.string :item_type, {:null=>false}
7
+ t.integer :item_id, null: false
8
+ t.string :event, null: false
9
+ t.string :whodunnit
10
+ t.text :object, limit: TEXT_BYTES
11
+ t.datetime :created_at
12
+
13
+ end
14
+
15
+ add_index :phcdevworks_core_modules_marketing_optimization_versions, %i(item_type item_id), :name => 'marketing_optimization_versions'
16
+
17
+ end
18
+ end
data/db/migrate/20200706094820_create_phcdevworks_core_modules_post_categories.rb CHANGED
@@ -2,14 +2,14 @@ class CreatePhcdevworksCoreModulesPostCategories < ActiveRecord::Migration[6.0]
2
2
  def change
3
3
  create_table :phcdevworks_core_modules_post_categories do |t|
4
4
 
5
- t.string :category_name
5
+ t.string :post_category_name
6
+
7
+ t.string :optimization_id
6
8
 
7
9
  t.string :slug
8
10
  t.string :user_id
9
11
  t.string :org_id
10
12
 
11
- t.string :optimization_id
12
-
13
13
  t.timestamps
14
14
 
15
15
  end
data/lib/phcdevworks_core_modules.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require "phcdevworks_core_modules/engine"
2
2
 
3
3
  module PhcdevworksCoreModules
4
- # Your code goes here...
4
+ # Your code goes here...
5
5
  end
data/lib/phcdevworks_core_modules/engine.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module PhcdevworksCoreModules
2
2
  class Engine < ::Rails::Engine
3
-
3
+
4
4
  # Load Main Dependencies
5
5
  require "jbuilder"
6
6
  require "paper_trail"
@@ -28,7 +28,7 @@ module PhcdevworksCoreModules
28
28
 
29
29
  # Load User Accounts
30
30
  require "phcdevworks_accounts"
31
-
31
+
32
32
  # Engine Namespace
33
33
  isolate_namespace PhcdevworksCoreModules
34
34
 
data/lib/phcdevworks_core_modules/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module PhcdevworksCoreModules
2
- VERSION = '3.0.0'
2
+ VERSION = '6.0.1'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phcdevworks_core_modules
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0
4
+ version: 6.0.1
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-07 00:00:00.000000000 Z
11
+ date: 2020-07-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -64,84 +64,84 @@ dependencies:
64
64
  requirements:
65
65
  - - "~>"
66
66
  - !ruby/object:Gem::Version
67
- version: '1.10'
67
+ version: '2.0'
68
68
  type: :runtime
69
69
  prerelease: false
70
70
  version_requirements: !ruby/object:Gem::Requirement
71
71
  requirements:
72
72
  - - "~>"
73
73
  - !ruby/object:Gem::Version
74
- version: '1.10'
74
+ version: '2.0'
75
75
  - !ruby/object:Gem::Dependency
76
76
  name: phcthemes_web_theme_pack
77
77
  requirement: !ruby/object:Gem::Requirement
78
78
  requirements:
79
79
  - - "~>"
80
80
  - !ruby/object:Gem::Version
81
- version: '1.10'
81
+ version: '2.0'
82
82
  type: :runtime
83
83
  prerelease: false
84
84
  version_requirements: !ruby/object:Gem::Requirement
85
85
  requirements:
86
86
  - - "~>"
87
87
  - !ruby/object:Gem::Version
88
- version: '1.10'
88
+ version: '2.0'
89
89
  - !ruby/object:Gem::Dependency
90
90
  name: phcdevworks_active_menus
91
91
  requirement: !ruby/object:Gem::Requirement
92
92
  requirements:
93
93
  - - "~>"
94
94
  - !ruby/object:Gem::Version
95
- version: '1.5'
95
+ version: '2.0'
96
96
  type: :runtime
97
97
  prerelease: false
98
98
  version_requirements: !ruby/object:Gem::Requirement
99
99
  requirements:
100
100
  - - "~>"
101
101
  - !ruby/object:Gem::Version
102
- version: '1.5'
102
+ version: '2.0'
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: phcdevworks_core
105
105
  requirement: !ruby/object:Gem::Requirement
106
106
  requirements:
107
107
  - - "~>"
108
108
  - !ruby/object:Gem::Version
109
- version: '1.5'
109
+ version: '2.0'
110
110
  type: :runtime
111
111
  prerelease: false
112
112
  version_requirements: !ruby/object:Gem::Requirement
113
113
  requirements:
114
114
  - - "~>"
115
115
  - !ruby/object:Gem::Version
116
- version: '1.5'
116
+ version: '2.0'
117
117
  - !ruby/object:Gem::Dependency
118
118
  name: phcdevworks_notifications
119
119
  requirement: !ruby/object:Gem::Requirement
120
120
  requirements:
121
121
  - - "~>"
122
122
  - !ruby/object:Gem::Version
123
- version: '1.5'
123
+ version: '2.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: '1.5'
130
+ version: '2.0'
131
131
  - !ruby/object:Gem::Dependency
132
132
  name: phcdevworks_titleseo
133
133
  requirement: !ruby/object:Gem::Requirement
134
134
  requirements:
135
135
  - - "~>"
136
136
  - !ruby/object:Gem::Version
137
- version: '2.4'
137
+ version: '3.0'
138
138
  type: :runtime
139
139
  prerelease: false
140
140
  version_requirements: !ruby/object:Gem::Requirement
141
141
  requirements:
142
142
  - - "~>"
143
143
  - !ruby/object:Gem::Version
144
- version: '2.4'
144
+ version: '3.0'
145
145
  - !ruby/object:Gem::Dependency
146
146
  name: wicked
147
147
  requirement: !ruby/object:Gem::Requirement
@@ -190,14 +190,14 @@ dependencies:
190
190
  requirements:
191
191
  - - "~>"
192
192
  - !ruby/object:Gem::Version
193
- version: '1.67'
193
+ version: '1.74'
194
194
  type: :runtime
195
195
  prerelease: false
196
196
  version_requirements: !ruby/object:Gem::Requirement
197
197
  requirements:
198
198
  - - "~>"
199
199
  - !ruby/object:Gem::Version
200
- version: '1.67'
200
+ version: '1.74'
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: google-cloud-storage
203
203
  requirement: !ruby/object:Gem::Requirement
@@ -232,14 +232,14 @@ dependencies:
232
232
  requirements:
233
233
  - - "~>"
234
234
  - !ruby/object:Gem::Version
235
- version: '1.13'
235
+ version: '2.0'
236
236
  type: :runtime
237
237
  prerelease: false
238
238
  version_requirements: !ruby/object:Gem::Requirement
239
239
  requirements:
240
240
  - - "~>"
241
241
  - !ruby/object:Gem::Version
242
- version: '1.13'
242
+ version: '2.0'
243
243
  - !ruby/object:Gem::Dependency
244
244
  name: sqlite3
245
245
  requirement: !ruby/object:Gem::Requirement
@@ -256,7 +256,7 @@ dependencies:
256
256
  version: '1.4'
257
257
  description: Core modules for PHCDevworks plugins.
258
258
  email:
259
- - info@phcdevworks.com
259
+ - developers@phcdevworks.com
260
260
  executables: []
261
261
  extensions: []
262
262
  extra_rdoc_files: []
@@ -281,13 +281,13 @@ files:
281
281
  - app/jobs/phcdevworks_core_modules/application_job.rb
282
282
  - app/mailers/phcdevworks_core_modules/application_mailer.rb
283
283
  - app/models/phcdevworks_core_modules/application_record.rb
284
- - app/models/phcdevworks_core_modules/core_category_versions.rb
285
- - app/models/phcdevworks_core_modules/core_optimization_versions.rb
286
284
  - app/models/phcdevworks_core_modules/marketing.rb
287
285
  - app/models/phcdevworks_core_modules/marketing/optimization.rb
286
+ - app/models/phcdevworks_core_modules/marketing_optimization_versions.rb
288
287
  - app/models/phcdevworks_core_modules/modules.rb
289
288
  - app/models/phcdevworks_core_modules/post.rb
290
289
  - app/models/phcdevworks_core_modules/post/category.rb
290
+ - app/models/phcdevworks_core_modules/post_category_versions.rb
291
291
  - app/views/layouts/phcdevworks_core_modules/application.html.erb
292
292
  - app/views/layouts/phcdevworks_core_modules/components/backend/footer/_footer.html.erb
293
293
  - app/views/layouts/phcdevworks_core_modules/components/backend/navigation/_top_menu.html.erb
@@ -303,9 +303,9 @@ files:
303
303
  - app/views/phcdevworks_core_modules/post/categories/new.html.erb
304
304
  - app/views/phcdevworks_core_modules/post/categories/show.html.erb
305
305
  - config/routes.rb
306
- - db/migrate/20170517064427_create_phcdevworks_core_modules_category_versions.rb
306
+ - db/migrate/20170517064427_create_phcdevworks_core_modules_post_category_versions.rb
307
307
  - db/migrate/20200705223718_create_phcdevworks_core_modules_marketing_optimizations.rb
308
- - db/migrate/20200705225433_create_phcdevworks_core_modules_optimization_versions.rb
308
+ - db/migrate/20200705225433_create_phcdevworks_core_modules_marketing_optimization_versions.rb
309
309
  - db/migrate/20200706094820_create_phcdevworks_core_modules_post_categories.rb
310
310
  - lib/phcdevworks_core_modules.rb
311
311
  - lib/phcdevworks_core_modules/engine.rb
data/app/models/phcdevworks_core_modules/core_category_versions.rb DELETED
@@ -1,5 +0,0 @@
1
- module PhcdevworksCoreModules
2
- class CoreCategoryVersions < PaperTrail::Version
3
- self.table_name = :phcdevworks_core_modules_category_versions
4
- end
5
- end
data/app/models/phcdevworks_core_modules/core_optimization_versions.rb DELETED
@@ -1,5 +0,0 @@
1
- module PhcdevworksCoreModules
2
- class CoreOptimizationVersions < PaperTrail::Version
3
- self.table_name = :phcdevworks_core_modules_optimization_versions
4
- end
5
- end
data/db/migrate/20170517064427_create_phcdevworks_core_modules_category_versions.rb DELETED
@@ -1,17 +0,0 @@
1
- class CreatePhcdevworksCoreModulesCategoryVersions < ActiveRecord::Migration[6.0]
2
- TEXT_BYTES = 1_073_741_823
3
- def change
4
-
5
- create_table :phcdevworks_core_modules_category_versions do |t|
6
- t.string :item_type, {:null=>false}
7
- t.integer :item_id, null: false
8
- t.string :event, null: false
9
- t.string :whodunnit
10
- t.text :object, limit: TEXT_BYTES
11
- t.datetime :created_at
12
- end
13
-
14
- add_index :phcdevworks_core_modules_category_versions, %i(item_type item_id), :name => 'core_category_versions'
15
-
16
- end
17
- end