Remove Makerlog and Resolves #19

models/user.go

@@ -108,7 +108,6 @@ type User struct {
 	Twitter       string
 	Linkedin      string
 	Github        string
-	Makerlog      string
 	Stackoverflow string
 	Twitch        string
 	Telegram      string

pkg/form/admin.go

@@ -43,7 +43,6 @@ type AdminEditUser struct {
 	Twitter          string `binding:"MaxSize(50)"`
 	Linkedin         string `binding:"MaxSize(50)"`
 	Github           string `binding:"MaxSize(50)"`
-	Makerlog         string `binding:"MaxSize(50)"`
 	Stackoverflow    string `binding:"MaxSize(50)"`
 	Twitch           string `binding:"MaxSize(50)"`
 	Telegram         string `binding:"MaxSize(50)"`

pkg/form/user.go

@@ -106,7 +106,6 @@ type UpdateSocial struct {
 	Twitter       string `binding:"MaxSize(50)"`
 	Linkedin      string `binding:"MaxSize(50)"`
 	Github        string `binding:"MaxSize(50)"`
-	Makerlog      string `binding:"MaxSize(50)"`
 	Stackoverflow string `binding:"MaxSize(50)"`
 	Twitch        string `binding:"MaxSize(50)"`
 	Telegram      string `binding:"MaxSize(50)"`

routes/admin/users.go

@@ -242,7 +242,6 @@ func EditUserPost(c *context.Context, f form.AdminEditUser) {
 	u.Twitter = f.Twitter
 	u.Linkedin = f.Linkedin
 	u.Github = f.Github
-	u.Makerlog = f.Makerlog
 	u.Stackoverflow = f.Stackoverflow
 	u.Twitch = f.Twitch
 	u.Telegram = f.Telegram

routes/user/setting.go

@@ -182,7 +182,6 @@ func SettingsSocial(c *context.Context) {
 	c.Data["twitter"] = c.User.Twitter
 	c.Data["linkedin"] = c.User.Linkedin
 	c.Data["github"] = c.User.Github
-	c.Data["makerlog"] = c.User.Makerlog
 	c.Data["stackoverflow"] = c.User.Stackoverflow
 	c.Data["twitch"] = c.User.Twitch
 	c.Data["telegram"] = c.User.Telegram
@@ -205,7 +204,6 @@ func SettingsSocialPost(c *context.Context, f form.UpdateSocial) {
 	c.User.Twitter = f.Twitter
 	c.User.Linkedin = f.Linkedin
 	c.User.Github = f.Github
-	c.User.Makerlog = f.Makerlog
 	c.User.Stackoverflow = f.Stackoverflow
 	c.User.Twitch = f.Twitch
 	c.User.Telegram = f.Telegram

templates/admin/news/edit.tmpl

@@ -88,10 +88,6 @@
 							<label for="gitlab">GitLab</label>
 							<input id="gitlab" name="gitlab" value="{{.User.Gitlab}}">
 						</div>
-						<div class="field {{if .Err_MakerLog}}error{{end}}">
-							<label for="makerlog">MakerLog</label>
-							<input id="makerlog" name="makerlog" value="{{.User.Makerlog}}">
-						</div>
 						<div class="field {{if .Err_Stackoverflow}}error{{end}}">
 							<label for="stackoverflow">Stackoverflow</label>
 							<input id="stackoverflow" name="stackoverflow" value="{{.User.Stackoverflow}}">

templates/admin/user/edit.tmpl

@@ -88,10 +88,6 @@
 							<label for="gitlab">GitLab</label>
 							<input id="gitlab" name="gitlab" value="{{.User.Gitlab}}">
 						</div>
-						<div class="field {{if .Err_MakerLog}}error{{end}}">
-							<label for="makerlog">MakerLog</label>
-							<input id="makerlog" name="makerlog" value="{{.User.Makerlog}}">
-						</div>
 						<div class="field {{if .Err_Stackoverflow}}error{{end}}">
 							<label for="stackoverflow">Stackoverflow</label>
 							<input id="stackoverflow" name="stackoverflow" value="{{.User.Stackoverflow}}">

templates/user/profile.tmpl

@@ -137,12 +137,11 @@
 									<p style="font-weight:500">{{.Owner.Status}}</p>
 								</li>
 							{{end}}
-							{{if or .Owner.Twitter .Owner.Linkedin .Owner.Github .Owner.Makerlog .Owner.Stackoverflow .Owner.Twitch .Owner.Telegram .Owner.Codepen}}
+							{{if or .Owner.Twitter .Owner.Linkedin .Owner.Github .Owner.Stackoverflow .Owner.Twitch .Owner.Telegram .Owner.Codepen}}
 								<li class="ui center">
 									{{if .Owner.Twitter}}<a href="https://twitter.com/{{.Owner.Twitter}}" target="_blank"><i class="twitter icon"></i></a>{{end}}
 									{{if .Owner.Linkedin}}<a href="https://linkedin.com/in/{{.Owner.Linkedin}}" target="_blank"><i class="linkedin icon"></i></a>{{end}}
 									{{if .Owner.Github}}<a href="https://github.com/{{.Owner.Github}}" target="_blank"><i class="github icon"></i></a>{{end}}
-									{{if .Owner.Makerlog}}<a href="https://getmakerlog.com/@{{.Owner.Makerlog}}" target="_blank"><i class="check circle icon"></i></a>{{end}}
 									{{if .Owner.Stackoverflow}}<a href="https://stackoverflow.com/users/{{.Owner.Stackoverflow}}" target="_blank"><i class="stack overflow icon"></i></a>{{end}}
 									{{if .Owner.Twitch}}<a href="https://www.twitch.tv/{{.Owner.Twitch}}" target="_blank"><i class="twitch icon"></i></a>{{end}}
 									{{if .Owner.Telegram}}<a href="https://t.me/{{.Owner.Telegram}}" target="_blank"><i class="telegram icon"></i></a>{{end}}

templates/user/settings/social.tmpl

@@ -28,10 +28,6 @@
 							<label for="gitlab">GitLab</label>
 							<input id="gitlab" name="gitlab" value="{{.gitlab}}"  placeholder="username">
 						</div>
-						<div class="field">
-							<label for="makerlog">MakerLog</label>
-							<input id="makerlog" name="makerlog" value="{{.makerlog}}" placeholder="username">
-						</div>
 						<div class="field">
 							<label for="stackoverflow">Stackoverflow</label>
 							<input id="stackoverflow" name="stackoverflow" value="{{.stackoverflow}}"  placeholder="id/username">