Finish patreon integration

webcontroller/patreon.go

@@ -0,0 +1,89 @@
+package webcontroller
+
+import (
+	"fmt"
+	"html/template"
+	"net/http"
+)
+
+func (wc *WebController) patreonLinkForm(td *TemplateData, r *http.Request) (f Form) {
+	f.Name = "link_patreon_subscription"
+	f.Title = "Link Patreon pledge to pixeldrain account"
+	f.SubmitLabel = "Submit"
+
+	if r.FormValue("key") == "" {
+		f.Submitted = true
+		f.SubmitMessages = []template.HTML{"Patron ID not found"}
+		return f
+	}
+
+	patron, err := td.PixelAPI.PatreonByID(r.FormValue("key"))
+	if err != nil && err.Error() == "not_found" {
+		f.Submitted = true
+		f.SubmitMessages = []template.HTML{"Patron ID not found"}
+		return f
+	} else if err != nil {
+		f.Submitted = true
+		formAPIError(err, &f)
+		return f
+	}
+
+	f.Fields = []Field{{
+		Name:         "1",
+		Label:        "",
+		DefaultValue: "",
+		Description:  "<h3>Please confirm that the following information is correct:</h3>",
+		Type:         FieldTypeDescription,
+	}, {
+		Name:         "2",
+		Label:        "Pixeldrain username",
+		DefaultValue: td.User.Username,
+		Type:         FieldTypeDescription,
+	}, {
+		Name:         "3",
+		Label:        "Pixeldrain e-mail",
+		DefaultValue: td.User.Email,
+		Type:         FieldTypeDescription,
+	}, {
+		Name:         "4",
+		Label:        "Patreon username",
+		DefaultValue: patron.FullName,
+		Type:         FieldTypeDescription,
+	}, {
+		Name:         "5",
+		Label:        "Patreon e-mail",
+		DefaultValue: patron.UserEmail,
+		Type:         FieldTypeDescription,
+	}, {
+		Name:         "6",
+		Label:        "Subscription name",
+		DefaultValue: patron.Subscription.Name,
+		Type:         FieldTypeDescription,
+	}, {
+		Name:         "7",
+		Label:        "Monthly contribution",
+		DefaultValue: fmt.Sprintf("€ %.2f / month", float64(patron.PledgeAmountCents)/100.0),
+		Type:         FieldTypeDescription,
+	}, {
+		Name: "8",
+		Description: "When clicking submit your patreon pledge will be linked " +
+			"to your pixeldrain account and you will be able to use " +
+			"pixeldrain's premium features. If you would like to update or " +
+			"cancel your subscription later on you can do so through " +
+			"patreon's dashboard",
+		Type: FieldTypeDescription,
+	}}
+
+	if f.ReadInput(r) {
+		if err := td.PixelAPI.PatreonLink(r.FormValue("key")); err != nil {
+			formAPIError(err, &f)
+		} else {
+			// Request was a success
+			f.SubmitSuccess = true
+			f.SubmitMessages = []template.HTML{template.HTML(
+				"Success! Your account has been upgraded to the " + patron.Subscription.Name + " plan.",
+			)}
+		}
+	}
+	return f
+}

webcontroller/user_settings.go

@@ -217,83 +217,3 @@ func (wc *WebController) usernameForm(td *TemplateData, r *http.Request) (f Form
 	}
 	return f
 }
-
-func (wc *WebController) patreonLinkForm(td *TemplateData, r *http.Request) (f Form) {
-	f.Name = "link_patreon_subscription"
-	f.Title = "Link Patreon pledge to pixeldrain account"
-	f.SubmitLabel = "Submit"
-
-	if r.FormValue("key") == "" {
-		f.Submitted = true
-		f.SubmitMessages = []template.HTML{"Patron ID not found"}
-		return f
-	}
-
-	patron, err := td.PixelAPI.PatreonByID(r.FormValue("key"))
-	if err != nil && err.Error() == "not_found" {
-		f.Submitted = true
-		f.SubmitMessages = []template.HTML{"Patron ID not found"}
-		return f
-	} else if err != nil {
-		f.Submitted = true
-		formAPIError(err, &f)
-		return f
-	}
-
-	f.Fields = []Field{{
-		Name:         "1",
-		Label:        "",
-		DefaultValue: "",
-		Description:  "<h3>Please confirm that the following information is correct:</h3>",
-		Type:         FieldTypeDescription,
-	}, {
-		Name:         "2",
-		Label:        "Pixeldrain username",
-		DefaultValue: td.User.Username,
-		Type:         FieldTypeDescription,
-	}, {
-		Name:         "3",
-		Label:        "Pixeldrain e-mail",
-		DefaultValue: td.User.Email,
-		Type:         FieldTypeDescription,
-	}, {
-		Name:         "4",
-		Label:        "Patreon username",
-		DefaultValue: patron.FullName,
-		Type:         FieldTypeDescription,
-	}, {
-		Name:         "5",
-		Label:        "Patreon e-mail",
-		DefaultValue: patron.UserEmail,
-		Type:         FieldTypeDescription,
-	}, {
-		Name:         "6",
-		Label:        "Subscription name",
-		DefaultValue: patron.Subscription.Name,
-		Type:         FieldTypeDescription,
-	}, {
-		Name:         "7",
-		Label:        "Monthly contribution",
-		DefaultValue: fmt.Sprintf("€ %.2f / month", float64(patron.PledgeAmountCents)/100.0),
-		Type:         FieldTypeDescription,
-	}, {
-		Name: "8",
-		Description: "When clicking submit your patreon pledge will be linked " +
-			"to your pixeldrain account and you will be able to use " +
-			"pixeldrain's premium features. If you would like to update or " +
-			"cancel your subscription later on you can do so through " +
-			"patreon's dashboard",
-		Type: FieldTypeDescription,
-	}}
-
-	if f.ReadInput(r) {
-		if err := td.PixelAPI.PatreonLink(r.FormValue("key")); err != nil {
-			formAPIError(err, &f)
-		} else {
-			// Request was a success
-			f.SubmitSuccess = true
-			f.SubmitMessages = []template.HTML{template.HTML("Success!")}
-		}
-	}
-	return f
-}

webcontroller/user_style.go

@@ -208,7 +208,7 @@ var defaultPixeldrainStyle = pixeldrainStyleSheet{
 	TextColor:                hsl{0, 0, .7},
 	InputColor:               hsl{0, 0, .2},
 	InputTextColor:           hsl{0, 0, 1},
-	HighlightColor:           hsl{89, .51, .45},
+	HighlightColor:           hsl{89, .60, .45},
 	HighlightTextColor:       hsl{0, 0, 0},
 	DangerColor:              hsl{339, .65, .31},
 	ScrollbarForegroundColor: hsl{0, 0, .35},