From 025c9dbe4921f9a82d3d4869d680bd2ae2a86534 Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 15:07:30 +0100 Subject: [PATCH 01/19] style textarea on add new case details --- package-lock.json | 43 +++++++++++++++++++------- package.json | 6 ++-- src/components/Pages/AddNew/style.scss | 12 +++++++ 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index f6da3ab..7e214b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -921,6 +921,7 @@ "version": "0.6.8", "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.6.8.tgz", "integrity": "sha512-IMSL7ekYhmFlILXcouA6ket3vV7u9BqStlXzbKOF9HBtpUPMMlHU+bBxrLOa2NvleVwNIxeq/zL8LafLbeUXcA==", + "dev": true, "requires": { "@emotion/memoize": "^0.6.6" } @@ -928,7 +929,8 @@ "@emotion/memoize": { "version": "0.6.6", "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.6.6.tgz", - "integrity": "sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ==" + "integrity": "sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ==", + "dev": true }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", @@ -1213,7 +1215,8 @@ "asap": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", + "dev": true }, "asn1": { "version": "0.2.4", @@ -1637,6 +1640,7 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.8.0.tgz", "integrity": "sha512-PcrdbXFO/9Plo9JURIj8G0Dsz+Ct8r+NvjoLh6qPt8Y/3EIAj1gHGW1ocPY1IkQbXZLBEZZSRBAxJem1KFdBXg==", + "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.0.0", "lodash": "^4.17.10" @@ -3150,7 +3154,8 @@ "css-color-keywords": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz", - "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=" + "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=", + "dev": true }, "css-color-names": { "version": "0.0.4", @@ -3224,6 +3229,7 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.2.2.tgz", "integrity": "sha512-w99Fzop1FO8XKm0VpbQp3y5mnTnaS+rtCvS+ylSEOK76YXO5zoHQx/QMB1N54Cp+Ya9jB9922EHrh14ld4xmmw==", + "dev": true, "requires": { "css-color-keywords": "^1.0.0", "fbjs": "^0.8.5", @@ -3887,6 +3893,7 @@ "version": "0.1.12", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", + "dev": true, "requires": { "iconv-lite": "~0.4.13" } @@ -4849,6 +4856,7 @@ "version": "0.8.17", "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", + "dev": true, "requires": { "core-js": "^1.0.0", "isomorphic-fetch": "^2.1.1", @@ -4862,7 +4870,8 @@ "core-js": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", - "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" + "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=", + "dev": true } } }, @@ -6415,6 +6424,7 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" } @@ -6890,7 +6900,8 @@ "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "dev": true }, "is-svg": { "version": "3.0.0", @@ -6952,6 +6963,7 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", + "dev": true, "requires": { "node-fetch": "^1.0.1", "whatwg-fetch": ">=0.10.0" @@ -6961,6 +6973,7 @@ "version": "1.7.3", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "dev": true, "requires": { "encoding": "^0.1.11", "is-stream": "^1.0.1" @@ -8767,7 +8780,8 @@ "memoize-one": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-4.0.2.tgz", - "integrity": "sha512-ucx2DmXTeZTsS4GPPUZCbULAN7kdPT1G+H49Y34JjbQ5ESc6OGhVxKvb1iKhr9v19ZB9OtnHwNnhUnNR/7Wteg==" + "integrity": "sha512-ucx2DmXTeZTsS4GPPUZCbULAN7kdPT1G+H49Y34JjbQ5ESc6OGhVxKvb1iKhr9v19ZB9OtnHwNnhUnNR/7Wteg==", + "dev": true }, "meow": { "version": "3.7.0", @@ -11679,6 +11693,7 @@ "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "dev": true, "requires": { "asap": "~2.0.3" } @@ -11921,7 +11936,8 @@ "react-is": { "version": "16.5.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.5.2.tgz", - "integrity": "sha512-hSl7E6l25GTjNEZATqZIuWOgSnpXb3kD0DVCujmg46K5zLxsbiKaaT6VO9slkSBDPZfYs30lwfJwbOFOnoEnKQ==" + "integrity": "sha512-hSl7E6l25GTjNEZATqZIuWOgSnpXb3kD0DVCujmg46K5zLxsbiKaaT6VO9slkSBDPZfYs30lwfJwbOFOnoEnKQ==", + "dev": true }, "react-router": { "version": "4.3.1", @@ -13158,6 +13174,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-4.0.2.tgz", "integrity": "sha512-VTNCmBLNx0OS2GRaYk0yRAnQVDBCGnnxGkR6+BCmkKVv9VgICO7bEn3UDjlnwCw8hgIyecMzVLOPl+p1zqUxog==", + "dev": true, "requires": { "@emotion/is-prop-valid": "^0.6.8", "babel-plugin-styled-components": ">= 1", @@ -13240,12 +13257,14 @@ "stylis": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.3.tgz", - "integrity": "sha512-TxU0aAscJghF9I3V9q601xcK3Uw1JbXvpsBGj/HULqexKOKlOEzzlIpLFRbKkCK990ccuxfXUqmPbIIo7Fq/cQ==" + "integrity": "sha512-TxU0aAscJghF9I3V9q601xcK3Uw1JbXvpsBGj/HULqexKOKlOEzzlIpLFRbKkCK990ccuxfXUqmPbIIo7Fq/cQ==", + "dev": true }, "stylis-rule-sheet": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz", - "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==" + "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==", + "dev": true }, "superagent": { "version": "3.8.3", @@ -13766,7 +13785,8 @@ "ua-parser-js": { "version": "0.7.18", "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.18.tgz", - "integrity": "sha512-LtzwHlVHwFGTptfNSgezHp7WUlwiqb0gA9AALRbKaERfxwJoiX0A73QbTToxteIAuIaFshhgIZfqK8s7clqgnA==" + "integrity": "sha512-LtzwHlVHwFGTptfNSgezHp7WUlwiqb0gA9AALRbKaERfxwJoiX0A73QbTToxteIAuIaFshhgIZfqK8s7clqgnA==", + "dev": true }, "uglify-js": { "version": "3.4.9", @@ -14205,7 +14225,8 @@ "whatwg-fetch": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz", - "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==" + "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==", + "dev": true }, "whatwg-mimetype": { "version": "2.2.0", diff --git a/package.json b/package.json index 5ac3fe2..bca891c 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ }, "homepage": "https://github.com/fac-14/OSCEBossKey#readme", "devDependencies": { + "babel-plugin-styled-components": "^1.8.0", "codecov": "^3.1.0", "eslint": "^5.6.1", "eslint-config-prettier": "^3.1.0", @@ -42,6 +43,7 @@ "node-fetch": "^2.2.0", "nodemon": "^1.18.4", "react-testing-library": "^5.1.1", + "styled-components": "^4.0.2", "supertest": "^3.3.0" }, "dependencies": { @@ -49,7 +51,6 @@ "babel-core": "^6.26.3", "babel-eslint": "^10.0.1", "babel-jest": "^23.6.0", - "babel-plugin-styled-components": "^1.8.0", "babel-plugin-transform-class-properties": "^6.24.1", "babel-preset-env": "^1.7.0", "babel-preset-react": "^6.24.1", @@ -66,7 +67,6 @@ "react-router": "^4.3.1", "react-router-dom": "^4.3.1", "sass": "^1.14.1", - "serve-favicon": "^2.5.0", - "styled-components": "^4.0.2" + "serve-favicon": "^2.5.0" } } diff --git a/src/components/Pages/AddNew/style.scss b/src/components/Pages/AddNew/style.scss index d89c381..2ee39f3 100644 --- a/src/components/Pages/AddNew/style.scss +++ b/src/components/Pages/AddNew/style.scss @@ -1,3 +1,15 @@ #add-new-wrapper { margin-top: 44px; } + +textarea { + resize: none; + margin: 16px; + padding: 8px; + width: calc(100vw - 2 * (16px + 8px)); + height: calc(100vh - 272px); + border: none; + font-size: 16px; + line-height: 1.2; + font-family: $text-font; +} From bf08f8f0415e31561188695fa5465738bc663c65 Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 15:22:48 +0100 Subject: [PATCH 02/19] make click area bigger on nav buttons, relates #93 --- src/components/Navbar/navbar.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/Navbar/navbar.scss b/src/components/Navbar/navbar.scss index 9eb92ba..2a1345a 100644 --- a/src/components/Navbar/navbar.scss +++ b/src/components/Navbar/navbar.scss @@ -17,6 +17,8 @@ display: flex; flex-direction: column; align-items: center; + width: 100%; + height: 100%; } #navbar img { From 8bed68f06282536c54e83c836743b05370e515cf Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 16:10:45 +0100 Subject: [PATCH 03/19] fix differences between margin in add new case flow --- src/components/Pages/AddNew/AddTile.js | 20 ++++++++++---------- src/components/Pages/AddNew/NewTileInput.js | 1 + src/components/Pages/AddNew/style.scss | 6 +++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/components/Pages/AddNew/AddTile.js b/src/components/Pages/AddNew/AddTile.js index 36bf4a1..348dff6 100644 --- a/src/components/Pages/AddNew/AddTile.js +++ b/src/components/Pages/AddNew/AddTile.js @@ -11,9 +11,9 @@ import TopBar from "../../TopBar/TopBar"; import airtableQuery from "../../../utils/fetch"; -const StyledInstructionContainer = styled.div` - margin-top: 100px; -`; +// const StyledInstructionContainer = styled.div` +// margin-top: 100px; +// `; const StyledAddNewBannerContainer = styled.div` margin-bottom: 16px; @@ -43,13 +43,13 @@ export default class AddTile extends React.Component { station={this.state.station} tickDisplayed={true} /> - - - - + {/* */} + + + {/* */} Date: Thu, 18 Oct 2018 16:11:21 +0100 Subject: [PATCH 04/19] remove comments --- src/components/Pages/AddNew/style.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/components/Pages/AddNew/style.scss b/src/components/Pages/AddNew/style.scss index 2ff77cb..21e1d9f 100644 --- a/src/components/Pages/AddNew/style.scss +++ b/src/components/Pages/AddNew/style.scss @@ -1,7 +1,3 @@ -// #add-new-wrapper { -// margin-top: 44px; -// } - textarea { resize: none; margin: 16px; From c694c54ab44ed2dc24ea64bf8558fda4d338b803 Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 16:12:11 +0100 Subject: [PATCH 05/19] remove unused style.css file from addnew folder --- src/components/Pages/AddNew/style.scss | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 src/components/Pages/AddNew/style.scss diff --git a/src/components/Pages/AddNew/style.scss b/src/components/Pages/AddNew/style.scss deleted file mode 100644 index 21e1d9f..0000000 --- a/src/components/Pages/AddNew/style.scss +++ /dev/null @@ -1,11 +0,0 @@ -textarea { - resize: none; - margin: 16px; - padding: 8px; - width: calc(100vw - 2 * (16px + 8px)); - height: calc(100vh - 272px); - border: none; - font-size: 16px; - line-height: 1.2; - font-family: $text-font; -} From cb37af478d174c071276dfa17ca7865956a5e3bd Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 16:12:46 +0100 Subject: [PATCH 06/19] add textarea style to universal-styles --- src/assets/universal-styles.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/assets/universal-styles.scss b/src/assets/universal-styles.scss index 2e55c20..fa3007f 100644 --- a/src/assets/universal-styles.scss +++ b/src/assets/universal-styles.scss @@ -34,3 +34,15 @@ body { padding: 32px 0; // border: 1px solid yellow; } + +textarea { + resize: none; + margin: 16px; + padding: 8px; + width: calc(100vw - 2 * (16px + 8px)); + height: calc(100vh - 272px); + border: none; + font-size: 16px; + line-height: 1.2; + font-family: $text-font; +} From 70745a2905010576e6178766a019d72fa1a4b5df Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 16:13:55 +0100 Subject: [PATCH 07/19] remove unnecessary container div from addtile --- src/components/Pages/AddNew/AddTile.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/Pages/AddNew/AddTile.js b/src/components/Pages/AddNew/AddTile.js index 348dff6..19b1225 100644 --- a/src/components/Pages/AddNew/AddTile.js +++ b/src/components/Pages/AddNew/AddTile.js @@ -43,13 +43,11 @@ export default class AddTile extends React.Component { station={this.state.station} tickDisplayed={true} /> - {/* */} - {/* */} Date: Thu, 18 Oct 2018 16:27:50 +0100 Subject: [PATCH 08/19] fix height and margins on textarea --- src/assets/universal-styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/universal-styles.scss b/src/assets/universal-styles.scss index 6e7b4cd..5c69152 100644 --- a/src/assets/universal-styles.scss +++ b/src/assets/universal-styles.scss @@ -40,7 +40,7 @@ textarea { margin: 16px; padding: 8px; width: calc(100vw - 2 * (16px + 8px)); - height: calc(100vh - 272px); + height: calc(100vh - 302px); border: none; font-size: 16px; line-height: 1.2; From 1128a28838a6e2e0f27e6f4b4f4a1356a56c10e3 Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 16:28:45 +0100 Subject: [PATCH 09/19] increase padding on timer so it looks better without tick present --- src/components/TopBar/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/TopBar/style.scss b/src/components/TopBar/style.scss index 01b06e4..402a27e 100644 --- a/src/components/TopBar/style.scss +++ b/src/components/TopBar/style.scss @@ -28,7 +28,7 @@ } #topbar-timer { - width: 55px; + width: 60px; } #topbar img { From 8ff906fd24335d041a7be5fe8446eff50b50a883 Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 16:37:18 +0100 Subject: [PATCH 10/19] fix position of texarea on both layouts --- src/assets/universal-styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/universal-styles.scss b/src/assets/universal-styles.scss index 5c69152..227d4c6 100644 --- a/src/assets/universal-styles.scss +++ b/src/assets/universal-styles.scss @@ -40,7 +40,7 @@ textarea { margin: 16px; padding: 8px; width: calc(100vw - 2 * (16px + 8px)); - height: calc(100vh - 302px); + height: calc(100vh - 322px); border: none; font-size: 16px; line-height: 1.2; From 50eebc86cc3da7f6ab38d4f7efefabe6339a66fb Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 16:56:29 +0100 Subject: [PATCH 11/19] fix removeHyphens function when string is null --- src/utils/removeHyphens.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/removeHyphens.js b/src/utils/removeHyphens.js index b10e4b2..a15701c 100644 --- a/src/utils/removeHyphens.js +++ b/src/utils/removeHyphens.js @@ -1,3 +1,3 @@ -const removeHyphens = string => string.replace(/-/g, " "); +const removeHyphens = string => (!string ? string : string.replace(/-/g, " ")); export default removeHyphens; From 1250b26dcfa6eeee39fec9c121548902ac983fdd Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 17:06:18 +0100 Subject: [PATCH 12/19] add more test cases for removeHyphens function --- __test__/removeHyphens.test.js | 2 ++ src/utils/removeHyphens.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/__test__/removeHyphens.test.js b/__test__/removeHyphens.test.js index 7647f45..6fe335e 100644 --- a/__test__/removeHyphens.test.js +++ b/__test__/removeHyphens.test.js @@ -5,4 +5,6 @@ test("removeHyphens() should all hyphens from a string of text", () => { expect(removeHyphens("not the definition of insanity - e=mc2")).toEqual( "not the definition of insanity e=mc2" ); + expect(removeHyphens("")).toEqual(""); + expect(removeHyphens(null)).toEqual(null); }); diff --git a/src/utils/removeHyphens.js b/src/utils/removeHyphens.js index a15701c..b10e4b2 100644 --- a/src/utils/removeHyphens.js +++ b/src/utils/removeHyphens.js @@ -1,3 +1,3 @@ -const removeHyphens = string => (!string ? string : string.replace(/-/g, " ")); +const removeHyphens = string => string.replace(/-/g, " "); export default removeHyphens; From 7bbd70374055c5aac0b6aa827d588133c9089c90 Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 17:06:56 +0100 Subject: [PATCH 13/19] update removeHyphens function to pass all tests --- src/utils/removeHyphens.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/removeHyphens.js b/src/utils/removeHyphens.js index b10e4b2..c25088d 100644 --- a/src/utils/removeHyphens.js +++ b/src/utils/removeHyphens.js @@ -1,3 +1,3 @@ -const removeHyphens = string => string.replace(/-/g, " "); +const removeHyphens = string => (string ? string.replace(/-/g, " ") : string); export default removeHyphens; From 96e61a990874457a862e88f5ad28b181bd6cce84 Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 17:27:11 +0100 Subject: [PATCH 14/19] change state of tickDisplayed --- src/components/Pages/AddNew/AddTile.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/Pages/AddNew/AddTile.js b/src/components/Pages/AddNew/AddTile.js index 36bf4a1..b3d561e 100644 --- a/src/components/Pages/AddNew/AddTile.js +++ b/src/components/Pages/AddNew/AddTile.js @@ -22,7 +22,8 @@ const StyledAddNewBannerContainer = styled.div` export default class AddTile extends React.Component { state = { exam: this.props.match.params.exam, - station: "" + station: "", + tickDisplayed: false }; submitTile = () => { @@ -30,7 +31,7 @@ export default class AddTile extends React.Component { }; userTypes = input => { - this.setState({ station: input }); + this.setState({ station: input, tickDisplayed: true }); }; render() { @@ -41,7 +42,7 @@ export default class AddTile extends React.Component { submitCase={this.submitTile} stationName={"add new"} station={this.state.station} - tickDisplayed={true} + tickDisplayed={this.state.tickDisplayed} /> Date: Thu, 18 Oct 2018 17:33:05 +0100 Subject: [PATCH 15/19] delete empty addbanner file --- src/components/Pages/AddNew/AddBanner.js | 6 ------ src/components/Pages/AddNew/AddTile.js | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 src/components/Pages/AddNew/AddBanner.js diff --git a/src/components/Pages/AddNew/AddBanner.js b/src/components/Pages/AddNew/AddBanner.js deleted file mode 100644 index a18b0a3..0000000 --- a/src/components/Pages/AddNew/AddBanner.js +++ /dev/null @@ -1,6 +0,0 @@ -import React from "react"; - -import AddNewBanner from "../../Cases/CasesPage"; -import TopBar from "../../TopBar/TopBar"; - -export default class AddBanner extends React.Component {} diff --git a/src/components/Pages/AddNew/AddTile.js b/src/components/Pages/AddNew/AddTile.js index b3d561e..b858d0a 100644 --- a/src/components/Pages/AddNew/AddTile.js +++ b/src/components/Pages/AddNew/AddTile.js @@ -31,7 +31,9 @@ export default class AddTile extends React.Component { }; userTypes = input => { - this.setState({ station: input, tickDisplayed: true }); + input + ? this.setState({ station: input, tickDisplayed: true }) + : this.setState({ station: "", tickDisplayed: false }); }; render() { From a79d8907f0407e2b1093cb2d15157f2a89b2a714 Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 17:41:41 +0100 Subject: [PATCH 16/19] prevent addnewcase option if station name empty --- src/components/Pages/AddNew/AddTile.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/Pages/AddNew/AddTile.js b/src/components/Pages/AddNew/AddTile.js index b858d0a..1869f71 100644 --- a/src/components/Pages/AddNew/AddTile.js +++ b/src/components/Pages/AddNew/AddTile.js @@ -54,11 +54,13 @@ export default class AddTile extends React.Component { - + {this.state.station && ( + + )} ); From 390249232d388164414baba93360483a672acf71 Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 17:47:57 +0100 Subject: [PATCH 17/19] prevent instruction from rendering when station name is empty --- src/components/Pages/AddNew/AddTile.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Pages/AddNew/AddTile.js b/src/components/Pages/AddNew/AddTile.js index 1869f71..80ad548 100644 --- a/src/components/Pages/AddNew/AddTile.js +++ b/src/components/Pages/AddNew/AddTile.js @@ -51,17 +51,17 @@ export default class AddTile extends React.Component { instructionText={"Add station"} userTypes={this.userTypes} /> - - - {this.state.station && ( + + {this.state.station && ( + - )} - + + )} ); } From ead303ec38edf4829c37f98d221c63afa3af9400 Mon Sep 17 00:00:00 2001 From: Brymon Date: Thu, 18 Oct 2018 18:02:07 +0100 Subject: [PATCH 18/19] update readme update run in the browser link to heroku --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 71b51c4..1828dea 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![codecov](https://codecov.io/gh/fac-14/OSCEBossKey/branch/master/graph/badge.svg)](https://codecov.io/gh/fac-14/OSCEBossKey) Weeks 13-16 > Tech for Better project -## [Run in the browser](https://reverent-ptolemy-d2df8c.netlify.com/) +## [Run in the browser](https://oscebosskey.herokuapp.com) ## Instructions to run the program locally From 9eb2716b355568179b1cc2c03e6e90b5d30ba2f5 Mon Sep 17 00:00:00 2001 From: BryMon Date: Thu, 18 Oct 2018 18:08:58 +0100 Subject: [PATCH 19/19] address QA comments --- src/assets/universal-styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/universal-styles.scss b/src/assets/universal-styles.scss index 227d4c6..7f78327 100644 --- a/src/assets/universal-styles.scss +++ b/src/assets/universal-styles.scss @@ -39,7 +39,7 @@ textarea { resize: none; margin: 16px; padding: 8px; - width: calc(100vw - 2 * (16px + 8px)); + width: calc(100vw - 48px); height: calc(100vh - 322px); border: none; font-size: 16px;