From a6adbb5d246b8a64be19657d941192f0d94a87db Mon Sep 17 00:00:00 2001 From: Jeremy Meiss Date: Wed, 28 Feb 2024 10:34:43 -0600 Subject: [PATCH 01/10] add `get-a-drink` redirect --- netlify.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/netlify.toml b/netlify.toml index 3f29f27..99aa054 100644 --- a/netlify.toml +++ b/netlify.toml @@ -27,4 +27,8 @@ [[redirects]] from = "/chat-with-team" to = "https://calendly.com/devex-institute/60min-chat-with-the-team" + status = 302 + + from = "/get-a-drink" + to = "https://calendly.com/devex-institute/" status = 302 \ No newline at end of file From 9a9ccab010232e270f11ce297f644f7ff96a2acd Mon Sep 17 00:00:00 2001 From: Jeremy Meiss Date: Wed, 28 Feb 2024 10:37:33 -0600 Subject: [PATCH 02/10] use correct syntax --- netlify.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/netlify.toml b/netlify.toml index 99aa054..24d7842 100644 --- a/netlify.toml +++ b/netlify.toml @@ -29,6 +29,7 @@ to = "https://calendly.com/devex-institute/60min-chat-with-the-team" status = 302 +[[redirects]] from = "/get-a-drink" to = "https://calendly.com/devex-institute/" status = 302 \ No newline at end of file From 7d610a6948cf401195de305bd071a3f91c908acb Mon Sep 17 00:00:00 2001 From: Jeremy Meiss Date: Thu, 29 Feb 2024 12:49:30 -0600 Subject: [PATCH 03/10] update branch deploy build command --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 24d7842..5b4b535 100644 --- a/netlify.toml +++ b/netlify.toml @@ -19,7 +19,7 @@ command = "hugo --gc --buildFuture -b $DEPLOY_PRIME_URL" [context.branch-deploy] - command = "hugo --gc -b $DEPLOY_PRIME_URL" + command = "hugo --cleanDestinationDir --gc --buildFuture -b $DEPLOY_PRIME_URL" [context.next.environment] HUGO_ENABLEGITINFO = "true" From 5dcb12d4287f018f72d1ab4848c83c3dbf9f3b6f Mon Sep 17 00:00:00 2001 From: Jeremy Meiss Date: Mon, 4 Mar 2024 10:53:03 -0600 Subject: [PATCH 04/10] add landingPage layout + meet up page (#3) * layout for landing pages * meetup with team page * adjust content * setup description * fix wording on page --- content/meetup-with-team.md | 28 ++++++++++++++++++++++++++++ layouts/page/landingPage.html | 20 ++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 content/meetup-with-team.md create mode 100644 layouts/page/landingPage.html diff --git a/content/meetup-with-team.md b/content/meetup-with-team.md new file mode 100644 index 0000000..d3b962a --- /dev/null +++ b/content/meetup-with-team.md @@ -0,0 +1,28 @@ ++++ +title = 'Meet With Team' +date = 2024-03-03T13:05:17-06:00 +draft = true +type = "page" +layout = "landingPage" +description = "" ++++ + +We would love to meet up with you, have a drink (coffee, tea, boba, wine, beer, etc.), and talk about your experiences using different tools and ways that we can be a resource for you. We have the following activities and events coming up, and would also be happy to meet up somewhere close to where you are. + +## Events + +- March 14-15, 2024: **Monki Gras 2024**, London, England +- March 14-17, 2024: **SCaLE 21x / DevOpsDays LA**, Los Angeles, CA +- March 19-22, 2024: **KubeCon Europe 2024**, Paris, France + - Happy Hour (LINK to event page) + - Meet up anytime (LINK to Calendly) +- April 9-12, 2024: **DevNexus 2024**, Atlanta, GA +- April 15-19, 2024: **Open Source Summit North America 2024**, Seattle, WA +- April 22-24, 2024: **Infobip Shift Miami**, Miami, FL +- April 29-30, 2024: **DevOps Denver Meetup**, Denver, CO + +## Chat with us locally + +- London, England (LINK to Calendly) +- Kansas City Metro Area (LINK to Calendly) + diff --git a/layouts/page/landingPage.html b/layouts/page/landingPage.html new file mode 100644 index 0000000..36a4f44 --- /dev/null +++ b/layouts/page/landingPage.html @@ -0,0 +1,20 @@ +{{ define "main" }} + +{{ partial "navigation.html" . }} + +
+
+
+
+

{{ .Title }}

+
+
+
+ {{ .Content }} +
+
+
+
+
+ +{{ end }} \ No newline at end of file From d001390c1996ec2409acd51cde967b4cb61029f5 Mon Sep 17 00:00:00 2001 From: Jeremy Meiss Date: Mon, 4 Mar 2024 11:20:18 -0600 Subject: [PATCH 05/10] update redirect --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 5b4b535..ca56556 100644 --- a/netlify.toml +++ b/netlify.toml @@ -31,5 +31,5 @@ [[redirects]] from = "/get-a-drink" - to = "https://calendly.com/devex-institute/" + to = "/meet-the-team" status = 302 \ No newline at end of file From 27e6ca51b0e2b8505cc2b6ff10335d301015bf9f Mon Sep 17 00:00:00 2001 From: Jeremy Meiss Date: Mon, 4 Mar 2024 11:20:55 -0600 Subject: [PATCH 06/10] change file name for meeting the team --- content/{meetup-with-team.md => meet-the-team.md} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename content/{meetup-with-team.md => meet-the-team.md} (97%) diff --git a/content/meetup-with-team.md b/content/meet-the-team.md similarity index 97% rename from content/meetup-with-team.md rename to content/meet-the-team.md index d3b962a..134c4fc 100644 --- a/content/meetup-with-team.md +++ b/content/meet-the-team.md @@ -1,5 +1,5 @@ +++ -title = 'Meet With Team' +title = 'Meet the Team' date = 2024-03-03T13:05:17-06:00 draft = true type = "page" From c5314017331cf9176305c0525617e77c98639e82 Mon Sep 17 00:00:00 2001 From: Jeremy Meiss Date: Mon, 4 Mar 2024 21:24:39 -0600 Subject: [PATCH 07/10] redo meet page / template (#4) * update data files and templates * meet page styling and data file --- content/meet-the-team.md | 2 +- data/en/meet.yml | 158 ++++++++++++++++++++++++++++++++ layouts/page/landingPage.html | 10 +- layouts/page/meet-the-team.html | 77 ++++++++++++++++ 4 files changed, 244 insertions(+), 3 deletions(-) create mode 100644 data/en/meet.yml create mode 100644 layouts/page/meet-the-team.html diff --git a/content/meet-the-team.md b/content/meet-the-team.md index 134c4fc..b74c93d 100644 --- a/content/meet-the-team.md +++ b/content/meet-the-team.md @@ -3,7 +3,7 @@ title = 'Meet the Team' date = 2024-03-03T13:05:17-06:00 draft = true type = "page" -layout = "landingPage" +layout = "meet-the-team" description = "" +++ diff --git a/data/en/meet.yml b/data/en/meet.yml new file mode 100644 index 0000000..a592668 --- /dev/null +++ b/data/en/meet.yml @@ -0,0 +1,158 @@ +############################# Meet the Team ################################### +### in meet-the-team.html +###

{{ (time .startdate).Format "January 2" }}-{{ (time .enddate).Format "2, 2006" }}: {{ .title }}, {{ .location }}

+### + +meet: + enable : true + title : 'Meet the Team' +# about_item : + content : "We would love to meet up with you, have a drink (coffee, tea, boba, wine, beer, etc.), and talk about your experiences using different tools and ways that we can be a resource for you. We have the following activities and events coming up, and would also be happy to meet up somewhere close to where you are." + + title_events : Upcoming Events + title_chats : Chat with us locally + event_item : +# # event item loop +# - title : +# icon : # themify icon pack : https://themify.me/themify-icons +# startdate : "YYYY-MM-DD" +# enddate : "YYYY-MM-DD" +# location : +# happy_hour : true +# happy_hour_link : +# happy_hour_text : +# calendly : true +# calendly_link : +# calendly_text : + + # event item loop + - title : Monki Gras 2024 + icon : # themify icon pack : https://themify.me/themify-icons + conf_dates : "March 14-15, 2024" + startdate : 03-14-2024 + enddate : 03-15-2024 + location : London, England + happy_hour : false + happy_hour_link : + happy_hour_text : + calendly : true + calendly_link : + calendly_text : Let's meet up + + # event item loop + - title : SCaLE 21x / DevOpsDays LA + icon : # themify icon pack : https://themify.me/themify-icons + conf_dates : "March 14-17, 2024" + startdate : 03-14-2024 + enddate : 03-17-2024 + location : Los Angeles, CA + happy_hour : false + happy_hour_link : + happy_hour_text : + calendly : true + calendly_link : + calendly_text : Let's meet up + + # event item loop + - title : KubeCon Europe 2024 + icon : # themify icon pack : https://themify.me/themify-icons + conf_dates : "March 19-22, 2024" + startdate : 03-19-2024 + enddate : 03-22-2024 + location : Paris, France + happy_hour : true + happy_hour_link : + happy_hour_text : Happy Hour + calendly : true + calendly_link : + calendly_text : Let's meet up + + # event item loop + - title : DevNexus 2024 + icon : # themify icon pack : https://themify.me/themify-icons + conf_dates : "April 9-12, 2024" + startdate : 04-09-2024 + enddate : 04-12-2024 + location : Atlanta, GA + happy_hour : false + happy_hour_link : + happy_hour_text : + calendly : true + calendly_link : + calendly_text : Let's meet up + + # event item loop + - title : Open Source Summit North America 2024 + icon : # themify icon pack : https://themify.me/themify-icons + conf_dates : "April 15-19, 2024" + startdate : 04-15-2024 + enddate : 04-19-2024 + location : Seattle, WA + happy_hour : false + happy_hour_link : + happy_hour_text : + calendly : true + calendly_link : + calendly_text : Let's meet up + + # event item loop + - title : Infobip Shift Miami + icon : # themify icon pack : https://themify.me/themify-icons + conf_dates : "April 22-24, 2024" + startdate : 04-22-2024 + enddate : 04-24-2024 + location : Miami, FL + happy_hour : false + happy_hour_link : + happy_hour_text : + calendly : true + calendly_link : + calendly_text : Let's meet up + + # event item loop + - title : DevOps Denver Meetup + icon : # themify icon pack : https://themify.me/themify-icons + conf_dates : "April 29-30, 2024" + startdate : 04-29-2024 + enddate : 04-30-2024 + location : Denver, CO + happy_hour : false + happy_hour_link : + happy_hour_text : + calendly : true + calendly_link : + calendly_text : Let's meet up + + local_chat_item : +# # local chat item loop +# - title : +# icon : # themify icon pack : https://themify.me/themify-icons +# location : +# happy_hour : true +# happy_hour_link : +# happy_hour_text : +# calendly : true +# calendly_link : +# calendly_text : + + # local chat item loop + - title : London Area + icon : # themify icon pack : https://themify.me/themify-icons + location : + happy_hour : false + happy_hour_link : + happy_hour_text : + calendly : true + calendly_link : + calendly_text : Meet up anytime + + # local chat item loop + - title : Kansas City Metro Area + icon : # themify icon pack : https://themify.me/themify-icons + location : + happy_hour : false + happy_hour_link : + happy_hour_text : + calendly : true + calendly_link : + calendly_text : Meet up anytime diff --git a/layouts/page/landingPage.html b/layouts/page/landingPage.html index 36a4f44..e390ae1 100644 --- a/layouts/page/landingPage.html +++ b/layouts/page/landingPage.html @@ -2,11 +2,16 @@ {{ partial "navigation.html" . }} +{{ $filename := .File.ContentBaseName }} +{{ $data := index site.Data site.Language.Lang $filename }} +{{ $name := $data $filename.name }} +{{ if $name.enable }} +asdf
-

{{ .Title }}

+

asdf{{ .title_events }}

@@ -17,4 +22,5 @@

{{ .Title }}

-{{ end }} \ No newline at end of file + {{ end }} + {{ end }} \ No newline at end of file diff --git a/layouts/page/meet-the-team.html b/layouts/page/meet-the-team.html new file mode 100644 index 0000000..2fb3af3 --- /dev/null +++ b/layouts/page/meet-the-team.html @@ -0,0 +1,77 @@ +{{ define "main" }} +{{ $data := index site.Data site.Language.Lang }} + +{{ partial "navigation.html" . }} + + {{ if $data.meet.meet.enable}} + {{ with $data.meet.meet }} +
+
+
+
+

{{ .title }}

+
+
+
+

{{ .content }}

+
+
+
+ +
+ +
+
+

{{ .title_events }}

+
+
+ {{ $events := .event_item }} + {{ range $events }} +
+
+
+

{{ .conf_dates }}: {{ .title }}, {{ .location }}

+

+ {{ if .happy_hour }} + {{ .happy_hour_text }} + {{ end }} + {{ if .calendly }} + {{ .calendly_text }} + {{ end }} +

+
+
+
+ {{ end }} + +
+ +
+
+

{{ .title_chats }}

+
+
+ {{ $local := .local_chat_item }} + {{ range $local }} +
+
+
+

{{ .title }}

+

+ {{ if .happy_hour }} + {{ .happy_hour_text }} + {{ end }} + {{ if .calendly }} + {{ .calendly_text }} + {{ end }} +

+
+
+
+ {{ end }} + +
+
+ {{ end }} + {{ end }} +{{ end }} \ No newline at end of file From c79e142eb740b8fcf6f42766edbf3091a56f6cd0 Mon Sep 17 00:00:00 2001 From: Jeremy Meiss Date: Tue, 5 Mar 2024 07:28:29 -0600 Subject: [PATCH 08/10] fix styling of text, events, and spacing between hr, h2, div row --- layouts/page/meet-the-team.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/layouts/page/meet-the-team.html b/layouts/page/meet-the-team.html index 2fb3af3..f6bcb4d 100644 --- a/layouts/page/meet-the-team.html +++ b/layouts/page/meet-the-team.html @@ -12,25 +12,25 @@

{{ .title }}

-
+

{{ .content }}

-
+
-

{{ .title_events }}

+

{{ .title_events }}

{{ $events := .event_item }} {{ range $events }} -
+
-

{{ .conf_dates }}: {{ .title }}, {{ .location }}

+

{{ .conf_dates }}: {{ .title }}, {{ .location }}

{{ if .happy_hour }} {{ .happy_hour_text }} @@ -44,19 +44,19 @@

{{ .title_events }}

{{ end }} -
+
-

{{ .title_chats }}

+

{{ .title_chats }}

{{ $local := .local_chat_item }} {{ range $local }} -
+
-

{{ .title }}

+

{{ .title }}

{{ if .happy_hour }} {{ .happy_hour_text }} From a4ed771d3d2f02f01f5442da9cbdd79af3536afb Mon Sep 17 00:00:00 2001 From: Jeremy Meiss Date: Tue, 5 Mar 2024 08:12:39 -0600 Subject: [PATCH 09/10] add calendly link generation --- data/en/meet.yml | 30 +++++++++++++++++++----------- layouts/page/meet-the-team.html | 8 ++++---- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/data/en/meet.yml b/data/en/meet.yml index a592668..34b7e87 100644 --- a/data/en/meet.yml +++ b/data/en/meet.yml @@ -14,19 +14,21 @@ meet: event_item : # # event item loop # - title : +# short_name : # icon : # themify icon pack : https://themify.me/themify-icons # startdate : "YYYY-MM-DD" # enddate : "YYYY-MM-DD" # location : -# happy_hour : true +# happy_hour : false # happy_hour_link : # happy_hour_text : -# calendly : true -# calendly_link : -# calendly_text : +# calendly : false +# calendly_link : https://calendly.com/devex-institute/conference-meet-up?&location=1 +# calendly_text : Let's meet up # event item loop - title : Monki Gras 2024 + short_name : MonkiGras icon : # themify icon pack : https://themify.me/themify-icons conf_dates : "March 14-15, 2024" startdate : 03-14-2024 @@ -36,11 +38,12 @@ meet: happy_hour_link : happy_hour_text : calendly : true - calendly_link : + calendly_link : https://calendly.com/devex-institute/conference-meet-up?&location=1 calendly_text : Let's meet up # event item loop - title : SCaLE 21x / DevOpsDays LA + short_name : SCaLE21x icon : # themify icon pack : https://themify.me/themify-icons conf_dates : "March 14-17, 2024" startdate : 03-14-2024 @@ -50,11 +53,12 @@ meet: happy_hour_link : happy_hour_text : calendly : true - calendly_link : + calendly_link : https://calendly.com/devex-institute/conference-meet-up?&location=1 calendly_text : Let's meet up # event item loop - title : KubeCon Europe 2024 + short_name : KubeCon-EU icon : # themify icon pack : https://themify.me/themify-icons conf_dates : "March 19-22, 2024" startdate : 03-19-2024 @@ -64,11 +68,12 @@ meet: happy_hour_link : happy_hour_text : Happy Hour calendly : true - calendly_link : + calendly_link : https://calendly.com/devex-institute/conference-meet-up?&location=1 calendly_text : Let's meet up # event item loop - title : DevNexus 2024 + short_name : DevNexus icon : # themify icon pack : https://themify.me/themify-icons conf_dates : "April 9-12, 2024" startdate : 04-09-2024 @@ -78,11 +83,12 @@ meet: happy_hour_link : happy_hour_text : calendly : true - calendly_link : + calendly_link : https://calendly.com/devex-institute/conference-meet-up?&location=1 calendly_text : Let's meet up # event item loop - title : Open Source Summit North America 2024 + short_name : OSSummit-NA icon : # themify icon pack : https://themify.me/themify-icons conf_dates : "April 15-19, 2024" startdate : 04-15-2024 @@ -92,11 +98,12 @@ meet: happy_hour_link : happy_hour_text : calendly : true - calendly_link : + calendly_link : https://calendly.com/devex-institute/conference-meet-up?&location=1 calendly_text : Let's meet up # event item loop - title : Infobip Shift Miami + short_name : InfobipShift icon : # themify icon pack : https://themify.me/themify-icons conf_dates : "April 22-24, 2024" startdate : 04-22-2024 @@ -106,11 +113,12 @@ meet: happy_hour_link : happy_hour_text : calendly : true - calendly_link : + calendly_link : https://calendly.com/devex-institute/conference-meet-up?&location=1 calendly_text : Let's meet up # event item loop - title : DevOps Denver Meetup + short_name : DenverDevOps icon : # themify icon pack : https://themify.me/themify-icons conf_dates : "April 29-30, 2024" startdate : 04-29-2024 @@ -120,7 +128,7 @@ meet: happy_hour_link : happy_hour_text : calendly : true - calendly_link : + calendly_link : https://calendly.com/devex-institute/conference-meet-up?&location=1 calendly_text : Let's meet up local_chat_item : diff --git a/layouts/page/meet-the-team.html b/layouts/page/meet-the-team.html index f6bcb4d..e0e825a 100644 --- a/layouts/page/meet-the-team.html +++ b/layouts/page/meet-the-team.html @@ -33,10 +33,10 @@

{{ .title_events }}

{{ .conf_dates }}: {{ .title }}, {{ .location }}

{{ if .happy_hour }} - {{ .happy_hour_text }} + {{ .happy_hour_text }} {{ end }} {{ if .calendly }} - {{ .calendly_text }} + {{ .calendly_text }} {{ end }}

@@ -59,10 +59,10 @@

{{ .title_chats }}

{{ .title }}

{{ if .happy_hour }} - {{ .happy_hour_text }} + {{ .happy_hour_text }} {{ end }} {{ if .calendly }} - {{ .calendly_text }} + {{ .calendly_text }} {{ end }}

From 5fe857c31663cc0c890bd5c1e28825f2f98ca0f3 Mon Sep 17 00:00:00 2001 From: Jeremy Meiss Date: Tue, 5 Mar 2024 10:25:52 -0600 Subject: [PATCH 10/10] add links for local meetups --- data/en/meet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/en/meet.yml b/data/en/meet.yml index 34b7e87..37c36f2 100644 --- a/data/en/meet.yml +++ b/data/en/meet.yml @@ -151,7 +151,7 @@ meet: happy_hour_link : happy_hour_text : calendly : true - calendly_link : + calendly_link : https://calendly.com/devex-institute/meet-up-in-london calendly_text : Meet up anytime # local chat item loop @@ -162,5 +162,5 @@ meet: happy_hour_link : happy_hour_text : calendly : true - calendly_link : + calendly_link : https://calendly.com/devex-institute/meet-up-in-kansascity calendly_text : Meet up anytime