Skip to content

Commit 2e2b30c

Browse files
anuran-royanuran-roy
authored
Merge branch 'jamstack:main' into anuran-roy-add-fossfolio
2 parents 0a37e9f + 5de11bb commit 2e2b30c

File tree

10 files changed

+72
-47
lines changed

10 files changed

+72
-47
lines changed

‎netlify.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
to = "https://jamstackconf.com/conf/"
2121
status = 200
2222

23+
[[redirects]]
24+
from = "/conf/cfp"
25+
to = "https://docs.google.com/forms/d/e/1FAIpQLSc-z50GyD7zXzr_JCn2M1NBFZ-h65kSdu7zn43V1u2qAKO3ew/viewform"
26+
status = 302
27+
2328
[[redirects]]
2429
from = "/conf/*"
2530
to = "https://jamstackconf.com/conf/:splat"
@@ -55,11 +60,6 @@
5560
to = "https://res.cloudinary.com/netlify/image/fetch/c_fit,l_text:Roboto_56_bold::term,co_rgb:FFFFFF,g_north_west,y_75,x_100,w_1000/c_fit,l_text:Roboto_38_light::summary,co_rgb:FFFFFF,g_north_west,y_200,x_160,w_885/https://jamstack.org/img/og/glossary-card-bg.png"
5661
status = 200
5762

58-
[[redirects]]
59-
from = "/conf/cfp"
60-
to = "https://docs.google.com/forms/d/e/1FAIpQLSc-z50GyD7zXzr_JCn2M1NBFZ-h65kSdu7zn43V1u2qAKO3ew/viewform"
61-
status = 302
62-
6363
[[redirects]]
6464
from = "/glossary/*"
6565
to = "/glossary/contribute/index.html"

‎src/site/_data/announcementbar.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"text": "",
3-
"cta": "Fill out the 2022 Jamstack Community Survey and get a free sticker!",
2+
"text": "Do you build websites and apps?",
3+
"cta": "Take the Jamstack Community Survey 2022 today!",
44
"url": "https://netlify.qualtrics.com/jfe/form/SV_0BRbhN47gyZWYNo?Source=jamstack_eyebrow"
55
}

‎src/site/_data/glossary.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,11 @@
106106

107107
- term: 'Jamstack'
108108
id: 'jamstack'
109-
summary: 'A way of thinking about how to build for the web. The UI is compiled, the frontend is decoupled, and data is pulled in as needed.'
110-
definition: 'A way of thinking about how to build for the web. The UI is [compiled](/glossary/pre-render), the frontend is [decoupled](/glossary/decoupling), and data is pulled in as needed.'
109+
summary: Jamstack is an architectural approach that decouples the web experience layer from data and business logic, improving flexibility, scalability, performance, and maintainability.'
110+
definition: 'Jamstack is an architectural approach that [decouples](/glossary/decoupling) the web experience layer from data and business logic, improving flexibility, scalability, performance, and maintainability. Jamstack removes the need for business logic to dictate the web experience.
111+
112+
113+
It enables a composable architecture for the web where custom logic and 3rd party services are consumed through [APIs](/glossary/api).'
111114

112115
- term: 'Monolith'
113116
id: 'monolith'

