Skip to content

Commit 50347fe

Browse files
ngeorgerngeorger
authored
Merge pull request #50 from sredevopsorg/logins
2 parents 6337908 + 886a035 commit 50347fe

File tree

15 files changed

+1657
-64
lines changed

15 files changed

+1657
-64
lines changed

‎.github/workflows/tests-pr.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,19 @@ jobs:
1818
fail-fast: true
1919
matrix:
2020
# node-version: [14.x, 16.x, 18.x]
21-
node-version: [20, 18]
21+
node-version: [20]
2222
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2323

2424
steps:
25+
-
26+
name: Harden Runner
27+
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
28+
with:
29+
egress-policy: audit
30+
2531
- uses: actions/checkout@v4
2632
with:
27-
ref: ${{ github.head_ref }}
33+
ref: ${{ github.head_ref || github.ref }}
2834
fetch-depth: 1
2935
persist-credentials: false
3036

‎.github/workflows/theme.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ on:
55
branches: [main]
66
types:
77
- completed
8-
# push:
9-
# branches:
10-
# - main
118
workflow_dispatch:
129
jobs:
1310
deploy:

‎assets/built/screen.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/built/screen.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/screen.css‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3393,7 +3393,8 @@ figcaption a {
33933393
}
33943394

33953395
/* Share button */
3396-
3396+
span .sign-google,
3397+
span .sign-github,
33973398
.nav .nav-discord a,
33983399
.nav .nav-discourse a,
33993400
.nav .nav-facebook a,
@@ -3410,7 +3411,8 @@ figcaption a {
34103411
.nav .nav-youtube a {
34113412
font-size: 0 !important;
34123413
}
3413-
3414+
span .sign-google::before,
3415+
span .sign-github::before,
34143416
.nav .nav-discord a::before,
34153417
.nav .nav-discourse a::before,
34163418
.nav .nav-facebook a::before,
@@ -3434,11 +3436,13 @@ figcaption a {
34343436
text-rendering: auto;
34353437
-webkit-font-smoothing: antialiased;
34363438
}
3437-
3439+
span .sign-google::before {content: "\f1a0"}
3440+
span .sign-github::before {content: "\f09b"}
34383441
.nav .nav-discord a::before {content: "\f392"}
34393442
.nav .nav-discourse a::before {content: "\f393"}
34403443
.nav .nav-facebook a::before {content: "\f09a"}
34413444
.nav .nav-github a::before {content: "\f09b"}
3445+
.nav .nav-github a::before {content: "\f09b"}
34423446
.nav .nav-instagram a::before {content: "\f16d"}
34433447
.nav .nav-linkedin a::before {content: "\f08c"}
34443448
.nav .nav-mastodon a::before {content: "\f4f6"}

‎default.hbs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@
5050
{{/is}}
5151

5252
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/brands.min.css" integrity="sha512-DJLNx+VLY4aEiEQFjiawXaiceujj5GA7lIY8CHCIGQCBPfsEG0nGz1edb4Jvw1LR7q031zS5PpPqFuPA8ihlRA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
53-
{{#is "post, page"}}
54-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.28.2/tocbot.min.css" integrity="sha512-4q0OX9NAYcRTFEfy9nTK0AV9N7MxM665neDXEW3CjAj1pXc6+8Bcd6ryXl6cY8mTBBXt0aXepnSDLLQZSuJRww==" crossorigin="anonymous" referrerpolicy="no-referrer" />
55-
{{/is}}
5653
{{!-- Ghost outputs important meta data with this tag --}}
5754
{{ghost_head}}
5855

@@ -69,9 +66,11 @@
6966
{{> "components/footer"}}
7067

7168
</div>
72-
7369
{{#is "post, page"}}
74-
{{> "lightbox"}}
70+
{{> "lightbox"}}
71+
{{/is}}
72+
{{#is "post"}}
73+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.28.2/tocbot.min.css" integrity="sha512-4q0OX9NAYcRTFEfy9nTK0AV9N7MxM665neDXEW3CjAj1pXc6+8Bcd6ryXl6cY8mTBBXt0aXepnSDLLQZSuJRww==" crossorigin="anonymous" referrerpolicy="no-referrer" />
7574
<style>
7675
.gh-content {
7776
position: relative;

‎error-404.hbs‎

Lines changed: 91 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,98 @@
11
{{!< default}}
2+
{{!-- The tag above means: insert everything in this file into the body of the default.hbs template --}}
3+
4+
{{!-- {{#post}} --}}
5+
6+
<main class="gh-main">
7+
8+
<article class="gh-article {{post_class}}">
9+
10+
<header class="gh-article-header gh-canvas">
11+
12+
{{!-- {{#if primary_tag}}
13+
<a class="gh-article-tag" href="{{primary_tag.url}}">{{primary_tag.name}}</a>
14+
{{/if}} --}}
15+
{{#if tags}}
16+
<div class="gh-article-tags">
17+
{{#foreach tags}}
18+
<a class="gh-article-tag" href="{{url}}">{{name}}</a>&nbsp;
19+
{{/foreach}}
20+
</div>
21+
{{/if}}
22+
23+
<h1 class="gh-article-title is-title">{{title}}</h1>
24+
{{!-- {{> share-block}} --}}
25+
{{#if custom_excerpt}}
26+
<p class="gh-article-excerpt is-body">{{custom_excerpt}}</p>
27+
{{/if}}
28+
29+
{{#if @custom.show_post_metadata}}
30+
<div class="gh-article-meta">
31+
<div class="gh-article-author-image">
32+
{{#foreach authors}}
33+
{{#if profile_image}}
34+
<a href="{{url}}">
35+
<img class="author-profile-image" src="{{img_url profile_image size="xs"}}" alt="{{name}}" />
36+
</a>
37+
{{else}}
38+
<a href="{{url}}">{{> "icons/avatar"}}</a>
39+
{{/if}}
40+
{{/foreach}}
41+
</div>
42+
<div class="gh-article-meta-wrapper">
43+
<h4 class="gh-article-author-name">{{authors}}</h4>
44+
<div class="gh-article-meta-content">
45+
<time class="gh-article-meta-date" datetime="{{date format="DD-MM-YYYY"}}">{{date}}</time>
46+
{{#if reading_time}}
47+
<span class="gh-article-meta-length"><span class="bull">—</span> {{reading_time}}</span>
48+
{{/if}}
49+
</div>
50+
</div>
51+
</div>
52+
{{/if}}
53+
54+
{{> "feature-image"}}
55+
56+
</header>
57+
58+
59+
<section class="gh-content gh-canvas is-body{{#if @custom.enable_drop_caps_on_posts}} drop-cap{{/if}}">
60+
261
<section class="error-message">
362
<h1 class="error-code">404</h1>
4-
<a class="error-link" href="{{@site.url}}">Go to the front page →</a>
63+
<a class="error-link" href="{{@site.url}}">Go to the front page →</a> or try searching below.
564
</section>
6-
{{!-- The tag above means: insert everything in this file into the body of the default.hbs template --}}
7-
{{!--
8-
{{> "components/header" headerStyle=@custom.header_style}}
965

10-
{{#match @custom.header_style "!=" "Highlight"}}
11-
{{> "components/featured" showFeatured=@custom.show_featured_posts limit=4}}
12-
{{/match}}
66+
<script async src="https://cse.google.com/cse.js?cx=f4d905c360b884054">
67+
</script>
68+
<div class="gcse-search"></div>
69+
{{!-- {{content}} --}}
70+
</section>
71+
72+
</article>
73+
{{#if comments}}
74+
<div class="gh-comments gh-canvas">
75+
{{comments}}
76+
</div>
77+
{{/if}}
78+
79+
</main>
1380

14-
{{> "components/cta"}} --}}
81+
{{!-- {{/post}} --}}
1582

16-
{{> "components/post-list" feed="index" postFeedStyle=@custom.post_feed_style showTitle=true showSidebar=@custom.show_publication_info_sidebar}}
83+
{{#if @custom.show_related_articles}}
84+
{{#get "posts" include="authors" filter="id:-{{post.id}}" limit="4" as |next|}}
85+
{{#if next}}
86+
<section class="gh-container is-grid gh-outer">
87+
<div class="gh-container-inner gh-inner">
88+
<h2 class="gh-container-title">Read interesting articles in SREDevOps.org: </h2>
89+
<div class="gh-feed">
90+
{{#foreach next}}
91+
{{> "post-card" lazyLoad=true}}
92+
{{/foreach}}
93+
</div>
94+
</div>
95+
</section>
96+
{{/if}}
97+
{{/get}}
98+
{{/if}}

‎gulpfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function js(done) {
6666

6767
const cssWatcher = () => watch('assets/css/**', css);
6868
const jsWatcher = () => watch('assets/js/**', js);
69-
const hbsWatcher = () => watch(['*.hbs', 'partials/**/*.hbs'], hbs);
69+
const hbsWatcher = () => watch(['*.hbs', 'partials/**/*.hbs', 'members/**/*.hbs'], hbs);
7070
const watcher = parallel(cssWatcher, jsWatcher, hbsWatcher);
7171
const build = series(css, js);
7272

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "ghost-source-theme",
33
"description": "Fork of the default theme of Ghost publishing platform, customized for sredevops.org",
44
"demo": "https://sredevops.org",
5-
"version": "1.5.0",
5+
"version": "1.5.1",
66
"engines": {
77
"ghost": ">=5.0.0"
88
},

‎partials/components/navigation.hbs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{{@site.title}}
1010
{{/if}}
1111
</a>
12-
{{> "search-toggle"}}
12+
{{> "email"}}
1313
<button class="gh-burger gh-icon-button" aria-label="Menu">
1414
{{> "icons/burger"}}
1515
{{> "icons/close"}}
@@ -20,30 +20,31 @@
2020
{{navigation}}
2121
{{#unless @site.members_enabled}}
2222
{{#match navigationLayout "Stacked"}}
23-
{{> "search-toggle"}}
23+
{{> "email"}}
2424
{{/match}}
2525
{{/unless}}
2626
</nav>
2727

2828
<div class="gh-navigation-actions">
2929
{{#unless @site.members_enabled}}
3030
{{^match navigationLayout "Stacked"}}
31-
{{> "search-toggle"}}
31+
{{> "email"}}
3232
{{/match}}
3333
{{else}}
34-
{{> "search-toggle"}}
35-
<div class="gh-navigation-members">
34+
{{> "email"}}
35+
<div class="nav">
3636
{{#unless @member}}
3737
{{#unless @site.members_invite_only}}
38-
<a href="#/portal/signin" data-portal="signin">Sign in</a>
3938
{{#unless hideSubscribeButton}}
40-
<a class="gh-button" href="#/portal/signup" data-portal="signup">Subscribe</a>
39+
<span><a class="sign-google" href="https://login.spectralwebservices.com/auth/google?inbound=b89c0c7a-1b79-4c68-b75e-32060012d7ca" alt="Sign in with Google">Google</a></span>
40+
<span><a class="sign-github" href="https://login.spectralwebservices.com/auth/github?inbound=b89c0c7a-1b79-4c68-b75e-32060012d7ca" alt="Sign in with Github">Github</a></span>
4141
{{/unless}}
4242
{{else}}
43-
<a class="gh-button" href="#/portal/signin" data-portal="signin">Sign in</a>
43+
<span><a class="sign-google" href="https://login.spectralwebservices.com/auth/google?inbound=b89c0c7a-1b79-4c68-b75e-32060012d7ca" alt="Sign in with Google">Google</a></span>
44+
<span><a class="sign-github" href="https://login.spectralwebservices.com/auth/github?inbound=b89c0c7a-1b79-4c68-b75e-32060012d7ca" alt="Sign in with Github">Github</a></span>
4445
{{/unless}}
4546
{{else}}
46-
<a class="gh-button" href="#/portal/account" data-portal="account">Account</a>
47+
<a class="gh-button" href="#/portal/account" data-portal="account">Settings</a>
4748
{{/unless}}
4849
</div>
4950
{{/unless}}

0 commit comments

Comments
 (0)