From dae9146ba5308c7b782667576d90f53947537ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0smail=20Akbudak?= <ismail.akbudak@lab2023.com>
Date: Mon, 8 Jan 2018 13:54:05 +0300
Subject: [PATCH] KBP-175 KBP-181 #time 1h fix app_name errors

---
 templates/README.md.erb                       |  8 +++++++-
 .../layouts/hq/partials/_navbar.html.haml     |  8 ++++----
 templates/devise/seeds.rb.erb                 |  2 +-
 templates/docker/start-sidekiq.sh.erb         | 20 +++++++++++++++----
 .../recipient_interceptor_settings.yml.erb    |  6 +++---
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/templates/README.md.erb b/templates/README.md.erb
index cb65d47..8ff3f78 100644
--- a/templates/README.md.erb
+++ b/templates/README.md.erb
@@ -1,4 +1,10 @@
 # <%= app_name.capitalize %>
 
 # TODOs
-➜ ✗ npm install jscs -g
+➜ ✗ docker-compose build
+➜ ✗ docker-compose run app bundle
+➜ ✗ docker-compose run app bundle exec rails db:create
+➜ ✗ docker-compose run app bundle exec rails db:migrate
+➜ ✗ docker-compose run app bundle exec rails db:seed
+➜ ✗ docker-compose up
+Look: localhost:3000 or lvh.me:3000
diff --git a/templates/app_files/app/views/layouts/hq/partials/_navbar.html.haml b/templates/app_files/app/views/layouts/hq/partials/_navbar.html.haml
index 11cfcc7..b328473 100644
--- a/templates/app_files/app/views/layouts/hq/partials/_navbar.html.haml
+++ b/templates/app_files/app/views/layouts/hq/partials/_navbar.html.haml
@@ -2,10 +2,10 @@
   %a.navbar-brand{ href: hq_dashboard_index_path }
     %i.fas.fa-coffee
     = t('view.navbar.admin_portal')
-  %button.navbar-toggler{ 'aria-controls' => 'navbarNavDropdown',
+  %button.navbar-toggler{ 'aria-controls' => 'navbar-nav-dropdown',
                           'aria-expanded' => 'false',
                           'aria-label' => 'Toggle navigation',
-                          'data-target' => '#navbarNavDropdown',
+                          'data-target' => '#navbar-nav-dropdown',
                           'data-toggle' => 'collapse',
                           type: 'button' }
     %span.navbar-toggler-icon
@@ -24,12 +24,12 @@
           %strong
             = current_admin.email
           %b.caret
-        .dropdown-menu{ 'aria-labelledby' => 'navbarDropdownMenuLink' }
+        .dropdown-menu{ 'aria-labelledby' => 'navbar-dropdown-menu-link' }
           = link_to t('view.navbar.edit_login_info'),
                     edit_admin_registration_path,
                     class: 'dropdown-item'
           .dropdown-divider
-          = link_to t('view.navbar.signout'),
+          = link_to t('view.navbar.sign_out'),
                     destroy_admin_session_path,
                     method: :delete,
                     class: 'dropdown-item'
diff --git a/templates/devise/seeds.rb.erb b/templates/devise/seeds.rb.erb
index 24df64c..fee0124 100644
--- a/templates/devise/seeds.rb.erb
+++ b/templates/devise/seeds.rb.erb
@@ -1 +1 @@
-Admin.create(email: "admin@#{app_name}.com", name: 'Admin', surname: 'Admin', password: '12341234', password_confirmation: '12341234')
\ No newline at end of file
+Admin.create(email: 'admin@<%= app_name %>.com', name: 'Admin', surname: 'Admin', password: '12341234', password_confirmation: '12341234')
\ No newline at end of file
diff --git a/templates/docker/start-sidekiq.sh.erb b/templates/docker/start-sidekiq.sh.erb
index 7d27452..217a38a 100644
--- a/templates/docker/start-sidekiq.sh.erb
+++ b/templates/docker/start-sidekiq.sh.erb
@@ -3,11 +3,23 @@
 bundle check || bundle install
 bundle config git.allow_insecure true
 
-echo 'Stopping sidekiq if exists'
-bundle exec sidekiqctl stop tmp/pids/sidekiq.pid
+# Create directory if not exists
+if [ ! -d ./tmp/pids ]; then
+    mkdir ./tmp/pids
+fi
 
-echo 'Stopped sidekiq'
-rm -rf ./tmp/pids/sidekiq.pid
+# If file exist stop sidekiq
+if [ -f ./tmp/pids/sidekiq.pid ]; then
+{
+    echo 'Stopping sidekiq'
+    bundle exec sidekiqctl stop tmp/pids/sidekiq.pid
+
+    echo 'Stopped sidekiq'
+    rm -rf ./tmp/pids/sidekiq.pid
+} || {
+    echo 'Error occurred when stopping sidekiq'
+}
+fi
 
 echo 'Starting sidekiq'
 bundle exec sidekiq -C config/sidekiq.yml
diff --git a/templates/recipient_interceptor/recipient_interceptor_settings.yml.erb b/templates/recipient_interceptor/recipient_interceptor_settings.yml.erb
index 2034fec..819f515 100644
--- a/templates/recipient_interceptor/recipient_interceptor_settings.yml.erb
+++ b/templates/recipient_interceptor/recipient_interceptor_settings.yml.erb
@@ -1,4 +1,4 @@
 email:
-  sandbox: sandbox@#{app_name}.com
-  noreply: no-reply@#{app_name}.com
-  admin: admin@#{app_name}.com
\ No newline at end of file
+  sandbox: sandbox@<%= app_name %>.com
+  noreply: no-reply@<%= app_name %>.com
+  admin: admin@<%= app_name %>.com
\ No newline at end of file