Remove extra lines from speaker file

Fixes #63

Signed-off-by: Matt Stratton <[email protected]>

Author: mattstratton

speaker/speaker.go

@@ -36,6 +36,19 @@ var qsCreateSpeaker = []*survey.Question{
 		Name:   "bio",
 		Prompt: &survey.Editor{Message: "Enter the speaker's bio [Enter to launch editor]"},
 	},
+	{
+		Name: "website",
+		Prompt: &survey.Input{
+			Message: "What is the speaker's website? [optional]",
+			Help:    "This should be the full URL to the speaker's website. Example: https://www.mattstratton.com",
+		},
+		Validate: func(val interface{}) error {
+			if str, _ := val.(string); (str != "") && (helpers.ValidateField(str, "facebook") == false) {
+				return errors.New("Please enter a valid URL.")
+			}
+			return nil
+		},
+	},
 	{
 		Name: "twitter",
 		Prompt: &survey.Input{

speaker/templates.go

@@ -3,13 +3,27 @@ package speaker
 const speakerTmpl = `+++
 Title = "{{ .Title }}"
 type = "speaker"
-{{ with .Website }}website = "{{ . }}"{{ end }}
-{{ with .Twitter }}twitter = "{{ . }}"{{ end }}
-{{ with .Facebook }}facebook = "{{ . }}"{{ end }}
-{{ with .Linkedin }}linkedin = "{{ . }}"{{ end }}
-{{ with .Github }}github = "{{ . }}"{{ end }}
-{{ with .Gitlab }}gitlab = "{{ . }}"{{ end }}
-{{ with .ImagePath }}image = "{{ . }}"{{ end }}
+{{- with .Website }}
+website = "{{ . }}"
+{{- end }}
+{{- with .Twitter }}
+twitter = "{{ . }}"
+{{- end }}
+{{- with .Facebook }}
+facebook = "{{ . }}"
+{{- end }}
+{{- with .Linkedin }}
+linkedin = "{{ . }}"
+{{- end }}
+{{- with .Github }}
+github = "{{ . }}"
+{{- end }}
+{{- with .Gitlab }}
+gitlab = "{{ . }}"
+{{- end }}
+{{- with .ImagePath -}}
+image = "{{ . }}"
+{{- end }}
 +++
 {{ with .Bio }}{{.}}{{ end }}
 `

testdata/content/events/2017-ponyville/speakers/matt-stratton.md

@@ -6,7 +6,6 @@ twitter = "mattstratton"
 facebook = "https://www.facebook.com/matt.stratton"
 linkedin = "https://www.linkedin.com/in/mattstratton/"
 github = "mattstratton"
-gitlab = "mattstratton"
-image = "matt-stratton.jpg"
+gitlab = "mattstratton"image = "matt-stratton.jpg"
 +++
 

testdata/content/events/2018-canterlot/speakers/fancy-cat.md

@@ -0,0 +1,7 @@
++++
+Title = "Fancy Cat"
+type = "speaker"
+website = "http://www.mattstratton.com"
+twitter = "fancycat\n"github = "fancycat\n"
++++
+

testdata/content/events/2018-canterlot/speakers/henry-stratton.md

@@ -0,0 +1,9 @@
++++
+Title = "Henry Stratton"
+type = "speaker"
+twitter = "henryboy"
+
+github = "henry"
++++
+Henry loves guite
+

testdata/content/events/2018-canterlot/speakers/joey-stratton.md

@@ -0,0 +1,8 @@
++++
+Title = "Joey Stratton"
+type = "speaker"
+twitter = "joeyjoeu"
+github = "joey"
++++
+joaoiasdfj
+