diff --git a/Gemfile.lock b/Gemfile.lock index 1eb5670..e0786c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,7 @@ GEM activesupport (>= 3.1) parallel (1.19.1) ptools (1.3.5) - public_suffix (4.0.2) + public_suffix (4.0.3) rack (2.0.8) rack-livereload (0.3.17) rack diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 0000000..a71368e --- /dev/null +++ b/bin/bundle @@ -0,0 +1,114 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'bundle' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "rubygems" + +m = Module.new do + module_function + + def invoked_as_script? + File.expand_path($0) == File.expand_path(__FILE__) + end + + def env_var_version + ENV["BUNDLER_VERSION"] + end + + def cli_arg_version + return unless invoked_as_script? # don't want to hijack other binstubs + return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + bundler_version = nil + update_index = nil + ARGV.each_with_index do |a, i| + if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN + bundler_version = a + end + next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ + bundler_version = $1 + update_index = i + end + bundler_version + end + + def gemfile + gemfile = ENV["BUNDLE_GEMFILE"] + return gemfile if gemfile && !gemfile.empty? + + File.expand_path("../../Gemfile", __FILE__) + end + + def lockfile + lockfile = + case File.basename(gemfile) + when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + else "#{gemfile}.lock" + end + File.expand_path(lockfile) + end + + def lockfile_version + return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) + return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) + end + + def bundler_version + @bundler_version ||= + env_var_version || cli_arg_version || + lockfile_version + end + + def bundler_requirement + return "#{Gem::Requirement.default}.a" unless bundler_version + + bundler_gem_version = Gem::Version.new(bundler_version) + + requirement = bundler_gem_version.approximate_recommendation + + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + + requirement += ".a" if bundler_gem_version.prerelease? + + requirement + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + activate_bundler + end + + def activate_bundler + gem_error = activation_error_handling do + gem "bundler", bundler_requirement + end + return if gem_error.nil? + require_error = activation_error_handling do + require "bundler/version" + end + return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`" + exit 42 + end + + def activation_error_handling + yield + nil + rescue StandardError, LoadError => e + e + end +end + +m.load_bundler! + +if m.invoked_as_script? + load Gem.bin_path("bundler", "bundle") +end diff --git a/config.rb b/config.rb index 12a6fec..6348759 100644 --- a/config.rb +++ b/config.rb @@ -16,13 +16,13 @@ configure :build do #activate :minify_css #activate :minify_javascript, compressor: proc { ::Uglifier.new harmony: true } # activate :asset_hash - set :http_prefix, '/tmp' + #set :http_prefix, '/tmp' end activate :deploy do |deploy| deploy.deploy_method = :rsync deploy.host = 'rabbit.passageenseine.fr' - deploy.path = '/var/www/pses/tmp' + deploy.path = '/var/www/pses' deploy.port = 2222 deploy.build_before = true # Optional Settings diff --git a/data/donate.yml b/data/donate.yml index 1bb2dc5..6fec089 100644 --- a/data/donate.yml +++ b/data/donate.yml @@ -1,3 +1,3 @@ -current: 1000 +current: 5 target: 2500 color: #800000 diff --git a/source/_infos.erb b/source/_infos.erb index f1cda76..7a001a2 100644 --- a/source/_infos.erb +++ b/source/_infos.erb @@ -105,7 +105,7 @@ 1.4% + 0.25€ de commission
- <% link_to 'https://paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=EUR&business=paypal@passageenseine.fr&item_name=Don%20PSES', class: 'donate' do %> + <% link_to 'https://www.paypal.me/PasSageEnSeine/0eur', class: 'donate' do %> <%= image_tag 'paypal.png', alt: 'Paypal' %> <% end %>
3.4% + 0.25€ de commission diff --git a/source/donate.html.erb b/source/donate.html.erb index c3c561a..855a807 100644 --- a/source/donate.html.erb +++ b/source/donate.html.erb @@ -86,7 +86,7 @@ title: Pas Sage en Seine - Financement participatif 1.4% + 0.25€ de commission
- <% link_to 'https://paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=EUR&business=paypal@passageenseine.fr&item_name=Don%20PSES', class: 'donate' do %> + <% link_to 'https://www.paypal.me/PasSageEnSeine/0eur', class: 'donate' do %> <%= image_tag 'paypal.png', alt: 'Paypal' %> <% end %>
3.4% + 0.25€ de commission