diff --git a/api/commenter_update.go b/api/commenter_update.go index 04755d2..a16dd7f 100644 --- a/api/commenter_update.go +++ b/api/commenter_update.go @@ -1,6 +1,8 @@ package main -import () +import ( + "net/http" +) func commenterUpdate(commenterHex string, email string, name string, link string, photo string, provider string) error { if email == "" || name == "" || link == "" || photo == "" || provider == "" { @@ -27,3 +29,38 @@ func commenterUpdate(commenterHex string, email string, name string, link string return nil } + +func commenterUpdateHandler(w http.ResponseWriter, r *http.Request) { + type request struct { + CommenterToken *string `json:"commenterToken"` + Name *string `json:"name"` + Email *string `json:"email"` + Link *string `json:"link"` + Photo *string `json:"photo"` + } + + var x request + if err := bodyUnmarshal(r, &x); err != nil { + bodyMarshal(w, response{"success": false, "message": err.Error()}) + return + } + + c, err := commenterGetByCommenterToken(*x.CommenterToken) + if err != nil { + bodyMarshal(w, response{"success": false, "message": err.Error()}) + return + } + + if c.Provider == "commento" { + *x.Link = c.Link + *x.Photo = c.Photo + } + *x.Email = c.Email + + if err = commenterUpdate(c.CommenterHex, *x.Email, *x.Name, *x.Link, *x.Photo, c.Provider); err != nil { + bodyMarshal(w, response{"success": false, "message": err.Error()}) + return + } + + bodyMarshal(w, response{"success": true}) +} diff --git a/api/router_api.go b/api/router_api.go index 235bcae..aed7c6a 100644 --- a/api/router_api.go +++ b/api/router_api.go @@ -27,6 +27,7 @@ func apiRouterInit(router *mux.Router) error { router.HandleFunc("/api/commenter/new", commenterNewHandler).Methods("POST") router.HandleFunc("/api/commenter/login", commenterLoginHandler).Methods("POST") router.HandleFunc("/api/commenter/self", commenterSelfHandler).Methods("POST") + router.HandleFunc("/api/commenter/update", commenterUpdateHandler).Methods("POST") router.HandleFunc("/api/commenter/photo", commenterPhotoHandler).Methods("GET") router.HandleFunc("/api/forgot", forgotHandler).Methods("POST") diff --git a/api/router_static.go b/api/router_static.go index b705b3b..984d433 100644 --- a/api/router_static.go +++ b/api/router_static.go @@ -102,6 +102,7 @@ func staticRouterInit(router *mux.Router) error { "/unsubscribe", "/dashboard", "/logout", + "/profile", } for _, page := range pages { diff --git a/frontend/gulpfile.js b/frontend/gulpfile.js index 9cebfc4..17ca4d0 100644 --- a/frontend/gulpfile.js +++ b/frontend/gulpfile.js @@ -83,6 +83,12 @@ const jsCompileMap = { "js/http.js", "js/unsubscribe.js", ], + "js/profile.js": [ + "js/constants.js", + "js/utils.js", + "js/http.js", + "js/profile.js", + ], }; gulp.task("scss-devel", function (done) { diff --git a/frontend/js/commento.js b/frontend/js/commento.js index 9a7410c..821ad70 100644 --- a/frontend/js/commento.js +++ b/frontend/js/commento.js @@ -246,7 +246,18 @@ refreshAll(); } - function selfLoad(commenter) { + + function profileEdit() { + window.open(origin + "/profile?commenterToken=" + commenterTokenGet(), "_blank"); + } + + + function notificationSettings(unsubscribeSecretHex) { + window.open(origin + "/unsubscribe?unsubscribeSecretHex=" + unsubscribeSecretHex, "_blank"); + } + + + function selfLoad(commenter, email) { commenters[commenter.commenterHex] = commenter; selfHex = commenter.commenterHex; @@ -259,7 +270,9 @@ name = create("div"); } var avatar; - var logout = create("div"); + var notificationSettingsButton = create("div"); + var profileEditButton = create("div"); + var logoutButton = create("div"); var color = colorGet(commenter.commenterHex + "-" + commenter.name); loggedContainer.id = ID_LOGGED_CONTAINER; @@ -267,12 +280,19 @@ classAdd(loggedContainer, "logged-container"); classAdd(loggedInAs, "logged-in-as"); classAdd(name, "name"); - classAdd(logout, "logout"); + classAdd(notificationSettingsButton, "profile-button"); + classAdd(profileEditButton, "profile-button"); + classAdd(logoutButton, "profile-button"); name.innerText = commenter.name; - logout.innerText = "Logout"; + notificationSettingsButton.innerText = "Notification Settings"; + profileEditButton.innerText = "Edit Profile"; + logoutButton.innerText = "Logout"; - onclick(logout, global.logout); + onclick(logoutButton, global.logout); + console.log(commenter); + onclick(notificationSettingsButton, notificationSettings, email.unsubscribeSecretHex); + onclick(profileEditButton, profileEdit); attrSet(loggedContainer, "style", "display: none"); if (commenter.link !== "undefined") { @@ -292,7 +312,9 @@ append(loggedInAs, avatar); append(loggedInAs, name); append(loggedContainer, loggedInAs); - append(loggedContainer, logout); + append(loggedContainer, logoutButton); + append(loggedContainer, profileEditButton); + append(loggedContainer, notificationSettingsButton); prepend(root, loggedContainer); isAuthenticated = true; @@ -318,7 +340,7 @@ return; } - selfLoad(resp.commenter); + selfLoad(resp.commenter, resp.email); global.allShow(); call(callback); @@ -1087,7 +1109,6 @@ append(card, header); append(card, contents); - console.log(children); if (comment.deleted && (hideDeleted === "true" || children === null)) { return; } @@ -1408,7 +1429,6 @@ comment.creationDate = new Date(comment.creationDate); - console.log(m, parentHex); m[parentHex].push(comment); commentsMap[comment.commentHex] = { "html": comment.html, @@ -1730,7 +1750,7 @@ cookieSet("commentoCommenterToken", resp.commenterToken); - selfLoad(resp.commenter); + selfLoad(resp.commenter, resp.email); global.allShow(); remove($(ID_LOGIN)); diff --git a/frontend/js/profile.js b/frontend/js/profile.js new file mode 100644 index 0000000..d347c67 --- /dev/null +++ b/frontend/js/profile.js @@ -0,0 +1,76 @@ +(function (global, document) { + "use strict"; + + (document); + + // Update the email records. + global.update = function(event) { + event.preventDefault(); + + $(".err").text(""); + $(".msg").text(""); + + var allOk = global.unfilledMark(["#name", "#email"], function(el) { + el.css("border-bottom", "1px solid red"); + }); + + if (!allOk) { + global.textSet("#err", "Please make sure all fields are filled"); + return; + } + + var json = { + "commenterToken": global.paramGet("commenterToken"), + "name": $("#name").val(), + "email": $("#email").val(), + "link": $("#link").val(), + "photo": $("#photo").val(), + }; + + global.buttonDisable("#save-button"); + global.post(global.origin + "/api/commenter/update", json, function(resp) { + global.buttonEnable("#save-button"); + if (!resp.success) { + $(".err").text(resp.message); + return; + } + + $(".msg").text("Successfully updated!"); + }); + } + + global.profilePrefill = function() { + $(".err").text(""); + $(".msg").text(""); + var json = { + "commenterToken": global.paramGet("commenterToken"), + }; + + global.post(global.origin + "/api/commenter/self", json, function(resp) { + $("#loading").hide(); + $("#form").show(); + if (!resp.success) { + $(".err").text(resp.message); + return; + } + + $("#name").val(resp.commenter.name); + $("#email").val(resp.commenter.email); + $("#unsubscribe").attr("href", global.origin + "/unsubscribe?unsubscribeSecretHex=" + resp.email.unsubscribeSecretHex); + + if (resp.commenter.provider === "commento") { + $("#link-row").attr("style", "") + if (resp.commenter.link !== "undefined") { + $("#link").val(resp.commenter.link); + } + + $("#photo-row").attr("style", "") + $("#photo-subtitle").attr("style", "") + if (resp.commenter.photo !== "undefined") { + $("#photo").val(resp.commenter.photo); + } + } + }); + }; + +} (window.commento, document)); diff --git a/frontend/profile.html b/frontend/profile.html new file mode 100644 index 0000000..206136f --- /dev/null +++ b/frontend/profile.html @@ -0,0 +1,66 @@ + + + + + + + + Commento: Edit Profile + + +
+ Commento +
+ + + +
+
+
+ Loading... +
+ +
+
+ + [[[.Footer]]] + diff --git a/frontend/sass/auth-main.scss b/frontend/sass/auth-main.scss index 0aa8387..201f1f3 100644 --- a/frontend/sass/auth-main.scss +++ b/frontend/sass/auth-main.scss @@ -36,11 +36,17 @@ body { padding-bottom: 24px; } - .row { - padding-left: 8px; - padding-right: 8px; - margin-bottom: 20px; - border-bottom: 1px solid $gray-1; + .small-subtitle { + font-size: 12px; + color: $gray-6; + padding: 0px 12px 20px 12px; + } + + .row { + padding-left: 8px; + padding-right: 8px; + margin-bottom: 20px; + border-bottom: 1px solid $gray-1; input[type=text], input[type=password] { @@ -74,6 +80,10 @@ body { } } + .no-margin-bottom-row { + margin-bottom: 6px; + } + .button { @extend .shadow; border: 1px solid $blue-6; diff --git a/frontend/sass/commento-logged.scss b/frontend/sass/commento-logged.scss index f5c21f3..0cfa0c6 100644 --- a/frontend/sass/commento-logged.scss +++ b/frontend/sass/commento-logged.scss @@ -21,12 +21,12 @@ position: relative; height: 38px; - .commento-logout { + .commento-profile-button { + float: right; cursor: pointer; - position: absolute; - top: 6px; - right: 16px; - color: $gray-5; + color: $gray-6; + margin: 6px 12px; + font-size: 13px; } .commento-logged-in-as { diff --git a/frontend/unsubscribe.html b/frontend/unsubscribe.html index 7536f39..e57ffe2 100644 --- a/frontend/unsubscribe.html +++ b/frontend/unsubscribe.html @@ -5,7 +5,7 @@ - Commento: Unsubscribe + Commento: Email Notification Settings