From 28649c6893602404cc00c859de8c20eed10984b7 Mon Sep 17 00:00:00 2001 From: Joxit Date: Wed, 1 Jun 2016 20:06:33 +0200 Subject: [PATCH 1/4] [rg-router] Add router for taglist and catalog --- app.tag | 28 +++++++++++++++++ catalog.tag | 13 ++++++-- index.html | 5 +-- package.json | 3 +- script.js | 1 + taglist.tag | 89 ++++++++++++++++++++++++++++------------------------ 6 files changed, 92 insertions(+), 47 deletions(-) create mode 100644 app.tag diff --git a/app.tag b/app.tag new file mode 100644 index 0000000..db7f529 --- /dev/null +++ b/app.tag @@ -0,0 +1,28 @@ + + + + + + diff --git a/catalog.tag b/catalog.tag index 5fc0d5b..edc2a69 100644 --- a/catalog.tag +++ b/catalog.tag @@ -16,14 +16,14 @@ --> -
+

Repositories of { registryUI.url() }

    -
  • +
  • send { item } @@ -39,6 +39,7 @@ diff --git a/index.html b/index.html index 0de3690..cf5ff73 100644 --- a/index.html +++ b/index.html @@ -40,8 +40,7 @@
    - - +
    @@ -61,7 +60,9 @@ + + diff --git a/package.json b/package.json index 6e40005..6412084 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "material-design-lite": "^1.1", "material-design-icons": "^2.2", "dialog-polyfill": "^0.4", - "riot": "^2.3" + "riot": "^2.3", + "riotgear-router": "^1.3.1" } } diff --git a/script.js b/script.js index c186cae..ba579b8 100644 --- a/script.js +++ b/script.js @@ -57,3 +57,4 @@ riot.mount('taglist'); riot.mount('add'); riot.mount('change'); riot.mount('menu'); +riot.mount('app'); diff --git a/taglist.tag b/taglist.tag index 23edda2..0c97c8e 100644 --- a/taglist.tag +++ b/taglist.tag @@ -16,15 +16,15 @@ --> -
    +
    - + arrow_back

    Tags of { registryUI.url() + '/' + registryUI.taglist.name }

    - + @@ -48,48 +48,52 @@ From e45c107fe727bef6abb6ffa2f6a9b24e61a3ed57 Mon Sep 17 00:00:00 2001 From: Joxit Date: Fri, 3 Jun 2016 22:37:22 +0200 Subject: [PATCH 2/4] [rg-router] Fix taglist update --- app.tag | 25 ++++++++++++++++++++----- catalog.tag | 3 +-- taglist.tag | 12 +++++++----- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/app.tag b/app.tag index db7f529..249e7c0 100644 --- a/app.tag +++ b/app.tag @@ -19,10 +19,25 @@ diff --git a/catalog.tag b/catalog.tag index edc2a69..1902519 100644 --- a/catalog.tag +++ b/catalog.tag @@ -80,8 +80,7 @@ componentHandler.upgradeElements(this['catalog-tag']); }); catalog.go = function (image) { - rg.router.go('taglist', - { + rg.router.go('taglist', { repository: image.split('/')[0], image: image.split('/')[1] }); diff --git a/taglist.tag b/taglist.tag index 0c97c8e..371505d 100644 --- a/taglist.tag +++ b/taglist.tag @@ -48,10 +48,7 @@ diff --git a/script.js b/script.js index ba579b8..ad987b0 100644 --- a/script.js +++ b/script.js @@ -46,10 +46,9 @@ registryUI.changeServer = function(url) { } registryServer.splice(index, 1); registryServer = [url].concat(registryServer); - registryUI.registryServer.servers = registryServer; localStorage.setItem('registryServer', JSON.stringify(registryServer)); } -var catalog = {}; +registryUI.catalog = {}; registryUI.taglist = {}; riot.mount('catalog'); diff --git a/taglist.tag b/taglist.tag index 371505d..ee0f0c1 100644 --- a/taglist.tag +++ b/taglist.tag @@ -53,7 +53,6 @@ name = rg.router.current.params.repository + (rg.router.current.params.image ? '/' + rg.router.current.params.image : ''); - registryUI.content = 'taglist'; var oReq = new XMLHttpRequest(); registryUI.taglist.name = name; registryUI.taglist.createSnackbar = function (msg) { From ce88cf588c0f8a520bed95667261f37d5b83200f Mon Sep 17 00:00:00 2001 From: Joxit Date: Tue, 7 Jun 2016 22:37:50 +0200 Subject: [PATCH 4/4] [rg-router] update view when adding or changing server url --- add.tag | 1 + change.tag | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/add.tag b/add.tag index 01476bc..15f9ab2 100644 --- a/add.tag +++ b/add.tag @@ -47,6 +47,7 @@ registryUI.addServer(registryUI.addTag.addServer.value); } registryUI.addTag.addServer.value = ''; + rg.router.go('home'); registryUI.addTag.dialog.close(); }; registryUI.addTag.close = function () { diff --git a/change.tag b/change.tag index bc234de..02471b5 100644 --- a/change.tag +++ b/change.tag @@ -10,7 +10,7 @@ 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 . --> @@ -42,6 +42,7 @@ }); registryUI.changeTag.show = function () { registryUI.changeTag.update(); + registryUI.changeTag.serverList.value = registryUI.url();; registryUI.changeTag.dialog.showModal(); }; registryUI.changeTag.change = function () { @@ -49,6 +50,7 @@ registryUI.changeServer(registryUI.changeTag.serverList.value); } registryUI.changeTag.serverList.value = ''; + rg.router.go('home'); registryUI.changeTag.dialog.close(); }; registryUI.changeTag.close = function () {