diff --git a/storage/migration.go b/storage/migration.go index 83842fb..5028cd1 100644 --- a/storage/migration.go +++ b/storage/migration.go @@ -7,7 +7,7 @@ import ( "strconv" ) -const schemaVersion = 8 +const schemaVersion = 9 func Migrate(db *sql.DB) { var currentVersion int diff --git a/storage/sql.go b/storage/sql.go index 93866b7..5528edd 100644 --- a/storage/sql.go +++ b/storage/sql.go @@ -42,4 +42,6 @@ alter column about TYPE TEXT;`, add column email varchar(500) not null DEFAULT '';`, "schema_version_8": `alter table statuses add column face varchar(1) not null DEFAULT '🙂';`, + "schema_version_9": `alter table users + drop column style;`, } diff --git a/storage/sql/schema_version_9.sql b/storage/sql/schema_version_9.sql new file mode 100644 index 0000000..4bfd461 --- /dev/null +++ b/storage/sql/schema_version_9.sql @@ -0,0 +1,2 @@ +alter table users + drop column style; \ No newline at end of file diff --git a/storage/user.go b/storage/user.go index 2c2fc46..7db079b 100644 --- a/storage/user.go +++ b/storage/user.go @@ -4,10 +4,10 @@ import ( "status/model" ) -const queryFindName = `SELECT name, hash, created_at, homepage, about, style, picture, email FROM users WHERE name=lower($1);` +const queryFindName = `SELECT name, hash, created_at, homepage, about, picture, email FROM users WHERE name=lower($1);` func (s *Storage) queryUser(q string, params ...interface{}) (user model.User, err error) { - err = s.db.QueryRow(q, params...).Scan(&user.Name, &user.Hash, &user.CreatedAt, &user.Homepage, &user.About, &user.Style, &user.Picture, &user.Email) + err = s.db.QueryRow(q, params...).Scan(&user.Name, &user.Hash, &user.CreatedAt, &user.Homepage, &user.About, &user.Picture, &user.Email) return } @@ -77,11 +77,11 @@ func (s *Storage) DeleteUser(username string) error { return err } -func (s *Storage) UpdateSettings(username, homepage, about, style, picture, email string) error { - stmt, err := s.db.Prepare(`UPDATE users SET homepage = $1, about = $2, style = $3, picture = $4, email = $5 WHERE name = $6;`) +func (s *Storage) UpdateSettings(username, homepage, about, picture, email string) error { + stmt, err := s.db.Prepare(`UPDATE users SET homepage = $1, about = $2, picture = $3, email = $4 WHERE name = $5;`) if err != nil { return err } - _, err = stmt.Exec(homepage, about, style, picture, email, username) + _, err = stmt.Exec(homepage, about, picture, email, username) return err } diff --git a/web/handler/common.go b/web/handler/common.go index fc0f49a..4681cea 100644 --- a/web/handler/common.go +++ b/web/handler/common.go @@ -47,58 +47,21 @@ var TplCommonMap = map[string]string{ {{ end }}`, "status_form": `{{ define "status_form" }}
+ {{ range $i, $v := faces }}
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - + +
+ {{ end }}
diff --git a/web/handler/form/settings.go b/web/handler/form/settings.go index 7882eab..af0e794 100644 --- a/web/handler/form/settings.go +++ b/web/handler/form/settings.go @@ -7,7 +7,6 @@ import ( type SettingsForm struct { Homepage string About string - Style string Picture string Email string } @@ -16,7 +15,6 @@ func NewSettingsForm(r *http.Request) *SettingsForm { return &SettingsForm{ Homepage: r.FormValue("homepage"), About: r.FormValue("about"), - Style: r.FormValue("style"), Picture: r.FormValue("picture"), Email: r.FormValue("email"), } diff --git a/web/handler/html.go b/web/handler/html.go index 7f2df8a..d0fcd14 100644 --- a/web/handler/html.go +++ b/web/handler/html.go @@ -283,11 +283,6 @@ var TplMap = map[string]string{
- -
- - -
diff --git a/web/handler/html/common/status_form.html b/web/handler/html/common/status_form.html index 548b887..dea6ef3 100644 --- a/web/handler/html/common/status_form.html +++ b/web/handler/html/common/status_form.html @@ -1,57 +1,20 @@ {{ define "status_form" }}
+ {{ range $i, $v := faces }}
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - + +
+ {{ end }}
diff --git a/web/handler/html/settings.html b/web/handler/html/settings.html index 273087d..7171e94 100644 --- a/web/handler/html/settings.html +++ b/web/handler/html/settings.html @@ -25,11 +25,6 @@
- -
- - -
diff --git a/web/handler/settings_update.go b/web/handler/settings_update.go index 15f2fd7..b23c206 100644 --- a/web/handler/settings_update.go +++ b/web/handler/settings_update.go @@ -13,7 +13,7 @@ func (h *Handler) updateSettings(w http.ResponseWriter, r *http.Request) { return } f := form.NewSettingsForm(r) - if err := h.storage.UpdateSettings(user, f.Homepage, f.About, f.Style, f.Picture, f.Email); err != nil { + if err := h.storage.UpdateSettings(user, f.Homepage, f.About, f.Picture, f.Email); err != nil { serverError(w, err) return } diff --git a/web/handler/tpl.go b/web/handler/tpl.go index 9463b30..2946dd4 100644 --- a/web/handler/tpl.go +++ b/web/handler/tpl.go @@ -14,7 +14,11 @@ func (h *Handler) initTpl() { } for name, content := range TplMap { - views[name] = template.Must(template.New("main").Parse(commonTemplates + content)) + views[name] = template.Must(template.New("main").Funcs(template.FuncMap{ + "faces": func() []string { + return []string{"☕", "🙂", "🙃", "😇", "😋", "😐", "😴", "😎", "🤓", "🧐", "😭", "😡", "💀", "🤖", + "🍺", "🍷"} + }}).Parse(commonTemplates + content)) } }