Skip to content

Commit

Permalink
Merge pull request #182 from rickselby-servers/2024-update
Browse files Browse the repository at this point in the history
2024 update
  • Loading branch information
rickselby authored Jul 11, 2023
2 parents e84cecd + d395207 commit 9deb7e5
Show file tree
Hide file tree
Showing 24 changed files with 328 additions and 68 deletions.
9 changes: 5 additions & 4 deletions .idea/ciclos-major-sinatra.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
require_relative 'helpers'

DEV_SECRET = '0fe07dcd4c857ba8dcb8f060c1e8ebf65694fea2a1371b6e5e4b49534725df2f'
SOLD_OUT_312 = true
SOLD_OUT_312 = false
REGISTER_INTEREST_312 = true

configure do
Sequel.extension :core_extensions, :migration
Expand Down Expand Up @@ -73,7 +74,6 @@
get('/ride-groups') { erb :ride_groups }
get('/routes') { erb :routes }
get('/safety') { erb :safety }
get('/support-crew') { erb :support_crew }
get('/terms-and-conditions') { erb :terms_and_conditions }
get('/testimonials') { erb :testimonials }

Expand All @@ -86,6 +86,9 @@
get('/camps/2023-spring') { erb :'camps/2023-spr' }
get('/camps/2023-autumn') { erb :'camps/2023-aut' }
get('/camps/2023-312') { erb :'camps/2023-312' }
get('/camps/2024-spring') { erb :'camps/2024-spr' }
get('/camps/2024-autumn') { erb :'camps/2024-aut' }
get('/camps/2024-312') { erb :'camps/2024-312' }
# Hotels
get('/hotels/can-ribera') { erb :'hotels/can_ribera' }
get('/hotels/zafiro-palace') { erb :'hotels/zafiro_palace' }
Expand Down
3 changes: 3 additions & 0 deletions public/img/booking-links/2024-03.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/booking-links/2024-09.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/booking-links/2024-312.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/camps/2024-312.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/camps/2024-aut.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/img/camps/2024-spr.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions public/img/guides/andrew-yeoman.jpg

This file was deleted.

3 changes: 0 additions & 3 deletions public/img/guides/nick-cooper.jpg

This file was deleted.

3 changes: 0 additions & 3 deletions public/img/guides/toni-saunders.jpg

This file was deleted.

3 changes: 3 additions & 0 deletions public/img/index/prices-2024.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions public/img/support-crew/rob-veronica-smith.jpg

This file was deleted.

Binary file added public/prices/2024-club-autumn.pdf
Binary file not shown.
Binary file added public/prices/2024-club-spring.pdf
Binary file not shown.
Binary file added public/prices/2024.pdf
Binary file not shown.
20 changes: 20 additions & 0 deletions views/camps/2024-312.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<h1>
Mallorca 312 Sportive
<% if SOLD_OUT_312 %>
<span class="badge bg-danger">
Sold out!
</span>
<% end %>
</h1>

<div class="alert alert-primary">
Mallorca 312 Sportive takes place on 27th April 2024
</div>

<p>
Full details should be available by the end of July 2023.
</p>

<a href="https://form.jotform.com/231904522028348" class="btn btn-primary">
Register your interest now
</a>
93 changes: 93 additions & 0 deletions views/camps/2024-aut.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<h1>Mallorca Autumn 2024</h1>
<h2>14th September to 3rd November</h2>

<div class="row mb-3">
<div class="col camp-background-image" style="background-image: url(/img/camps/2024-aut.jpg);"></div>
<div class="col-8">
<p>
Autumn 2024 Prices, including transfers to and from hotel,
half board accommodation with guided rides,
goody bag including Ciclos Major jersey, cycling food etc.
</p>
<p>
Prices quoted are <span class="fw-bold">per person per week</span>.
<br />
Bookings can be made for fewer or more days.
</p>
<p>
<a href="/prices/2024.pdf">View our full price list</a> for other room types and daily price adjustments.
</p>
</div>
</div>

<div class="row mb-3">
<div class="col camp-background-image" style="background-image: url(/img/camps/tropic.jpg);"></div>
<div class="col-8">
<h3>Zafiro Tropic 4* Hotel - Alcudia</h3>
<table class="table">
<thead>
<tr>
<th></th>
<th>2 person share studio</th>
<th>Single in studio</th>
</tr>
</thead>
<tbody>
<tr>
<td>14th September to 5th October</td>
<td>£924.00</td>
<td>£1,169.00</td>
</tr>
<tr>
<td>6th October to 3rd November</td>
<td>£819.00</td>
<td>£1,004.00</td>
</tr>
</tbody>
</table>
<div class="text-center">
<a href="/contact-us" class="btn btn-primary">
Enquire about Prices and Availability
</a>
<a href="https://form.jotform.com/231904272661353" class="btn btn-primary">
Book Now
</a>
</div>
</div>
</div>

