phcdevworks_portfolio 10.0.2 → 10.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/layouts/phcdevworks_portfolio/components/backend/sidebars/_side_menu.html.erb +71 -9
  3. data/config/routes.rb +1 -1
  4. data/config/spring.rb +2 -0
  5. data/lib/phcdevworks_portfolio/engine.rb +4 -4
  6. data/lib/phcdevworks_portfolio/version.rb +1 -1
  7. metadata +21 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c3fc015c32fd1225ba10393798c1a2e78c5f356237c0b4bedaf2bff5b20995d8
4
- data.tar.gz: 4a28cb1a1eee4244dae99871992b0bc752ec33cec3ff6797773101a2c5165a26
3
+ metadata.gz: 74310009930ca2224a1eb2dc332399a47043d4512c940565e5fd72b0fd120714
4
+ data.tar.gz: c85a60235322112324e4a12f0a732ff98009a26b0c769e6702b2794c526e1140
5
5
  SHA512:
6
- metadata.gz: 18e93b8de5a9ac85a6aef80746040c755363136f7c9fe35edd311b952e46f1d982e0e68b264456868ab11d62594b2fb01fd4cafed8a1a680c919d3b7c3eb3773
7
- data.tar.gz: 687c730c48716cae87e8927eddffa08ca211a82d2468f89b543f69a80c87149c5d95c80d5388082eeac9855ae8c7acd42803c6ec9b5123eb6580a6377542f114
6
+ metadata.gz: dc7360d1b8b5919534167c3c5dbc6c234f3f0c1f4cf74d38519933b27bd43cd36d6fe7e385d34d544d899145285a505086d69de79836b00e9775fa18706c52ae
7
+ data.tar.gz: 228e6538aa8ab8b6103aec616035e3d2fb1f13eb950094fb7dcedadb650e9cbfa0e37d94551743972180ef1b3f539019c0512b3f1b8d6be75fb15712baed85a5
data/app/views/layouts/phcdevworks_portfolio/components/backend/sidebars/_side_menu.html.erb CHANGED
@@ -277,30 +277,92 @@
277
277
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
278
278
  <% end %>
279
279
 
280
- <% if current_user && current_user.admin? %>
280
+ <% if current_user and current_user.admin? %>
281
+ <li class="nav-header">Administration</li>
282
+ <% if defined?phcdevworks_accounts_stripe and current_user.admin? %>
283
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Accounts Stripe -->
284
+ <li class="has-sub">
285
+ <a href="javascript:;">
286
+ <b class="caret"></b>
287
+ <i class="fab fa-cc-visa"></i>
288
+ <span>Accounting</span>
289
+ </a>
290
+ <ul class="sub-menu">
291
+ <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/subscriptions#admin_subscription_list") %>"><%= link_to("Invoices", phcdevworks_accounts_stripe.admin_invoices_path) %></li>
292
+ <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/subscriptions#admin_subscription_list") %>"><%= link_to("Subscriptions", phcdevworks_accounts_stripe.admin_subscriptions_path) %></li>
293
+ </ul>
294
+ </li>
295
+ <li class="has-sub">
296
+ <a href="javascript:;">
297
+ <b class="caret"></b>
298
+ <i class="fad fa-money-check-alt"></i>
299
+ <span>Services</span>
300
+ </a>
301
+ <ul class="sub-menu">
302
+ <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/products#admin_products_list") %>"><%= link_to("Product List", phcdevworks_accounts_stripe.admin_products_path) %></li>
303
+ </ul>
304
+ </li>
305
+ <li class="has-sub">
306
+ <a href="javascript:;">
307
+ <b class="caret"></b>
308
+ <i class="fad fa-users"></i>
309
+ <span>Customers</span>
310
+ </a>
311
+ <ul class="sub-menu">
312
+ <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/customers#admin_customer_list") %>"><%= link_to("Customer List", phcdevworks_accounts_stripe.admin_customers_path) %></li>
313
+ </ul>
314
+ </li>
315
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Accounts Stripe -->
316
+ <% end %>
281
317
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->
282
- <li class="nav-header">User Administration</li>
283
318
  <li class="has-sub">
284
319
  <a href="javascript:;">
285
320
  <b class="caret"></b>
286
- <i class="fad fa-user"></i>
287
- <span>Admin</span>
321
+ <i class="fad fa-user-lock"></i>
322
+ <span>User Logins</span>
288
323
  </a>
289
324
  <ul class="sub-menu">
290
325
  <li class="<%= phc_menu_active_controller("phcdevworks_accounts/admin/users") %>"><%= link_to "User List", phcdevworks_accounts.admin_users_all_path %></li>
291
326
  </ul>
292
327
  </li>
