Skip to content

Commit e2bb415

Browse files
jpsamaroojpsamaroo
authored
Merge pull request #6 from emmanuellujan/new-template
New template using Xranklin
2 parents db47c83 + 1c03351 commit e2bb415

29 files changed

+357
-293
lines changed

‎.github/workflows/Deploy.yml

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,27 @@
1-
name: Build and Deploy
1+
name: Deploy
2+
23
on:
34
push:
45
branches:
56
- main
6-
- master
7+
78
jobs:
8-
build-and-deploy:
9+
deploy:
910
runs-on: ubuntu-latest
11+
permissions: write-all
1012
steps:
11-
- name: Checkout
12-
uses: actions/checkout@v2
13-
with:
14-
persist-credentials: false
15-
# NOTE: Python is necessary for the pre-rendering (minification) step
16-
- name: Install python
17-
uses: actions/setup-python@v2
18-
with:
19-
python-version: '3.8'
20-
# NOTE: Here you can install dependencies such as matplotlib if you use
21-
# packages such as PyPlot.
22-
# - run: pip install matplotlib
23-
- name: Install Julia
24-
uses: julia-actions/setup-julia@v1
25-
with:
26-
version: 1.6
27-
# NOTE
28-
# The steps below ensure that NodeJS and Franklin are loaded then it
29-
# installs highlight.js which is needed for the prerendering step
30-
# (code highlighting + katex prerendering).
31-
# Then the environment is activated and instantiated to install all
32-
# Julia packages which may be required to successfully build your site.
33-
# The last line should be `optimize()` though you may want to give it
34-
# specific arguments, see the documentation or ?optimize in the REPL.
35-
- run: julia -e '
36-
using Pkg; Pkg.activate("."); Pkg.instantiate();
37-
using NodeJS; run(`$(npm_cmd()) install highlight.js`);
38-
using Franklin;
39-
optimize()'
40-
- name: Build and Deploy
41-
uses: JamesIves/github-pages-deploy-action@releases/v3
42-
with:
43-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44-
BRANCH: gh-pages
45-
FOLDER: __site
13+
- uses: actions/checkout@v2
14+
- uses: tlienart/xranklin-build-action@v3.2
15+
with:
16+
# NOTE: this is the Xranklin branch the site is built with
17+
BRANCH: "dev"
18+
# NOTE: this is the base URL prefix (landing page at /$BASE_URL_PREFIX/)
19+
BASE_URL_PREFIX: ""
20+
21+
# ===================================================================
22+
# DON'T CHANGE THE FOLLOWING UNLESS YOU HAVE GOOD REASONS TO
23+
# >> amounts to build(clear=true) when commit message contains [clear]
24+
CLEAR_CACHE: ${{ contains(github.event.head_commit.message, '[clear]') }}
25+
# >> change the digit at the end if, for some reason, you believe
26+
# that the cache used by the github action has an issue
27+
CACHE_KEY: "franklin-cache"

‎.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
# Files generated by invoking Julia with --track-allocation
66
*.jl.mem
77

8+
# .DS_Store files
9+
.DS_Store
10+
811
# System-specific files and directories generated by the BinaryProvider and BinDeps packages
912
# They contain absolute paths specific to the host computer, and so should not be committed
1013
deps/deps.jl
@@ -21,5 +24,5 @@ docs/site/
2124
# It records a fixed state of all packages used by the project. As such, it should not be
2225
# committed for packages, but should be committed for applications that require a static
2326
# environment.
24-
Manifest.toml
25-
__site
27+
# Manifest.toml
28+
__site

‎404.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
@def title = "404"
1+
+++
2+
title = "404"
3+
+++
24

35
~~~
46
<div style="margin-top: 40px; font-size: 40px; text-align: center;">

