Browse Source

Merge branch 'feature/homepage-links' into develop

* feature/homepage-links:
  Fix linting issues with capistrano
  Add links to "faux" homepage urls
tags/0.3.6^2
Bèr Kessels 1 month ago
parent
commit
eb7ed122b3
4 changed files with 22 additions and 25 deletions
  1. 7
    5
      Capfile
  2. 7
    7
      app/views/home.erb
  3. 5
    12
      config/deploy.rb
  4. 3
    1
      config/deploy/production.rb

+ 7
- 5
Capfile View File

@@ -1,13 +1,15 @@
# frozen_string_literal: true

# Load DSL and set up stages
require "capistrano/setup"
require 'capistrano/setup'

# Include default deployment tasks
require "capistrano/deploy"
require 'capistrano/deploy'

require "capistrano/scm/git"
require 'capistrano/scm/git'
install_plugin Capistrano::SCM::Git

require "capistrano/bundler"
require 'capistrano/bundler'

# Load custom tasks from `lib/capistrano/tasks` if you have any defined
Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }
Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

+ 7
- 7
app/views/home.erb View File

@@ -33,20 +33,20 @@ set_content_for(:closing_js, js)
<div class="col">
<h2 class="title">Populaire plaatsen</h2>
<ul class="popular">
<li><a href="">Amsterdam</a></li>
<li><a href="">Rotterdam</a></li>
<li><a href="">Utrecht</a></li>
<li><a href="">Groningen</a></li>
<li><a href="/in/amsterdam">Amsterdam</a></li>
<li><a href="/in/rotterdam">Rotterdam</a></li>
<li><a href="/in/utrecht">Utrecht</a></li>
<li><a href="/in/groningen">Groningen</a></li>
<li><a href="/in/nijmegen">Nijmegen</a></li>
</ul>
</div>
<div class="col">
<h2 class="title">Recent gezocht</h2>
<ul class="popular">
<li><a href="">HEMA</a></li>
<li><a href="">Albert Heijn</a></li>
<li><a href="/search?q=Hema">HEMA</a></li>
<li><a href="/search?q=Hema">Albert Heijn</a></li>
<li><a href="/in/nijmegen">Nijmegen</a></li>
<li><a href="">Tankstation Groningen</a></li>
<li><a href="/search?q=Tankstation%20Groningen">Tankstation Groningen</a></li>
</ul>
</div>
</section>

+ 5
- 12
config/deploy.rb View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true

# config valid for current version and patch releases of Capistrano
lock '~> 3.14.1'

@@ -8,14 +10,7 @@ set :repo_url, 'ssh://gitea@git.webschuur.com:2222/placebazaar/hours.git'
ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp

# Default deploy_to directory is /var/www/my_app_name
set :deploy_to, "/u/apps/webapp"

# Default value for :format is :airbrussh.
# set :format, :airbrussh

# You can configure the Airbrussh format using :format_options.
# These are the defaults.
# set :format_options, command_output: true, log_file: "log/capistrano.log", color: :auto, truncate: :auto
set :deploy_to, '/u/apps/webapp'

# Default value for :pty is false
set :pty, true
@@ -24,7 +19,8 @@ set :pty, true
# append :linked_files, "config/database.yml"

# Default value for linked_dirs is []
# append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "public/system"
# append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets",
# "public/system"
append :linked_dirs, '.bundle'

# Default value for default_env is {}
@@ -36,9 +32,6 @@ append :linked_dirs, '.bundle'
# Default value for keep_releases is 5
# set :keep_releases, 5

# Uncomment the following to require manually verifying the host key before first deploy.
# set :ssh_options, verify_host_key: :secure
#
namespace :systemd do
desc 'Reload service'
task :reload do

+ 3
- 1
config/deploy/production.rb View File

@@ -1 +1,3 @@
server "toekomstige.tijden.org", user: "deploy", roles: %w{app web}
# frozen_string_literal: true

server 'toekomstige.tijden.org', user: 'deploy', roles: %w[app web]

Loading…
Cancel
Save