From 3536fa15aed352b329fd0c5a1ef9ebe89a29eece Mon Sep 17 00:00:00 2001 From: Amanda Bullington Date: Fri, 12 Nov 2021 17:10:54 -0800 Subject: [PATCH] Move all RN/JS code under src folder to (hopefully) make things easier to find & edit --- components/UserProfile/__tests__/UserProfile.test.js | 12 ------------ index.js | 2 +- ios/Podfile.lock | 2 +- {__mocks__ => src/__mocks__}/realm.js | 0 .../__tests__/Observations}/ObsCard.test.js | 2 +- .../__tests__/Observations}/ObsList.test.js | 0 .../components}/ObsDetails/ActivityTab.js | 0 {components => src/components}/ObsDetails/DataTab.js | 0 .../components}/ObsDetails/ObsDetails.js | 0 .../components}/ObsDetails/PhotoScroll.js | 0 .../components}/ObsDetails/SmallSquareImage.js | 0 .../ObsDetails/hooks/fetchObsFromRealm.js | 0 .../components}/Observations/EmptyList.js | 0 .../components}/Observations/ObsCard.js | 0 .../components}/Observations/ObsList.js | 0 .../Observations/hooks/fetchObsListFromRealm.js | 0 .../Observations/hooks/fetchObservations.js | 0 .../components}/SharedComponents/Footer.js | 0 .../components}/SharedComponents/Map.js | 0 .../components}/SharedComponents/UserIcon.js | 0 .../components}/SharedComponents/ViewWithFooter.js | 0 .../components}/UserProfile/UserProfile.js | 0 .../components}/UserProfile/hooks/fetchUser.js | 0 {models => src/models}/Comment.js | 0 {models => src/models}/Identification.js | 0 {models => src/models}/Observation.js | 0 {models => src/models}/Photo.js | 0 {models => src/models}/index.js | 0 {navigation => src/navigation}/drawerNavigation.js | 0 {navigation => src/navigation}/stackNavigation.js | 0 {styles => src/styles}/global.js | 0 {styles => src/styles}/obsDetails.js | 0 {styles => src/styles}/observations/obsCard.js | 0 {styles => src/styles}/sharedComponents/footer.js | 0 {styles => src/styles}/sharedComponents/map.js | 0 .../styles}/sharedComponents/viewWithFooter.js | 0 {styles => src/styles}/userProfile/userProfile.js | 0 37 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 components/UserProfile/__tests__/UserProfile.test.js rename {__mocks__ => src/__mocks__}/realm.js (100%) rename {components/Observations/__tests__ => src/__tests__/Observations}/ObsCard.test.js (96%) rename {components/Observations/__tests__ => src/__tests__/Observations}/ObsList.test.js (100%) rename {components => src/components}/ObsDetails/ActivityTab.js (100%) rename {components => src/components}/ObsDetails/DataTab.js (100%) rename {components => src/components}/ObsDetails/ObsDetails.js (100%) rename {components => src/components}/ObsDetails/PhotoScroll.js (100%) rename {components => src/components}/ObsDetails/SmallSquareImage.js (100%) rename {components => src/components}/ObsDetails/hooks/fetchObsFromRealm.js (100%) rename {components => src/components}/Observations/EmptyList.js (100%) rename {components => src/components}/Observations/ObsCard.js (100%) rename {components => src/components}/Observations/ObsList.js (100%) rename {components => src/components}/Observations/hooks/fetchObsListFromRealm.js (100%) rename {components => src/components}/Observations/hooks/fetchObservations.js (100%) rename {components => src/components}/SharedComponents/Footer.js (100%) rename {components => src/components}/SharedComponents/Map.js (100%) rename {components => src/components}/SharedComponents/UserIcon.js (100%) rename {components => src/components}/SharedComponents/ViewWithFooter.js (100%) rename {components => src/components}/UserProfile/UserProfile.js (100%) rename {components => src/components}/UserProfile/hooks/fetchUser.js (100%) rename {models => src/models}/Comment.js (100%) rename {models => src/models}/Identification.js (100%) rename {models => src/models}/Observation.js (100%) rename {models => src/models}/Photo.js (100%) rename {models => src/models}/index.js (100%) rename {navigation => src/navigation}/drawerNavigation.js (100%) rename {navigation => src/navigation}/stackNavigation.js (100%) rename {styles => src/styles}/global.js (100%) rename {styles => src/styles}/obsDetails.js (100%) rename {styles => src/styles}/observations/obsCard.js (100%) rename {styles => src/styles}/sharedComponents/footer.js (100%) rename {styles => src/styles}/sharedComponents/map.js (100%) rename {styles => src/styles}/sharedComponents/viewWithFooter.js (100%) rename {styles => src/styles}/userProfile/userProfile.js (100%) diff --git a/components/UserProfile/__tests__/UserProfile.test.js b/components/UserProfile/__tests__/UserProfile.test.js deleted file mode 100644 index 01d840270..000000000 --- a/components/UserProfile/__tests__/UserProfile.test.js +++ /dev/null @@ -1,12 +0,0 @@ -// import React from "react"; -// import AccessibilityEngine from "react-native-accessibility-engine"; - -// import UserProfile from "../UserProfile"; - -// test( "should not have accessibility errors", ( ) => { -// // need to mock inatjs fetch -// // right now this throws Cannot read property 'then' of undefined error -// // because promise / results from iNatAPI are undefined -// const userProfile = ; -// expect( ( ) => AccessibilityEngine.check( userProfile ) ).not.toThrow(); -// } ); diff --git a/index.js b/index.js index 856fc3414..f9bb59da7 100644 --- a/index.js +++ b/index.js @@ -4,7 +4,7 @@ import "react-native-gesture-handler"; import {AppRegistry} from "react-native"; import inatjs from "inaturalistjs"; -import App from "./navigation/stackNavigation"; +import App from "./src/navigation/stackNavigation"; import {name as appName} from "./app.json"; inatjs.setConfig( { diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 0656bc5d1..911ff3d59 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -561,7 +561,7 @@ SPEC CHECKSUMS: React-jsiexecutor: 43f2542aed3c26e42175b339f8d37fe3dd683765 React-jsinspector: 41e58e5b8e3e0bf061fdf725b03f2144014a8fb0 react-native-maps: 41d01d8e0afcebe32bec9eea3bd945adc1b18f7a - react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057 + react-native-safe-area-context: 5cf05f49df9d17261e40e518481f2e334c6cd4b5 React-perflogger: fd28ee1f2b5b150b00043f0301d96bd417fdc339 React-RCTActionSheet: 7f3fa0855c346aa5d7c60f9ced16e067db6d29fa React-RCTAnimation: 2119a18ee26159004b001bc56404ca5dbaae6077 diff --git a/__mocks__/realm.js b/src/__mocks__/realm.js similarity index 100% rename from __mocks__/realm.js rename to src/__mocks__/realm.js diff --git a/components/Observations/__tests__/ObsCard.test.js b/src/__tests__/Observations/ObsCard.test.js similarity index 96% rename from components/Observations/__tests__/ObsCard.test.js rename to src/__tests__/Observations/ObsCard.test.js index 2f075fab7..3eb1f7af9 100644 --- a/components/Observations/__tests__/ObsCard.test.js +++ b/src/__tests__/Observations/ObsCard.test.js @@ -2,7 +2,7 @@ import React from "react"; import { fireEvent, render } from "@testing-library/react-native"; import AccessibilityEngine from "react-native-accessibility-engine"; -import ObsCard from "../ObsCard"; +import ObsCard from "../../components/Observations/ObsCard"; const testObservation = { userPhoto: "amazon_url", diff --git a/components/Observations/__tests__/ObsList.test.js b/src/__tests__/Observations/ObsList.test.js similarity index 100% rename from components/Observations/__tests__/ObsList.test.js rename to src/__tests__/Observations/ObsList.test.js diff --git a/components/ObsDetails/ActivityTab.js b/src/components/ObsDetails/ActivityTab.js similarity index 100% rename from components/ObsDetails/ActivityTab.js rename to src/components/ObsDetails/ActivityTab.js diff --git a/components/ObsDetails/DataTab.js b/src/components/ObsDetails/DataTab.js similarity index 100% rename from components/ObsDetails/DataTab.js rename to src/components/ObsDetails/DataTab.js diff --git a/components/ObsDetails/ObsDetails.js b/src/components/ObsDetails/ObsDetails.js similarity index 100% rename from components/ObsDetails/ObsDetails.js rename to src/components/ObsDetails/ObsDetails.js diff --git a/components/ObsDetails/PhotoScroll.js b/src/components/ObsDetails/PhotoScroll.js similarity index 100% rename from components/ObsDetails/PhotoScroll.js rename to src/components/ObsDetails/PhotoScroll.js diff --git a/components/ObsDetails/SmallSquareImage.js b/src/components/ObsDetails/SmallSquareImage.js similarity index 100% rename from components/ObsDetails/SmallSquareImage.js rename to src/components/ObsDetails/SmallSquareImage.js diff --git a/components/ObsDetails/hooks/fetchObsFromRealm.js b/src/components/ObsDetails/hooks/fetchObsFromRealm.js similarity index 100% rename from components/ObsDetails/hooks/fetchObsFromRealm.js rename to src/components/ObsDetails/hooks/fetchObsFromRealm.js diff --git a/components/Observations/EmptyList.js b/src/components/Observations/EmptyList.js similarity index 100% rename from components/Observations/EmptyList.js rename to src/components/Observations/EmptyList.js diff --git a/components/Observations/ObsCard.js b/src/components/Observations/ObsCard.js similarity index 100% rename from components/Observations/ObsCard.js rename to src/components/Observations/ObsCard.js diff --git a/components/Observations/ObsList.js b/src/components/Observations/ObsList.js similarity index 100% rename from components/Observations/ObsList.js rename to src/components/Observations/ObsList.js diff --git a/components/Observations/hooks/fetchObsListFromRealm.js b/src/components/Observations/hooks/fetchObsListFromRealm.js similarity index 100% rename from components/Observations/hooks/fetchObsListFromRealm.js rename to src/components/Observations/hooks/fetchObsListFromRealm.js diff --git a/components/Observations/hooks/fetchObservations.js b/src/components/Observations/hooks/fetchObservations.js similarity index 100% rename from components/Observations/hooks/fetchObservations.js rename to src/components/Observations/hooks/fetchObservations.js diff --git a/components/SharedComponents/Footer.js b/src/components/SharedComponents/Footer.js similarity index 100% rename from components/SharedComponents/Footer.js rename to src/components/SharedComponents/Footer.js diff --git a/components/SharedComponents/Map.js b/src/components/SharedComponents/Map.js similarity index 100% rename from components/SharedComponents/Map.js rename to src/components/SharedComponents/Map.js diff --git a/components/SharedComponents/UserIcon.js b/src/components/SharedComponents/UserIcon.js similarity index 100% rename from components/SharedComponents/UserIcon.js rename to src/components/SharedComponents/UserIcon.js diff --git a/components/SharedComponents/ViewWithFooter.js b/src/components/SharedComponents/ViewWithFooter.js similarity index 100% rename from components/SharedComponents/ViewWithFooter.js rename to src/components/SharedComponents/ViewWithFooter.js diff --git a/components/UserProfile/UserProfile.js b/src/components/UserProfile/UserProfile.js similarity index 100% rename from components/UserProfile/UserProfile.js rename to src/components/UserProfile/UserProfile.js diff --git a/components/UserProfile/hooks/fetchUser.js b/src/components/UserProfile/hooks/fetchUser.js similarity index 100% rename from components/UserProfile/hooks/fetchUser.js rename to src/components/UserProfile/hooks/fetchUser.js diff --git a/models/Comment.js b/src/models/Comment.js similarity index 100% rename from models/Comment.js rename to src/models/Comment.js diff --git a/models/Identification.js b/src/models/Identification.js similarity index 100% rename from models/Identification.js rename to src/models/Identification.js diff --git a/models/Observation.js b/src/models/Observation.js similarity index 100% rename from models/Observation.js rename to src/models/Observation.js diff --git a/models/Photo.js b/src/models/Photo.js similarity index 100% rename from models/Photo.js rename to src/models/Photo.js diff --git a/models/index.js b/src/models/index.js similarity index 100% rename from models/index.js rename to src/models/index.js diff --git a/navigation/drawerNavigation.js b/src/navigation/drawerNavigation.js similarity index 100% rename from navigation/drawerNavigation.js rename to src/navigation/drawerNavigation.js diff --git a/navigation/stackNavigation.js b/src/navigation/stackNavigation.js similarity index 100% rename from navigation/stackNavigation.js rename to src/navigation/stackNavigation.js diff --git a/styles/global.js b/src/styles/global.js similarity index 100% rename from styles/global.js rename to src/styles/global.js diff --git a/styles/obsDetails.js b/src/styles/obsDetails.js similarity index 100% rename from styles/obsDetails.js rename to src/styles/obsDetails.js diff --git a/styles/observations/obsCard.js b/src/styles/observations/obsCard.js similarity index 100% rename from styles/observations/obsCard.js rename to src/styles/observations/obsCard.js diff --git a/styles/sharedComponents/footer.js b/src/styles/sharedComponents/footer.js similarity index 100% rename from styles/sharedComponents/footer.js rename to src/styles/sharedComponents/footer.js diff --git a/styles/sharedComponents/map.js b/src/styles/sharedComponents/map.js similarity index 100% rename from styles/sharedComponents/map.js rename to src/styles/sharedComponents/map.js diff --git a/styles/sharedComponents/viewWithFooter.js b/src/styles/sharedComponents/viewWithFooter.js similarity index 100% rename from styles/sharedComponents/viewWithFooter.js rename to src/styles/sharedComponents/viewWithFooter.js diff --git a/styles/userProfile/userProfile.js b/src/styles/userProfile/userProfile.js similarity index 100% rename from styles/userProfile/userProfile.js rename to src/styles/userProfile/userProfile.js