Skip to content

Commit 2b39af2

Browse files
ShubhamOulkarShubhamOulkar
committed
use site.baseurl liquid veriable instead of relative paths so that we can run/test fork environment correctly
1 parent 478e6bd commit 2b39af2

3 files changed

Lines changed: 67 additions & 61 deletions

File tree

‎_includes/head.html‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,38 @@
44
<meta name="viewport" content="width=device-width, initial-scale=1">
55
<link
66
rel="preload"
7-
href="/fonts/open-sans/woff2/open-sans-latin-wght-normal.woff2"
7+
href="{{ site.baseurl }}/fonts/open-sans/woff2/open-sans-latin-wght-normal.woff2"
88
as="font"
99
type="font/woff2"
1010
crossorigin
1111
/>
1212
<link
1313
rel="preload"
14-
href="/fonts/open-sans/woff2/open-sans-latin-wght-italic.woff2"
14+
href="{{ site.baseurl }}/fonts/open-sans/woff2/open-sans-latin-wght-italic.woff2"
1515
as="font"
1616
type="font/woff2"
1717
crossorigin
1818
/>
1919
<link
20-
href="/fonts/open-sans/woff/OpenSans.woff"
20+
href="{{ site.baseurl }}/fonts/open-sans/woff/OpenSans.woff"
2121
as="font"
2222
type="font/woff"
2323
crossorigin
2424
/>
2525
<link
26-
href="/fonts/open-sans/woff/OpenSans-Italic.woff"
26+
href="{{ site.baseurl }}/fonts/open-sans/woff/OpenSans-Italic.woff"
2727
as="font"
2828
type="font/woff"
2929
crossorigin
3030
/>
31-
<link rel="stylesheet" href="/fonts/open-sans/fonts.css" />
32-
<link rel="icon" type="image/png" href="/images/favicon.png" />
33-
<script data-cfasync="false" src="/js/theme.js"></script>
34-
<link rel="stylesheet" href="/css/variables.css?_={{ site.time | date: '%s' }}">
35-
<link rel="stylesheet" href="/css/themes/dark-theme.css?_={{ site.time | date: '%s' }}">
36-
<link rel="stylesheet" href="/css/style.css?_={{ site.time | date: '%s' }}">
37-
<link rel="stylesheet" href="/css/sintax.css?_={{ site.time | date: '%s' }}">
38-
<link rel="stylesheet" href="/css/langs/{{ page.lang }}.css">
31+
<link rel="stylesheet" href="{{ site.baseurl }}/fonts/open-sans/fonts.css" />
32+
<link rel="icon" type="image/png" href="{{ site.baseurl }}/images/favicon.png" />
33+
<script data-cfasync="false" src="{{ site.baseurl }}/js/theme.js"></script>
34+
<link rel="stylesheet" href="{{ site.baseurl }}/css/variables.css?_={{ site.time | date: '%s' }}">
35+
<link rel="stylesheet" href="{{ site.baseurl }}/css/themes/dark-theme.css?_={{ site.time | date: '%s' }}">
36+
<link rel="stylesheet" href="{{ site.baseurl }}/css/style.css?_={{ site.time | date: '%s' }}">
37+
<link rel="stylesheet" href="{{ site.baseurl }}/css/sintax.css?_={{ site.time | date: '%s' }}">
38+
<link rel="stylesheet" href="{{ site.baseurl }}/css/langs/{{ page.lang }}.css">
3939
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
4040
<meta name="description" content="{{page.description}}">
4141
<meta property="og:url" content="https://expressjs.com{{page.url}}">
@@ -64,10 +64,10 @@
6464
{% else %}
6565
<meta property="twitter:image" content="https://expressjs.com/images/og.png">
6666
{% endif %}
67-
<script data-cfasync="false" defer src="/js/app.js"></script>
68-
<script data-cfasync="false" defer src="/js/menu.js"></script>
69-
<script data-cfasync="false" defer src="/js/copycode.js"></script>
67+
<script data-cfasync="false" defer src="{{ site.baseurl }}/js/app.js"></script>
68+
<script data-cfasync="false" defer src="{{ site.baseurl }}/js/menu.js"></script>
69+
<script data-cfasync="false" defer src="{{ site.baseurl }}/js/copycode.js"></script>
7070
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />
71-
<link rel="alternate" type="application/atom+xml" href="/feed.xml" title="Express Blog" />
72-
<link rel="alternate" type="application/atom+xml" href="/vulnerabilities.xml" title="Express Vulnerabilities" />
71+
<link rel="alternate" type="application/atom+xml" href="{{ site.baseurl }}/feed.xml" title="Express Blog" />
72+
<link rel="alternate" type="application/atom+xml" href="{{ site.baseurl }}/vulnerabilities.xml" title="Express Vulnerabilities" />
7373
</head>