‎src/site/_includes/header.njk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{%
22
set linkList = [
3-
{ "url": "/", "text": "Home", "children": [
4-
]},
3+
{ "url": "/", "text": "Home" },
4+
{ "url": "/conf", "text": "Jamstack Conf 2022" },
55
{ "url": "/glossary/", "text": "Glossary" },
66
{ "url": "/women-of-jamstack/", "text": "Women of Jamstack"},
77
{ "url": "/tv/", "text": "Jamstack TV" },

‎src/site/_includes/layouts/base.njk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ ogimage: "/img/og/default-og-image.png"
5353
{% include "header.njk" %}
5454
</div>
5555
<div>
56+
{% include "banner.njk" %}
5657
{{ content | safe }}
5758
<div class="border-blue-800 border-t">
5859
{% include "footer.njk" %}

‎src/site/_includes/navigation-links.njk‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ul class="block list-jams-logo-pink mb-12">
1+
<ul class="block list-jams-logo-pink mb-12">
22
{% for link in linkList %}
33
<li>
44
<a href="{{ link.url }}"
@@ -7,18 +7,18 @@
77
</a>
88
</li>
99
{%- if link.children %}
10-
<li class="list-jams-no-bullet">
11-
<ul class="list-jams-logo list-jams-logo-border">
12-
{%- for childlink in link.children %}
13-
<li>
14-
<a href="{{ childlink.url }}"
10+
<li class="list-jams-no-bullet">
11+
<ul class="list-jams-logo list-jams-logo-border">
12+
{%- for childlink in link.children %}
13+
<li>
14+
<a href="{{ childlink.url }}"
1515
class="block text-sm text-white hover:underline py-2 pl-16 pr-8{% if page.url.split("/")[1] == childlink.url.split("/")[1] %} bg-gray-900 font-bold{% endif %}">
16-
{{ childlink.text }}
17-
</a>
18-
</li>
19-
{%- endfor %}
20-
</ul>
21-
</li>
16+
{{ childlink.text }}
17+
</a>
18+
</li>
19+
{%- endfor %}
20+
</ul>
21+
</li>
2222
{%- endif %}
2323
{% endfor %}
24-
</ul>
24+
</ul>

‎src/site/headless-cms/payload-cms.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Payload CMS
33
repo: payloadcms/payload
44
homepage: https://payloadcms.com
55
twitter: PayloadCMS
6-
opensource: "No"
6+
opensource: "Yes"
77
typeofcms: "API Driven"
88
supportedgenerators:
99
- All

‎src/site/index.njk‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,19 @@ layout: layouts/base.njk
1414

1515
<section class="relative p-10 mb-16">
1616
<div class="p-2 rounded-lg bg-gradient-jams" w-full>
17-
<div class="flex flex-col bg-blue-900 p-10">
17+
<div class="flex flex-col bg-blue-900 p-10 text-xl">
1818
<a class="border-b-0" name="what-is-jamstack">
1919
<h1>What is <span class="font-extrabold text-transparent bg-clip-text bg-gradient-jams">Jamstack</span>?</h1>
2020
</a>
21-
22-
<p>Jamstack is an architectural approach that decouples the web experience layer from data and business logic, improving flexibility, scalability, performance, and maintainability. Jamstack removes the need for business logic to dictate the web experience. It enables a composable architecture for the web where custom logic and 3rd party services are consumed through APIs.</p>
21+
<p>
22+
Jamstack is an architectural approach that decouples the web experience layer from data and business logic, improving flexibility, scalability, performance, and maintainability.
23+
</p>
24+
<p>
25+
Jamstack removes the need for business logic to dictate the web experience.
26+
</p>
27+
<p>
28+
It enables a composable architecture for the web where custom logic and 3rd party services are consumed through APIs.</p>
29+
</p>
2330
</div>
2431
</div>
2532
</section>
@@ -56,4 +63,4 @@ layout: layouts/base.njk
5663
</div>
5764
<a href="/resources/" class="cta">See more videos and resources</a>
5865
</div>
59-
</section>
66+
</section>

‎src/site/survey-confirmation.njk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ layout: layouts/base.njk
3434
<p>Stickers will be sent after campaign has ended, or maximum has been reached. Stickers will be shipped with U.S. domestic or international postage stamps. Delivery is not guarenteed or trackable.</p>
3535

3636
<div class="flex items-center justify-center mt-10 p-10 border-4 rounded-lg border-pink-500 ">
37-
<a class="text-xl text-white" href="www.jamstackconf.com">Save the date for Jamstack Conf and get 20% off the ticket cost!</a>
37+
<a class="text-xl text-white" href="https://jamstack.org/conf/">Register for Jamstack Conf!</a>
3838
</div>
3939
</section>

‎src/site/survey/2021.njk‎

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,29 @@ gradientColors:
2525
dusk: [ "#960000", "#E94242" ]
2626
rain: [ "#FF72CF", "#C92ECC" ]
2727
---
28+
<div class="flex items-center justify-center mt-10 p-10 border-4 rounded-lg border-pink-500 w-1/2 m-auto underline">
29+
<a class="text-xl text-white" href="https://netlify.qualtrics.com/jfe/form/SV_0BRbhN47gyZWYNo?Source=jamstack_eyebrow">The 2022 Survey is live! Take it now!</a>
30+
</div>
31+
2832
<svg style="position: absolute; left: -9999px; width: 1px; height: 1px; overflow: hidden;">
2933
<defs>
3034
<filter x="0" y="0" width="1" height="1" id="offset-label-bg">
31-
<feFlood flood-color="#161a2c" result="bg" />
35+
<feFlood flood-color="#161a2c" result="bg"/>
3236
<feMerge>
3337
<feMergeNode in="bg"/>
3438
<feMergeNode in="SourceGraphic"/>
3539
</feMerge>
3640
</filter>
3741

3842
{%- for key, entry in gradientColors %}
39-
<linearGradient id="gradient-{{key}}-h">
40-
<stop offset="0%" stop-color="{{entry[0]}}"/>
41-
<stop offset="100%" stop-color="{{entry[1]}}"/>
42-
</linearGradient>
43-
<linearGradient id="gradient-{{key}}-v" x1="0" x2="0" y1="0" y2="1">
44-
<stop offset="0%" stop-color="{{entry[0]}}"/>
45-
<stop offset="100%" stop-color="{{entry[1]}}"/>
46-
</linearGradient>
43+
<linearGradient id="gradient-{{key}}-h">
44+
<stop offset="0%" stop-color="{{entry[0]}}"/>
45+
<stop offset="100%" stop-color="{{entry[1]}}"/>
46+
</linearGradient>
47+
<linearGradient id="gradient-{{key}}-v" x1="0" x2="0" y1="0" y2="1">
48+
<stop offset="0%" stop-color="{{entry[0]}}"/>
49+
<stop offset="100%" stop-color="{{entry[1]}}"/>
50+
</linearGradient>
4751
{%- endfor %}
4852
</defs>
4953
</svg>
@@ -52,19 +56,30 @@ gradientColors:
5256
<h1 class="leading-tight">{{ title }}</h1>
5357

5458
<p>This year we saw Jamstack go mainstream, with big changes in working patterns for Jamstack developers in every region. Our community has grown, adding not only experienced developers but also becoming the first stop for those just breaking into the industry. We also learned that the move to remote work has been significant and lasting among web developers. </p>
55-
<p><a href="https://www.netlify.com/">Netlify</a> sits at the center of the Jamstack community, and we conduct our annual survey so we can understand our community of developers. This helps us tailor our products and services to our community. In sharing our survey results, we also want to help developers better understand themselves and one another. Working as a developer often means working in a vacuum, without a sense of what’s happening in the broader community. Our survey data can help provide a sense of best practices as well as an idea of what else is happening in the community. </p>
59+
<p>
60+
<a href="https://www.netlify.com/">Netlify</a> sits at the center of the Jamstack community, and we conduct our annual survey so we can understand our community of developers. This helps us tailor our products and services to our community. In sharing our survey results, we also want to help developers better understand themselves and one another. Working as a developer often means working in a vacuum, without a sense of what’s happening in the broader community. Our survey data can help provide a sense of best practices as well as an idea of what else is happening in the community. </p>
5661
<p>This year, for example, you told us that content management systems Sanity and Strapi are having a moment. You shared that security is a rising priority for all devs. You also offered a lot of insight about new developers, from which specific devs have moved to remote work to the (obvious and less obvious) reasons why.</p>
5762
<p>To get a better picture of the full developer landscape, we surveyed people who build websites in general, regardless of whether they build Jamstack sites, though our analysis focuses on active Jamstack developers.</p>
5863
<p>We ran this year’s survey from June 23 to August 10 and received over 7,000 responses, more than twice as many as last year’s survey. You can review our <a href="/survey/2021/community-survey-2021-methodology.pdf">methodology document</a> for a detailed breakdown of the demographics and accuracy of the survey sample and results.</p>
5964
<p>To the developers who took the time to respond to our survey to help us learn more about the Jamstack and our community: Thank you. We hope you walk away from this report learning something about yourselves and the expanding Jamstack community.</p>
6065

6166
<nav class="overflow-hidden my-8">
6267
<ol class="list-decimal float-left p-4 bg-gray-900 rounded-default">
63-
<li class="py-1 px-2 ml-4"><a href="#demographics">Demographics</a></li>
64-
<li class="py-1 px-2 ml-4"><a href="#adoption">Jamstack adoption</a></li>
65-
<li class="py-1 px-2 ml-4"><a href="#workflows">Workflows</a></li>
66-
<li class="py-1 px-2 ml-4"><a href="#choices">Technology choices</a></li>
67-
<li class="py-1 px-2 ml-4"><a href="#conclusion">Conclusion</a></li>
68+
<li class="py-1 px-2 ml-4">
69+
<a href="#demographics">Demographics</a>
70+
</li>
71+
<li class="py-1 px-2 ml-4">
72+
<a href="#adoption">Jamstack adoption</a>
73+
</li>
74+
<li class="py-1 px-2 ml-4">
75+
<a href="#workflows">Workflows</a>
76+
</li>
77+
<li class="py-1 px-2 ml-4">
78+
<a href="#choices">Technology choices</a>
79+
</li>
80+
<li class="py-1 px-2 ml-4">
81+
<a href="#conclusion">Conclusion</a>
82+
</li>
6883
</ol>
6984
</nav>
7085

@@ -95,5 +110,4 @@ gradientColors:
95110
<section id="conclusion" class="border-b pb-16 mb-16">
96111
<h2>Jamstack has become the standard architecture for the web.</h2>
97112
{% include "survey/conclusion.njk" %}
98-
</section>
99-
113+
</section>

0 commit comments

Comments
 (0)