From 0f4a5447bf2691ff91226592f1f80b10f61602ee Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 4 Jun 2021 04:07:44 +1200 Subject: [PATCH 01/11] new pataka onboarding dialog --- .../components/community/CommunitiesList.vue | 2 +- ui/src/components/dialog/SettingsDialog.vue | 4 +- .../NewPatakaDialog.vue | 0 .../dialog/connection/OnboardDialog.vue | 185 ++++++++++++++++++ .../dialog/connection/PatakaHelper.vue | 93 +++++++++ ui/src/translations/en/index.js | 1 + .../translations/en/instructions-pataka.json | 12 ++ ui/src/translations/en/view-tribes.json | 2 +- ui/src/views/Login.vue | 62 ++++-- 9 files changed, 344 insertions(+), 17 deletions(-) rename ui/src/components/dialog/{community => connection}/NewPatakaDialog.vue (100%) create mode 100644 ui/src/components/dialog/connection/OnboardDialog.vue create mode 100644 ui/src/components/dialog/connection/PatakaHelper.vue create mode 100644 ui/src/translations/en/instructions-pataka.json diff --git a/ui/src/components/community/CommunitiesList.vue b/ui/src/components/community/CommunitiesList.vue index 5c86cc3e..a8702067 100644 --- a/ui/src/components/community/CommunitiesList.vue +++ b/ui/src/components/community/CommunitiesList.vue @@ -106,7 +106,7 @@ import gql from 'graphql-tag' import whakapapa from '@/assets/whakapapa.png' import ProfileCard from '@/components/profile/ProfileCard.vue' import Avatar from '@/components/Avatar.vue' -import NewPatakaDialog from '@/components/dialog/community/NewPatakaDialog.vue' +import NewPatakaDialog from '@/components/dialog/connection/NewPatakaDialog.vue' import AlertMessage from '@/components/dialog/AlertMessage.vue' import BigAddButton from '@/components/button/BigAddButton.vue' import { getTribes } from '@/lib/community-helpers.js' diff --git a/ui/src/components/dialog/SettingsDialog.vue b/ui/src/components/dialog/SettingsDialog.vue index 715ce91f..e84529e4 100644 --- a/ui/src/components/dialog/SettingsDialog.vue +++ b/ui/src/components/dialog/SettingsDialog.vue @@ -7,7 +7,7 @@ {{ t('loseAccess') }}. {{ t('backUpKey') }}

- + -

{{ t('languageTitle') }}

+

{{ t('languageTitle') }}

{{ t('chooseLanguage') }}