‎Manifest.toml

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
# This file is machine-generated - editing it directly is not advised
2+
3+
julia_version = "1.7.3"
4+
manifest_format = "2.0"
5+
6+
[[deps.ArgTools]]
7+
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
8+
9+
[[deps.Artifacts]]
10+
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
11+
12+
[[deps.Base64]]
13+
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
14+
15+
[[deps.CRC32c]]
16+
uuid = "8bf52ea8-c179-5cab-976a-9e18b702a9bc"
17+
18+
[[deps.Crayons]]
19+
git-tree-sha1 = "249fe38abf76d48563e2f4556bebd215aa317e15"
20+
uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f"
21+
version = "4.1.1"
22+
23+
[[deps.Dates]]
24+
deps = ["Printf"]
25+
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
26+
27+
[[deps.Downloads]]
28+
deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
29+
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
30+
31+
[[deps.FileWatching]]
32+
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
33+
34+
[[deps.FranklinParser]]
35+
deps = ["REPL"]
36+
git-tree-sha1 = "34eab60f8bb982f55f40558a121ec5e50d5d254e"
37+
uuid = "796511e7-1510-466f-ad0c-1823c64bcafa"
38+
version = "0.6.0"
39+
40+
[[deps.HTTP]]
41+
deps = ["Base64", "Dates", "IniFile", "Logging", "MbedTLS", "NetworkOptions", "Sockets", "URIs"]
42+
git-tree-sha1 = "0fa77022fe4b511826b39c894c90daf5fce3334a"
43+
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
44+
version = "0.9.17"
45+
46+
[[deps.IOCapture]]
47+
deps = ["Logging", "Random"]
48+
git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a"
49+
uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89"
50+
version = "0.2.2"
51+
52+
[[deps.IniFile]]
53+
git-tree-sha1 = "f550e6e32074c939295eb5ea6de31849ac2c9625"
54+
uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f"
55+
version = "0.5.1"
56+
57+
[[deps.InteractiveUtils]]
58+
deps = ["Markdown"]
59+
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
60+
61+
[[deps.LibCURL]]
62+
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
63+
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
64+
65+
[[deps.LibCURL_jll]]
66+
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
67+
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
68+
69+
[[deps.LibGit2]]
70+
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
71+
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
72+
73+
[[deps.LibSSH2_jll]]
74+
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
75+
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
76+
77+
[[deps.Libdl]]
78+
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
79+
80+
[[deps.LiveServer]]
81+
deps = ["Crayons", "FileWatching", "HTTP", "MIMEs", "Pkg", "Sockets", "Test"]
82+
git-tree-sha1 = "79783c2901a09bab202f55f24fe07a9a03b14e8a"
83+
uuid = "16fef848-5104-11e9-1b77-fb7a48bbb589"
84+
version = "0.8.3"
85+
86+
[[deps.Logging]]
87+
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
88+
89+
[[deps.MIMEs]]
90+
git-tree-sha1 = "65f28ad4b594aebe22157d6fac869786a255b7eb"
91+
uuid = "6c6e2e6c-3030-632d-7369-2d6c69616d65"
92+
version = "0.1.4"
93+
94+
[[deps.Markdown]]
95+
deps = ["Base64"]
96+
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
97+
98+
[[deps.MbedTLS]]
99+
deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"]
100+
git-tree-sha1 = "1c38e51c3d08ef2278062ebceade0e46cefc96fe"
101+
uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
102+
version = "1.0.3"
103+
104+
[[deps.MbedTLS_jll]]
105+
deps = ["Artifacts", "Libdl"]
106+
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
107+
108+
[[deps.MozillaCACerts_jll]]
109+
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
110+
111+
[[deps.NetworkOptions]]
112+
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
113+
114+
[[deps.OrderedCollections]]
115+
git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c"
116+
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
117+
version = "1.4.1"
118+
119+
[[deps.Pkg]]
120+
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
121+
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
122+
123+
[[deps.Printf]]
124+
deps = ["Unicode"]
125+
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
126+
127+
[[deps.REPL]]
128+
deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
129+
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
130+
131+
[[deps.Random]]
132+
deps = ["SHA", "Serialization"]
133+
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
134+
135+
[[deps.SHA]]
136+
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
137+
138+
[[deps.Serialization]]
139+
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
140+
141+
[[deps.Sockets]]
142+
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
143+
144+
[[deps.TOML]]
145+
deps = ["Dates"]
146+
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
147+
148+
[[deps.Tar]]
149+
deps = ["ArgTools", "SHA"]
150+
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
151+
152+
[[deps.Test]]
153+
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
154+
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
155+
156+
[[deps.URIs]]
157+
git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355"
158+
uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
159+
version = "1.3.0"
160+
161+
[[deps.UUIDs]]
162+
deps = ["Random", "SHA"]
163+
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
164+
165+
[[deps.Unicode]]
166+
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
167+
168+
[[deps.Xranklin]]
169+
deps = ["CRC32c", "Dates", "FranklinParser", "IOCapture", "LiveServer", "Logging", "OrderedCollections", "Pkg", "REPL", "Serialization", "TOML", "URIs"]
170+
git-tree-sha1 = "40e2ff898170175d5f7406929464341230f968e2"
171+
repo-rev = "dev"
172+
repo-url = "https://github.com/tlienart/Xranklin.jl"
173+
uuid = "558449b0-171e-4e1f-900f-d076a5ddf486"
174+
version = "0.1.0"
175+
176+
[[deps.Zlib_jll]]
177+
deps = ["Libdl"]
178+
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
179+
180+
[[deps.nghttp2_jll]]
181+
deps = ["Artifacts", "Libdl"]
182+
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
183+
184+
[[deps.p7zip_jll]]
185+
deps = ["Artifacts", "Libdl"]
186+
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"

