From 39c5d4e225756b3e2bb9a3b5d8add1804ff435d7 Mon Sep 17 00:00:00 2001 From: martin bedouret Date: Fri, 29 Nov 2019 11:07:47 -0300 Subject: [PATCH] prepare for version 1.0.11 --- package.json | 3 ++- public/index.html | 4 ++-- src/components/Board/Board.container.js | 4 ++-- src/components/Board/SymbolSearch/SymbolSearch.component.js | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 60f946156..30d1a7d6b 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "tts", "text-to-speech" ], - "homepage": "https://app.cboard.io", + "homepage": ".", "private": false, "license": "GPL-3.0-only", "dependencies": { @@ -34,6 +34,7 @@ "intl": "^1.2.5", "ismobilejs": "^0.5.1", "iso-639-1": "2.0.3", + "is-url": "1.2.4", "jss": "^9.8.7", "jss-rtl": "^0.2.3", "jszip": "^3.1.5", diff --git a/public/index.html b/public/index.html index 7792d2fbc..59349ff9d 100644 --- a/public/index.html +++ b/public/index.html @@ -19,8 +19,8 @@ https://stats.g.doubleclick.net/ https://*.blob.core.windows.net/ https://www.madaportal.org/tawasol/ - https://api.arasaac.org/api/ - https://globalsymbols.com/api/ + https://*.arasaac.org/ + https://globalsymbols.com/ https://www.googletagmanager.com/ https://ssl.gstatic.com blob: diff --git a/src/components/Board/Board.container.js b/src/components/Board/Board.container.js index 085fa7bd5..133a16535 100644 --- a/src/components/Board/Board.container.js +++ b/src/components/Board/Board.container.js @@ -472,12 +472,12 @@ export class BoardContainer extends Component { const boardExists = boards.find(b => b.id === tile.loadBoard); if (boardExists) { changeBoard(tile.loadBoard); - this.props.history.replace(tile.loadBoard); + this.props.history.push(tile.loadBoard); } else { const rboardExists = boards.find(b => b.name === tile.label); if (rboardExists) { changeBoard(rboardExists.id); - this.props.history.replace(rboardExists.id); + this.props.history.push(rboardExists.id); } else { showNotification(intl.formatMessage(messages.boardMissed)); } diff --git a/src/components/Board/SymbolSearch/SymbolSearch.component.js b/src/components/Board/SymbolSearch/SymbolSearch.component.js index c00a61da9..62520f995 100644 --- a/src/components/Board/SymbolSearch/SymbolSearch.component.js +++ b/src/components/Board/SymbolSearch/SymbolSearch.component.js @@ -117,7 +117,7 @@ export class SymbolSearch extends PureComponent { ) ]; const arasaacSuggestions = data.map( - ({ idPictogram, keywords: [keyword] }) => { + ({ _id: idPictogram, keywords: [keyword] }) => { return { id: keyword.keyword, src: `${ARASAAC_BASE_PATH_API}pictograms/${idPictogram}?${queryString.stringify(