From 5aaa38d9284777fe18cad07aeed6f58cbc9e432c Mon Sep 17 00:00:00 2001 From: Santiago Siri Date: Fri, 7 Feb 2020 13:50:48 +0100 Subject: [PATCH 1/6] the less the better --- i18n/en.i18n.json | 10 +++++----- .../ui/templates/components/collective/collective.js | 2 ++ .../templates/layout/authentication/authentication.js | 7 ++++++- imports/ui/templates/layout/url/topbar/topbar.js | 7 ++++++- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 4c8d00c94..7f93f7808 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -831,10 +831,10 @@ "guild-voting-addresses": "Voters", "replica-person": "Profile.", "replica-score": "Personhood", - "replica-detail-very-human": "🤠 Definitely a human.", - "replica-detail-likely-human": "🐵 Certainly a human.", + "replica-detail-very-human": "🤠 Definitely human.", + "replica-detail-likely-human": "🐵 Certainly human.", "replica-detail-maybe-human": "👽 Uncertain if human or robot.", - "replica-detail-unlikely-human": "🤖 Certainly a robot.", - "replica-detail-not-human": "👾 Definitely a robot.", - "replica-detail-unknown-human": "😔 Unknown score." + "replica-detail-unlikely-human": "🤖 Certainly robot.", + "replica-detail-not-human": "👾 Definitely robot.", + "replica-detail-unknown-human": "😔 Unknown 0score." } diff --git a/imports/ui/templates/components/collective/collective.js b/imports/ui/templates/components/collective/collective.js index 79a07a5c6..abbe30838 100644 --- a/imports/ui/templates/components/collective/collective.js +++ b/imports/ui/templates/components/collective/collective.js @@ -1,6 +1,8 @@ import { Meteor } from 'meteor/meteor'; import { Template } from 'meteor/templating'; import { Session } from 'meteor/session'; +import { Router } from 'meteor/iron:router'; + import { $ } from 'meteor/jquery'; import { Collectives } from '/imports/api/collectives/Collectives'; diff --git a/imports/ui/templates/layout/authentication/authentication.js b/imports/ui/templates/layout/authentication/authentication.js index 1806147ef..2ee1639f0 100644 --- a/imports/ui/templates/layout/authentication/authentication.js +++ b/imports/ui/templates/layout/authentication/authentication.js @@ -106,7 +106,12 @@ Template.authentication.helpers({ Template.authentication.events({ 'click #loggedUser'(event) { event.stopPropagation(); - promptLogin((!Session.get('user-login') || !Session.get('user-login').visible), event); + if (Meteor.user()) { + Router.go(`/address/${Meteor.user().username}`); + } else { + Router.go('/'); + } + // promptLogin((!Session.get('user-login') || !Session.get('user-login').visible), event); }, 'click #navbar-post-button'() { _publish(); diff --git a/imports/ui/templates/layout/url/topbar/topbar.js b/imports/ui/templates/layout/url/topbar/topbar.js index 55903b7bb..fb3e22ecf 100644 --- a/imports/ui/templates/layout/url/topbar/topbar.js +++ b/imports/ui/templates/layout/url/topbar/topbar.js @@ -97,7 +97,12 @@ Template.topbar.helpers({ Template.topbar.events({ 'click #collective-login'() { event.stopPropagation(); - _prompt(Template.instance()); + if (Meteor.user()) { + Router.go(`/address/${Meteor.user().username}`); + } else { + Router.go('/'); + } + // _prompt(Template.instance()); }, 'click #nav-home'(event) { event.preventDefault(); From d7a64f42ec1f18b36d60ea57b34d368260f356a3 Mon Sep 17 00:00:00 2001 From: Santiago Siri Date: Fri, 7 Feb 2020 14:00:20 +0100 Subject: [PATCH 2/6] sign out done --- imports/ui/templates/layout/url/topbar/topbar.html | 2 +- public/templates/daoverse/css/daoverse.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/imports/ui/templates/layout/url/topbar/topbar.html b/imports/ui/templates/layout/url/topbar/topbar.html index bdbbc8ce9..7e63bc5ed 100644 --- a/imports/ui/templates/layout/url/topbar/topbar.html +++ b/imports/ui/templates/layout/url/topbar/topbar.html @@ -9,7 +9,7 @@ {{else}}