Compare commits
171 Commits
main
...
shop-fix-3
| Author | SHA1 | Date |
|---|---|---|
 giles
|
b9bb7399a4 | |
|
giles
|
a90e248af2 | |
|
giles
|
b3324076a3 | |
|
giles
|
b0cb6fe8b2 | |
|
giles
|
69ba19779e | |
|
giles
|
df34463774 | |
|
giles
|
525a6f474e | |
|
giles
|
20b5dd51ca | |
|
giles
|
1fe1a82abe | |
|
giles
|
3ae5459e58 | |
|
giles
|
807408a142 | |
|
giles
|
804c9c5db0 | |
|
giles
|
bf14ef5af8 | |
|
giles
|
8648957de8 | |
|
giles
|
3b882cdd71 | |
|
giles
|
1f58aecbdb | |
|
giles
|
7cbfbc5255 | |
|
giles
|
b959cf5e42 | |
|
giles
|
ccab445ea5 | |
|
giles
|
21ed94a7db | |
|
giles
|
8da683ee3f | |
|
giles
|
214b1ad9c1 | |
|
giles
|
1d9c094bc9 | |
|
giles
|
7f2616f784 | |
|
giles
|
b5b3b05abc | |
|
giles
|
263a14fccc | |
|
giles
|
11109f4d57 | |
|
giles
|
e34a149657 | |
|
giles
|
fe67ee5bd8 | |
|
giles
|
5cccdfced7 | |
|
giles
|
15ca7d5194 | |
|
giles
|
4d5a1b2154 | |
|
giles
|
31bdef900f | |
|
giles
|
cc60a93933 | |
|
giles
|
7ba2c79544 | |
|
giles
|
76e8f59fdc | |
|
giles
|
f3977a8601 | |
|
giles
|
ef53804dea | |
|
giles
|
181e6fc6cd | |
|
giles
|
c595cf8560 | |
|
giles
|
88090e19cf | |
|
giles
|
bb6007b867 | |
|
giles
|
aded426ca5 | |
|
giles
|
b18849a2c2 | |
|
giles
|
a9539e10ee | |
|
giles
|
6a24c27354 | |
|
giles
|
c6c1562168 | |
|
giles
|
7df4f67f3e | |
|
giles
|
fe80a323d0 | |
|
giles
|
806635bf1f | |
|
giles
|
d67245d514 | |
|
giles
|
2839ee1884 | |
|
giles
|
61aa006914 | |
|
giles
|
c0e4285d9d | |
|
giles
|
7eb44c4391 | |
|
giles
|
6c492562ae | |
|
giles
|
7dbad9305e | |
|
giles
|
f8f0a28d61 | |
|
giles
|
5f9ed6917b | |
|
giles
|
acd77867df | |
|
giles
|
041a238c76 | |
|
giles
|
3502613f41 | |
|
giles
|
eb70e4b699 | |
|
giles
|
2887cbb646 | |
|
giles
|
5b90ee3c73 | |
|
giles
|
ba0c7c8e7e | |
|
giles
|
bf2597ac5a | |
|
giles
|
9a48a0290c | |
|
giles
|
a3ed6b95ab | |
|
giles
|
7d2945e0e9 | |
|
giles
|
4ead854059 | |
|
giles
|
d32cacb858 | |
|
giles
|
79df56c747 | |
|
giles
|
1e5fb41b49 | |
|
giles
|
78f4bb4838 | |
|
giles
|
01f436c09d | |
|
giles
|
d9278f2f73 | |
|
giles
|
591468e5ee | |
|
giles
|
ef87a2d1fa | |
|
giles
|
03dd02deb3 | |
|
giles
|
701a93f72f | |
|
giles
|
73286d67c0 | |
|
giles
|
f639819cef | |
|
giles
|
50c010481a | |
|
giles
|
3b79eb8cdb | |
|
giles
|
ee61190ad7 | |
|
giles
|
2ceb958416 | |
|
giles
|
d3ad11649d | |
|
giles
|
f9327f3c04 | |
|
giles
|
1835ee12ba | |
|
giles
|
c2f1ca6997 | |
|
giles
|
e21995330a | |
|
giles
|
48b8acef55 | |
|
giles
|
30d7876785 | |
|
giles
|
4d72fafce1 | |
|
giles
|
eacc8a8911 | |
|
giles
|
82172bbb1f | |
|
giles
|
506a095fc2 | |
|
giles
|
2db9a186b4 | |
|
giles
|
018e9301ef | |
|
giles
|
fa0f62e221 | |
|
giles
|
2249e31a1b | |
|
giles
|
7cf62d5624 | |
|
giles
|
b0486c3afc | |
|
giles
|
5e53446ced | |
|
giles
|
b3af891c54 | |
|
giles
|
7211d1d1e9 | |
|
giles
|
4fbf65d2a0 | |
|
giles
|
698b8837de | |
|
giles
|
025204d5fe | |
|
giles
|
3a4780915d | |
|
giles
|
72aee58d4e | |
|
giles
|
a60d350432 | |
|
giles
|
b78200d5a9 | |
|
giles
|
ae6d1c1b3f | |
|
giles
|
e235a89da6 | |
|
giles
|
9e5652deda | |
|
giles
|
24a913ee94 | |
|
giles
|
4a15dca1df | |
|
giles
|
1097a3eed6 | |
|
giles
|
d077414306 | |
|
giles
|
d2ecd20395 | |
|
giles
|
9ac17c5cb1 | |
|
giles
|
73a3db7b0c | |
|
giles
|
39c4a92f20 | |
|
giles
|
de022b4560 | |
|
giles
|
c5425f46c5 | |
|
giles
|
942068951d | |
|
giles
|
86ab5cd95e | |
|
giles
|
b6bae4c8c3 | |
|
giles
|
1db59590de | |
|
giles
|
6cc7e3d7e1 | |
|
giles
|
afd0b33a4c | |
|
giles
|
54140076fb | |
|
giles
|
d8358ab1c6 | |
|
giles
|
b1868d0e9d | |
|
giles
|
0e9e74321f | |
|
giles
|
c97f913044 | |
|
giles
|
84cedc1a00 | |
|
giles
|
d1eca05064 | |
|
giles
|
5d3b2faf4c | |
|
giles
|
7aa7cc85e9 | |
|
giles
|
1addbfad9d | |
|
giles
|
e07aec9b6e | |
|
giles
|
2248ee4586 | |
|
giles
|
619f460424 | |
|
giles
|
980dfea442 | |
|
giles
|
27167dcff6 | |
|
giles
|
5f8c1a187e | |
|
giles
|
cf4e7082e1 | |
|
giles
|
6544351855 | |
|
giles
|
a462cbb0c6 | |
|
giles
|
bd6812e493 | |
|
giles
|
d83c4ca8fa | |
|
giles
|
16d17453a5 | |
|
giles
|
1ddde70236 | |
|
giles
|
9b3f33311f | |
|
giles
|
637741222f | |
|
giles
|
bb03afab5b | |
|
giles
|
a1ebc4b207 | |
|
giles
|
8487b210a8 | |
|
giles
|
5eaa5979b7 | |
|
giles
|
ccb8cf6685 | |
|
giles
|
e700e68aa5 | |
|
giles
|
b751f439c2 | |
|
giles
|
683613f723 | |
|
giles
|
4d46ebf9d7 | |
|
giles
|
c044686621 | |
|
giles
|
42f7e8ea6b | |
|
giles
|
309473bf2a | |
giles
|
b188397c9f |
|
|
@ -0,0 +1 @@
|
|||
node_modules
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,5 +1,4 @@
|
|||
{{!< default}}
|
||||
|
||||
<main class="site-main">
|
||||
|
||||
{{#post}}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{{!< default}}
|
||||
|
||||
<main class="site-main">
|
||||
|
||||
{{#post}}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{{!< default}}
|
||||
|
||||
<main class="site-main">
|
||||
|
||||
{{#post}}
|
||||
|
|
|
|||
26
default.hbs
26
default.hbs
|
|
@ -5,10 +5,34 @@
|
|||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>{{meta_title}}</title>
|
||||
{{> "shop/style"}}
|
||||
{{> "shop/scripts"}}
|
||||
|
||||
<link rel="stylesheet" href="{{asset "built/screen.css"}}">
|
||||
|
||||
<!--ghost-head-start-->
|
||||
{{ghost_head}}
|
||||
<!--ghost-head-end-->
|
||||
|
||||
<style>
|
||||
.share-block {
|
||||
margin-top: 8rem;
|
||||
text-align: center;
|
||||
}
|
||||
.share-block span {
|
||||
display: inline-block;
|
||||
font-weight: bold;
|
||||
margin-right: 1rem;
|
||||
font-size: 2rem;
|
||||
}
|
||||
.share-block a {
|
||||
display: inline-block;
|
||||
transition: all 0.3s;
|
||||
margin: 0 0.25rem;
|
||||
}
|
||||
.share-block a:hover {
|
||||
transform: scale(1.1);
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body class="{{body_class}}{{{block "body_class"}}} is-head-{{#match @custom.navigation_layout "Logo on the left"}}left-logo{{else match @custom.navigation_layout "Logo in the middle"}}middle-logo{{else}}stacked{{/match}}{{#match @custom.title_font "=" "Elegant serif"}} has-serif-title{{/match}}{{#match @custom.body_font "=" "Elegant serif"}} has-serif-body{{/match}}{{^is "home"}}{{#if @site.cover_image}} is-head-brand{{/if}}{{/is}}">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
git add -A
|
||||
git commit -m 'deployed'
|
||||
git push origin HEAD
|
||||
ssh root@rose-ash.com -t 'cd web-site/themes/edition && git checkout shop-fix-3 && git pull && cd ../.. && . ./.env && docker service scale rose-ash_ghost=0 && docker service scale rose-ash_ghost=1'
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
<article class="single {{post_class}}">
|
||||
|
||||
{{#match @page.show_title_and_feature_image}}
|
||||
<header class="single-header gh-canvas">
|
||||
{{#is "post"}}
|
||||
|
|
@ -7,7 +6,7 @@
|
|||
<!--
|
||||
<span class="single-meta-item single-meta-date">
|
||||
<time datetime="{{date format="YYYY-MM-DD"}}">
|
||||
{{date published_at}}
|
||||
published: {{date published_at}}
|
||||
</time>
|
||||
</span>
|
||||
-->
|
||||
|
|
@ -22,13 +21,18 @@
|
|||
</div>
|
||||
{{/is}}
|
||||
|
||||
<h1 class="single-title">{{title}}</h1>
|
||||
|
||||
<h1 class="single-title">
|
||||
<a href=".">
|
||||
{{title}}
|
||||
</a>
|
||||
</h1>
|
||||
{{#if custom_excerpt}}
|
||||
<div class="single-excerpt">
|
||||
{{custom_excerpt}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
|
||||
|
||||
{{#if feature_image}}
|
||||
{{#unless no_image}}
|
||||
|
|
@ -46,8 +50,10 @@
|
|||
<div class="single-content gh-content gh-canvas">
|
||||
{{content}}
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
{{#is "post"}}
|
||||
|
||||
<div class="gh-canvas">
|
||||
<footer class="single-footer">
|
||||
|
||||
|
|
@ -91,9 +97,9 @@
|
|||
</div>
|
||||
{{/next_post}}
|
||||
</div>
|
||||
|
||||
</footer>
|
||||
</div>
|
||||
{{/is}}
|
||||
|
||||
|
||||
|
||||
</article>
|
||||
|
|
@ -1,9 +1,16 @@
|
|||
<div class="cover{{#if @site.cover_image}} image-loading{{/if}}{{#match @custom.publication_cover_style "Half screen"}} half{{/match}} gh-outer">
|
||||
<div
|
||||
class="cover{{#if @site.cover_image}} image-loading{{/if}}{{#match @custom.publication_cover_style "Half screen"}} half{{/match}} gh-outer"
|
||||
style="overflow: visible"
|
||||
>
|
||||
<div id="rose-ash-scripts"></div>
|
||||
{{#if @site.cover_image}}
|
||||
<img class="cover-image u-object-fit" src="{{@site.cover_image}}" alt="{{@site.title}}">
|
||||
{{/if}}
|
||||
|
||||
<div class="cover-content">
|
||||
<div
|
||||
class="cover-content"
|
||||
style="z-index:11"
|
||||
>
|
||||
{{#if @site.description}}
|
||||
<div class="cover-description">
|
||||
{{#unless @member}}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
<div class="share-block">
|
||||
<span>Share</span>
|
||||
<a href="https://twitter.com/intent/tweet?url={{url absolute='true'}}&text={{encode title}}" target="_blank" rel="noopener">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path d="M24 4.6c-.9.4-1.8.7-2.8.8 1-.6 1.8-1.6 2.2-2.7-1 .6-2 1-3.1 1.2-.9-1-2.2-1.6-3.6-1.6-2.7 0-4.9 2.2-4.9 4.9 0 .4 0 .8.1 1.1-4.2-.2-7.8-2.2-10.2-5.2-.5.8-.7 1.6-.7 2.5 0 1.7.9 3.2 2.2 4.1-.8 0-1.6-.2-2.2-.6v.1c0 2.4 1.7 4.4 3.9 4.8-.4.1-.8.2-1.3.2-.3 0-.6 0-.9-.1.6 2 2.4 3.4 4.6 3.4-1.7 1.3-3.8 2.1-6.1 2.1-.4 0-.8 0-1.2-.1 2.2 1.4 4.8 2.2 7.5 2.2 9.1 0 14-7.5 14-14v-.6c1-.7 1.8-1.6 2.5-2.5z" fill="#1da1f2"/></svg>
|
||||
</a>
|
||||
|
||||
<a href="https://www.facebook.com/sharer.php?u={{url absolute='true'}}" target="_blank" rel="noopener">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path d="M24 12.072a12 12 0 10-13.875 11.854v-8.385H7.078v-3.469h3.047V9.428c0-3.007 1.792-4.669 4.532-4.669a18.611 18.611 0 012.687.234v2.954H15.83a1.734 1.734 0 00-1.947 1.49 1.71 1.71 0 00-.008.385v2.25H17.2l-.532 3.469h-2.8v8.385A12 12 0 0024 12.072z" fill="#4267B2"/></svg>
|
||||
</a>
|
||||
|
||||
<a href="https://pinterest.com/pin/create/button/?url={{url absolute='true'}}&media=&description={{encode title}}" target="_blank" rel="noopener" data-pin-do="none">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path d="M12 0C5.4 0 0 5.4 0 12c0 5.1 3.2 9.4 7.6 11.2-.1-.9-.2-2.4 0-3.4.2-.9 1.4-6 1.4-6s-.3-.8-.3-1.8c0-1.7 1-2.9 2.2-2.9 1 0 1.5.8 1.5 1.7 0 1-.7 2.6-1 4-.3 1.2.6 2.2 1.8 2.2 2.1 0 3.8-2.2 3.8-5.5 0-2.9-2.1-4.9-5-4.9-3.4 0-5.4 2.6-5.4 5.2 0 1 .4 2.1.9 2.7.1.1.1.2.1.3-.1.4-.3 1.2-.3 1.4-.1.2-.2.3-.4.2-1.5-.7-2.4-2.9-2.4-4.6 0-3.8 2.8-7.3 7.9-7.3 4.2 0 7.4 3 7.4 6.9 0 4.1-2.6 7.5-6.2 7.5-1.2 0-2.4-.6-2.8-1.4 0 0-.6 2.3-.7 2.9-.3 1-1 2.3-1.5 3.1 1 .3 2.2.5 3.4.5 6.6 0 12-5.4 12-12S18.6 0 12 0z" fill="#E60023"/></svg>
|
||||
</a>
|
||||
|
||||
<a href="https://www.linkedin.com/shareArticle?mini=true&url={{url absolute='true'}}&title={{encode title}}" target="_blank" rel="noopener">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><path d="M23 0H1C.4 0 0 .4 0 1v22c0 .6.4 1 1 1h22c.6 0 1-.4 1-1V1c0-.6-.4-1-1-1zM7.1 20.5H3.6V9h3.6v11.5zM5.3 7.4c-1.1 0-2.1-.9-2.1-2.1 0-1.1.9-2.1 2.1-2.1 1.1 0 2.1.9 2.1 2.1 0 1.2-.9 2.1-2.1 2.1zm15.2 13.1h-3.6v-5.6c0-1.3 0-3-1.8-3-1.9 0-2.1 1.4-2.1 2.9v5.7H9.4V9h3.4v1.6c.5-.9 1.6-1.8 3.4-1.8 3.6 0 4.3 2.4 4.3 5.5v6.2z" fill="#2867B2"/></svg>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
<script src="https://unpkg.com/htmx.org@2.0.3" integrity="sha384-0895/pl2MU10Hqc6jd4RvrthNlDiE9U1tWmX7WRESftEDRosgxNsQG/Ze9YMRzHq" crossorigin="anonymous"></script>
|
||||
<script src="https://unpkg.com/htmx-ext-response-targets@2.0.0/response-targets.js"></script>
|
||||
<script src="https://gateway.sumup.com/gateway/ecom/card/v2/sdk.js"></script>
|
||||
|
||||
<script
|
||||
src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"
|
||||
integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
|
||||
crossorigin="anonymous"
|
||||
></script>
|
||||
|
||||
<link
|
||||
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
|
||||
rel="stylesheet"
|
||||
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
|
||||
crossorigin="anonymous"
|
||||
>
|
||||
<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
|
||||
<script src="https://kit.fontawesome.com/61b729a4f7.js" crossorigin="anonymous"></script>
|
||||
|
||||
|
||||
<script
|
||||
src="https://code.jquery.com/jquery-3.7.1.min.js"
|
||||
integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo="
|
||||
crossorigin="anonymous"></script>
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
<style>
|
||||
|
||||
.rose-ash {
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
.rose-ash h3 {
|
||||
font-size: 110%;
|
||||
}
|
||||
.rose-ash * {
|
||||
font-size: 100%;
|
||||
}
|
||||
|
||||
.swal2-popup {
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
.swal-wide{
|
||||
width:850px !important;
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.w-md-100 {
|
||||
width:100% !important;
|
||||
}
|
||||
.w-md-75 {
|
||||
width:75% !important;
|
||||
}
|
||||
.w-md-50 {
|
||||
width:50% !important;
|
||||
}
|
||||
.w-md-25 {
|
||||
width:25% !important;
|
||||
}
|
||||
|
||||
}
|
||||
.sumup-payment-142vw6r {
|
||||
min-height: 70px !important;
|
||||
}
|
||||
[data-sumup-id='hostedfield--cardholder_number'] {
|
||||
|
||||
}
|
||||
|
||||
.htmx-swapping.rose-ash-fade-me-out {
|
||||
opacity: 0;
|
||||
transition: opacity 1s ease-out;
|
||||
}
|
||||
.htmx-added.rose-ash-fade-me-in {
|
||||
opacity: 0;
|
||||
}
|
||||
.rose-ash-fade-me-in {
|
||||
opacity: 1;
|
||||
transition: opacity 1s ease-out;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
|
||||
<div class="rose-ash">
|
||||
<div id="rose-ash-scripts"></div>
|
||||
<div
|
||||
style="z-index:11;"
|
||||
hx-get="shop/cycle/?simple=true"
|
||||
hx-swap="outerHTML"
|
||||
hx-trigger="load, every 15s"
|
||||
hx-headers='{"rose-ash-shop-layout-disable": "yes"}'
|
||||
>
|
||||
</div>
|
||||
|
||||
<div
|
||||
hx-get="shop/menu/"
|
||||
hx-swap="outerHTML"
|
||||
hx-trigger="load, every 1s"
|
||||
hx-headers='{"rose-ash-shop-layout-disable": "yes"}'
|
||||
>
|
||||
</div>
|
||||
<!--
|
||||
<div
|
||||
hx-get="shop/?"
|
||||
hx-trigger="load delay:1ms"
|
||||
hx-headers='{ "rose-ash-shop": "true", "rose-ash-shop-layout-top": "shop" }'
|
||||
hx-on::config-request = "
|
||||
//e vent.detail.path += window.location.search
|
||||
const param = new URLSearchParams(window. location.search)
|
||||
param.set('embed', 'true')
|
||||
event.detail.path += param.toString()
|
||||
"
|
||||
hx-swap="outerHTML"
|
||||
>
|
||||
</div>
|
||||
-->
|
||||
</div>
|
||||
|
||||
3
post.hbs
3
post.hbs
|
|
@ -1,5 +1,4 @@
|
|||
{{!< default}}
|
||||
|
||||
<main class="site-main">
|
||||
|
||||
{{#post}}
|
||||
|
|
@ -12,6 +11,6 @@
|
|||
|
||||
{{#post}}
|
||||
{{> "comments"}}
|
||||
{{> share-block}}
|
||||
{{/post}}
|
||||
|
||||
</main>
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
User-agent: facebookexternalhit
|
||||
Sitemap: https://rose-ash.com/sitemap.xml
|
||||
Disallow: /ghost/
|
||||
Disallow: /email/
|
||||
Disallow: /members/api/comments/counts/
|
||||
Disallow: /r/
|
||||
Disallow: /webmentions/receive/
|
||||
|
||||
User-agent: *
|
||||
Sitemap: https://rose-ash.com/sitemap.xml
|
||||
Disallow: /ghost/
|
||||
Disallow: /email/
|
||||
Disallow: /members/api/comments/counts/
|
||||
Disallow: /r/
|
||||
Disallow: /webmentions/receive/
|
||||
Loading…
Reference in New Issue