Skip to content

Commit 4627eff

Browse files
vagelispvagelisp
authored
Merge branch 'jamstack:main' into main
2 parents bdc6ec4 + 4f2710a commit 4627eff

File tree

12 files changed

+215
-8
lines changed

12 files changed

+215
-8
lines changed

‎netlify.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
to = "/glossary/contribute/index.html"
5656
status = 404
5757

58+
[[redirects]]
59+
from = "/survey"
60+
to = "https://www.surveymonkey.com/r/jamstack-survey"
61+
status = 302
62+
5863

5964
[[plugins]]
6065
package = "./plugins/keep-dot-cache-folder"

‎src/css/tailwind.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* import via postcss */
22
@import "../site/css/ticker.css";
3+
@import "../site/css/hubspot-form.css";
34

45
/* purgecss start ignore */
56
@tailwind base;

‎src/site/_data/announcementbar.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"text": "Learn more about Jamstack at this year's conference, October 6-7. ",
3-
"cta": "Register for free",
4-
"url": "https://jamstackconf.com/"
2+
"text": "Help the community by participating in the Jamstack Community Survey 2021.",
3+
"cta": "Take the 10-minute survey now.",
4+
"url": "https://www.jamstack.org/survey"
55
}

‎src/site/_data/community.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
feed: https://api.meetup.com/Jamstack-Minsk/events
8181

8282
- name: Chicago
83-
link: https://www.meetup.com/Jamstack-Chicago/
84-
feed: https://api.meetup.com/Jamstack-Chicago/events
83+
link: https://www.meetup.com/b4974f5c-3d26-4bfb-8e24-6b670605fa9e/
84+
feed: https://api.meetup.com/b4974f5c-3d26-4bfb-8e24-6b670605fa9e/events
8585

8686
- name: Lagos
8787
link: https://www.meetup.com/Jamstack-Lagos/

‎src/site/_data/examples/essential-clinic.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
title: Essential Clinic
3+
description: Canadian Online Men's Health Clinic
4+
link: 'https://www.essentialclinic.ca'
5+
thumbnailurl: /img/examples/essential-clinic.jpg
6+
tools:
7+
- Scully
8+
- Angular
9+
- AWS Amplify
10+
- GitLab
11+
- Material Design
12+
- Markdown
13+

‎src/site/_includes/components/zinger-cta.njk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
{% macro cta(text, url, theme, icon ) %}
3-
<a href="{{ url }}" target="_BLANK" rel="noopener" class="block mb-4 md:inline-block {{ theme }} bg-gradient-to-r border-none py-6 rounded-xl rounded-tr-none text-center">
4-
<svg role="img" aria-label="{{ text }}" aria-hidden="true" focusable="false" width="40" height="40" class="mx-auto"><use xlink:href="{{ icon }}"></use></svg>
5-
<p class="font-bold text-lg mt-2">
3+
<a href="{{ url }}" target="_BLANK" rel="noopener" class="block mb-4 md:inline-block {{ theme }} bg-gradient-to-r border-none p-6 rounded-xl rounded-tr-none text-center">
4+
{% if icon %}<svg role="img" aria-label="{{ text }}" aria-hidden="true" focusable="false" width="40" height="40" class="mx-auto"><use xlink:href="{{ icon }}"></use></svg>{% endif %}
5+
<p class="font-bold text-lg {% if icon %}mt-2{% endif %}">
66
{{ text }}
77
</p>
88
</a>

‎src/site/css/hubspot-form.css‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
.hs-form .hs-input {
2+
@apply mb-3;
3+
@apply p-2;
4+
@apply bg-gray-400;
5+
@apply w-full;
6+
7+
color: white;
8+
}
9+
10+
.hs-form .hs-form-required {
11+
@apply hidden;
12+
}
13+
14+
.hs-form .hs-form-field label {
15+
@apply block;
16+
@apply mb-1;
17+
@apply font-bold;
18+
}
19+
20+
.hs-form .hs-form-field label.hs-error-msg {
21+
@apply text-red-300;
22+
@apply text-sm;
23+
@apply font-normal;
24+
}
25+
26+
.hs-form .hs-button {
27+
@apply inline-block;
28+
@apply bg-pink-900;
29+
@apply text-white;
30+
@apply rounded-full;
31+
@apply font-semibold;
32+
@apply px-4;
33+
@apply py-2;
34+
@apply border-none;
35+
@apply my-4;
36+
@apply card-shadow;
37+
}
38+
39+
.hs-form .hs-button:hover,
40+
.hs-form .hs-button:focus {
41+
@apply bg-orange-500;
42+
box-shadow: 0px 3px 15px rgba(241, 86, 77, 0.6);
43+
}
44+
45+
.survey-form .hs-form {
46+
@apply grid;
47+
@apply grid-cols-1;
48+
grid-gap: 1em;
49+
}
50+
51+
@media (min-width: 40em) { /* 640px */
52+
.survey-form .hs-form {
53+
grid-template-columns: repeat(auto-fit, minmax(17em, 1fr));
54+
}
55+
}
56+
57+
.survey-form .hs_email,
58+
.survey-form .hs_jamstack_survey_promo,
59+
.survey-form .hs_address {
60+
@apply col-span-full;
61+
}

