Merge pull request #50 from achilleas-k/repolist-split

Nice and pretty

Author: mpsonntag

internal/resources/templates/generic_results.go

@@ -24,11 +24,11 @@ const GenericResults = `
 			<div class="ui tabs divider"></div>
 		</div>
 		<div class="ui container">
-	<hr>
-	<div>
-		<pre>
-			{{.Content}}
-		</pre>
+			<hr>
+			<div>
+				<pre>{{.Content}}</pre>
+			</div>
+		</div>
 	</div>
 {{end}}
 `

internal/resources/templates/repolist.go

@@ -6,7 +6,7 @@ const RepoList = `
 
 <div class="explore repositories">
 	<div class="ui container repository list">
-		{{range .}}
+		{{range .Active}}
 			{{$repopath := .FullName}}
 			<div class="item">
 				<div class="ui grid">
@@ -31,6 +31,25 @@ const RepoList = `
 				</div>
 			</div>
 		{{end}}
+		<hr>
+		<h2>Inactive repositories</h2>
+		{{range .Inactive}}
+			{{$repopath := .FullName}}
+			<div class="item">
+				<div class="ui grid">
+					<div class="ui two wide column middle aligned center">
+						<i class="mega-octicon octicon-repo"></i>
+					</div>
+					<div class="ui fourteen wide column">
+						<div class="ui header">
+							<a class="name" href="/repos/{{$repopath}}/hooks">{{$repopath}}</a>
+						</div>
+						<p class="has-emoji">{{.Description}}</p>
+						<a href="{{.HTMLURL}}">Repository on GIN</a> | <a href="{{.HTMLURL}}/settings/hooks">Repository hooks</a>
+					</div>
+				</div>
+			</div>
+		{{end}}
 	</div>
 </div>
 	{{end}}

internal/web/user.go

@@ -264,18 +264,41 @@ func ListRepos(w http.ResponseWriter, r *http.Request) {
 		fail(w, http.StatusInternalServerError, "something went wrong")
 		return
 	}
-	repos := make([]repoHooksInfo, len(userrepos))
+	reposActive := make([]repoHooksInfo, 0, len(userrepos))
+	reposInactive := make([]repoHooksInfo, 0, len(userrepos))
+
+	checkActive := func(rhinfo repoHooksInfo) bool {
+		// If at least one hook is not hooknone, return true
+		for _, hook := range rhinfo.Hooks {
+			if hook.State != hooknone {
+				return true
+			}
+		}
+		return false
+	}
 
 	// TODO: Enum for hook states (see issue #5)
-	for idx, rinfo := range userrepos {
+	for _, rinfo := range userrepos {
 		repohooks, err := getRepoHooks(cl, rinfo.FullName)
 		if err != nil {
 			// simply initialise the map for now
 			repohooks = make(map[string]ginhook)
 		}
-		repos[idx] = repoHooksInfo{rinfo, repohooks}
+		rhinfo := repoHooksInfo{rinfo, repohooks}
+		if checkActive(rhinfo) {
+			reposActive = append(reposActive, rhinfo)
+		} else {
+			reposInactive = append(reposInactive, rhinfo)
+		}
+	}
+	allrepos := struct {
+		Active   []repoHooksInfo
+		Inactive []repoHooksInfo
+	}{
+		reposActive,
+		reposInactive,
 	}
-	tmpl.Execute(w, &repos)
+	tmpl.Execute(w, &allrepos)
 }
 
 // matchValidator receives a URL path from a GIN hook and returns the validator
@@ -362,7 +385,7 @@ func getRepoHooks(cl *ginclient.Client, repopath string) (map[string]ginhook, er
 		hooks[validator] = ginhook{validator, hook.ID, state}
 		// TODO: Check if the same validator is found twice
 	}
-	// add supported validators that were not found and mark them disabled
+	// add supported validators that were not found and mark them hooknone
 	supportedValidators := config.Read().Settings.Validators
 	for _, validator := range supportedValidators {
 		if _, ok := hooks[validator]; !ok {