From 9d77fbe1e1eeaf17fc6f1d49e0a04a610dbfc66e Mon Sep 17 00:00:00 2001 From: Robert Paul Date: Sat, 6 Jul 2024 15:16:33 +0100 Subject: [PATCH 1/6] add stripe pricing table to homepage --- assets/css/main.css | 8 ++++ assets/iridium/iridium.css | 3 +- index.html | 82 ++++---------------------------------- 3 files changed, 17 insertions(+), 76 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index de9be51..2ee0048 100755 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -271,3 +271,11 @@ a:hover { } } } + +.row { + max-width: 65rem; +} + +.button.round { + border-radius: 6px; +} diff --git a/assets/iridium/iridium.css b/assets/iridium/iridium.css index b13c58b..3ff919b 100644 --- a/assets/iridium/iridium.css +++ b/assets/iridium/iridium.css @@ -129,7 +129,7 @@ ul.posts li .title { color: rgb(100, 10, 100); } .user-content h3, .user-content h4, .user-content h5, .user-content h6 { - font-size: 1.1em + font-size: 1.1em; font-weight: bold; text-transform: uppercase; } @@ -145,4 +145,3 @@ div.block p { div.block .th-container { padding-top: 10px; } - diff --git a/index.html b/index.html index 34bc766..3173e97 100644 --- a/index.html +++ b/index.html @@ -18,92 +18,26 @@
-
+

Get Involved
-

Becoming a member of the Labs +

Becoming a member of the Labs opens the doors to our resources and space any time, as well as free access to events. Long-term desk rental is also available for members.

-
- {% for tier in site.membership_tiers.monthly %} -
-
-

- {{ tier.name }} -

- - £{{ tier.price }} per month - -
-
-

- {{ tier.description }} -

-
-
-
    - {% for benefit in tier.benefits %} -
  • {{ benefit }}
    • - {% endfor %} -
-
- -
- {% endfor %} -
-
- Click here to check out annual plans -
+ + +
- -
- -

Desk Rental

- -
- {% for tier in site.desk_rental_tiers %} -
-
-

- {{ tier.name }} -

- - £{{ tier.price }} per {% if tier.period == "monthly" %} month {% else %} year {% endif %} - -
-
-

- {{ tier.description }} -

-
-
-
    - {% for benefit in tier.benefits %} -
  • {{ benefit }}
    • - {% endfor %} -
-
- -
- {% endfor %} -
-
-

Support Us

From 9452fb7491fb7d8c0bdff6f19d641a089965ff43 Mon Sep 17 00:00:00 2001 From: Robert Paul Date: Sat, 6 Jul 2024 15:18:16 +0100 Subject: [PATCH 2/6] update button styles on Who We Are --- about/who_we_are.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/about/who_we_are.html b/about/who_we_are.html index 2976a30..a0062ee 100644 --- a/about/who_we_are.html +++ b/about/who_we_are.html @@ -37,8 +37,8 @@

{{officer.name}}

{{officer.pronouns}}

{{officer.title}} ({{officer.year}} )
{{ officer.blurb | unindent | markdownify }} -
@@ -70,8 +70,8 @@
{{officer.title}} ({{officer.year}} )
{% if officer.blurb %} {{ officer.blurb | unindent | markdownify }} {% endif %} -
@@ -122,4 +122,3 @@

Acknowledgements

We would like to thank our corporate members, who are actively encouraging the next generation of experimenters and revolutionaries; Tibus Connect, and Weavers Court Business Park, for believing in us from day one.

- From 0ef5a37e3445cd9b476f26df5aa50f7ac586ecc0 Mon Sep 17 00:00:00 2001 From: Robert Paul Date: Sat, 6 Jul 2024 15:18:47 +0100 Subject: [PATCH 3/6] limit button width on Donate page --- support/donate.md | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/support/donate.md b/support/donate.md index 458a653..2bf1911 100644 --- a/support/donate.md +++ b/support/donate.md @@ -16,7 +16,9 @@ for charitable donations. If you'd like to support our work in this way, follow the link below! Thanks! -Donate +

+ Donate +

For larger donations, it may be easier to [contact us](mailto:donate@farsetlabs.org.uk) to arrange a BACS payment and @@ -31,8 +33,10 @@ including many of the world's largest companies such as Microsoft, Coca-Cola, and Google. If your employer is one of them, you can support the work of the charity below. -Support -us via Benevity +

+ Support + us via Benevity +

## Friends of Farset @@ -42,14 +46,14 @@ towards the upkeep of the space and it's community and if you want to support anything in particular, you can say so in the form!
-Support us via Patreon -
- - - - - -
+ Support us via Patreon +
+ + + + + +
Please [contact us](mailto:donate@farsetlabs.org.uk) if you'd like to make a From 88bfb9a9621253d67aa2326a0fa0652a2397bc6f Mon Sep 17 00:00:00 2001 From: Robert Paul Date: Sat, 6 Jul 2024 15:19:14 +0100 Subject: [PATCH 4/6] Remove Nexudus pricing config --- _config.yml | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/_config.yml b/_config.yml index 7e77180..2a86d10 100644 --- a/_config.yml +++ b/_config.yml @@ -44,51 +44,3 @@ officers: twitter: "awflwafl" linkedin: "artemiy-kondratiev" github: "awflwafl" -membership_tiers: - monthly: - - name: Casual - description: For students and those who are occasionally in the space. - price: 20 - benefits: - - 🏪 24/7 access - - 🤖 Fair use of workshop facilities (training may be required) - - 🎟️ Free entry to Farset Labs events - url: "https://farsetlabs.spaces.nexudus.com/signup?tariff_guid=2bbe61f6-f61c-43ae-955b-447d3f5694a4" - - name: Standard - description: For those who regularly use the space. - price: 35 - benefits: - - 🏪 24/7 access - - 🤖 Fair use of workshop facilities (training may be required) - - 🎟️ Free entry to Farset Labs events - url: "https://farsetlabs.spaces.nexudus.com/signup?tariff_guid=19b169ca-f352-46fb-9b6c-d7c0c5b00385" - - name: Professional - description: For those consistently in the space with ongoing long term projects. - price: 50 - benefits: - - 🏪 24/7 access - - 🤖 Fair use of workshop facilities (training may be required) - - 🎟️ Free entry to Farset Labs events - url: "https://farsetlabs.spaces.nexudus.com/signup?tariff_guid=ec3a5718-ab0d-4814-b276-9a637b0e9468" -desk_rental_tiers: - - name: Standard + Desk - description: For those who regularly use the space and want a dedicated desk to work from. - price: 135 - period: monthly - benefits: - - 🖥️ Dedicated desk rental - - 🏪 24/7 access - - 🤖 Fair use of workshop facilities (training may be required) - - 🎟️ Free entry to Farset Labs events - url: "https://farsetlabs.spaces.nexudus.com/signup?tariff_guid=02662296-c46f-49fd-b3ed-0dd0e0f01c92" - - name: Standard + Desk (Annual) - description: For those who regularly use the space and want a dedicated desk to work from. - price: 1,485 - period: annual - benefits: - - 🆓 1 Month Free - - 🖥️ Dedicated desk rental - - 🏪 24/7 access - - 🤖 Fair use of workshop facilities (training may be required) - - 🎟️ Free entry to Farset Labs events - url: "https://farsetlabs.spaces.nexudus.com/signup?tariff_guid=bd6e3095-6286-4ae9-b9d4-2e28a21bd8d9" From fde81c4f5a8ab06701d1992ca9a53504181fe7c2 Mon Sep 17 00:00:00 2001 From: Robert Paul Date: Fri, 12 Jul 2024 16:13:03 +0100 Subject: [PATCH 5/6] Use *live* pricing table --- index.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 3173e97..a8cebdb 100644 --- a/index.html +++ b/index.html @@ -32,10 +32,8 @@

Get Involved

- +
From 74bc8e6cc9d3208e6f057c6178bcf46a17ff9020 Mon Sep 17 00:00:00 2001 From: Robert Paul Date: Fri, 12 Jul 2024 18:38:27 +0100 Subject: [PATCH 6/6] pr feedback --- assets/css/main.css | 54 ++++----------------------------------------- index.html | 5 +++-- support/donate.md | 8 +++---- 3 files changed, 11 insertions(+), 56 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index 2ee0048..9dc0ed5 100755 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -222,56 +222,6 @@ a:hover { margin-left: auto; } -.membership-carousel { - display: flex; - flex-direction: column; - - .membership-tier { - display: flex; - flex: 1; - flex-basis: 30%; - flex-direction: column; - padding-left: 0.5rem; - padding-right: 0.5rem; - - .header { - margin-bottom: 0.75rem; - - h3 { - margin-bottom: 0; - } - - sub { - font-size: 85%; - } - } - - .description-box { - flex: 1; - } - - .benefits-list { - li { - font-size: 0.95rem; - } - } - } -} - -@media screen and (min-width: 640px) { - .membership-carousel { - flex-direction: row; - - .membership-tier { - border-right: 1px solid lightgrey; - - &:last-child { - border-right: none; - } - } - } -} - .row { max-width: 65rem; } @@ -279,3 +229,7 @@ a:hover { .button.round { border-radius: 6px; } + +.max-w-md { + max-width: 28rem; +} diff --git a/index.html b/index.html index a8cebdb..d0fab7c 100644 --- a/index.html +++ b/index.html @@ -18,13 +18,13 @@
-
+

Get Involved
-

Becoming a member of the Labs +

Becoming a member of the Labs opens the doors to our resources and space any time, as well as free access to events. @@ -36,6 +36,7 @@

Get Involved

publishable-key="pk_live_1sIaEOF4fdxq136517FMhqG0">
+

Support Us

diff --git a/support/donate.md b/support/donate.md index 2bf1911..7e9bd3a 100644 --- a/support/donate.md +++ b/support/donate.md @@ -17,7 +17,7 @@ for charitable donations. If you'd like to support our work in this way, follow the link below! Thanks!

- Donate + Donate

For larger donations, it may be easier to @@ -34,7 +34,7 @@ and Google. If your employer is one of them, you can support the work of the charity below.

- Support + Support us via Benevity

@@ -46,13 +46,13 @@ towards the upkeep of the space and it's community and if you want to support anything in particular, you can say so in the form!
- Support us via Patreon + Support us via Patreon
- +