From ddf04611971ba6be6fd830e977c3a4293b4f1559 Mon Sep 17 00:00:00 2001 From: James Martin Date: Thu, 23 May 2019 11:40:22 -0400 Subject: [PATCH 01/20] Update index.css --- generators/app/templates/src/index.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/generators/app/templates/src/index.css b/generators/app/templates/src/index.css index 41defa92..b255d79f 100644 --- a/generators/app/templates/src/index.css +++ b/generators/app/templates/src/index.css @@ -104,3 +104,8 @@ form-group .select-role { margin: 10px 0; } +.solid-provider-select { + text-align: left !important; + padding-left: 14px !important; +} + From b1c63a32514afa21ffc581a711a9784b8b898e20 Mon Sep 17 00:00:00 2001 From: James Martin Date: Thu, 23 May 2019 11:46:01 -0400 Subject: [PATCH 02/20] Adding css overrides to the styleguide for the login provider dropdown --- generators/app/templates/src/index.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/generators/app/templates/src/index.css b/generators/app/templates/src/index.css index b255d79f..487573fb 100644 --- a/generators/app/templates/src/index.css +++ b/generators/app/templates/src/index.css @@ -104,8 +104,12 @@ form-group .select-role { margin: 10px 0; } +/* Overriding the center-align property from the styleguide */ .solid-provider-select { text-align: left !important; - padding-left: 14px !important; +} + +.solid-provider-select .option { + padding-left: 10px !important; } From eed44e574dc1894df1c58628501b3f8d51570c9f Mon Sep 17 00:00:00 2001 From: James Martin Date: Thu, 23 May 2019 11:52:59 -0400 Subject: [PATCH 03/20] Fixing margin and color on registration success page --- .../RegistrationSuccess/registration-success.style.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/generators/app/templates/src/containers/Register/children/RegistrationSuccess/registration-success.style.js b/generators/app/templates/src/containers/Register/children/RegistrationSuccess/registration-success.style.js index d6ed2b49..1dc115f6 100644 --- a/generators/app/templates/src/containers/Register/children/RegistrationSuccess/registration-success.style.js +++ b/generators/app/templates/src/containers/Register/children/RegistrationSuccess/registration-success.style.js @@ -3,6 +3,11 @@ import { GradientBackground } from "@util-components"; export const RegistrationPage = styled(GradientBackground)` text-align: center; + margin-top: 40px; + + h1 { + color: #ffffff; + } span { color: #ffffff; From 3326fc9a97b242ecccd7785df3d3afa219a37ff4 Mon Sep 17 00:00:00 2001 From: James Martin Date: Wed, 29 May 2019 13:16:23 -0400 Subject: [PATCH 04/20] Updating text and fixing image predicate --- .../app/templates/public/locales/en-US/translation.json | 2 +- .../app/templates/public/locales/en/translation.json | 2 +- .../app/templates/public/locales/es/translation.json | 2 +- .../Profile/components/Image/image.component.js | 6 +++--- .../src/containers/Profile/profile.container.js | 8 ++++---- .../templates/src/containers/Profile/profile.style.js | 2 +- .../src/containers/Welcome/welcome.container.js | 9 ++++----- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/generators/app/templates/public/locales/en-US/translation.json b/generators/app/templates/public/locales/en-US/translation.json index aade00cf..d6a4b72d 100644 --- a/generators/app/templates/public/locales/en-US/translation.json +++ b/generators/app/templates/public/locales/en-US/translation.json @@ -89,6 +89,6 @@ "unsupported": "Unsupported media type", "maximumFiles": "Sorry, you have exceeded the maximum number of files allowed per upload" }, - "deleteNotification": "Clicking ‘Remove’ will delete the associated element immediately. There is no undo." + "autosaveNotification": "Profile changes are saved immediately. There is no undo." } } diff --git a/generators/app/templates/public/locales/en/translation.json b/generators/app/templates/public/locales/en/translation.json index aade00cf..d6a4b72d 100644 --- a/generators/app/templates/public/locales/en/translation.json +++ b/generators/app/templates/public/locales/en/translation.json @@ -89,6 +89,6 @@ "unsupported": "Unsupported media type", "maximumFiles": "Sorry, you have exceeded the maximum number of files allowed per upload" }, - "deleteNotification": "Clicking ‘Remove’ will delete the associated element immediately. There is no undo." + "autosaveNotification": "Profile changes are saved immediately. There is no undo." } } diff --git a/generators/app/templates/public/locales/es/translation.json b/generators/app/templates/public/locales/es/translation.json index c05f5f9e..8616dd2e 100644 --- a/generators/app/templates/public/locales/es/translation.json +++ b/generators/app/templates/public/locales/es/translation.json @@ -89,6 +89,6 @@ "unsupported": "Formato no soportado", "maximumFiles": "Disculpe, has excedido la cantidad máxima de archivos permitidos por subida" }, - "deleteNotification": "Dar click a 'Eliminar' borraría el elemento asociado inmediatamente. No hay vuelta atrás." + "autosaveNotification": "Cambios realizados en el Perfil son guardados automáticamente. No se puede deshacer." } } diff --git a/generators/app/templates/src/containers/Profile/components/Image/image.component.js b/generators/app/templates/src/containers/Profile/components/Image/image.component.js index 2ef48196..660faf0d 100644 --- a/generators/app/templates/src/containers/Profile/components/Image/image.component.js +++ b/generators/app/templates/src/containers/Profile/components/Image/image.component.js @@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react'; import data from '@solid/query-ldflex'; import { Uploader, useLiveUpdate } from '@inrupt/solid-react-components'; import { useTranslation } from 'react-i18next'; - +import { namedNode } from "@rdfjs/data-model"; import { ImageProfile } from '@components'; type Props = { @@ -35,7 +35,7 @@ export const Image = ({ webId, toastManager, defaultProfilePhoto }: Props) => { * if you want to know more about context please go to: * https://github.com/digitalbazaar/jsonld.js */ - const image = (await user.image) || (await user.vcard_hasPhoto); + const image = await user.vcard_hasPhoto; setImage(image && image.value); } @@ -55,7 +55,7 @@ export const Image = ({ webId, toastManager, defaultProfilePhoto }: Props) => { try { const { user } = data; - await user.image.set(uri); + await user.vcard_hasPhoto.set(namedNode(uri)); toastManager.add(['', t('profile.uploadSuccess')], { appearance: 'success', diff --git a/generators/app/templates/src/containers/Profile/profile.container.js b/generators/app/templates/src/containers/Profile/profile.container.js index a3829e0e..6bac2b08 100644 --- a/generators/app/templates/src/containers/Profile/profile.container.js +++ b/generators/app/templates/src/containers/Profile/profile.container.js @@ -8,7 +8,7 @@ import { ProfileContainer, ProfileWrapper, ShexForm, - DeleteNotification, + AutoSaveNotification, WebId, } from './profile.style'; import { Image } from './components'; @@ -59,12 +59,12 @@ const Profile = ({ toastManager }) => { /> - +
- {t('profile.deleteNotification')} + {t('profile.autosaveNotification')}
- + diff --git a/generators/app/templates/src/containers/Profile/profile.style.js b/generators/app/templates/src/containers/Profile/profile.style.js index 9724435c..64047b01 100644 --- a/generators/app/templates/src/containers/Profile/profile.style.js +++ b/generators/app/templates/src/containers/Profile/profile.style.js @@ -147,6 +147,6 @@ background: #f9f9f9; } `; -export const DeleteNotification = styled.section` +export const AutoSaveNotification = styled.section` margin-bottom:0px !important; `; diff --git a/generators/app/templates/src/containers/Welcome/welcome.container.js b/generators/app/templates/src/containers/Welcome/welcome.container.js index 7ee9be71..11d9eb81 100644 --- a/generators/app/templates/src/containers/Welcome/welcome.container.js +++ b/generators/app/templates/src/containers/Welcome/welcome.container.js @@ -3,7 +3,7 @@ import WelcomePageContent from './welcome.component'; import { withWebId } from '@inrupt/solid-react-components'; import data from '@solid/query-ldflex'; import { withToastManager } from 'react-toast-notifications'; - +import { namedNode } from "@rdfjs/data-model"; const defaultProfilePhoto = '/img/icon/empty-profile.svg'; /** @@ -51,8 +51,7 @@ class WelcomeComponent extends Component { const name = nameLd ? nameLd.value : ''; - let imageLd = await user.image; - imageLd = imageLd ? imageLd : await user.vcard_hasPhoto; + let imageLd = await user.vcard_hasPhoto; let image; if (imageLd && imageLd.value) { @@ -85,8 +84,8 @@ class WelcomeComponent extends Component { try { const { user } = data; this.state.hasImage - ? await user.image.set(uri) - : await user.image.add(uri); + ? await user.vcard_hasPhoto.set(namedNode(uri)) + : await user.vcard_hasPhoto.add(namedNode(uri)); this.props.toastManager.add(['', message], { appearance: 'success' From 00ee607d179e1b70c1e94c00d51b3968f44e25c0 Mon Sep 17 00:00:00 2001 From: Pablo Rodriguez Date: Wed, 29 May 2019 15:28:40 -0600 Subject: [PATCH 05/20] Removing 'image' predicate for profile picture --- .../src/components/AuthNavBar/auth-nav-bar.container.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/generators/app/templates/src/components/AuthNavBar/auth-nav-bar.container.js b/generators/app/templates/src/components/AuthNavBar/auth-nav-bar.container.js index 91ed9af6..96c00581 100644 --- a/generators/app/templates/src/components/AuthNavBar/auth-nav-bar.container.js +++ b/generators/app/templates/src/components/AuthNavBar/auth-nav-bar.container.js @@ -23,8 +23,7 @@ class AuthNavBarContainer extends Component { * for more information please go to: https://github.com/digitalbazaar/jsonld.js */ const userName = await user.name; - let userImage = await user.image; - userImage = userImage ? userImage : await user.vcard_hasPhoto; + const userImage = await user.vcard_hasPhoto; const name = userName ? userName.value : ""; const image = userImage ? userImage.value : "/img/icon/empty-profile.svg"; this.setState({ From 52352e207c16d01e13cfd14860b8ac3cbe569ad4 Mon Sep 17 00:00:00 2001 From: Pablo Rodriguez Date: Wed, 29 May 2019 16:08:56 -0600 Subject: [PATCH 06/20] multiple image upload while on welcome page --- .../app/templates/src/containers/Welcome/welcome.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/app/templates/src/containers/Welcome/welcome.component.js b/generators/app/templates/src/containers/Welcome/welcome.component.js index d0c4c02e..b18e44b4 100644 --- a/generators/app/templates/src/containers/Welcome/welcome.component.js +++ b/generators/app/templates/src/containers/Welcome/welcome.component.js @@ -51,7 +51,7 @@ const WelcomePageContent = props => { } }, onComplete: uploadedFiles => { - updatePhoto(uploadedFiles[0].uri, t('welcome.uploadSuccess')); + updatePhoto(uploadedFiles[uploadedFiles.length - 1].uri, t('welcome.uploadSuccess')); }, render: props => ( Date: Fri, 31 May 2019 14:58:08 -0400 Subject: [PATCH 07/20] Updating components version --- generators/app/templates/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json index 00d6fb4d..59018dd3 100644 --- a/generators/app/templates/package.json +++ b/generators/app/templates/package.json @@ -4,7 +4,7 @@ "@fortawesome/free-brands-svg-icons": "^5.8.0", "@fortawesome/free-solid-svg-icons": "^5.6.3", "@fortawesome/react-fontawesome": "^0.1.4", - "@inrupt/solid-react-components": "^0.4.0", + "@inrupt/solid-react-components": "^0.4.1-rc.0", "@inrupt/solid-style-guide": "^0.1.34", "@rdfjs/data-model": "^1.1.1", "@solid/query-ldflex": "^2.4.0", From 429a1fecfd869cd076411af112205bcae5297bf8 Mon Sep 17 00:00:00 2001 From: James Martin Date: Fri, 31 May 2019 15:33:11 -0400 Subject: [PATCH 08/20] Updating package-lock --- generators/app/templates/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/generators/app/templates/package-lock.json b/generators/app/templates/package-lock.json index 26ed5b37..32832603 100644 --- a/generators/app/templates/package-lock.json +++ b/generators/app/templates/package-lock.json @@ -1965,9 +1965,9 @@ } }, "@inrupt/solid-react-components": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@inrupt/solid-react-components/-/solid-react-components-0.4.0.tgz", - "integrity": "sha512-R7HgkhXt/VeuEQkT9AC/1YzCyiYJrFEEzzBP8zXDFVBUHfccVtCayzNDlqCXxYe+G/NeAPClrRkjIG8g7T3ZiA==", + "version": "0.4.1-rc.0", + "resolved": "https://registry.npmjs.org/@inrupt/solid-react-components/-/solid-react-components-0.4.1-rc.0.tgz", + "integrity": "sha512-79KfidNqJo+mzy80ocCYuG1TqMN7H+venYCmPQxYceW2xcUpQKN+P+DGWK2fbu4mKX5faZsLuCPK5WnRRNjCXA==", "requires": { "@babel/runtime": "^7.1.2", "@shexjs/core": "^1.0.0-alpha.4", @@ -16556,9 +16556,9 @@ } }, "react-select": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/react-select/-/react-select-2.4.3.tgz", - "integrity": "sha512-cmxNaiHpviRYkojeW9rGEUJ4jpX7QTmPe2wcscwA4d1lStzw/cJtr4ft5H2O/YhfpkrcwaLghu3XmEYdXhBo8Q==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-2.4.4.tgz", + "integrity": "sha512-C4QPLgy9h42J/KkdrpVxNmkY6p4lb49fsrbDk/hRcZpX7JvZPNb6mGj+c5SzyEtBv1DmQ9oPH4NmhAFvCrg8Jw==", "requires": { "classnames": "^2.2.5", "emotion": "^9.1.2", From b41c682bbd34cc19a5a26c858b23448b77223325 Mon Sep 17 00:00:00 2001 From: James Martin Date: Fri, 31 May 2019 15:44:00 -0400 Subject: [PATCH 09/20] Adding autosave --- .../app/templates/src/containers/Profile/profile.container.js | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/app/templates/src/containers/Profile/profile.container.js b/generators/app/templates/src/containers/Profile/profile.container.js index 6bac2b08..56fbcdde 100644 --- a/generators/app/templates/src/containers/Profile/profile.container.js +++ b/generators/app/templates/src/containers/Profile/profile.container.js @@ -104,6 +104,7 @@ const Profile = ({ toastManager }) => { }, successCallback, errorCallback, + autoSaveMode : false }} /> From 29fe569bb482a068ed4f1fb205779402196f23db Mon Sep 17 00:00:00 2001 From: James Martin Date: Fri, 31 May 2019 15:48:32 -0400 Subject: [PATCH 10/20] Adding autosave again --- .../app/templates/src/containers/Profile/profile.container.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/app/templates/src/containers/Profile/profile.container.js b/generators/app/templates/src/containers/Profile/profile.container.js index 56fbcdde..8eb65168 100644 --- a/generators/app/templates/src/containers/Profile/profile.container.js +++ b/generators/app/templates/src/containers/Profile/profile.container.js @@ -104,7 +104,7 @@ const Profile = ({ toastManager }) => { }, successCallback, errorCallback, - autoSaveMode : false + autoSaveMode : true }} /> From 30bab46cc2c09b7b2565ba7dfbc2a290d74e8215 Mon Sep 17 00:00:00 2001 From: Jairo Campos Date: Tue, 4 Jun 2019 09:42:54 -0600 Subject: [PATCH 11/20] added language on shexForm --- generators/app/templates/package-lock.json | 54 +++++++++++++------ .../public/locales/en-US/translation.json | 7 ++- .../public/locales/en/translation.json | 7 ++- .../public/locales/es/translation.json | 7 ++- .../containers/Profile/profile.container.js | 7 +++ 5 files changed, 62 insertions(+), 20 deletions(-) diff --git a/generators/app/templates/package-lock.json b/generators/app/templates/package-lock.json index 32832603..6a24e588 100644 --- a/generators/app/templates/package-lock.json +++ b/generators/app/templates/package-lock.json @@ -9298,7 +9298,8 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "bundled": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -9316,11 +9317,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -9333,15 +9336,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -9444,7 +9450,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -9454,6 +9461,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -9466,17 +9474,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -9493,6 +9504,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -9565,7 +9577,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -9575,6 +9588,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -9650,7 +9664,8 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true + "bundled": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -9680,6 +9695,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -9697,6 +9713,7 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -9735,11 +9752,13 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true + "bundled": true, + "optional": true }, "yallist": { "version": "3.0.3", - "bundled": true + "bundled": true, + "optional": true } } }, @@ -13199,8 +13218,13 @@ "resolved": "https://registry.npmjs.org/node-web-streams/-/node-web-streams-0.2.2.tgz", "integrity": "sha1-CH52u+t+jcVmhrJdtOYMX/nbCR8=", "requires": { - "is-stream": "^1.1.0", - "web-streams-polyfill": "git://github.com/gwicke/web-streams-polyfill.git#42c488428adea1dc0c0245014e4896ad456b1ded" + "is-stream": "^1.1.0" + }, + "dependencies": { + "web-streams-polyfill": { + "version": "git://github.com/gwicke/web-streams-polyfill.git#42c488428adea1dc0c0245014e4896ad456b1ded", + "from": "git://github.com/gwicke/web-streams-polyfill.git#42c488428adea1dc0c0245014e4896ad456b1ded" + } } }, "nopt": { @@ -19224,10 +19248,6 @@ "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.3.tgz", "integrity": "sha512-r8sAtNmgR0WKOKOxzuSgk09JsHlpKlB+uHi937qypOu3PZ17UxPrierFKDye/uNHjNTTEshu5PId8rojIPj/tA==" }, - "web-streams-polyfill": { - "version": "git://github.com/gwicke/web-streams-polyfill.git#42c488428adea1dc0c0245014e4896ad456b1ded", - "from": "git://github.com/gwicke/web-streams-polyfill.git#spec_performance_improvements" - }, "webidl-conversions": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", diff --git a/generators/app/templates/public/locales/en-US/translation.json b/generators/app/templates/public/locales/en-US/translation.json index d6a4b72d..94726f64 100644 --- a/generators/app/templates/public/locales/en-US/translation.json +++ b/generators/app/templates/public/locales/en-US/translation.json @@ -89,6 +89,11 @@ "unsupported": "Unsupported media type", "maximumFiles": "Sorry, you have exceeded the maximum number of files allowed per upload" }, - "autosaveNotification": "Profile changes are saved immediately. There is no undo." + "autosaveNotification": "Profile changes are saved immediately. There is no undo.", + "warningResolution": "Field value has been updated to:", + "minMxNumberInclusive": "Error: Min and max should be ", + "minMxNumberExclusive": "Error: Min and max value should be ", + "minMaxString": "Error: Min and max should be ", + "defaultError": "Error: Field value has wrong format" } } diff --git a/generators/app/templates/public/locales/en/translation.json b/generators/app/templates/public/locales/en/translation.json index d6a4b72d..94726f64 100644 --- a/generators/app/templates/public/locales/en/translation.json +++ b/generators/app/templates/public/locales/en/translation.json @@ -89,6 +89,11 @@ "unsupported": "Unsupported media type", "maximumFiles": "Sorry, you have exceeded the maximum number of files allowed per upload" }, - "autosaveNotification": "Profile changes are saved immediately. There is no undo." + "autosaveNotification": "Profile changes are saved immediately. There is no undo.", + "warningResolution": "Field value has been updated to:", + "minMxNumberInclusive": "Error: Min and max should be ", + "minMxNumberExclusive": "Error: Min and max value should be ", + "minMaxString": "Error: Min and max should be ", + "defaultError": "Error: Field value has wrong format" } } diff --git a/generators/app/templates/public/locales/es/translation.json b/generators/app/templates/public/locales/es/translation.json index 8616dd2e..b6acd644 100644 --- a/generators/app/templates/public/locales/es/translation.json +++ b/generators/app/templates/public/locales/es/translation.json @@ -89,6 +89,11 @@ "unsupported": "Formato no soportado", "maximumFiles": "Disculpe, has excedido la cantidad máxima de archivos permitidos por subida" }, - "autosaveNotification": "Cambios realizados en el Perfil son guardados automáticamente. No se puede deshacer." + "autosaveNotification": "Cambios realizados en el Perfil son guardados automáticamente. No se puede deshacer.", + "warningResolution": "El valor del campo se ha actualizado a ", + "minMxNumberInclusive": "Error: Mínimo y máximo debería ser ", + "minMxNumberExclusive": "Error: Mínimo y máximo debería ser ", + "minMaxString": "Error: Mínimo y máximo debería ser ", + "defaultError": "Error: Formato incorrecto" } } diff --git a/generators/app/templates/src/containers/Profile/profile.container.js b/generators/app/templates/src/containers/Profile/profile.container.js index 8eb65168..afcc2014 100644 --- a/generators/app/templates/src/containers/Profile/profile.container.js +++ b/generators/app/templates/src/containers/Profile/profile.container.js @@ -101,6 +101,13 @@ const Profile = ({ toastManager }) => { dropdownDefaultText: t( 'profile.dropdownDefaultText' ), + warningResolution: t('profile.warningResolution'), + formValidate: { + minMxNumberInclusive: t('profile.minMxNumberInclusive'), + minMxNumberExclusive: t('profile.minMxNumberExclusive'), + minMaxString: t('profile.minMaxString'), + default: t('profile.defaultError') + } }, successCallback, errorCallback, From b832ed901f637ca214bb65eee088af10dbae8d1b Mon Sep 17 00:00:00 2001 From: James Martin Date: Tue, 4 Jun 2019 13:38:57 -0400 Subject: [PATCH 12/20] Updating components version --- generators/app/templates/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json index 59018dd3..c511bde1 100644 --- a/generators/app/templates/package.json +++ b/generators/app/templates/package.json @@ -4,7 +4,7 @@ "@fortawesome/free-brands-svg-icons": "^5.8.0", "@fortawesome/free-solid-svg-icons": "^5.6.3", "@fortawesome/react-fontawesome": "^0.1.4", - "@inrupt/solid-react-components": "^0.4.1-rc.0", + "@inrupt/solid-react-components": "^0.4.1-rc.1", "@inrupt/solid-style-guide": "^0.1.34", "@rdfjs/data-model": "^1.1.1", "@solid/query-ldflex": "^2.4.0", From 7ab9dda20f1c2b0887e22915af9a68e6a7310eda Mon Sep 17 00:00:00 2001 From: Jairo Campos Date: Tue, 4 Jun 2019 12:46:43 -0600 Subject: [PATCH 13/20] fixed liveupdate --- .../app/templates/src/containers/Profile/profile.container.js | 2 +- .../app/templates/src/layouts/PrivateLayout/private.layout.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generators/app/templates/src/containers/Profile/profile.container.js b/generators/app/templates/src/containers/Profile/profile.container.js index 8eb65168..56fbcdde 100644 --- a/generators/app/templates/src/containers/Profile/profile.container.js +++ b/generators/app/templates/src/containers/Profile/profile.container.js @@ -104,7 +104,7 @@ const Profile = ({ toastManager }) => { }, successCallback, errorCallback, - autoSaveMode : true + autoSaveMode : false }} /> diff --git a/generators/app/templates/src/layouts/PrivateLayout/private.layout.js b/generators/app/templates/src/layouts/PrivateLayout/private.layout.js index 59fdfd99..0605f852 100644 --- a/generators/app/templates/src/layouts/PrivateLayout/private.layout.js +++ b/generators/app/templates/src/layouts/PrivateLayout/private.layout.js @@ -26,9 +26,9 @@ const PrivateLayout = ({ routes, ...rest }) => { {...rest} component={matchProps => ( - + { rest.webId && - + } {routes.map(route => ( From 84eb4554d35b1d52c7f895813eefc424efd88ab7 Mon Sep 17 00:00:00 2001 From: Jairo Campos Date: Tue, 4 Jun 2019 12:55:40 -0600 Subject: [PATCH 14/20] auto save true --- .../app/templates/src/containers/Profile/profile.container.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/app/templates/src/containers/Profile/profile.container.js b/generators/app/templates/src/containers/Profile/profile.container.js index 56fbcdde..8eb65168 100644 --- a/generators/app/templates/src/containers/Profile/profile.container.js +++ b/generators/app/templates/src/containers/Profile/profile.container.js @@ -104,7 +104,7 @@ const Profile = ({ toastManager }) => { }, successCallback, errorCallback, - autoSaveMode : false + autoSaveMode : true }} /> From 74b9f3ae38650aa9575d52b062917b536b501f45 Mon Sep 17 00:00:00 2001 From: James Martin Date: Tue, 4 Jun 2019 15:30:10 -0400 Subject: [PATCH 15/20] Updating package version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e450956d..e42fad9e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@inrupt/generator-solid-react", - "version": "0.5.0", + "version": "0.5.1-rc.0", "description": "Solid React Application Generator", "homepage": "https://solid.inrupt.com/docs", "contributors": [ From 71d9c0aa01edaff8d0cf6f26f551b18543b1423a Mon Sep 17 00:00:00 2001 From: James Martin Date: Tue, 4 Jun 2019 16:44:11 -0400 Subject: [PATCH 16/20] Triggering a build --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e42fad9e..a96ed01d 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, { "name": "Arne Hassel", - "email": "arneh@inrupt.com" + "email": "arneh@inrupt.com" } ], "files": [ From 0c4799893a3fb2c60c24b2c99c306e1e9a419711 Mon Sep 17 00:00:00 2001 From: James Martin Date: Wed, 5 Jun 2019 13:08:13 -0400 Subject: [PATCH 17/20] Updating changelog and version --- CHANGELOG.md | 17 ++++++ generators/app/templates/package-lock.json | 60 ++++++++-------------- generators/app/templates/package.json | 2 +- 3 files changed, 38 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd203148..372d16bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Solid React Application Generator +## 0.5.1 (June 5, 2019) + +#### Solid React Application Base + +##### Updated +* Profile form now autosaves +* Profile form now liveupdates when the form data changes from another source +* New error messages (and translations) added for the new profile form +* Latest version of solid-react-components + +##### Fixed +* Login Provider list is now properly left-aligned instead of center-aligned +* Registration page title is now the proper color and is no longer underneath the top nav +* Profile image predicate now matches the Solid data browser profile image predicate +* Uploading multiple profile images from the welcome page now properly uses the latest uploaded file (previously was only using first uploaded file) + + ## 0.5.0 (May 22, 2019) #### Solid React Application Base diff --git a/generators/app/templates/package-lock.json b/generators/app/templates/package-lock.json index 6a24e588..0810d2cf 100644 --- a/generators/app/templates/package-lock.json +++ b/generators/app/templates/package-lock.json @@ -1965,9 +1965,9 @@ } }, "@inrupt/solid-react-components": { - "version": "0.4.1-rc.0", - "resolved": "https://registry.npmjs.org/@inrupt/solid-react-components/-/solid-react-components-0.4.1-rc.0.tgz", - "integrity": "sha512-79KfidNqJo+mzy80ocCYuG1TqMN7H+venYCmPQxYceW2xcUpQKN+P+DGWK2fbu4mKX5faZsLuCPK5WnRRNjCXA==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@inrupt/solid-react-components/-/solid-react-components-0.4.1.tgz", + "integrity": "sha512-eOea7h3YdgksN3YMk6YcFPTEKwx2yB3PRmpJMVK5H60lSpwe4to8KbCnQHoMdioWLKYRLwkYR+42R0H2QgJNtA==", "requires": { "@babel/runtime": "^7.1.2", "@shexjs/core": "^1.0.0-alpha.4", @@ -9298,8 +9298,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -9317,13 +9316,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -9336,18 +9333,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -9450,8 +9444,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -9461,7 +9454,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -9474,20 +9466,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.3.5", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -9504,7 +9493,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -9577,8 +9565,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -9588,7 +9575,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -9664,8 +9650,7 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -9695,7 +9680,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -9713,7 +9697,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -9752,13 +9735,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.3", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -13218,13 +13199,8 @@ "resolved": "https://registry.npmjs.org/node-web-streams/-/node-web-streams-0.2.2.tgz", "integrity": "sha1-CH52u+t+jcVmhrJdtOYMX/nbCR8=", "requires": { - "is-stream": "^1.1.0" - }, - "dependencies": { - "web-streams-polyfill": { - "version": "git://github.com/gwicke/web-streams-polyfill.git#42c488428adea1dc0c0245014e4896ad456b1ded", - "from": "git://github.com/gwicke/web-streams-polyfill.git#42c488428adea1dc0c0245014e4896ad456b1ded" - } + "is-stream": "^1.1.0", + "web-streams-polyfill": "git://github.com/gwicke/web-streams-polyfill.git#42c488428adea1dc0c0245014e4896ad456b1ded" } }, "nopt": { @@ -19248,6 +19224,10 @@ "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.3.tgz", "integrity": "sha512-r8sAtNmgR0WKOKOxzuSgk09JsHlpKlB+uHi937qypOu3PZ17UxPrierFKDye/uNHjNTTEshu5PId8rojIPj/tA==" }, + "web-streams-polyfill": { + "version": "git://github.com/gwicke/web-streams-polyfill.git#42c488428adea1dc0c0245014e4896ad456b1ded", + "from": "git://github.com/gwicke/web-streams-polyfill.git#spec_performance_improvements" + }, "webidl-conversions": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json index c511bde1..0794a6b0 100644 --- a/generators/app/templates/package.json +++ b/generators/app/templates/package.json @@ -4,7 +4,7 @@ "@fortawesome/free-brands-svg-icons": "^5.8.0", "@fortawesome/free-solid-svg-icons": "^5.6.3", "@fortawesome/react-fontawesome": "^0.1.4", - "@inrupt/solid-react-components": "^0.4.1-rc.1", + "@inrupt/solid-react-components": "^0.4.1", "@inrupt/solid-style-guide": "^0.1.34", "@rdfjs/data-model": "^1.1.1", "@solid/query-ldflex": "^2.4.0", From 51be6090f02de12a0afe7454e656a7e78392178f Mon Sep 17 00:00:00 2001 From: James Martin Date: Wed, 5 Jun 2019 14:52:53 -0400 Subject: [PATCH 18/20] Updating components --- generators/app/templates/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json index 0794a6b0..08bf8276 100644 --- a/generators/app/templates/package.json +++ b/generators/app/templates/package.json @@ -4,7 +4,7 @@ "@fortawesome/free-brands-svg-icons": "^5.8.0", "@fortawesome/free-solid-svg-icons": "^5.6.3", "@fortawesome/react-fontawesome": "^0.1.4", - "@inrupt/solid-react-components": "^0.4.1", + "@inrupt/solid-react-components": "^0.4.2-rc.0", "@inrupt/solid-style-guide": "^0.1.34", "@rdfjs/data-model": "^1.1.1", "@solid/query-ldflex": "^2.4.0", From bec9644d05e353e95f0d0c48c87a6acf2ca10227 Mon Sep 17 00:00:00 2001 From: James Martin Date: Wed, 5 Jun 2019 15:26:30 -0400 Subject: [PATCH 19/20] Updating components --- generators/app/templates/package-lock.json | 6 +++--- generators/app/templates/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generators/app/templates/package-lock.json b/generators/app/templates/package-lock.json index 0810d2cf..f6fb5f7d 100644 --- a/generators/app/templates/package-lock.json +++ b/generators/app/templates/package-lock.json @@ -1965,9 +1965,9 @@ } }, "@inrupt/solid-react-components": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@inrupt/solid-react-components/-/solid-react-components-0.4.1.tgz", - "integrity": "sha512-eOea7h3YdgksN3YMk6YcFPTEKwx2yB3PRmpJMVK5H60lSpwe4to8KbCnQHoMdioWLKYRLwkYR+42R0H2QgJNtA==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@inrupt/solid-react-components/-/solid-react-components-0.4.2.tgz", + "integrity": "sha512-jsqIQkNn7YruoeK3Q0kPWhUh7KFQBcXSbgbrAwn1kGt1L0mIe1Kc7yKXf6AWr50GfWrS7Dnx2pWwQ5L6qfjrpw==", "requires": { "@babel/runtime": "^7.1.2", "@shexjs/core": "^1.0.0-alpha.4", diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json index 08bf8276..1cd6e392 100644 --- a/generators/app/templates/package.json +++ b/generators/app/templates/package.json @@ -4,7 +4,7 @@ "@fortawesome/free-brands-svg-icons": "^5.8.0", "@fortawesome/free-solid-svg-icons": "^5.6.3", "@fortawesome/react-fontawesome": "^0.1.4", - "@inrupt/solid-react-components": "^0.4.2-rc.0", + "@inrupt/solid-react-components": "^0.4.2", "@inrupt/solid-style-guide": "^0.1.34", "@rdfjs/data-model": "^1.1.1", "@solid/query-ldflex": "^2.4.0", From cbb35aa582d67d77bff7c8d55ac793ab8bd3ada9 Mon Sep 17 00:00:00 2001 From: James Martin Date: Wed, 5 Jun 2019 15:51:46 -0400 Subject: [PATCH 20/20] Updating version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a96ed01d..aca38842 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@inrupt/generator-solid-react", - "version": "0.5.1-rc.0", + "version": "0.5.1", "description": "Solid React Application Generator", "homepage": "https://solid.inrupt.com/docs", "contributors": [