Compare commits

..

No commits in common. "shop-fix-3" and "main" have entirely different histories.

18 changed files with 16 additions and 3661 deletions

1
.gitignore vendored
View File

@ -1 +0,0 @@
node_modules

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,5 @@
{{!< default}} {{!< default}}
<main class="site-main"> <main class="site-main">
{{#post}} {{#post}}

View File

@ -1,4 +1,5 @@
{{!< default}} {{!< default}}
<main class="site-main"> <main class="site-main">
{{#post}} {{#post}}

View File

@ -1,4 +1,5 @@
{{!< default}} {{!< default}}
<main class="site-main"> <main class="site-main">
{{#post}} {{#post}}

View File

@ -5,34 +5,10 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{meta_title}}</title> <title>{{meta_title}}</title>
{{> "shop/style"}}
{{> "shop/scripts"}}
<link rel="stylesheet" href="{{asset "built/screen.css"}}"> <link rel="stylesheet" href="{{asset "built/screen.css"}}">
<!--ghost-head-start-->
{{ghost_head}}
<!--ghost-head-end-->
<style> {{ghost_head}}
.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> </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}}"> <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}}">

View File

@ -1,4 +0,0 @@
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'

View File

@ -1 +0,0 @@
{{ghost_head}}

View File

@ -1,4 +1,5 @@
{{!< default}} {{!< default}}
<main class="site-main"> <main class="site-main">
{{#post}} {{#post}}

View File

@ -1,4 +1,5 @@
<article class="single {{post_class}}"> <article class="single {{post_class}}">
{{#match @page.show_title_and_feature_image}} {{#match @page.show_title_and_feature_image}}
<header class="single-header gh-canvas"> <header class="single-header gh-canvas">
{{#is "post"}} {{#is "post"}}
@ -6,7 +7,7 @@
<!-- <!--
<span class="single-meta-item single-meta-date"> <span class="single-meta-item single-meta-date">
<time datetime="{{date format="YYYY-MM-DD"}}"> <time datetime="{{date format="YYYY-MM-DD"}}">
published: {{date published_at}} {{date published_at}}
</time> </time>
</span> </span>
--> -->
@ -21,19 +22,14 @@
</div> </div>
{{/is}} {{/is}}
<h1 class="single-title"> <h1 class="single-title">{{title}}</h1>
<a href=".">
{{title}}
</a>
</h1>
{{#if custom_excerpt}} {{#if custom_excerpt}}
<div class="single-excerpt"> <div class="single-excerpt">
{{custom_excerpt}} {{custom_excerpt}}
</div> </div>
{{/if}} {{/if}}
{{#if feature_image}} {{#if feature_image}}
{{#unless no_image}} {{#unless no_image}}
<figure class="single-media kg-width-{{width}}"> <figure class="single-media kg-width-{{width}}">
@ -51,9 +47,7 @@
{{content}} {{content}}
</div> </div>
{{#is "post"}} {{#is "post"}}
<div class="gh-canvas"> <div class="gh-canvas">
<footer class="single-footer"> <footer class="single-footer">
@ -97,9 +91,9 @@
</div> </div>
{{/next_post}} {{/next_post}}
</div> </div>
</footer> </footer>
</div> </div>
{{/is}} {{/is}}
</article> </article>

View File

@ -1,16 +1,9 @@
<div <div class="cover{{#if @site.cover_image}} image-loading{{/if}}{{#match @custom.publication_cover_style "Half screen"}} half{{/match}} gh-outer">
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}} {{#if @site.cover_image}}
<img class="cover-image u-object-fit" src="{{@site.cover_image}}" alt="{{@site.title}}"> <img class="cover-image u-object-fit" src="{{@site.cover_image}}" alt="{{@site.title}}">
{{/if}} {{/if}}
<div <div class="cover-content">
class="cover-content"
style="z-index:11"
>
{{#if @site.description}} {{#if @site.description}}
<div class="cover-description"> <div class="cover-description">
{{#unless @member}} {{#unless @member}}

View File

@ -1,19 +0,0 @@
<div class="share-block">
<span>Share</span>
<a href="https://twitter.com/intent/tweet?url={{url absolute='true'}}&amp;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>
&nbsp;
<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>
&nbsp;
<a href="https://pinterest.com/pin/create/button/?url={{url absolute='true'}}&amp;media=&amp;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>
&nbsp;
<a href="https://www.linkedin.com/shareArticle?mini=true&amp;url={{url absolute='true'}}&amp;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>

View File

@ -1,27 +0,0 @@
<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>

View File

@ -1,54 +0,0 @@
<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>

View File

@ -1,36 +0,0 @@
<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>

View File

@ -1,4 +1,5 @@
{{!< default}} {{!< default}}
<main class="site-main"> <main class="site-main">
{{#post}} {{#post}}
@ -11,6 +12,6 @@
{{#post}} {{#post}}
{{> "comments"}} {{> "comments"}}
{{> share-block}}
{{/post}} {{/post}}
</main> </main>

View File

@ -1,15 +0,0 @@
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/