diff --git a/ui/src/components/dialog/community/NewPatakaDialog.vue b/ui/src/components/dialog/connection/NewPatakaDialog.vue similarity index 100% rename from ui/src/components/dialog/community/NewPatakaDialog.vue rename to ui/src/components/dialog/connection/NewPatakaDialog.vue diff --git a/ui/src/components/dialog/connection/OnboardDialog.vue b/ui/src/components/dialog/connection/OnboardDialog.vue new file mode 100644 index 00000000..4cfbd87b --- /dev/null +++ b/ui/src/components/dialog/connection/OnboardDialog.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/ui/src/components/dialog/connection/PatakaHelper.vue b/ui/src/components/dialog/connection/PatakaHelper.vue new file mode 100644 index 00000000..b404c89f --- /dev/null +++ b/ui/src/components/dialog/connection/PatakaHelper.vue @@ -0,0 +1,93 @@ + + + + diff --git a/ui/src/translations/en/index.js b/ui/src/translations/en/index.js index 2f74b599..607d68ab 100644 --- a/ui/src/translations/en/index.js +++ b/ui/src/translations/en/index.js @@ -27,6 +27,7 @@ module.exports = { notifications: require('./notifications.json'), pataka: require('./pataka'), + patakaInstruction: require('./instructions-pataka.json'), sideProfile: require('./side-profile.json'), diff --git a/ui/src/translations/en/instructions-pataka.json b/ui/src/translations/en/instructions-pataka.json new file mode 100644 index 00000000..ccb388b0 --- /dev/null +++ b/ui/src/translations/en/instructions-pataka.json @@ -0,0 +1,12 @@ +{ + "titlePataka":"Pātaka", + "description":"A Pātaka is alot like other 'cloud' services, It syncs an online back up of information within a chosen network of computers giving individuals the ability to share information between tribes.", + "difference":"The biggest difference between a 'Pātaka' and a 'cloud' is that a cloud is generally a warehouse of computers run by a company and chosen by the product developers. A Pātaka is a network of computers run by individuals and tribes and chosen by the users.", + "setup":"Individuals and Tribes can run there own Pataka to have greater control over the location their data.", + "ahau":"Ahau also runs A Pataka for those that dont have access to a Tribal Pataka.", + "ecryption":"All information held on a Pataka is completely encrypted and only accessible by yous or members of your tribe", + "info":"To learn more please visit https://docs.ahau.io", + "agree":"I Agree", + "close": "close" + } + \ No newline at end of file diff --git a/ui/src/translations/en/view-tribes.json b/ui/src/translations/en/view-tribes.json index b8b46bcf..f2c2f746 100644 --- a/ui/src/translations/en/view-tribes.json +++ b/ui/src/translations/en/view-tribes.json @@ -2,5 +2,5 @@ "tribes": "Tribes", "newTribeButton": "new tribe", "connectedTribes": "Tribes that you are connected to", - "otherTribes": "Other whānau tribes" + "otherTribes": "Other tribes" } diff --git a/ui/src/views/Login.vue b/ui/src/views/Login.vue index 6077388f..968b2935 100644 --- a/ui/src/views/Login.vue +++ b/ui/src/views/Login.vue @@ -58,17 +58,27 @@ isUser @close="toggleNew" @create="save($event)" /> - + From 6fad1e345b07c26cd742a6b6d8badcce717b23e0 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 6 Jun 2021 02:34:21 +1200 Subject: [PATCH 02/11] updated pataka dialog and pataka helper dialog --- desktop/CHANGELOG.md | 4 + ui/src/App.vue | 4 + .../assets/animations/alternative-servers.svg | 590 +++++ ui/src/assets/animations/corporate-server.svg | 559 +++++ .../data-on-a-p\304\201taka_css.svg" | 1893 +++++++++++++++++ .../multiple-p\304\201taka_css.svg" | 1456 +++++++++++++ .../replication-via-internet_css.svg | 871 ++++++++ .../components/community/CommunitiesList.vue | 22 +- ui/src/components/dialog/AlertMessage.vue | 4 +- ui/src/components/dialog/Dialog.vue | 2 +- .../dialog/connection/NewPatakaDialog.vue | 224 +- .../dialog/connection/OnboardDialog.vue | 185 -- .../dialog/connection/PatakaHelper.vue | 41 +- .../dialog/profile/NewNodeDialog.vue | 10 +- ui/src/components/menu/Appbar.vue | 1 - ui/src/components/profile/Profile.vue | 4 +- .../translations/en/instructions-pataka.json | 19 +- ui/src/translations/en/pataka.json | 40 +- ui/src/views/Login.vue | 43 +- ui/src/views/ProfileShow.vue | 23 +- 20 files changed, 5683 insertions(+), 312 deletions(-) create mode 100644 ui/src/assets/animations/alternative-servers.svg create mode 100644 ui/src/assets/animations/corporate-server.svg create mode 100644 "ui/src/assets/animations/data-on-a-p\304\201taka_css.svg" create mode 100644 "ui/src/assets/animations/multiple-p\304\201taka_css.svg" create mode 100644 ui/src/assets/animations/replication-via-internet_css.svg delete mode 100644 ui/src/components/dialog/connection/OnboardDialog.vue diff --git a/desktop/CHANGELOG.md b/desktop/CHANGELOG.md index 04851ae1..6ca1dc72 100644 --- a/desktop/CHANGELOG.md +++ b/desktop/CHANGELOG.md @@ -11,6 +11,9 @@ - In the settings dialog - The main nav bar now shows connected tribes for quick navigation - In tribe profile view you can now click on a member to view there profile info +- Updated Pataka onboarding + - updated the Pataka dialog to provided users with other options + - Users will now be prompted to join a Pātaka upon creating a profile ### Bug Fixes @@ -25,6 +28,7 @@ - fix showing tribes list if no tribes in appbar - fix addPersonFormTitle translations - Fixed bug causing selected locale to default to English when another language has been selected +- Updated the popup messages for consistency in style ## v1.4.2 diff --git a/ui/src/App.vue b/ui/src/App.vue index 29314f27..9ad7a5ef 100644 --- a/ui/src/App.vue +++ b/ui/src/App.vue @@ -171,6 +171,10 @@ body { flex:none } +.v-image__image--cover { + background-size: contain !important; +} + .version { color: #999; position: fixed; diff --git a/ui/src/assets/animations/alternative-servers.svg b/ui/src/assets/animations/alternative-servers.svg new file mode 100644 index 00000000..07d49649 --- /dev/null +++ b/ui/src/assets/animations/alternative-servers.svg @@ -0,0 +1,590 @@ + + + + + + image/svg+xml + + + + + Sam Muirhead + + + https://github.com/ssbc/visual-docs/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui/src/assets/animations/corporate-server.svg b/ui/src/assets/animations/corporate-server.svg new file mode 100644 index 00000000..f499521e --- /dev/null +++ b/ui/src/assets/animations/corporate-server.svg @@ -0,0 +1,559 @@ + + + + + + image/svg+xml + + + + + Sam Muirhead + + + https://github.com/ssbc/visual-docs/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + BIGCORP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git "a/ui/src/assets/animations/data-on-a-p\304\201taka_css.svg" "b/ui/src/assets/animations/data-on-a-p\304\201taka_css.svg" new file mode 100644 index 00000000..4e3e320f --- /dev/null +++ "b/ui/src/assets/animations/data-on-a-p\304\201taka_css.svg" @@ -0,0 +1,1893 @@ + + + + + + image/svg+xml + + + + + Sam Muirhead + + + https://github.com/ssbc/visual-docs/ + + + + + + + + + + + + + Data on a Pātaka + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Pātaka + Member of Group A + Member of Groups A & B + Member of Group C + + + Group A + Group B + Group C + + + + + + + diff --git "a/ui/src/assets/animations/multiple-p\304\201taka_css.svg" "b/ui/src/assets/animations/multiple-p\304\201taka_css.svg" new file mode 100644 index 00000000..a7d7c8d1 --- /dev/null +++ "b/ui/src/assets/animations/multiple-p\304\201taka_css.svg" @@ -0,0 +1,1456 @@ + + + + + + image/svg+xml + + + + + Sam Muirhead + + + https://github.com/ssbc/visual-docs/ + + + + + + + + + + + + + Multiple Pātaka + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Join Pātaka + + + + + + + + + + + + + + + + Connected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Whānau members receive connect codes from a Pātaka + Whānau members accept invitation and connect to the Pātaka + it is backed up to the Pātaka + Whānau member B creates a new whakapapa record + The Pātaka replicates the whakapapa record to A and C + Whānau member A creates a new whakapapa record + The Pātaka replicates the whakapapa record to B and C + A second Pātaka is set up + The new Pātaka receives a connect code from the existing Pātaka + The existing Pātaka's content is replicated to the new Pātaka + The new Pātaka is now connected to whānau members A, B, and C + If the original Pātaka goes offline + The whānau members are still connected via the new Pātaka + + + diff --git a/ui/src/assets/animations/replication-via-internet_css.svg b/ui/src/assets/animations/replication-via-internet_css.svg new file mode 100644 index 00000000..e846d6ee --- /dev/null +++ b/ui/src/assets/animations/replication-via-internet_css.svg @@ -0,0 +1,871 @@ + + + + + + image/svg+xml + + + + + Sam Muirhead + + + https://github.com/ssbc/visual-docs/ + + + + + + + + + + + + + Replication via Pātaka + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Pātaka + + Internet + + Whānau Member + + Whānau Member + + + diff --git a/ui/src/components/community/CommunitiesList.vue b/ui/src/components/community/CommunitiesList.vue index a8702067..d3e9a3dd 100644 --- a/ui/src/components/community/CommunitiesList.vue +++ b/ui/src/components/community/CommunitiesList.vue @@ -92,24 +92,19 @@ @close="dialog = false" @submit="connected($event)" /> - diff --git a/ui/src/components/dialog/connection/OnboardDialog.vue b/ui/src/components/dialog/connection/OnboardDialog.vue deleted file mode 100644 index 4cfbd87b..00000000 --- a/ui/src/components/dialog/connection/OnboardDialog.vue +++ /dev/null @@ -1,185 +0,0 @@ - - - - - diff --git a/ui/src/components/dialog/connection/PatakaHelper.vue b/ui/src/components/dialog/connection/PatakaHelper.vue index b404c89f..dbb1933d 100644 --- a/ui/src/components/dialog/connection/PatakaHelper.vue +++ b/ui/src/components/dialog/connection/PatakaHelper.vue @@ -1,32 +1,32 @@