‎_includes/header.html‎

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,203 +5,207 @@
55
</div>
66
</div>
77
<div class="logo-container">
8-
<a href="/" title="Go to homepage" aria-label="Go to homepage">
8+
<a href="{{ site.baseurl }}/" title="Go to homepage" aria-label="Go to homepage">
99
{% include icons/express-logo.svg %}
1010
</a>
1111
</div>
1212
<nav id="navbar" aria-label="primary">
1313
<input id="q" placeholder="🔎 search">
1414
<ul id="navmenu">
1515
<li id="getting-started-menu" class="submenu">
16-
<a href="/{{ page.lang }}/starter/installing.html" {% if page.menu=='starter' %} class="active" {% endif%}>
16+
<a href="{{ site.baseurl }}/{{ page.lang }}/starter/installing.html" {% if page.menu=='starter' %}
17+
class="active" {% endif%}>
1718
{{ site.data[page.lang].menu.getting_started }}
1819
</a>
1920
<ul class="submenu-content">
2021
<li>
21-
<a href="/{{ page.lang }}/starter/installing.html">
22+
<a href="{{ site.baseurl }}/{{ page.lang }}/starter/installing.html">
2223
{{ site.data[page.lang].menu.installing }}
2324
</a>
2425
</li>
2526
<li>
26-
<a href="/{{ page.lang }}/starter/hello-world.html">
27+
<a href="{{ site.baseurl }}/{{ page.lang }}/starter/hello-world.html">
2728
{{ site.data[page.lang].menu.hello_world }}
2829
</a>
2930
</li>
3031
<li>
31-
<a href="/{{ page.lang }}/starter/generator.html">
32+
<a href="{{ site.baseurl }}/{{ page.lang }}/starter/generator.html">
3233
{{ site.data[page.lang].menu.generator }}
3334
</a>
3435
</li>
3536
<li>
36-
<a href="/{{ page.lang }}/starter/basic-routing.html">
37+
<a href="{{ site.baseurl }}/{{ page.lang }}/starter/basic-routing.html">
3738
{{ site.data[page.lang].menu.basic_routing }}
3839
</a>
3940
</li>
4041
<li>
41-
<a href="/{{ page.lang }}/starter/static-files.html">
42+
<a href="{{ site.baseurl }}/{{ page.lang }}/starter/static-files.html">
4243
{{ site.data[page.lang].menu.static_files }}
4344
</a>
4445
</li>
4546
<li>
46-
<a href="/{{ page.lang }}/starter/examples.html">
47+
<a href="{{ site.baseurl }}/{{ page.lang }}/starter/examples.html">
4748
{{ site.data[page.lang].menu.examples }}
4849
</a>
4950
</li>
5051
<li>
51-
<a href="/{{ page.lang }}/starter/faq.html">
52+
<a href="{{ site.baseurl }}/{{ page.lang }}/starter/faq.html">
5253
{{ site.data[page.lang].menu.faq }}
5354
</a>
5455
</li>
5556
</ul>
5657
</li>
5758
<li id="guide-menu" class="submenu">
58-
<a href="/{{ page.lang }}/guide/routing.html" {% if page.menu=='guide' %} class="active" {% endif %}>
59+
<a href="{{ site.baseurl }}/{{ page.lang }}/guide/routing.html" {% if page.menu=='guide' %} class="active" {%
60+
endif %}>
5961
{{ site.data[page.lang].menu.guide }}
6062
</a>
6163
<ul class="submenu-content">
6264
<li>
63-
<a href="/{{ page.lang }}/guide/routing.html">
65+
<a href="{{ site.baseurl }}/{{ page.lang }}/guide/routing.html">
6466
{{ site.data[page.lang].menu.routing }}
6567
</a>
6668
</li>
6769
<li>
68-
<a href="/{{ page.lang }}/guide/writing-middleware.html">
70+
<a href="{{ site.baseurl }}/{{ page.lang }}/guide/writing-middleware.html">
6971
{{ site.data[page.lang].menu.writing_middleware }}
7072
</a>
7173
</li>
7274
<li>
73-
<a href="/{{ page.lang }}/guide/using-middleware.html">
75+
<a href="{{ site.baseurl }}/{{ page.lang }}/guide/using-middleware.html">
7476
{{ site.data[page.lang].menu.using_middleware }}
7577
</a>
7678
</li>
7779
<li>
78-
<a href="/{{ page.lang }}/guide/overriding-express-api.html">
80+
<a href="{{ site.baseurl }}/{{ page.lang }}/guide/overriding-express-api.html">
7981
{{ site.data[page.lang].menu.overriding_express_api }}
8082
</a>
8183
</li>
8284
<li>
83-
<a href="/{{ page.lang }}/guide/using-template-engines.html">
85+
<a href="{{ site.baseurl }}/{{ page.lang }}/guide/using-template-engines.html">
8486
{{ site.data[page.lang].menu.using_template_engines }}
8587
</a>
8688
</li>
8789
<li>
88-
<a href="/{{ page.lang }}/guide/error-handling.html">
90+
<a href="{{ site.baseurl }}/{{ page.lang }}/guide/error-handling.html">
8991
{{ site.data[page.lang].menu.error_handling }}
9092
</a>
9193
</li>
9294
<li>
93-
<a href="/{{ page.lang }}/guide/debugging.html">
95+
<a href="{{ site.baseurl }}/{{ page.lang }}/guide/debugging.html">
9496
{{ site.data[page.lang].menu.debugging }}
9597
</a>
9698
</li>
9799
<li>
98-
<a href="/{{ page.lang }}/guide/behind-proxies.html">
100+
<a href="{{ site.baseurl }}/{{ page.lang }}/guide/behind-proxies.html">
99101
{{ site.data[page.lang].menu.behind_proxies }}
100102
</a>
101103
</li>
102104
<li>
103-
<a href="/{{ page.lang }}/guide/migrating-4.html">
105+
<a href="{{ site.baseurl }}/{{ page.lang }}/guide/migrating-4.html">
104106
{{ site.data[page.lang].menu.migrating_4 }}
105107
</a>
106108
</li>
107109
<li>
108-
<a href="/{{ page.lang }}/guide/migrating-5.html">
110+
<a href="{{ site.baseurl }}/{{ page.lang }}/guide/migrating-5.html">
109111
{{ site.data[page.lang].menu.migrating_5 }}
110112
</a>
111113
</li>
112114
<li>
113-
<a href="/{{ page.lang }}/guide/database-integration.html">
115+
<a href="{{ site.baseurl }}/{{ page.lang }}/guide/database-integration.html">
114116
{{ site.data[page.lang].menu.database_integration }}
115117
</a>
116118
</li>
117119
</ul>
118120
</li>
119121
<li id="application-menu" class="submenu">
120-
<a href="/{{ page.lang }}/5x/api.html" {% if page.menu=='api' %} class="active" {% endif %}>
122+
<a href="{{ site.baseurl }}/{{ page.lang }}/5x/api.html" {% if page.menu=='api' %} class="active" {% endif %}>
121123
{{ site.data[page.lang].menu.api }}
122124
</a>
123125
<ul class="submenu-content">
124126
<li>
125-
<a href="/{{ page.lang }}/5x/api.html">
127+
<a href="{{ site.baseurl }}/{{ page.lang }}/5x/api.html">
126128
{{ site.data[page.lang].menu.5x }}
127129
</a>
128130
</li>
129131
<li>
130-
<a href="/{{ page.lang }}/4x/api.html">
132+
<a href="{{ site.baseurl }}/{{ page.lang }}/4x/api.html">
131133
{{ site.data[page.lang].menu.4x }}
132134
</a>
133135
</li>
134136
<li>
135-
<a href="/{{ page.lang }}/3x/api.html">
137+
<a href="{{ site.baseurl }}/{{ page.lang }}/3x/api.html">
136138
{{ site.data[page.lang].menu.3x }}
137139
</a>
138140
</li>
139141
<li>
140-
<a href="/2x/">
142+
<a href="{{ site.baseurl }}/2x/">
141143
{{ site.data[page.lang].menu.2x }}
142144
</a>
143145
</li>
144146
</ul>
145147
</li>
146148
<li id="advanced-topics-menu" class="submenu">
147-
<a href="/{{ page.lang }}/advanced/developing-template-engines.html" {% if page.menu=='advanced' %} class="active" {% endif %}>
149+
<a href="{{ site.baseurl }}/{{ page.lang }}/advanced/developing-template-engines.html" {% if
150+
page.menu=='advanced' %} class="active" {% endif %}>
148151
{{ site.data[page.lang].menu.advanced }}
149152
</a>
150153
<ul class="submenu-content">
151154
<li>
152-
<a href="/{{ page.lang }}/advanced/developing-template-engines.html">
155+
<a href="{{ site.baseurl }}/{{ page.lang }}/advanced/developing-template-engines.html">
153156
{{ site.data[page.lang].menu.developing_template_engines }}
154157
</a>
155158
</li>
156159
<li>
157-
<a href="/{{ page.lang }}/advanced/security-updates.html">
160+
<a href="{{ site.baseurl }}/{{ page.lang }}/advanced/security-updates.html">
158161
{{ site.data[page.lang].menu.security_updates }}
159162
</a>
160163
</li>
161164
<li>
162-
<a href="/{{ page.lang }}/advanced/best-practice-security.html">
165+
<a href="{{ site.baseurl }}/{{ page.lang }}/advanced/best-practice-security.html">
163166
{{ site.data[page.lang].menu.best_practice_security }}
164167
</a>
165168
</li>
166169
<li>
167-
<a href="/{{ page.lang }}/advanced/best-practice-performance.html">
170+
<a href="{{ site.baseurl }}/{{ page.lang }}/advanced/best-practice-performance.html">
168171
{{ site.data[page.lang].menu.best_practice_performance }}
169172
</a>
170173
</li>
171174
<li>
172-
<a href="/{{ page.lang }}/advanced/healthcheck-graceful-shutdown.html">
175+
<a href="{{ site.baseurl }}/{{ page.lang }}/advanced/healthcheck-graceful-shutdown.html">
173176
{{ site.data[page.lang].menu.healthcheck_graceful_shutdown }}
174177
</a>
175178
</li>
176179
</ul>
177180
</li>
178181
<li id="resources-menu" class="submenu">
179-
<a href="/{{ page.lang }}/resources/community.html" {% if page.menu=='resources' %} class="active" {% endif %}>
182+
<a href="{{ site.baseurl }}/{{ page.lang }}/resources/community.html" {% if page.menu=='resources' %}
183+
class="active" {% endif %}>
180184
{{ site.data[page.lang].menu.resources }}
181185
</a>
182186
<ul class="submenu-content">
183187
<li>
184-
<a href="/{{ page.lang }}/resources/community.html">
188+
<a href="{{ site.baseurl }}/{{ page.lang }}/resources/community.html">
185189
{{ site.data[page.lang].menu.community }}
186190
</a>
187191
</li>
188192
<li>
189-
<a href="/{{ page.lang }}/resources/glossary.html">
193+
<a href="{{ site.baseurl }}/{{ page.lang }}/resources/glossary.html">
190194
{{ site.data[page.lang].menu.glossary }}
191195
</a>
192196
</li>
193197
<li>
194-
<a href="/{{ page.lang }}/resources/middleware.html">
198+
<a href="{{ site.baseurl }}/{{ page.lang }}/resources/middleware.html">
195199
{{ site.data[page.lang].menu.middleware }}
196200
</a>
197201
</li>
198202
<li>
199-
<a href="/{{ page.lang }}/resources/utils.html">
203+
<a href="{{ site.baseurl }}/{{ page.lang }}/resources/utils.html">
200204
{{ site.data[page.lang].menu.utils }}
201205
</a>
202206
</li>
203207
<li>
204-
<a href="/{{ page.lang }}/resources/contributing.html">
208+
<a href="{{ site.baseurl }}/{{ page.lang }}/resources/contributing.html">
205209
{{ site.data[page.lang].menu.contributing }}
206210
</a>
207211
</li>
@@ -213,7 +217,8 @@
213217
</ul>
214218
</li>
215219
<li>
216-
<a href="/{{ page.lang }}/support" id="support-menu" {% if page.menu=='support' %} class="active" {% endif %}>
220+
<a href="{{ site.baseurl }}/{{ page.lang }}/support" id="support-menu" {% if page.menu=='support' %}
221+
class="active" {% endif %}>
217222
{{ site.data[page.lang].menu.support }}
218223
</a>
219224
</li>
@@ -228,12 +233,12 @@
228233
</a>
229234
</li>
230235
<li>
231-
<a href="/en/blog/posts.html">
236+
<a href="{{ site.baseurl }}/en/blog/posts.html">
232237
{{ site.data[page.lang].menu.all_posts }}
233238
</a>
234239
</li>
235240
<li>
236-
<a href="/en/blog/write-post.html">
241+
<a href="{{ site.baseurl }}/en/blog/write-post.html">
237242
{{ site.data[page.lang].menu.write_post }}
238243
</a>
239244
</li>
@@ -248,4 +253,4 @@
248253
</button>
249254
{% include language-picker.html %}
250255
</div>
251-
</header>
256+
</header>

‎_includes/language-picker.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
{% assign url_remainder = url_parts | slice: 2, url_parts.size | join: '/' %}
33
{% assign current_lang = page.lang %}
44
<div class="desktop-lang-switcher">
5-
<button id="langBtn" class="lang-btn" type="button" aria-expanded="false" aria-haspopup="listbox" aria-label="Change language">
5+
<button id="langBtn" class="lang-btn" type="button" aria-expanded="false" aria-haspopup="listbox"
6+
aria-label="Change language">
67
{% include icons/i18n.svg %}
78
</button>
89
<ul id="langList" class="lang-list" role="listbox">
910
{% for lang in site.data.languages %}
1011
<li>
11-
<a href="/{{ lang.code }}/{{ url_remainder }}">
12+
<a href="{{ site.baseurl }}/{{ lang.code }}/{{ url_remainder }}">
1213
{% if lang.code == current_lang %}
1314
<strong>{{ lang.name }}</strong>
1415
{% else %}

0 commit comments

Comments
 (0)