From 93921cef3d2e76b53789140fad7153c025a7c340 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 16 Oct 2014 00:01:23 -0400 Subject: Add generations view. * guix-web/controller.scm (controller): Add '/generations' route. * guix-web/package.scm (profile-generations*): New procedure. * guix-web/view.scm (generations-json): New procedure. (javascripts): Add new JS files. * js/model/generations.js: New file. * js/controller/generations.js: New file. * js/view/generations.js: New file. * js/view/layout.js (guix.withLayout): Add 'Generations' navbar entry. * js/routes.js: Add '/generations' route. --- js/controller/generations.js | 30 +++++++++++++++++++++++ js/model/generations.js | 28 +++++++++++++++++++++ js/routes.js | 3 ++- js/view/generations.js | 58 ++++++++++++++++++++++++++++++++++++++++++++ js/view/layout.js | 10 +++++--- 5 files changed, 124 insertions(+), 5 deletions(-) create mode 100644 js/controller/generations.js create mode 100644 js/model/generations.js create mode 100644 js/view/generations.js (limited to 'js') diff --git a/js/controller/generations.js b/js/controller/generations.js new file mode 100644 index 0000000..011dfa2 --- /dev/null +++ b/js/controller/generations.js @@ -0,0 +1,30 @@ +// guix-web - Web interface for GNU Guix +// Copyright © 2014 David Thompson +// +// This program is free software: you can redistribute it and/or +// modify it under the terms of the GNU Affero General Public License +// as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public +// License along with this program. If not, see +// . + +(function(generations) { + generations.controller = (function() { + function controller() { + this.generations = m.prop([]); + + generations.Generations() + .then(this.generations) + .then(m.redraw); + } + + return controller; + })(); +})(guix.generations); diff --git a/js/model/generations.js b/js/model/generations.js new file mode 100644 index 0000000..0dc4e6c --- /dev/null +++ b/js/model/generations.js @@ -0,0 +1,28 @@ +// guix-web - Web interface for GNU Guix +// Copyright © 2014 David Thompson +// +// This program is free software: you can redistribute it and/or +// modify it under the terms of the GNU Affero General Public License +// as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public +// License along with this program. If not, see +// . + +guix.generations = {}; + +(function(generations) { + generations.Generations = function() { + return m.request({ + method: "GET", + url: "/generations", + background: true + }); + }; +})(guix.generations); diff --git a/js/routes.js b/js/routes.js index d749d3c..b3fee60 100644 --- a/js/routes.js +++ b/js/routes.js @@ -16,5 +16,6 @@ // . m.route(document.body, "/", { - "/": guix.packages + "/": guix.packages, + "/generations": guix.generations }); diff --git a/js/view/generations.js b/js/view/generations.js new file mode 100644 index 0000000..912a1ab --- /dev/null +++ b/js/view/generations.js @@ -0,0 +1,58 @@ +// guix-web - Web interface for GNU Guix +// Copyright © 2014 David Thompson +// +// This program is free software: you can redistribute it and/or +// modify it under the terms of the GNU Affero General Public License +// as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public +// License along with this program. If not, see +// . + +(function(generations) { + generations.view = function(ctrl) { + return guix.withLayout([ + m("h2", [ + "Generations", + m("span.badge", ctrl.generations().length) + ]), + m("table.table.table-bordered", [ + m("thead", m("tr", [ + m("th", "#"), + m("th", "Name"), + m("th", "Version"), + m("th", "Output"), + m("th", "Location") + ])), + m("tbody", [ + ctrl.generations().map(function(generation) { + var entries = generation.manifestEntries; + + function renderRow(entry, isFirst) { + return m("tr", [ + isFirst ? m("td", { + rowspan: entries.length + }, m("strong", generation.number)) : null, + m("td", entry.name), + m("td", entry.version), + m("td", entry.output), + m("td", entry.location) + ]); + } + + return [renderRow(entries[0], true)] + .concat(entries.slice(1).map(function (entry) { + return renderRow(entry, false); + })); + }) + ]) + ]) + ]); + }; +})(guix.generations); diff --git a/js/view/layout.js b/js/view/layout.js index c733a8f..02ee639 100644 --- a/js/view/layout.js +++ b/js/view/layout.js @@ -53,11 +53,13 @@ guix.withLayout = (function() { m(".navbar-header", m("img.logo", { src: "/images/logo.png" })), m("ul.nav.navbar-nav", [ m("li.active", m("a", { - href: "#", - onclick: function() { - m.route("/"); - } + config: m.route, + href: "/" }, "Packages")), + m("li", m("a", { + config: m.route, + href: "/generations" + }, "Generations")) ]), m("ul.nav.navbar-nav.navbar-right") ])), -- cgit v1.2.3