Skip to content

Commit 17353cc

Browse files
marcpruxmarcprux
authored
Share the footer content on all the pages (#114)
1 parent eaeb460 commit 17353cc

File tree

3 files changed

+78
-44
lines changed

3 files changed

+78
-44
lines changed

‎src/components/Footer.astro‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
import { markdownify } from '../i18n/config';
3+
4+
interface Props {
5+
contact_header?: string;
6+
contact_email?: string;
7+
site_problems_header?: string;
8+
site_report_issues?: string;
9+
site_disclaimer?: string;
10+
site_privacy?: string;
11+
site_copyright?: string;
12+
}
13+
14+
const {
15+
contact_header = "Contact",
16+
contact_email = "Email",
17+
site_problems_header = "Problems",
18+
site_report_issues = "Report Site Issues",
19+
site_disclaimer = "**Disclaimer:** This website is a community-driven noncommercial undertaking. It is operated solely for informational and educational purposes.",
20+
site_privacy = "**Privacy:** This site uses no cookies and performs no user tracking or logging.",
21+
site_copyright = "**Copyright:** None. This work is marked",
22+
} = Astro.props;
23+
---
24+
<footer>
25+
<div style="display: flex; flex-wrap: wrap; justify-content: space-between; padding-top: 2em; margin-left: auto; margin-right: auto;">
26+
<div style="flex: 1; min-width: 22em; margin: 20px;">
27+
<h4 style="margin-top: 0; margin-bottom: 10px; font-size: 16px;">
28+
{contact_header}
29+
</h4>
30+
<ul style="padding: 0; margin: 0;">
31+
<li style="list-style: none; margin-bottom: 5px;">{contact_email}: <a href="mailto:info@keepandroidopen.org" style="text-decoration: none;">info@keepandroidopen.org</a></li>
32+
<li style="list-style: none; margin-bottom: 5px;">Mastodon: <a target="_blank" href="https://techhub.social/@keepandroidopen" style="text-decoration: none;">@keepandroidopen@techhub.social</a></li>
33+
<li style="list-style: none; margin-bottom: 5px;">{site_problems_header}: <a target="_blank" href="https://github.com/keepandroidopen/keepandroidopen.github.io/issues" style="text-decoration: none;">{site_report_issues}</a></li>
34+
<li style="list-style: none; margin-bottom: 5px;"><a href="/banner" style="text-decoration: none;">Add countdown banner to your site</a></li>
35+
</ul>
36+
</div>
37+
<div style="flex: 3; min-width: 280px; margin: 20px;">
38+
<p><Fragment set:html={markdownify(site_disclaimer)} /></p>
39+
<p><Fragment set:html={markdownify(site_privacy)} /></p>
40+
<p>
41+
<Fragment set:html={markdownify(site_copyright)} /> <a href="https://creativecommons.org/publicdomain/zero/1.0/">CC0 1.0 Universal</a><img src="/img/cc.svg" alt="CC0 logo" style="max-width: 1em; max-height: 1em; margin-left: .2em;"><img src="/img/zero.svg" alt="CC0 zero logo" style="max-width: 1em; max-height: 1em; margin-left: .2em;">
42+
</p>
43+
</div>
44+
<div style="flex: 1; min-width: 200px; margin: 20px; text-align: center; justify-content: center; align-items: center;">
45+
<div class="outerlync" style="margin-top: 0; margin-bottom: 10px; font-size: 20px;">
46+
<img class="innerlync" alt="Altered Deal Logo" src="/img/altered-deal.png" style="width: 150px; margin-left: auto; margin-right: auto; text-align: center; justify-content: center; align-items: center; display: flex;">
47+
</div>
48+
</div>
49+
</div>
50+
</footer>

‎src/layouts/Default.astro‎

Lines changed: 21 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
---
2-
import { languages, markdownify } from '../i18n/config';
2+
import { languages } from '../i18n/config';
33
import ThemeToggle from '../components/ThemeToggle.astro';
4-
import Base from './Base.astro'; // Import the new Base layout
4+
import Footer from '../components/Footer.astro';
5+
import Base from './Base.astro';
56
67
interface Props {
78
title: string;
89
lang: string;
910
description: string;
10-
contact_header: string;
11-
contact_email: string;
12-
site_problems_header: string;
13-
site_report_issues: string;
14-
site_disclaimer: string;
15-
site_privacy: string;
16-
site_copyright: string;
17-
lockdown_banner: string;
11+
contact_header?: string;
12+
contact_email?: string;
13+
site_problems_header?: string;
14+
site_report_issues?: string;
15+
site_disclaimer?: string;
16+
site_privacy?: string;
17+
site_copyright?: string;
18+
lockdown_banner?: string;
1819
}
1920
2021
const {
@@ -39,7 +40,7 @@ const languageEntries = Object.entries(languages);
3940
description={description}
4041
>
4142
<div id="kao-banner"></div>
42-
<script is:inline src="/banner.js?id=kao-banner&size=normal&hidebutton=off"></script>
43+
<script is:inline src="/banner.js?id=kao-banner&link=none&size=normal&hidebutton=off"></script>
4344
<header>
4445
<span class="header-icons"><a href="https://techhub.social/@keepandroidopen" class="header-icon-link" aria-label="Mastodon" title="Mastodon" rel="me" target="_blank"><svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor"><path d="M16.45 17.77c2.77-.33 5.18-2.03 5.49-3.58.47-2.45.44-5.97.44-5.97 0-4.77-3.15-6.17-3.15-6.17-1.58-.72-4.3-1.03-7.13-1.05h-.07c-2.83.02-5.55.33-7.13 1.05 0 0-3.14 1.4-3.14 6.17v.91c-.01.88-.02 1.86 0 2.88.12 4.67.87 9.27 5.2 10.4 2 .53 3.72.64 5.1.57 2.51-.14 3.92-.9 3.92-.9l-.08-1.8s-1.8.56-3.8.5c-2-.08-4.1-.22-4.43-2.66a4.97 4.97 0 0 1-.04-.68s1.96.48 4.44.59c1.51.07 2.94-.09 4.38-.26Zm2.22-3.4h-2.3v-5.6c0-1.19-.5-1.79-1.5-1.79-1.1 0-1.66.71-1.66 2.12v3.07h-2.3V9.1c0-1.4-.55-2.12-1.65-2.12-1 0-1.5.6-1.5 1.78v5.61h-2.3V8.6c0-1.18.3-2.12.9-2.81a3.17 3.17 0 0 1 2.47-1.05c1.18 0 2.07.45 2.66 1.35l.57.96.58-.96a2.97 2.97 0 0 1 2.66-1.35c1.01 0 1.83.36 2.46 1.05.6.7.9 1.63.9 2.81v5.78Z"></path></svg></a><ThemeToggle /></span>
4546
<h1>{title}</h1>
@@ -55,32 +56,14 @@ const languageEntries = Object.entries(languages);
5556
<main>
5657
<slot />
5758
</main>
58-
<footer>
59-
<div style="display: flex; flex-wrap: wrap; justify-content: space-between; padding-top: 2em; margin-left: auto; margin-right: auto;">
60-
<div style="flex: 1; min-width: 22em; margin: 20px;">
61-
<h4 style="margin-top: 0; margin-bottom: 10px; font-size: 16px;">
62-
{contact_header}
63-
</h4>
64-
<ul style="padding: 0; margin: 0;">
65-
<li style="list-style: none; margin-bottom: 5px;">{contact_email}: <a href="mailto:info@keepandroidopen.org" style="text-decoration: none;">info@keepandroidopen.org</a></li>
66-
<li style="list-style: none; margin-bottom: 5px;">Mastodon: <a target="_blank" href="https://techhub.social/@keepandroidopen" style="text-decoration: none;">@keepandroidopen@techhub.social</a></li>
67-
<li style="list-style: none; margin-bottom: 5px;">{site_problems_header}: <a target="_blank" href="https://github.com/keepandroidopen/keepandroidopen.github.io/issues" style="text-decoration: none;">{site_report_issues}</a></li>
68-
<li style="list-style: none; margin-bottom: 5px;"><a href="/banner" style="text-decoration: none;">Add countdown banner to your site</a></li>
69-
</ul>
70-
</div>
71-
<div style="flex: 3; min-width: 280px; margin: 20px;">
72-
<p><Fragment set:html={markdownify(site_disclaimer)} /></p>
73-
<p><Fragment set:html={markdownify(site_privacy)} /></p>
74-
<p>
75-
<Fragment set:html={markdownify(site_copyright)} /> <a href="https://creativecommons.org/publicdomain/zero/1.0/">CC0 1.0 Universal</a><img src="/img/cc.svg" alt="CC0 logo" style="max-width: 1em; max-height: 1em; margin-left: .2em;"><img src="/img/zero.svg" alt="CC0 zero logo" style="max-width: 1em; max-height: 1em; margin-left: .2em;">
76-
</p>
77-
</div>
78-
<div style="flex: 1; min-width: 200px; margin: 20px; text-align: center; justify-content: center; align-items: center;">
79-
<div class="outerlync" style="margin-top: 0; margin-bottom: 10px; font-size: 20px;">
80-
<img class="innerlync" alt="Altered Deal Logo" src="/img/altered-deal.png" style="width: 150px; margin-left: auto; margin-right: auto; text-align: center; justify-content: center; align-items: center; display: flex;">
81-
</div>
82-
</div>
83-
</div>
84-
</footer>
59+
<Footer
60+
contact_header={contact_header}
61+
contact_email={contact_email}
62+
site_problems_header={site_problems_header}
63+
site_report_issues={site_report_issues}
64+
site_disclaimer={site_disclaimer}
65+
site_privacy={site_privacy}
66+
site_copyright={site_copyright}
67+
/>
8568

8669
</Base>

‎src/layouts/Letter.astro‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
import { languages, markdownify } from '../i18n/config';
32
import ThemeToggle from '../components/ThemeToggle.astro';
4-
import Base from './Base.astro'; // Import the new Base layout
3+
import Footer from '../components/Footer.astro';
4+
import Base from './Base.astro';
55
66
interface Props {
77
title: string;
@@ -17,15 +17,16 @@ const {
1717
1818
---
1919

20-
<Base
21-
title={title}
22-
lang={lang}
23-
description={description}
20+
<Base
21+
title={title}
22+
lang={lang}
23+
description={description}
2424
>
2525
<header>
2626
<h1><ThemeToggle /></h1>
2727
</header>
2828
<main>
2929
<slot />
3030
</main>
31+
<Footer />
3132
</Base>

0 commit comments

Comments
 (0)