Skip to content

Commit

Permalink
KBP-175 KBP-181 #time 1h fix app_name errors
Browse files Browse the repository at this point in the history
  • Loading branch information
İsmail Akbudak committed Jan 8, 2018
1 parent e164182 commit dae9146
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 13 deletions.
8 changes: 7 additions & 1 deletion templates/README.md.erb
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
2 changes: 1 addition & 1 deletion templates/devise/seeds.rb.erb
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Admin.create(email: "admin@#{app_name}.com", name: 'Admin', surname: 'Admin', password: '12341234', password_confirmation: '12341234')
Admin.create(email: 'admin@<%= app_name %>.com', name: 'Admin', surname: 'Admin', password: '12341234', password_confirmation: '12341234')
20 changes: 16 additions & 4 deletions templates/docker/start-sidekiq.sh.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
email:
sandbox: sandbox@#{app_name}.com
noreply: no-reply@#{app_name}.com
admin: admin@#{app_name}.com
sandbox: sandbox@<%= app_name %>.com
noreply: no-reply@<%= app_name %>.com
admin: admin@<%= app_name %>.com

0 comments on commit dae9146

Please sign in to comment.