From 73951f4a46eedc834ad5f2b57cdb2dd1ed14299c Mon Sep 17 00:00:00 2001 From: anthony-pertsel <76824702+Anthonyp0329@users.noreply.github.com> Date: Mon, 13 May 2024 22:54:56 -0700 Subject: [PATCH] styling fixes --- .DS_Store | Bin 0 -> 6148 bytes dfm-sideline-sidekick-app/app.json | 11 +- .../components/SearchBarComponent.tsx | 2 + .../components/barStyles.tsx | 10 +- .../components/viewAll.tsx | 6 +- dfm-sideline-sidekick-app/eas.json | 25 ++ dfm-sideline-sidekick-app/package-lock.json | 248 +++++++++++++++++- dfm-sideline-sidekick-app/package.json | 14 +- .../pages/ConditionSectionStyles.tsx | 2 +- dfm-sideline-sidekick-app/pages/HomePage.tsx | 14 +- .../pages/HomePageStyles.tsx | 18 +- .../pages/SearchPage.tsx | 10 +- .../pages/SearchPageStyles.tsx | 22 +- .../pages/generalPrinciples.tsx | 6 +- .../pages/generalPrinciplesMainStyles.tsx | 11 +- dfm-sideline-sidekick-app/styles/NavBar.tsx | 18 -- 16 files changed, 358 insertions(+), 59 deletions(-) create mode 100644 .DS_Store create mode 100644 dfm-sideline-sidekick-app/eas.json delete mode 100644 dfm-sideline-sidekick-app/styles/NavBar.tsx diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d7bc79c0d7ae5f83e192564d38b65ed3e7909e5b GIT binary patch literal 6148 zcmeHKyH3ME5S)b+k!VsvcRxVEA6QZNg8Tr8073~S0zvJL-)8o~!?KW4QJ`6AcYJ$0 zck&coF92J z*cA?m@#$cQ5r8;jI*iXTOAwnUh+W~3$PCSrN=&NNh+#=*zExdUI3y+=R>OzY%~lhN z#qB)5MLDcXRFnczV64D#E*IYaFX_L`|6`I?Qa}p)D+O$}TCbLTrRuGdm-AlR=vVYl qV{Mc(L@OpnE9Sym@#&Ac=Fi;k3Wvm?Gaq!Kegs?>nH2a71wH_@tQt=M literal 0 HcmV?d00001 diff --git a/dfm-sideline-sidekick-app/app.json b/dfm-sideline-sidekick-app/app.json index 6599919..a9d6e62 100644 --- a/dfm-sideline-sidekick-app/app.json +++ b/dfm-sideline-sidekick-app/app.json @@ -13,16 +13,23 @@ }, "assetBundlePatterns": ["**/*"], "ios": { - "supportsTablet": true + "supportsTablet": true, + "bundleIdentifier": "dfmsidelinesidekickapp" }, "android": { "adaptiveIcon": { "foregroundImage": "./assets/adaptive-icon.png", "backgroundColor": "#ffffff" - } + }, + "package": "com.anthonyp0329.dfmsidelinesidekickapp" }, "web": { "favicon": "./assets/favicon.png" + }, + "extra": { + "eas": { + "projectId": "81d4d973-577a-4924-aa62-1a57fda7e880" + } } } } diff --git a/dfm-sideline-sidekick-app/components/SearchBarComponent.tsx b/dfm-sideline-sidekick-app/components/SearchBarComponent.tsx index 3060f7d..040a17e 100644 --- a/dfm-sideline-sidekick-app/components/SearchBarComponent.tsx +++ b/dfm-sideline-sidekick-app/components/SearchBarComponent.tsx @@ -36,6 +36,8 @@ const SearchBar: React.FC = ({ value={query} onChangeText={setQuery} onFocus={onFocus} + // eslint-disable-next-line jsx-a11y/no-autofocus + autoFocus={isFocused} onBlur={onBlur} selectionColor="#909090" /> diff --git a/dfm-sideline-sidekick-app/components/barStyles.tsx b/dfm-sideline-sidekick-app/components/barStyles.tsx index 4cb63f1..725c786 100644 --- a/dfm-sideline-sidekick-app/components/barStyles.tsx +++ b/dfm-sideline-sidekick-app/components/barStyles.tsx @@ -5,13 +5,21 @@ const styles = StyleSheet.create({ flexDirection: "row", justifyContent: "space-around", alignItems: "center", - backgroundColor: "#f0f0f0", + backgroundColor: "#ffffff", padding: 8, position: "absolute", bottom: 0, left: 0, right: 0, height: 79, + elevation: 10, + + shadowColor: "rgba(0, 0, 0, 0.5)", + + // To add shadows for IOS devices + shadowOffset: { width: 0, height: 2 }, + shadowOpacity: 1, + shadowRadius: 2, }, }); diff --git a/dfm-sideline-sidekick-app/components/viewAll.tsx b/dfm-sideline-sidekick-app/components/viewAll.tsx index 716e02a..f353d0a 100644 --- a/dfm-sideline-sidekick-app/components/viewAll.tsx +++ b/dfm-sideline-sidekick-app/components/viewAll.tsx @@ -3,8 +3,7 @@ import { ParamListBase, RouteProp } from "@react-navigation/native"; // Import R import { StackNavigationProp } from "@react-navigation/stack"; // Import StackNavigationProp import { useFonts } from "expo-font"; import React from "react"; -import { Pressable, ScrollView, Text, TouchableOpacity, View } from "react-native"; -import Icon from "react-native-vector-icons/FontAwesome"; +import { Image, Pressable, ScrollView, Text, TouchableOpacity, View } from "react-native"; import { GeneralPrinciple, MedicalEmergency } from "../functions/DataContext"; import { Bookmark } from "../pages/HomePage"; @@ -80,7 +79,8 @@ const ViewAll: React.FC = ({ navigation, route }) => { }} style={styles.backButtonContainer} > - + {/* eslint-disable-next-line @typescript-eslint/no-unsafe-assignment */} + diff --git a/dfm-sideline-sidekick-app/eas.json b/dfm-sideline-sidekick-app/eas.json new file mode 100644 index 0000000..482b07b --- /dev/null +++ b/dfm-sideline-sidekick-app/eas.json @@ -0,0 +1,25 @@ +{ + "cli": { + "version": ">= 8.0.0" + }, + "build": { + "development": { + "developmentClient": true, + "distribution": "internal", + "env": { + "EXPO_PUBLIC_IP_ADDRESS": "http://100.115.166.152:3001" + } + }, + "preview": { + "distribution": "internal" + }, + "production": { + "env": { + "EXPO_PUBLIC_IP_ADDRESS": "https://sideline-sidekick-app.web.app" + } + } + }, + "submit": { + "production": {} + } +} diff --git a/dfm-sideline-sidekick-app/package-lock.json b/dfm-sideline-sidekick-app/package-lock.json index ced2766..804b1cf 100644 --- a/dfm-sideline-sidekick-app/package-lock.json +++ b/dfm-sideline-sidekick-app/package-lock.json @@ -20,6 +20,7 @@ "axios": "^1.6.7", "expo": "~49.0.15", "expo-app-loading": "^2.1.1", + "expo-dev-client": "~2.4.13", "expo-device": "~5.4.0", "expo-file-system": "~15.4.5", "expo-font": "~11.4.0", @@ -50,7 +51,8 @@ "eslint-plugin-react": "^7.33.2", "eslint-plugin-react-hooks": "^4.6.0", "husky": "^8.0.3", - "prettier": "^3.1.1" + "prettier": "^3.1.1", + "react-devtools-core": "^5.2.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -9571,6 +9573,88 @@ "expo": "*" } }, + "node_modules/expo-dev-client": { + "version": "2.4.13", + "resolved": "https://registry.npmjs.org/expo-dev-client/-/expo-dev-client-2.4.13.tgz", + "integrity": "sha512-EBNJlPntw+DZy7mKxYvpdrmE2GU4YjcEpxSLpwNn2GDwy7e2xXAC2k/25E13BGy3yKPLo1iBXNgB01uleIDdVg==", + "dependencies": { + "expo-dev-launcher": "2.4.15", + "expo-dev-menu": "3.2.4", + "expo-dev-menu-interface": "1.3.0", + "expo-manifests": "~0.7.0", + "expo-updates-interface": "~0.10.0" + }, + "peerDependencies": { + "expo": "*" + } + }, + "node_modules/expo-dev-launcher": { + "version": "2.4.15", + "resolved": "https://registry.npmjs.org/expo-dev-launcher/-/expo-dev-launcher-2.4.15.tgz", + "integrity": "sha512-6oF4NsxlKwuafnyIZvVtMp4OTxRu4Arsw6qJ9s4jDjZuGJtGwgEj9ux3R0YLkDPs8xhsK9Awp0q17RqbQzs1qg==", + "dependencies": { + "expo-dev-menu": "3.2.3", + "resolve-from": "^5.0.0", + "semver": "^7.5.3" + }, + "peerDependencies": { + "expo": "*" + } + }, + "node_modules/expo-dev-launcher/node_modules/expo-dev-menu": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/expo-dev-menu/-/expo-dev-menu-3.2.3.tgz", + "integrity": "sha512-DneF3okTC4AAfAZgaOIylQ/UngSO8SnUT6bRV6nHhJU/jQS1OIP1cZoNW23I100+2yj6x6mobL21PxyiI5VA8g==", + "dependencies": { + "expo-dev-menu-interface": "1.3.0", + "semver": "^7.5.3" + }, + "peerDependencies": { + "expo": "*" + } + }, + "node_modules/expo-dev-launcher/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/expo-dev-menu": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/expo-dev-menu/-/expo-dev-menu-3.2.4.tgz", + "integrity": "sha512-jPvEY4xGTsiVL6A8M6xThNG+tgCHKlDaWqmWHT+wy2EXgFf/7zE0daVYoFms0KJ1XtZc+/DmDRgIPTR86qIGTg==", + "dependencies": { + "expo-dev-menu-interface": "1.3.0", + "semver": "^7.5.3" + }, + "peerDependencies": { + "expo": "*" + } + }, + "node_modules/expo-dev-menu-interface": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/expo-dev-menu-interface/-/expo-dev-menu-interface-1.3.0.tgz", + "integrity": "sha512-WtRP7trQ2lizJJTTFXUSGGn1deIeHaYej0sUynvu/uC69VrSP4EeSnYOxbmEO29kuT/MsQBMGu0P/AkMQOqCOg==", + "peerDependencies": { + "expo": "*" + } + }, + "node_modules/expo-dev-menu/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/expo-device": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/expo-device/-/expo-device-5.4.0.tgz", @@ -9626,6 +9710,11 @@ "expo": "*" } }, + "node_modules/expo-json-utils": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/expo-json-utils/-/expo-json-utils-0.7.1.tgz", + "integrity": "sha512-L0lyH8diXQtV0q5BLbFlcoxTqPF5im79xDHPhybB0j36xYdm65hjwRJ4yMrPIN5lR18hj48FUZeONiDHRyEvIg==" + }, "node_modules/expo-keep-awake": { "version": "12.3.0", "resolved": "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-12.3.0.tgz", @@ -9634,6 +9723,14 @@ "expo": "*" } }, + "node_modules/expo-manifests": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/expo-manifests/-/expo-manifests-0.7.2.tgz", + "integrity": "sha512-xlhL0XI2zw3foJ0q2Ra4ieBhU0V2yz+Rv6GpVEaaIHFlIC/Dbx+mKrX5dgenZEMERr/MG7sRJaRbAVB2PaAYhA==", + "dependencies": { + "expo-json-utils": "~0.7.0" + } + }, "node_modules/expo-modules-autolinking": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.5.1.tgz", @@ -10035,6 +10132,14 @@ "resolved": "https://registry.npmjs.org/expo-status-bar/-/expo-status-bar-1.6.0.tgz", "integrity": "sha512-e//Oi2WPdomMlMDD3skE4+1ZarKCJ/suvcB4Jo/nO427niKug5oppcPNYO+csR6y3ZglGuypS+3pp/hJ+Xp6fQ==" }, + "node_modules/expo-updates-interface": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/expo-updates-interface/-/expo-updates-interface-0.10.1.tgz", + "integrity": "sha512-I6JMR7EgjXwckrydDmrkBEX/iw750dcqpzQVsjznYWfi0HTEOxajLHB90fBFqQkUV5i5s4Fd3hYQ1Cn0oMzUbA==", + "peerDependencies": { + "expo": "*" + } + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -15183,9 +15288,10 @@ } }, "node_modules/react-devtools-core": { - "version": "4.28.5", - "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.5.tgz", - "integrity": "sha512-cq/o30z9W2Wb4rzBefjv5fBalHU0rJGZCHAkf/RHSBWSSYwh8PlQTqqOJmgIIbBtpj27T6FIPXeomIjZtCNVqA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-5.2.0.tgz", + "integrity": "sha512-vZK+/gvxxsieAoAyYaiRIVFxlajb7KXhgBDV7OsoMzaAE+IqGpoxusBjIgq5ibqA2IloKu0p9n7tE68z1xs18A==", + "dev": true, "dependencies": { "shell-quote": "^1.6.1", "ws": "^7" @@ -15195,6 +15301,7 @@ "version": "7.5.9", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "dev": true, "engines": { "node": ">=8.3.0" }, @@ -15444,6 +15551,35 @@ "asap": "~2.0.6" } }, + "node_modules/react-native/node_modules/react-devtools-core": { + "version": "4.28.5", + "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.5.tgz", + "integrity": "sha512-cq/o30z9W2Wb4rzBefjv5fBalHU0rJGZCHAkf/RHSBWSSYwh8PlQTqqOJmgIIbBtpj27T6FIPXeomIjZtCNVqA==", + "dependencies": { + "shell-quote": "^1.6.1", + "ws": "^7" + } + }, + "node_modules/react-native/node_modules/react-devtools-core/node_modules/ws": { + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/react-native/node_modules/regenerator-runtime": { "version": "0.13.11", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", @@ -24648,6 +24784,66 @@ "uuid": "^3.3.2" } }, + "expo-dev-client": { + "version": "2.4.13", + "resolved": "https://registry.npmjs.org/expo-dev-client/-/expo-dev-client-2.4.13.tgz", + "integrity": "sha512-EBNJlPntw+DZy7mKxYvpdrmE2GU4YjcEpxSLpwNn2GDwy7e2xXAC2k/25E13BGy3yKPLo1iBXNgB01uleIDdVg==", + "requires": { + "expo-dev-launcher": "2.4.15", + "expo-dev-menu": "3.2.4", + "expo-dev-menu-interface": "1.3.0", + "expo-manifests": "~0.7.0", + "expo-updates-interface": "~0.10.0" + } + }, + "expo-dev-launcher": { + "version": "2.4.15", + "resolved": "https://registry.npmjs.org/expo-dev-launcher/-/expo-dev-launcher-2.4.15.tgz", + "integrity": "sha512-6oF4NsxlKwuafnyIZvVtMp4OTxRu4Arsw6qJ9s4jDjZuGJtGwgEj9ux3R0YLkDPs8xhsK9Awp0q17RqbQzs1qg==", + "requires": { + "expo-dev-menu": "3.2.3", + "resolve-from": "^5.0.0", + "semver": "^7.5.3" + }, + "dependencies": { + "expo-dev-menu": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/expo-dev-menu/-/expo-dev-menu-3.2.3.tgz", + "integrity": "sha512-DneF3okTC4AAfAZgaOIylQ/UngSO8SnUT6bRV6nHhJU/jQS1OIP1cZoNW23I100+2yj6x6mobL21PxyiI5VA8g==", + "requires": { + "expo-dev-menu-interface": "1.3.0", + "semver": "^7.5.3" + } + }, + "semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==" + } + } + }, + "expo-dev-menu": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/expo-dev-menu/-/expo-dev-menu-3.2.4.tgz", + "integrity": "sha512-jPvEY4xGTsiVL6A8M6xThNG+tgCHKlDaWqmWHT+wy2EXgFf/7zE0daVYoFms0KJ1XtZc+/DmDRgIPTR86qIGTg==", + "requires": { + "expo-dev-menu-interface": "1.3.0", + "semver": "^7.5.3" + }, + "dependencies": { + "semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==" + } + } + }, + "expo-dev-menu-interface": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/expo-dev-menu-interface/-/expo-dev-menu-interface-1.3.0.tgz", + "integrity": "sha512-WtRP7trQ2lizJJTTFXUSGGn1deIeHaYej0sUynvu/uC69VrSP4EeSnYOxbmEO29kuT/MsQBMGu0P/AkMQOqCOg==", + "requires": {} + }, "expo-device": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/expo-device/-/expo-device-5.4.0.tgz", @@ -24679,12 +24875,25 @@ "fontfaceobserver": "^2.1.0" } }, + "expo-json-utils": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/expo-json-utils/-/expo-json-utils-0.7.1.tgz", + "integrity": "sha512-L0lyH8diXQtV0q5BLbFlcoxTqPF5im79xDHPhybB0j36xYdm65hjwRJ4yMrPIN5lR18hj48FUZeONiDHRyEvIg==" + }, "expo-keep-awake": { "version": "12.3.0", "resolved": "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-12.3.0.tgz", "integrity": "sha512-ujiJg1p9EdCOYS05jh5PtUrfiZnK0yyLy+UewzqrjUqIT8eAGMQbkfOn3C3fHE7AKd5AefSMzJnS3lYZcZYHDw==", "requires": {} }, + "expo-manifests": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/expo-manifests/-/expo-manifests-0.7.2.tgz", + "integrity": "sha512-xlhL0XI2zw3foJ0q2Ra4ieBhU0V2yz+Rv6GpVEaaIHFlIC/Dbx+mKrX5dgenZEMERr/MG7sRJaRbAVB2PaAYhA==", + "requires": { + "expo-json-utils": "~0.7.0" + } + }, "expo-modules-autolinking": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.5.1.tgz", @@ -25003,6 +25212,12 @@ "resolved": "https://registry.npmjs.org/expo-status-bar/-/expo-status-bar-1.6.0.tgz", "integrity": "sha512-e//Oi2WPdomMlMDD3skE4+1ZarKCJ/suvcB4Jo/nO427niKug5oppcPNYO+csR6y3ZglGuypS+3pp/hJ+Xp6fQ==" }, + "expo-updates-interface": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/expo-updates-interface/-/expo-updates-interface-0.10.1.tgz", + "integrity": "sha512-I6JMR7EgjXwckrydDmrkBEX/iw750dcqpzQVsjznYWfi0HTEOxajLHB90fBFqQkUV5i5s4Fd3hYQ1Cn0oMzUbA==", + "requires": {} + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -28717,9 +28932,10 @@ } }, "react-devtools-core": { - "version": "4.28.5", - "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.5.tgz", - "integrity": "sha512-cq/o30z9W2Wb4rzBefjv5fBalHU0rJGZCHAkf/RHSBWSSYwh8PlQTqqOJmgIIbBtpj27T6FIPXeomIjZtCNVqA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-5.2.0.tgz", + "integrity": "sha512-vZK+/gvxxsieAoAyYaiRIVFxlajb7KXhgBDV7OsoMzaAE+IqGpoxusBjIgq5ibqA2IloKu0p9n7tE68z1xs18A==", + "dev": true, "requires": { "shell-quote": "^1.6.1", "ws": "^7" @@ -28729,6 +28945,7 @@ "version": "7.5.9", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "dev": true, "requires": {} } } @@ -28817,6 +29034,23 @@ "asap": "~2.0.6" } }, + "react-devtools-core": { + "version": "4.28.5", + "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.28.5.tgz", + "integrity": "sha512-cq/o30z9W2Wb4rzBefjv5fBalHU0rJGZCHAkf/RHSBWSSYwh8PlQTqqOJmgIIbBtpj27T6FIPXeomIjZtCNVqA==", + "requires": { + "shell-quote": "^1.6.1", + "ws": "^7" + }, + "dependencies": { + "ws": { + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "requires": {} + } + } + }, "regenerator-runtime": { "version": "0.13.11", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", diff --git a/dfm-sideline-sidekick-app/package.json b/dfm-sideline-sidekick-app/package.json index 08ed9dd..987dd3a 100644 --- a/dfm-sideline-sidekick-app/package.json +++ b/dfm-sideline-sidekick-app/package.json @@ -19,32 +19,33 @@ "@expo-google-fonts/roboto": "^0.2.3", "@react-native-async-storage/async-storage": "1.18.2", "@react-native-community/masked-view": "^0.1.11", + "@react-native-community/netinfo": "9.3.10", "@react-navigation/native": "^6.1.10", "@react-navigation/native-stack": "^6.9.18", "@react-navigation/stack": "^6.3.21", - "@react-native-community/netinfo": "9.3.10", "@types/react": "~18.2.14", "axios": "^1.6.7", "expo": "~49.0.15", "expo-app-loading": "^2.1.1", - "expo-font": "~11.4.0", + "expo-dev-client": "~2.4.13", "expo-device": "~5.4.0", "expo-file-system": "~15.4.5", + "expo-font": "~11.4.0", "expo-status-bar": "~1.6.0", "next": "^14.1.0", "node-localstorage": "^3.0.5", "react": "18.2.0", "react-native": "^0.72.10", + "react-native-dotenv": "^3.4.10", + "react-native-gesture-handler": "~2.12.0", "react-native-safe-area-context": "4.6.3", "react-native-screens": "~3.22.0", "react-native-svg": "13.9.0", "react-native-vector-icons": "^10.0.3", "react-navigation": "^5.0.0", "react-router-dom": "^6.22.0", - "react-native-dotenv": "^3.4.10", "react-router-native": "^6.22.1", - "typescript": "^5.1.3", - "react-native-gesture-handler": "~2.12.0" + "typescript": "^5.1.3" }, "devDependencies": { "@babel/core": "^7.20.0", @@ -57,7 +58,8 @@ "eslint-plugin-react": "^7.33.2", "eslint-plugin-react-hooks": "^4.6.0", "husky": "^8.0.3", - "prettier": "^3.1.1" + "prettier": "^3.1.1", + "react-devtools-core": "^5.2.0" }, "private": true } diff --git a/dfm-sideline-sidekick-app/pages/ConditionSectionStyles.tsx b/dfm-sideline-sidekick-app/pages/ConditionSectionStyles.tsx index 4aa9eb3..5482abd 100644 --- a/dfm-sideline-sidekick-app/pages/ConditionSectionStyles.tsx +++ b/dfm-sideline-sidekick-app/pages/ConditionSectionStyles.tsx @@ -20,7 +20,7 @@ export default StyleSheet.create({ }, margin: { marginLeft: 16, - marginTop: 20, + marginTop: 0, }, menu: { display: "flex", diff --git a/dfm-sideline-sidekick-app/pages/HomePage.tsx b/dfm-sideline-sidekick-app/pages/HomePage.tsx index 73c1531..1369709 100644 --- a/dfm-sideline-sidekick-app/pages/HomePage.tsx +++ b/dfm-sideline-sidekick-app/pages/HomePage.tsx @@ -133,9 +133,13 @@ const HomePage = () => { return ( - - - {!searchShowing && ( + + {!searchShowing && ( + Browse By Category @@ -210,8 +214,8 @@ const HomePage = () => { Loading... )} - )} - + + )} ); }; diff --git a/dfm-sideline-sidekick-app/pages/HomePageStyles.tsx b/dfm-sideline-sidekick-app/pages/HomePageStyles.tsx index b7e78fc..c2c27fd 100644 --- a/dfm-sideline-sidekick-app/pages/HomePageStyles.tsx +++ b/dfm-sideline-sidekick-app/pages/HomePageStyles.tsx @@ -3,16 +3,16 @@ import { Platform, StyleSheet } from "react-native"; const styles = StyleSheet.create({ container: { flex: 1, - backgroundColor: "white", + backgroundColor: "#FFFFFF", ...Platform.select({ ios: { - marginBottom: 100, + paddingBottom: 100, }, android: { - marginBottom: 110, + paddingBottom: 110, }, default: { - marginBottom: 120, + paddingBottom: 120, }, }), }, @@ -86,6 +86,13 @@ const styles = StyleSheet.create({ borderRadius: 10, width: "43%", height: 90, + elevation: 10, + shadowColor: "rgba(0, 0, 0, 0.5)", + + // To add shadows for IOS devices + shadowOffset: { width: 0, height: 2 }, + shadowOpacity: 0.5, + shadowRadius: 2, }, buttonText: { color: "#FFFFFF", @@ -115,5 +122,8 @@ const styles = StyleSheet.create({ topPadding: { paddingTop: 10, }, + topMargin: { + marginTop: 15, + }, }); export default styles; diff --git a/dfm-sideline-sidekick-app/pages/SearchPage.tsx b/dfm-sideline-sidekick-app/pages/SearchPage.tsx index 9ac8743..613dbc2 100644 --- a/dfm-sideline-sidekick-app/pages/SearchPage.tsx +++ b/dfm-sideline-sidekick-app/pages/SearchPage.tsx @@ -98,7 +98,7 @@ const SearchPage: React.FC = ({ if (exists) { return currentSearches; } - const newSearches = [document, ...currentSearches].slice(0, 10); // Limiting to most recent 10 searches + const newSearches = [document, ...currentSearches].slice(0, 5); // Limiting to most recent 10 searches // Save to AsyncStorage void AsyncStorage.setItem("recentSearches", JSON.stringify(newSearches)); @@ -176,8 +176,9 @@ const SearchPage: React.FC = ({ {onPage && ( {query.length === 0 ? ( - <> + Recent + item._id} @@ -197,13 +198,14 @@ const SearchPage: React.FC = ({ )} /> - + ) : ( - + item._id} ItemSeparatorComponent={() => } + style={styles.resultList} renderItem={({ item }) => ( = ({ route, navigation }) => { navigation.goBack(); }} > - + {/* eslint-disable-next-line @typescript-eslint/no-unsafe-assignment */} + {params.contentProp.title} diff --git a/dfm-sideline-sidekick-app/pages/generalPrinciplesMainStyles.tsx b/dfm-sideline-sidekick-app/pages/generalPrinciplesMainStyles.tsx index 605dc84..f379a4d 100644 --- a/dfm-sideline-sidekick-app/pages/generalPrinciplesMainStyles.tsx +++ b/dfm-sideline-sidekick-app/pages/generalPrinciplesMainStyles.tsx @@ -33,6 +33,7 @@ if (width > height) { const styles = StyleSheet.create({ container: { flexDirection: "column", + backgroundColor: "#ffffff", paddingBottom: 0.42 * height, //Give user leeway for optimal scroll space // padding - We should not apply padding here as per Figma specification }, @@ -41,11 +42,12 @@ const styles = StyleSheet.create({ // alignItems: "center", // Center the text horizontally paddingLeft: (16 / 390) * width, paddingVertical: (10 / 930.25) * height, + marginTop: 15, }, subheaderText: { color: "#182b49", fontFamily: "Roboto-Medium", - fontSize: 18, //0.05 * minDimension, + fontSize: 20, //0.05 * minDimension, fontWeight: "500", }, grid: { @@ -65,6 +67,13 @@ const styles = StyleSheet.create({ borderRadius, width: (170 / 390.0) * width, //uses Figma measurements to set a width height: pressableRatio * (170 / 390.0) * width, //aspect ratio applied to width to set a height + elevation: 10, + shadowColor: "rgba(0, 0, 0, 0.5)", + + // To add shadows for IOS devices + shadowOffset: { width: 0, height: 2 }, + shadowOpacity: 0.5, + shadowRadius: 2, }, pressableText: { fontFamily: "Roboto-Bold", diff --git a/dfm-sideline-sidekick-app/styles/NavBar.tsx b/dfm-sideline-sidekick-app/styles/NavBar.tsx deleted file mode 100644 index 4cb63f1..0000000 --- a/dfm-sideline-sidekick-app/styles/NavBar.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import { StyleSheet } from "react-native"; - -const styles = StyleSheet.create({ - bottomBar: { - flexDirection: "row", - justifyContent: "space-around", - alignItems: "center", - backgroundColor: "#f0f0f0", - padding: 8, - position: "absolute", - bottom: 0, - left: 0, - right: 0, - height: 79, - }, -}); - -export default styles;