adding style

input-output-hk · Jan 18, 2022 · 4693b1b · 4693b1b
1 parent 8222b8c
commit 4693b1b
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 13 deletions.
diff --git a/src/application/component/web/static/style.css b/src/application/component/web/static/style.css
@@ -85,3 +85,32 @@ iframe.iframe {
 .tabs > input:checked + label + div {
 	display: block;
 }
+
+ul.pagination {
+	display: inline-block;
+	padding: 0;
+	margin: 0;
+}
+
+ul.pagination li {
+	display: inline;
+	transition: background-color .3s;
+}
+
+ul.pagination li a {
+	color: black;
+	float: left;
+	padding: 8px 16px;
+	text-decoration: none;
+	border: 1px solid var(--border);
+}
+
+ul.pagination a:hover:not(.current) {
+	background-color: var(--border);
+}
+
+ul.pagination li a.disabled {
+	pointer-events: none;
+	cursor: default;
+	opacity: 0.6;
+}
diff --git a/src/application/component/web/templates/run/index.html b/src/application/component/web/templates/run/index.html
@@ -47,21 +47,26 @@
 			{{end}}
 		</tbody>
 	</table>
-	<nav aria-label="...">
-		<ul class="pagination justify-content-center">
 
-			<li class="page-item">
-				<a class="page-link" href="{{.Page.PrevPage}}">Previous</a>
+	<nav>
+		<ul class="pagination">
+			<li>
+				<a	{{if .Page.PrevPage}}
+					  class="page-item"
+					  {{else}}
+					  class="disabled"
+					  {{end}} href="{{.Page.PrevPage}}">«</a>
 			</li>
-
-			<li class="page-item active" aria-current="page">
-				<a class="page-link" href="#"> <span class="sr-only">{{.Page.PageNumber}}</span></a>
+			<li aria-current="page">
+				<a class="current" href="#"> <span>{{.Page.PageNumber}}</span></a>
 			</li>
-
-			<li class="page-item">
-				<a class="page-link" href="{{.Page.NextPage}}">Next</a>
+			<li>
+				<a	{{if .Page.NextPage}}
+					  class="page-item"
+					  {{else}}
+					  class="disabled"
+					  {{end}} href="{{.Page.NextPage}}">»</a>
 			</li>
-
 		</ul>
 	</nav>
 {{end}}
diff --git a/src/application/service/run.go b/src/application/service/run.go
@@ -99,17 +99,21 @@ func (self *runService) GetAll(fetchParam *domain.FetchParam) (*domain.FetchRuns
 		self.logger.Err(err).Msgf("fail to fetch runs with offset %s and limit %s", fetchParam.OffSet, fetchParam.Limit)
 		return nil, err
 	} else {
+		sizePage := len(runs)
+		if sizePage > 0 {
+			runs = runs[:len(runs)-1]
+		}
 		var fetchParamResponse = &domain.FetchRunsResponse{
 			Runs: runs,
 			FetchParamResponse: domain.FetchParamResponse{
 				PageNumber: fetchParam.OffSet / fetchParam.Limit,
 			},
 		}
-		if (fetchParam.OffSet - fetchParam.Limit) > 0 {
+		if (fetchParam.OffSet - fetchParam.Limit) >= 0 {
 			prevOffSet := fetchParam.OffSet - fetchParam.Limit
 			fetchParamResponse.FetchParamResponse.PrevOffSet = &prevOffSet
 		}
-		sizePage := len(runs)
+
 		if sizePage == (fetchParam.Limit + 1) {
 			nextOffSet := fetchParam.OffSet + fetchParam.Limit
 			fetchParamResponse.FetchParamResponse.NextOffSet = &nextOffSet