‎src/site/generators/teedoc.md‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
---
2+
title: teedoc
3+
repo: teedoc/teedoc
4+
homepage: https://teedoc.github.io
5+
language:
6+
- Python
7+
license:
8+
- MIT
9+
templates:
10+
- Markdown
11+
- Jupyter notebook
12+
description: A document site generator, Convert documents in Markdown or Jupyter Notebook format into HTML static web pages
13+
---
14+
15+
16+
17+
Official website: [teedoc.neucrack.com](https://teedoc.neucrack.com/) or [teedoc.github.io](https://teedoc.github.io/)
18+
Source code: [https://github.com/teedoc/teedoc](https://github.com/teedoc/teedoc)
19+
20+
Convert documents in `Markdown` or `Jupyter Notebook` format into `HTML` static web pages
21+
22+
`teedoc` can be used in the following scenarios:
23+
* Build a document website, and it’s best to support multiple documents and custom pages
24+
* Build a `WiKi` website
25+
* Build a personal or corporate knowledge base
26+
* Build a personal or corporate website
27+
* Blog
28+
29+
30+
## Features
31+
32+
- [x] Simple to use, cross-platform, only dependent on `Python3`
33+
- [x] No database required, all static pages of the website
34+
- [x] The deployment is simple, the generated website is a fully static page, which can be directly copied to the server or uploaded to a third party organization for deployment
35+
- [x] Easy to write, using Markdown syntax
36+
- [x] Jupyter notebook support
37+
- [x] HTML support, you can directly use HTML to write pages, with great freedom
38+
- [x] Multi-document support
39+
- [x] Plug-in support
40+
- [x] Multi-theme support (implemented by plug-in)
41+
- [x] Control the style accurate to the page through css (implemented by customizing the id and class of each page)
42+
- [x] Multi-level directory support
43+
- [x] Multi-language support (manual translation) (Internationalization/i18n)
44+
- [x] Multi-version support (implementation method is the same as multi-language)
45+
- [x] Search support
46+
- [x] SEO friendly
47+
- [x] Real-time preview of changes
48+
- [x] Multi-threaded construction, faster construction speed
49+
- [x] Blog support
50+
51+
## Demo
52+
53+
[Official website](https://teedoc.github.io/) is generated using `teedoc`, what you see now is what the generated website looks like.
54+
55+
In addition, there are other websites that use `teedoc`, please see [here](https://teedoc.github.io/get_started/en/usage/sites.html) for details
56+

‎src/site/img/examples/essential-clinic.jpg‎

143 KB
Loading

‎src/site/survey-closed.njk‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
title: Jamstack Sticker Giveaway
3+
description: Share the survey with your network and we’ll share some sticker love!
4+
layout: layouts/base.njk
5+
excludeFromSitemap: true
6+
---
7+
8+
{% import "components/zinger-cta.njk" as zinger %}
9+
10+
<section class="my-20">
11+
<h1>Thanks for filling out the Jamstack community survey</h1>
12+
{{ zinger.cta(
13+
"Share the survey",
14+
"https://twitter.com/intent/tweet?text=%F0%9F%8E%89I%20completed%20the%20Jamstack%20Community%20Survey.%20Share%20your%20feedback%20and%20unlock%20a%20special%20edition%20Jamstack%20sticker!&url=https%3A%2F%2Fwww.surveymonkey.com%2Fr%2Fjamstack-share-survey",
15+
"bg-gradient-card-sunrise card-shadow hover:card-shadow-sunrise mb-9"
16+
)
17+
}}
18+
<h2>Jamstack Sticker Giveaway</h2>
19+
<p class="font-semibold">Oh no! We’ve maxed out on our sticker giveaway.</p>
20+
<p>Thank you for taking the time to complete the survey. Please continue to share with your network, communities, and teams.</p>
21+
<p>Ready to connect with others in the Jamstack Community? Join the <a href="https://join.slack.com/t/jamstack/shared_invite/zt-qkent5tv-0D0Nu3M1rJEHhVHE4zUMBw">Jamstack Slack</a>!</p>
22+
</section>

0 commit comments

Comments
 (0)