cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add some navigation buttons

Browse source 
Both to the packages and derivations packages, as well as the JSON
representation of the pages.
This commit is contained in:
Christopher Baines 2019-02-26 08:33:17 +00:00
parent 2836a848cb
commit 46c724456f
Signed by: cbaines
GPG key ID: 5E28A33B0B84F577
1 changed files with 209 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

78
guix-data-service/web/view/html.scm
View file

@ -138,6 +138,10 @@
removed-packages removed-packages
version-changes version-changes
other-changes) other-changes)
(define query-params
(string-append "?base_commit=" base-commit
"&target_commit=" target-commit))
(layout (layout
#:extra-headers #:extra-headers
'((cache-control . ((max-age . 60)))) '((cache-control . ((max-age . 60))))
@ -145,11 +149,31 @@
`(,(header) `(,(header)
(div (div
(@ (class "container")) (@ (class "container"))
(h1 "Comparing " (div
(@ (class "row"))
(h1 (@ (class "pull-left"))
"Comparing "
(samp ,(string-take base-commit 8) "…") (samp ,(string-take base-commit 8) "…")
" and " " and "
(samp ,(string-take target-commit 8) "…")) (samp ,(string-take target-commit 8) "…"))
(h3 "New packages") (div
(@ (class "btn-group-vertical btn-group-lg pull-right") (role "group"))
(a (@ (class "btn btn-default")
(href ,(string-append "/compare/packages" query-params)))
"Compare packages")
(a (@ (class "btn btn-default")
(href ,(string-append "/compare/derivations" query-params)))
"Compare derivations")))
(div
(@ (class "row") (style "clear: left;"))
(a (@ (class "btn btn-default btn-lg")
(href ,(string-append
"/compare.json" query-params)))
"View JSON"))
(div
(@ (class "row"))
(h3 (@ (style "clear: both;"))
"New packages")
,(if (null? new-packages) ,(if (null? new-packages)
'(p "No new packages") '(p "No new packages")
`(table `(table
@ -165,7 +189,9 @@
`(tr `(tr
(td ,name) (td ,name)
(td ,version)))) (td ,version))))
new-packages)))) new-packages)))))
(div
(@ (class "row"))
(h3 "Removed packages") (h3 "Removed packages")
,(if (null? removed-packages) ,(if (null? removed-packages)
'(p "No removed packages") '(p "No removed packages")
@ -182,7 +208,9 @@
`(tr `(tr
(td ,name) (td ,name)
(td ,version)))) (td ,version))))
removed-packages)))) removed-packages)))))
(div
(@ (class "row"))
(h3 "Version changes") (h3 "Version changes")
,(if (null? version-changes) ,(if (null? version-changes)
'(p "No version changes") '(p "No version changes")
@ -209,7 +237,9 @@
" (old)" " (old)"
" (new)")))) " (new)"))))
versions)))))) versions))))))
version-changes)))) version-changes)))))
(div
(@ (class "row"))
(h3 "Other changed packages") (h3 "Other changed packages")
,@(if (null? other-changes) ,@(if (null? other-changes)
'((p "No other changes")) '((p "No other changes"))
@ -227,12 +257,16 @@
`(tr `(tr
(td ,name) (td ,name)
(td ,version)))) (td ,version))))
other-changes))))))))) other-changes))))))))))
(define (compare/derivations base-commit (define (compare/derivations base-commit
target-commit target-commit
base-derivations base-derivations
target-derivations) target-derivations)
(define query-params
(string-append "?base_commit=" base-commit
"&target_commit=" target-commit))
(layout (layout
#:extra-headers #:extra-headers
'((cache-control . ((max-age . 60)))) '((cache-control . ((max-age . 60))))
@ -240,10 +274,18 @@
`(,(header) `(,(header)
(div (div
(@ (class "container")) (@ (class "container"))
(div
(@ (class "row"))
(h1 "Comparing " (h1 "Comparing "
(samp ,(string-take base-commit 8) "…") (samp ,(string-take base-commit 8) "…")
" and " " and "
(samp ,(string-take target-commit 8) "…")) (samp ,(string-take target-commit 8) "…"))
(a (@ (class "btn btn-default btn-lg")
(href ,(string-append
"/compare/derivations.json" query-params)))
"View JSON"))
(div
(@ (class "row"))
(h3 "Base (" (h3 "Base ("
(samp ,base-commit) (samp ,base-commit)
")") ")")
@ -259,7 +301,9 @@
((id file-name) ((id file-name)
`(tr `(tr
(td ,file-name)))) (td ,file-name))))
base-derivations))) base-derivations))))
(div
(@ (class "row"))
(h3 "Target (" (h3 "Target ("
(samp ,target-commit) (samp ,target-commit)
")") ")")
@ -275,12 +319,16 @@
((id file-name) ((id file-name)
`(tr `(tr
(td ,file-name)))) (td ,file-name))))
target-derivations))))))) target-derivations))))))))
(define (compare/packages base-commit (define (compare/packages base-commit
target-commit target-commit
base-packages-vhash base-packages-vhash
target-packages-vhash) target-packages-vhash)
(define query-params
(string-append "?base_commit=" base-commit
"&target_commit=" target-commit))
(layout (layout
#:extra-headers #:extra-headers
'((cache-control . ((max-age . 60)))) '((cache-control . ((max-age . 60))))
@ -288,10 +336,18 @@
`(,(header) `(,(header)
(div (div
(@ (class "container")) (@ (class "container"))
(div
(@ (class "row"))
(h1 "Comparing " (h1 "Comparing "
(samp ,(string-take base-commit 8) "…") (samp ,(string-take base-commit 8) "…")
" and " " and "
(samp ,(string-take target-commit 8) "…")) (samp ,(string-take target-commit 8) "…"))
(a (@ (class "btn btn-default btn-lg")
(href ,(string-append
"/compare/packages.json" query-params)))
"View JSON"))
(div
(@ (class "row"))
(h3 "Base (" (h3 "Base ("
(samp ,base-commit) (samp ,base-commit)
")") ")")
@ -309,7 +365,9 @@
`(tr `(tr
(td ,name) (td ,name)
(td ,version)))) (td ,version))))
(vlist->list base-packages-vhash)))) (vlist->list base-packages-vhash)))))
(div
(@ (class "row"))
(h3 "Target (" (h3 "Target ("
(samp ,target-commit) (samp ,target-commit)
")") ")")
@ -327,7 +385,7 @@
`(tr `(tr
(td ,name) (td ,name)
(td ,version)))) (td ,version))))
(vlist->list target-packages-vhash)))))))) (vlist->list target-packages-vhash)))))))))
(define (compare-unknown-commit base-commit target-commit (define (compare-unknown-commit base-commit target-commit
base-exists? target-exists? base-exists? target-exists?