- Bow-commits - mailman.cloud.codelutin.com

branch bow-v2-go updated (965faf8 -> f6f40d7)
by chorem.org scm 27 May '20

27 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 965faf8 ajout de log pour essayer de comprendre d'ou vient le blocage new f6f40d7 correction dans la requete sql The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f6f40d7947e2a1f703a0207d15a16bb92b2c5536 Author: Benjamin <poussin(a)codelutin.com> Date: Wed May 27 19:31:43 2020 +0200 correction dans la requete sql Summary of changes: pkg/repository/bookmarkRepository.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch bow-v2-go updated (ca14891 -> 965faf8)
by chorem.org scm 27 May '20

27 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from ca14891 correction recup bookmark pour edition adds 965faf8 ajout de log pour essayer de comprendre d'ou vient le blocage No new revisions were added by this update. Summary of changes: pkg/http/router.go | 1 + pkg/repository/database.go | 6 ++++++ 2 files changed, 7 insertions(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch bow-v2-go updated (43ebc19 -> ca14891)
by chorem.org scm 27 May '20

27 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 43ebc19 rechargement force du user cote back (on garanti d'avoir les bonnes données) le token ne contient plus que l'id refacto du composant de tags (v-model), force la liste des tags dispo new ca14891 correction recup bookmark pour edition The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ca1489102a9c8636e64467b0566f920644dbac1a Author: Benjamin <poussin(a)codelutin.com> Date: Wed May 27 18:51:59 2020 +0200 correction recup bookmark pour edition Summary of changes: env-dev | 1 - pkg/http/bookmarkResource.go | 5 +---- pkg/repository/bookmarkRepository.go | 14 ++++++++++++++ run-dev | 4 ++++ 4 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 env-dev create mode 100755 run-dev -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch bow-v2-go updated (af68521 -> 43ebc19)
by chorem.org scm 25 May '20

25 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from af68521 en SQL il faut des ';' :) new 35ab6cf ajout du composant Navigation qui contient aussi le order new 43ebc19 rechargement force du user cote back (on garanti d'avoir les bonnes données) le token ne contient plus que l'id refacto du composant de tags (v-model), force la liste des tags dispo The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 43ebc196dc1b43bf94a73a9c06ebcd5c2bfe9b35 Author: Benjamin <poussin(a)codelutin.com> Date: Tue May 26 01:36:15 2020 +0200 rechargement force du user cote back (on garanti d'avoir les bonnes données) le token ne contient plus que l'id refacto du composant de tags (v-model), force la liste des tags dispo commit 35ab6cf446b553d582a5c3e2365254c38064f58d Author: Benjamin <poussin(a)codelutin.com> Date: Mon May 25 23:37:16 2020 +0200 ajout du composant Navigation qui contient aussi le order Summary of changes: pkg/constant/const.go | 4 +- pkg/http/router.go | 16 +++-- pkg/http/userResource.go | 2 +- pkg/repository/bookmarkRepository.go | 2 +- pkg/utils/jwt.go | 5 +- web/src/components/Navigation.vue | 76 ++++++++++++++++++++++ web/src/components/SearchInput.vue | 24 ++++--- web/src/components/common/TagsInput.vue | 56 ++++++++++------ web/src/components/preferences/MaxResultEditor.vue | 22 ++++--- web/src/components/preferences/TagsEditor.vue | 8 +-- web/src/main.js | 49 ++++++++++---- web/src/views/BookmarkEdit.vue | 2 +- web/src/views/Home.vue | 19 +----- web/src/views/Login.vue | 2 +- web/src/views/Preferences.vue | 4 +- 15 files changed, 205 insertions(+), 86 deletions(-) create mode 100644 web/src/components/Navigation.vue -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

01/02: ajout du composant Navigation qui contient aussi le order
by chorem.org scm 25 May '20

25 May '20

This is an automated email from the git hooks/post-receive script. New commit to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 35ab6cf446b553d582a5c3e2365254c38064f58d Author: Benjamin <poussin(a)codelutin.com> Date: Mon May 25 23:37:16 2020 +0200 ajout du composant Navigation qui contient aussi le order --- pkg/repository/bookmarkRepository.go | 2 +- web/src/components/Navigation.vue | 76 ++++++++++++++++++++++++++++++++++++ web/src/main.js | 27 +++++++++---- web/src/views/Home.vue | 19 ++------- 4 files changed, 100 insertions(+), 24 deletions(-) diff --git a/pkg/repository/bookmarkRepository.go b/pkg/repository/bookmarkRepository.go index 5cac40b..a940c0a 100644 --- a/pkg/repository/bookmarkRepository.go +++ b/pkg/repository/bookmarkRepository.go @@ -52,7 +52,7 @@ func BookmarkJSON(currentUser model.BowUser, id string, uri string, tags []strin tagsJoined := strings.Join(tags, ",") q := &query{sql: fmt.Sprintf(`WITH __query AS (%[5]s), - __info AS (select %[3]d as first, %[4]d as limit, count(id) as total, '%[1]s' as orderby, to_json('%[2]s' = 'asc') as orderasc, string_to_array($1, ',') as tags, $2::TEXT as fulltext, $3::TEXT as uri, $4::TEXT as id from __query), + __info AS (select %[3]d as first, %[4]d as limit, count(id) as total, '%[1]s' as orderby, to_json('%[2]s' <> 'desc') as orderasc, string_to_array($1, ',') as tags, $2::TEXT as fulltext, $3::TEXT as uri, $4::TEXT as id from __query), __infoJson AS (select row_to_json(i.*) as info from __info i), __allTags AS (select unnest(tags) as tag from __query), __tags AS (select tag, count(tag) from __allTags group by tag order by 2 desc), diff --git a/web/src/components/Navigation.vue b/web/src/components/Navigation.vue new file mode 100644 index 0000000..cef1acf --- /dev/null +++ b/web/src/components/Navigation.vue @@ -0,0 +1,76 @@ +<template> + <div class="navigation"> + <div class="cursor"> + <button @click="goFirst()"><<</button> + <button @click="goPrev()"><</button> + {{ 1 + queryInfo.first }}-{{ last }} + <button @click="goNext()">></button> + <button @click="goLast()">>></button> + / {{ queryInfo.total }} + </div> + + <div class="sort"> + <label + >order + <select v-model="orderby"> + <option>creationdate</option> + <option>importdate</option> + <option>privatealias</option> + <option>publicalias</option> + <option>updatedate</option> + <option>uri</option> + <option>visit</option> + </select> + </label> + <label>desc <input type="checkbox" v-model="orderasc"/></label> + </div> + </div> +</template> + +<script> +import { Component, Vue } from 'vue-property-decorator' + +@Component({ + name: 'Navigation', + components: {} +}) +class Navigation extends Vue { + get last() { + if (this.queryInfo.first + this.queryInfo.limit <= this.queryInfo.total) { + return this.queryInfo.first + this.queryInfo.limit + } + return this.queryInfo.total + } + + get orderby() { + return this.queryInfo.orderby + } + + set orderby(value) { + this.changeOrderBy(value) + } + + get orderasc() { + return this.queryInfo.orderasc + } + + set orderasc(value) { + this.changeOrderAsc(value) + } +} + +export default Navigation +</script> + +<style lang="less" scoped> +.navigation { + display: flex; + flex-wrap: wrap; + justify-content: center; + align-items: center; +} + +.sort { + margin-left: 15px; +} +</style> diff --git a/web/src/main.js b/web/src/main.js index c23dab2..45809e9 100644 --- a/web/src/main.js +++ b/web/src/main.js @@ -39,11 +39,25 @@ Vue.mixin({ fullQuery.fulltext && (query.fulltext = fullQuery.fulltext) fullQuery.query && (query.query = fullQuery.query) fullQuery.orderby != 'creationdate' && (query.orderby = fullQuery.orderby) - fullQuery.orderasc && (query.orderas = fullQuery.orderasc) + fullQuery.orderasc && (query.orderasc = fullQuery.orderasc) console.log('go params', query) this.$router.push({ name: 'Home', query }) }, + changeOrderBy: function(orderby) { + let query = { ...this.currentQuery } + if (query.orderby !== orderby) { + query.orderby = orderby + this.go(query) + } + }, + changeOrderAsc: function(orderasc) { + let query = { ...this.currentQuery } + if (query.orderasc !== orderasc) { + query.orderasc = orderasc + this.go(query) + } + }, changeTagsAndFulltextAndGo: function(tags, fulltext) { let query = { ...this.currentQuery } query.first = 0 @@ -52,17 +66,16 @@ Vue.mixin({ this.go(query) }, goFirst: function() { - let c = this.currentQuery - let query = { ...c } - query.first = 0 - if (query.first != c.first) { + let query = { ...this.currentQuery } + if (query.first != 0) { + query.first = 0 this.go(query) } }, goNext: function() { let query = { ...this.currentQuery } - query.first = query.first + this.user.maxresult - if (query.first < this.queryInfo.total) { + if (query.first + this.user.maxresult < this.queryInfo.total) { + query.first = query.first + this.user.maxresult this.go(query) } }, diff --git a/web/src/views/Home.vue b/web/src/views/Home.vue index fdcaf72..41be2c2 100644 --- a/web/src/views/Home.vue +++ b/web/src/views/Home.vue @@ -2,14 +2,7 @@ <div class="home"> <div>{{ errorMsg }}</div> <CloudTags></CloudTags> - <div class="navigation"> - <button @click="goFirst()"><<</button> - <button @click="goPrev()"><</button> - {{ 1 + queryInfo.first }}-{{ last }} - <button @click="goNext()">></button> - <button @click="goLast()">>></button> - / {{ queryInfo.total }} - </div> + <Navigation></Navigation> <div class="bookmarks-list"> <Bookmark v-for="bookmark in bookmarks" :key="bookmark.id" :bookmark="bookmark"></Bookmark> </div> @@ -21,11 +14,12 @@ import { Component, Prop, Vue } from 'vue-property-decorator' import Bookmark from '@/components/Bookmark' import CloudTags from '@/components/CloudTags' +import Navigation from '@/components/Navigation' @Component({ name: 'Home', props: ['id', 'tags', 'fulltext', 'query', 'orderby', 'orderasc', 'first'], - components: { CloudTags, Bookmark } + components: { CloudTags, Bookmark, Navigation } }) class Home extends Vue { @Prop id @@ -45,13 +39,6 @@ class Home extends Vue { errorMsg = '' - get last() { - if (this.queryInfo.first + this.queryInfo.limit <= this.queryInfo.total) { - return this.queryInfo.first + this.queryInfo.limit - } - return this.queryInfo.total - } - get bookmarks() { return this.queryResult } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch bow-v2-go updated (ce51486 -> af68521)
by chorem.org scm 25 May '20

25 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from ce51486 stockage des images en base64 pas de creation de role s'il existe deja ajout de la visu de l'auth info new af68521 en SQL il faut des ';' :) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit af685216505fe6baafc0999c3088358ea8e1c231 Author: Benjamin <poussin(a)codelutin.com> Date: Mon May 25 18:19:27 2020 +0200 en SQL il faut des ';' :) Summary of changes: migrate/001_init_schema.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch bow-v2-go updated (fff8634 -> ce51486)
by chorem.org scm 25 May '20

25 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from fff8634 on ne met plus d'en l'url les params qui ont la valeur par defaut new ce51486 stockage des images en base64 pas de creation de role s'il existe deja ajout de la visu de l'auth info The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ce5148617e7258268e82bfe0936e791ef490353a Author: Benjamin <poussin(a)codelutin.com> Date: Mon May 25 17:01:24 2020 +0200 stockage des images en base64 pas de creation de role s'il existe deja ajout de la visu de l'auth info Summary of changes: migrate/001_init_schema.sql | 15 +++++++----- migrate/002_migration_data.sql | 6 ++--- migrate/003_migrate_image.sql | 24 +++++++++++++++++++ pkg/repository/bookmarkRepository.go | 25 +++++++++---------- web/package.json | 1 + web/src/components/Bookmark.vue | 6 +++-- web/src/components/bookmark/AuthenticationInfo.vue | 28 ++++++++++++++++++++++ web/src/main.js | 3 +++ web/yarn.lock | 12 ++++++++++ 9 files changed, 97 insertions(+), 23 deletions(-) create mode 100644 migrate/003_migrate_image.sql create mode 100644 web/src/components/bookmark/AuthenticationInfo.vue -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch bow-v2-go updated (5e6b448 -> fff8634)
by chorem.org scm 24 May '20

24 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 5e6b448 amelioration navigation (borne) et refaco du inputSearch new fedbb6a ordre par defaut desc (les plus recent d'abord) new fff8634 on ne met plus d'en l'url les params qui ont la valeur par defaut The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit fff863477f5f69b59941319c95729eafb89e00a3 Author: Benjamin <poussin(a)codelutin.com> Date: Mon May 25 00:08:19 2020 +0200 on ne met plus d'en l'url les params qui ont la valeur par defaut commit fedbb6aec4f9ea99c8dba443438bdc2ccb2a2b91 Author: Benjamin <poussin(a)codelutin.com> Date: Sun May 24 23:09:18 2020 +0200 ordre par defaut desc (les plus recent d'abord) Summary of changes: doc/front-concept.md | 22 ++++++++++++++++++ pkg/constant/const.go | 4 ++-- pkg/http/bookmarkResource.go | 6 ++--- pkg/repository/bookmarkRepository.go | 8 +++---- web/src/main.js | 44 ++++++++++++++++++++---------------- web/src/router/index.js | 2 +- web/src/views/Home.vue | 8 +++---- 7 files changed, 60 insertions(+), 34 deletions(-) create mode 100644 doc/front-concept.md -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch bow-v2-go updated (6ba5781 -> 5e6b448)
by chorem.org scm 22 May '20

22 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 6ba5781 lors de l'ajout de tag a la recherche on ne permet pas l'ajout multiple du meme et on ne change d'url que si elle est bien differente new 5e6b448 amelioration navigation (borne) et refaco du inputSearch The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 5e6b4480043cc66cc610c7e9e161771bbc7a2248 Author: Benjamin <poussin(a)codelutin.com> Date: Fri May 22 04:21:25 2020 +0200 amelioration navigation (borne) et refaco du inputSearch Summary of changes: web/src/components/SearchInput.vue | 70 +++++++++----------------------------- web/src/main.js | 12 ++++--- web/src/views/Home.vue | 13 ++++--- 3 files changed, 33 insertions(+), 62 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch bow-v2-go updated (0017d99 -> 6ba5781)
by chorem.org scm 22 May '20

22 May '20

This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 0017d99 Navigation fonctionnel (par tag ou offset) adds 6ba5781 lors de l'ajout de tag a la recherche on ne permet pas l'ajout multiple du meme et on ne change d'url que si elle est bien differente No new revisions were added by this update. Summary of changes: web/src/main.js | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0