‎Project.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
name = "juliaparallelwebsite"
2+
uuid = "537948fd-c279-4aaa-8db0-b48e0ca81a15"
3+
authors = ["Julia Lab"]
4+
version = "0.1.0"
5+
16
[deps]
2-
Franklin = "713c75ef-9fc9-4b05-94a9-213340da978e"
3-
NodeJS = "2bd173c7-0d6d-553b-b6af-13a54713934c"
47
Xranklin = "558449b0-171e-4e1f-900f-d076a5ddf486"
5-
6-
[compat]
7-
Franklin = "0.10.56"

‎_css/adjust.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ h5 a:visited { color: #81353c !important; }
6262

6363

6464
.jp-logo {
65-
background-image: url("/assets/logo.png");
65+
background-image: url('../assets/logo.png');
6666
padding-right:10px;
6767
width:6%;
6868
}

‎_css/minimal-mistakes.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,7 +1867,7 @@ th {
18671867
}
18681868

18691869
.masthead {
1870-
background: transparent url("/assets/banner.png") fixed repeat center top;
1870+
background: transparent url('../assets/banner.png') fixed repeat center top;
18711871
height: 60px;
18721872
position: relative;
18731873
border-bottom: 1px solid #f2f3f3;
@@ -2529,7 +2529,7 @@ th {
25292529
}
25302530

25312531
.page__footer {
2532-
background-image: url("/assets/footer.png");
2532+
background-image: url('../assets/footer.png');
25332533
clear: both;
25342534
float: left;
25352535
margin-left: 0;

‎_layout/tag.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1">
66
{{insert style.html}}
7-
<title>Tag: {{fill fd_tag}}</title>
7+
<title>Tag: {{fill tag_name}}</title>
88
</head>
99
{{insert body_layout.html}}
1010

11-
<div class="{{div_content}}">
12-
<h1>Tag: {{fill fd_tag}}</h1>
11+
<div class="{{content_class}}">
12+
<h1>Tag: {{fill tag_name}}</h1>
1313
{{taglist}}
1414
{{insert page_foot.html}}
1515
</div>

‎_rss/head.xml

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)