Skip to content

Commit ddbb322

Browse files
authored
Merge pull request #6 from thinkocapo/empower
Empower Plant UI/UX Refactor
2 parents d89b3a7 + a3fee37 commit ddbb322

25 files changed

+16525
-26219
lines changed

README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
This is demo repo is used by Solution Engineers when demo'ing Sentry's [React Native](https://docs.sentry.io/platforms/react-native) SDK's capabilties.
22

3+
<!-- ![Empower PLant](./img/empower-plant.png) -->
4+
<img src="./img/empower-plant.png" width="200" height="400">
5+
6+
[./img](./img) for more screenshots of Empower Plant
7+
38
## Versions
49

510
| dependency | version
@@ -75,12 +80,12 @@ npx react-native run-android --variant Release
7580

7681
## Expected Behavior
7782

78-
Toolstore | Checkout
83+
EmpowerPlant | Checkout
7984
:-------------------------:|:-------------------------:
8085
![list of tools](./img/toolstore.png) | ![checkout cart](./img/cart.png)|
8186

8287
## Upgrade path
83-
1. npm install
88+
1. npm install, then `pod update` if `pod install` is failing. The pod updating depends on node_modules/@sentry/react-native being set.
8489
2. SDK Manager -> install 'emulator' or anything missing
8590
3. Review previous PR so you know what to expect
8691

@@ -149,4 +154,6 @@ You may run into issues if you haven't added sdk and sdk platform-tools to path:
149154
"error: Can't find the 'node' binary to build the React Native bundle." should be okay
150155

151156
If tools don't load, then swipe-away (kill) the app, then relaunch from app menu in the emulator. If still fails, then go to AVD Manager and 'wipe' the device and run the emulator again.
152-
Could also be a problem with the backend container/app you're requesting the tools from (check that URL/Postman, check TDA job)
157+
Could also be a problem with the backend container/app you're requesting the tools from (check that URL/Postman, check TDA job)
158+
159+
When developing locally, must point React Native to http://127.0.0.1:8080/products backend instead of https://localhost:8080/products backend.

img/empower-plant-cart.png

484 KB
Loading

img/empower-plant-contactinfo.png

441 KB
Loading

img/empower-plant.png

564 KB
Loading

ios/Podfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,12 +279,12 @@ PODS:
279279
- React-Core
280280
- RNScreens (2.18.1):
281281
- React-Core
282-
- RNSentry (2.4.0):
282+
- RNSentry (3.1.0):
283283
- React-Core
284-
- Sentry (= 6.1.4)
285-
- Sentry (6.1.4):
286-
- Sentry/Core (= 6.1.4)
287-
- Sentry/Core (6.1.4)
284+
- Sentry (= 7.2.6)
285+
- Sentry (7.2.6):
286+
- Sentry/Core (= 7.2.6)
287+
- Sentry/Core (7.2.6)
288288
- Yoga (1.14.0)
289289

290290
DEPENDENCIES:
@@ -438,8 +438,8 @@ SPEC CHECKSUMS:
438438
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
439439
RNReanimated: 514a11da3a2bcc6c3dfd9de32b38e2b9bf101926
440440
RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
441-
RNSentry: b0d55027200c96f52e26b9bfb20296d47fc5051d
442-
Sentry: 9d055e2de30a77685e86b219acf02e59b82091fc
441+
RNSentry: a3c522c9f17f191e4972c3e4d6065aba253b593e
442+
Sentry: be2f8f7a63e5274cc83d0813e40c1680119c0153
443443
Yoga: 8c8436d4171c87504c648ae23b1d81242bdf3bbf
444444

445445
PODFILE CHECKSUM: c50650cff1554a5b7988845b549ad6296a091b9d

package-lock.json

Lines changed: 16107 additions & 17919 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"@react-native-community/masked-view": "^0.1.10",
1414
"@react-navigation/native": "^5.7.3",
1515
"@react-navigation/stack": "^5.9.0",
16-
"@sentry/react-native": "2.4.0",
17-
"react": "16.13.1",
16+
"@sentry/react-native": "3.1.0",
17+
"react": "17.0.1",
1818
"react-native": "0.64.0",
1919
"react-native-gesture-handler": "^1.7.0",
2020
"react-native-linear-gradient": "^2.5.6",
@@ -34,7 +34,7 @@
3434
"eslint": "^6.5.1",
3535
"jest": "^25.1.0",
3636
"metro-react-native-babel-preset": "^0.59.0",
37-
"react-test-renderer": "16.13.1"
37+
"react-test-renderer": "17.0.1"
3838
},
3939
"jest": {
4040
"preset": "react-native"

src/App.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ import ManualTrackerScreen from './screens/ManualTrackerScreen';
1515
import PerformanceTimingScreen from './screens/PerformanceTimingScreen';
1616
import EndToEndTestsScreen from './screens/EndToEndTestsScreen';
1717
import ReduxScreen from './screens/ReduxScreen';
18-
import ToolStore from './screens/ToolStore';
18+
import EmpowerPlant from './screens/EmpowerPlant';
1919
import CartScreen from './screens/CartScreen';
20+
import CheckoutScreen from './screens/CheckoutScreen';
2021
import Toast from 'react-native-toast-message';
2122

2223
import {store} from './reduxApp';
@@ -35,7 +36,6 @@ Sentry.init({
3536
release: packageVersion,
3637
environment: "dev",
3738
beforeSend: (e) => {
38-
console.log(e);
3939
return e;
4040
},
4141
integrations: [
@@ -56,7 +56,7 @@ Sentry.init({
5656
enableAutoSessionTracking: true, // For testing, session close when 5 seconds (instead of the default 30) in the background.
5757
sessionTrackingIntervalMillis: 5000,
5858
maxBreadcrumbs: 150, // Extend from the default 100 breadcrumbs.
59-
debug: true
59+
// debug: true
6060
// dist: `${packageVersion}.0`, // optional.. Make sure this matches EXACTLY with the values on your sourcemaps
6161
});
6262

@@ -85,8 +85,9 @@ const App = () => {
8585
/>
8686
<Stack.Screen name="Redux" component={ReduxScreen} />
8787
<Stack.Screen name="EndToEndTests" component={EndToEndTestsScreen} />
88-
<Stack.Screen name="ToolStore" component={ToolStore} />
88+
<Stack.Screen name="Products" component={EmpowerPlant} />
8989
<Stack.Screen name="Cart" component={CartScreen} />
90+
<Stack.Screen name="Checkout" component={CheckoutScreen} />
9091
</Stack.Navigator>
9192
<Toast ref={(ref) => Toast.setRef(ref)} />
9293
</NavigationContainer>

src/assets/empowerplant-logo.png

7.5 KB
Loading

src/assets/empowerplant-logo.svg

Lines changed: 12 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)