293
328
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->
294
- <% end %>
295
-
296
- <% if current_user %>
329
+ <% end %>
330
+
331
+ <li class="nav-header">Your Account</li>
332
+ <% if defined?phcdevworks_accounts_stripe and current_user %>
333
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Accounts Stripe -->
334
+ <li class="has-sub">
335
+ <a href="javascript:;">
336
+ <b class="caret"></b>
337
+ <i class="fad fa-money-check-alt"></i>
338
+ <span>Your Subscription</span>
339
+ </a>
340
+ <ul class="sub-menu">
341
+ <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/subscriptions#admin_subscription_list") %>"><%= link_to("Your Subscription", phcdevworks_accounts_stripe.user_subscription_path) %></li>
342
+ <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/products#admin_product_list") %>"><%= link_to("Switch Subscriptions", phcdevworks_accounts_stripe.user_subscription_path) %></li>
343
+ </ul>
344
+ </li>
345
+ <li class="has-sub">
346
+ <a href="javascript:;">
347
+ <b class="caret"></b>
348
+ <i class="fad fa-file-invoice"></i>
349
+ <span>Your Invoices</span>
350
+ </a>
351
+ <ul class="sub-menu">
352
+ <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/user/invoices#admin_customer_list") %>"><%= link_to("Current Invoice", phcdevworks_accounts_stripe.user_invoices_path) %></li>
353
+ <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/user/invoices#admin_customer_list") %>"><%= link_to("Past Invoices", phcdevworks_accounts_stripe.admin_customers_path) %></li>
354
+ </ul>
355
+ </li>
356
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Accounts Stripe -->
357
+ <% end %>
358
+
359
+ <% if current_user %>
297
360
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts User Options -->
298
- <li class="nav-header">Your Account</li>
299
361
  <li class="has-sub">
300
362
  <a href="javascript:;">
301
363
  <b class="caret"></b>
302
364
  <i class="fad fa-user"></i>
303
- <span>Accounts Settings</span>
365
+ <span>Login Settings</span>
304
366
  </a>
305
367
  <ul class="sub-menu">
306
368
  <li class="<%= phc_menu_active_controller("phcdevworks_accounts/user/edit") %>"><%= link_to "Settings", phcdevworks_accounts.edit_user_registration_path %></li>
data/config/routes.rb CHANGED
@@ -6,7 +6,7 @@ PhcdevworksPortfolio::Engine.routes.draw do
6
6
  resources :types, class_name: "Project::Type"
7
7
  resources :pages, only: [:index, :show]
8
8
  end
9
-
9
+
10
10
  # Mount Routes
11
11
  mount PhcdevworksAccounts::Engine, :at => '/'
12
12
  mount PhcdevworksCoreModules::Engine, :at => '/'
data/config/spring.rb ADDED
@@ -0,0 +1,2 @@
1
+ Spring.application_root = './spec/test_app'
2
+
data/lib/phcdevworks_portfolio/engine.rb CHANGED
@@ -29,7 +29,7 @@ module PhcdevworksPortfolio
29
29
  # Mailer Dependencies
30
30
  require "mail_form"
31
31
 
32
- # Load User Accounts
32
+ # Load Required PHC Plugins
33
33
  require "phcdevworks_accounts"
34
34
  require "phcdevworks_core_modules"
35
35
 
@@ -38,9 +38,9 @@ module PhcdevworksPortfolio
38
38
 
39
39
  # Rspec Generators
40
40
  config.generators do |g|
41
- g.test_framework :rspec
42
- g.fixture_replacement :factory_bot
43
- g.factory_bot dir: 'spec/factories'
41
+ g.test_framework :rspec
42
+ g.fixture_replacement :factory_bot
43
+ g.factory_bot dir: 'spec/factories'
44
44
  end
45
45
 
46
46
  end
data/lib/phcdevworks_portfolio/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module PhcdevworksPortfolio
2
- VERSION = '10.0.2'
2
+ VERSION = "10.1.1"
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: 10.0.2
4
+ version: 10.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - PHCDevworks
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-03-07 00:00:00.000000000 Z
11
+ date: 2021-04-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -142,14 +142,14 @@ dependencies:
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: '7.1'
145
+ version: '7.2'
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: '7.1'
152
+ version: '7.2'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: wicked
155
155
  requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,28 @@ dependencies:
254
254
  requirements:
255
255
  - - "~>"
256
256
  - !ruby/object:Gem::Version
257
- version: '3.0'
257
+ version: '3.2'
258
+ type: :runtime
259
+ prerelease: false
260
+ version_requirements: !ruby/object:Gem::Requirement
261
+ requirements:
262
+ - - "~>"
263
+ - !ruby/object:Gem::Version
264
+ version: '3.2'
265
+ - !ruby/object:Gem::Dependency
266
+ name: phcdevworks_accounts_stripe
267
+ requirement: !ruby/object:Gem::Requirement
268
+ requirements:
269
+ - - "~>"
270
+ - !ruby/object:Gem::Version
271
+ version: 0.1.7
258
272
  type: :runtime
259
273
  prerelease: false
260
274
  version_requirements: !ruby/object:Gem::Requirement
261
275
  requirements:
262
276
  - - "~>"
263
277
  - !ruby/object:Gem::Version
264
- version: '3.0'
278
+ version: 0.1.7
265
279
  - !ruby/object:Gem::Dependency
266
280
  name: factory_bot_rails
267
281
  requirement: !ruby/object:Gem::Requirement
@@ -381,6 +395,7 @@ files:
381
395
  - app/views/phcdevworks_portfolio/project/types/index.html.erb
382
396
  - app/views/phcdevworks_portfolio/project/types/new.html.erb
383
397
  - config/routes.rb
398
+ - config/spring.rb
384
399
  - db/migrate/20191014112330_create_phcdevworks_portfolio_project_posts.rb
385
400
  - db/migrate/20191021225316_create_phcdevworks_portfolio_project_types.rb
386
401
  - db/migrate/20191024232111_create_phcdevworks_portfolio_project_categories_posts.rb