<div class="row mb-3">
<div class="col camp-background-image" style="background-image: url(/img/camps/palace.jpg);"></div>
<div class="col-8">
<h3>Zafiro Palace 5* Hotel - Alcudia</h3>
<table class="table">
<thead>
<tr>
<th></th>
<th>2 person share Junior Suite</th>
<th>Single in Junior Suite</th>
</tr>
</thead>
<tbody>
<tr>
<td>14th to 30th September</td>
<td>£1,154.00</td>
<td>£1,514.00</td>
</tr>
<tr>
<td>1st November to 4th November</td>
<td>£1,064.00</td>
<td>£1,384.00</td>
</tr>
</tbody>
</table>
<div class="text-center">
<a href="/contact-us" class="btn btn-primary">
Enquire about Prices and Availability
</a>
<a href="https://form.jotform.com/231904424484355" class="btn btn-primary">
Book Now
</a>
</div>
</div>
</div>
113 changes: 113 additions & 0 deletions views/camps/2024-spr.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<h1>Mallorca Spring 2024</h1>
<h2>15th February to 13th May</h2>

<div class="row mb-3">
<div class="col camp-background-image" style="background-image: url(/img/camps/2024-spr.jpg);"></div>
<div class="col-8">
<p>
Spring 2024 Prices, including transfers to and from hotel,
half board accommodation with guided rides,
goody bag including Ciclos Major jersey, cycling food etc.
</p>
<p>
Prices quoted are <span class="fw-bold">per person per week</span>.
<br />
Bookings can be made for fewer or more days.
</p>
<p>
<a href="/prices/2024.pdf">View our full price list</a> for other room types and daily price adjustments.
</p>
</div>
</div>

<div class="row mb-3">
<div class="col camp-background-image" style="background-image: url(/img/camps/tropic.jpg);"></div>
<div class="col-8">
<h3>Zafiro Tropic 4* Hotel - Alcudia</h3>
<table class="table">
<thead>
<tr>
<th></th>
<th>2 person share studio</th>
<th>Single in studio</th>
</tr>
</thead>
<tbody>
<tr>
<td>15th February to 7th March</td>
<td>£754.00</td>
<td>£909.00</td>
</tr>
<tr>
<td>8th to 21st March</td>
<td>£814.00</td>
<td>£1,014.00</td>
</tr>
<tr>
<td>22nd March to 30th April</td>
<td>£869.00</td>
<td>£1,094.00</td>
</tr>
<tr>
<td>1st to 13th May</td>
<td>£924.00</td>
<td>£1,159.00</td>
</tr>
</tbody>
</table>
<div class="text-center">
<a href="/contact-us" class="btn btn-primary">
Enquire about Prices and Availability
</a>
<a href="https://form.jotform.com/231904147839361" class="btn btn-primary">
Book Now
</a>
</div>
</div>
</div>

<div class="row mb-3">
<div class="col camp-background-image" style="background-image: url(/img/camps/palace.jpg);"></div>
<div class="col-8">
<h3>Zafiro Palace 5* Hotel - Alcudia</h3>
<table class="table">
<thead>
<tr>
<th></th>
<th>2 person share Junior Suite</th>
<th>Single in Junior Suite</th>
</tr>
</thead>
<tbody>
<tr>
<td>23rd February to 11th March</td>
<td>£949.00</td>
<td>£1,179.00</td>
</tr>
<tr>
<td>12th to 21st March</td>
<td>£1,034.00</td>
<td>£1,334.00</td>
</tr>
<tr>
<td>22nd March to 30th April</td>
<td>£1,119.00</td>
<td>£1,459.00</td>
</tr>
<tr>
<td>1st to 13th May</td>
<td>£1,154.00</td>
<td>£1,514.00</td>
</tr>
</tbody>
</table>
<div class="text-center">
<a href="/contact-us" class="btn btn-primary">
Enquire about Prices and Availability
</a>
<a href="https://form.jotform.com/231904250426348" class="btn btn-primary">
Book Now
</a>
</div>
</div>
</div>
24 changes: 19 additions & 5 deletions views/camps/312.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@
<img src="/img/312/logo.png" alt="Mallorca 312 Logo">
</p>

<div class="alert alert-primary">
Mallorca 312 Sportive takes place on 27th April 2024
</div>

<p>
Full details should be available by the end of July 2023.
</p>

<a href="https://form.jotform.com/231904522028348" class="btn btn-primary">
Register your interest now
</a>

<p></p>

<%== erb :_tinymce, locals: { id: 'camps.312.header' } %>

<p class="text-center">
Expand All @@ -10,11 +24,11 @@

<%== erb :_tinymce, locals: { id: 'camps.312.body' } %>

<p class="text-center d-grid">
<a href="/camps/2023-312" class="btn btn-primary btn-lg">
View 2023 Prices and Book Now
</a>
</p>
<!--<p class="text-center d-grid">-->
<!-- <a href="/camps/2024-312" class="btn btn-primary btn-lg">-->
<!-- View 2024 Prices and Book Now-->
<!-- </a>-->
<!--</p>-->

<p class="text-center">
<img class="img-fluid" src="/img/312/photo-1.jpg" alt="Cyclists riding along a road in Majorca">
Expand Down
Loading

0 comments on commit 9deb7e5

Please sign in to comment.