Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded to React Native 0.76.1 #35

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
01d09aa
Upgraded to React Native 0.76.1
roncodes Nov 11, 2024
9c792b1
bump version and setup corepack in cicd
roncodes Nov 11, 2024
8ff448b
include yarn.lock
roncodes Nov 11, 2024
1302552
upgraded react-native-device-info
roncodes Nov 11, 2024
6c81002
fixed app build for ios
roncodes Nov 12, 2024
d612cb6
complete refactor underway completing location management screens
roncodes Nov 14, 2024
35c7d4e
still working progress and working on product/cart/checkout functiona…
roncodes Nov 15, 2024
3773d97
completed search screen, minus composability refactor wip
roncodes Nov 24, 2024
1f4011e
latest
roncodes Nov 25, 2024
20875a8
location management completed
roncodes Nov 30, 2024
26a261f
further progress
roncodes Dec 2, 2024
5321e4a
working through checkout flow
roncodes Dec 4, 2024
8726333
working version for store orders only
roncodes Dec 24, 2024
a34fd08
upgraded fleetbase and storefront sdk
roncodes Dec 24, 2024
020c3e0
upgraded fleetbase sdks
roncodes Dec 25, 2024
d3af953
added assets and remove `storefront.config.js` as user should create
roncodes Dec 25, 2024
f6ad856
fix defaul socketcluster connection
roncodes Dec 25, 2024
857b8d6
fix for app icon and bootsplash
roncodes Dec 26, 2024
98267af
implemented account creation and improved checkout flow for delivery …
roncodes Dec 26, 2024
46e7d7c
fix bug in search screen
roncodes Dec 26, 2024
f9a3af8
little cleanup for auth screens
roncodes Dec 26, 2024
9f783f9
all the UX kinks are out
roncodes Jan 2, 2025
0afe60b
few fixes on login and location picker component
roncodes Jan 2, 2025
28492a4
patches for checkout flows and grid
roncodes Jan 3, 2025
61d1504
few patches and ability to prioritize pickup
roncodes Jan 3, 2025
58eb692
minor styling patch
roncodes Jan 3, 2025
37c47ad
when store location is not provided added handler
roncodes Jan 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 18 additions & 0 deletions .github/workflows/react-native-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ jobs:
- name: Install dependencies
run: npm install -g yarn

- name: Enable Corepack
run: corepack enable

- name: Activate Yarn 3.6.4
run: corepack prepare [email protected] --activate

- name: Install dependencies
run: yarn install

Expand All @@ -49,6 +55,12 @@ jobs:
- name: Install dependencies
run: npm install -g yarn

- name: Enable Corepack
run: corepack enable

- name: Activate Yarn 3.6.4
run: corepack prepare [email protected] --activate

- name: Install dependencies
run: yarn install

Expand Down Expand Up @@ -98,6 +110,12 @@ jobs:
- name: Install dependencies
run: npm install -g yarn

- name: Enable Corepack
run: corepack enable

- name: Activate Yarn 3.6.4
run: corepack prepare [email protected] --activate

- name: Install dependencies
run: yarn install

Expand Down
20 changes: 15 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
**/.xcode.env.local

# Android/IntelliJ
#
Expand All @@ -36,7 +37,6 @@ android/app/build
node_modules/
npm-debug.log
yarn-error.log
yarn.lock
.env
.env.*

Expand All @@ -46,6 +46,17 @@ buck-out/
*.keystore
!debug.keystore

# testing
/coverage

# Yarn
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
Expand All @@ -61,7 +72,7 @@ buck-out/
*.jsbundle

# CocoaPods
/ios/Pods/
**/Pods/

# react-native-config codegen
ios/tmp.xcconfig
Expand All @@ -72,7 +83,6 @@ android/app/google-services.json

# Storefront assets/configurations
#
assets/*
config/app.js
config/interface.js
storefront.config.js
.tamagui
vendor
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules/
build/
ios/
android/
8 changes: 8 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"semi": true,
"singleQuote": true,
"trailingComma": "es5",
"printWidth": 190,
"tabWidth": 4,
"jsxSingleQuote": true
}
9 changes: 0 additions & 9 deletions .prettierrc.js

This file was deleted.

16 changes: 16 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"java.configuration.updateBuildConfiguration": "automatic",
"prettier.prettierPath": "./node_modules/prettier",
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit"
},
"editor.formatOnSave": true,
"editor.formatOnPaste": true,
"editor.formatOnType": false,
"prettier.configPath": ".prettierrc",
"prettier.ignorePath": ".prettierignore",
"[dotenv]": {
"editor.defaultFormatter": "foxundermoon.shell-format"
}
}
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodeLinker: node-modules
# yarnPath: .yarn/releases/yarn-3.6.4.cjs
54 changes: 0 additions & 54 deletions App.js

This file was deleted.

53 changes: 53 additions & 0 deletions App.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import React from 'react';
import { GestureHandlerRootView } from 'react-native-gesture-handler';
import { TamaguiProvider, Theme } from 'tamagui';
import { Toasts } from '@backpackapp-io/react-native-toast';
import { PortalProvider, PortalHost } from '@gorhom/portal';
import { SafeAreaProvider } from 'react-native-safe-area-context';
import { BottomSheetModalProvider } from '@gorhom/bottom-sheet';
import { AuthProvider } from './src/contexts/AuthContext';
import { SocketClusterProvider } from './src/contexts/SocketClusterContext';
import { CartProvider } from './src/contexts/CartContext';
import AppNavigator from './src/navigation/AppNavigator';
import { ThemeProvider, useThemeContext } from './src/contexts/ThemeContext';
import config from './tamagui.config';

function AppContent(): React.JSX.Element {
const { appTheme } = useThemeContext();

return (
<TamaguiProvider config={config} theme={appTheme}>
<Theme name={appTheme}>
<GestureHandlerRootView style={{ flex: 1 }}>
<SafeAreaProvider>
<BottomSheetModalProvider>
<AuthProvider>
<SocketClusterProvider>
<CartProvider>
<AppNavigator />
<Toasts extraInsets={{ bottom: 80 }} />
<PortalHost name='MainPortal' />
<PortalHost name='BottomSheetPanelPortal' />
<PortalHost name='LocationPickerPortal' />
</CartProvider>
</SocketClusterProvider>
</AuthProvider>
</BottomSheetModalProvider>
</SafeAreaProvider>
</GestureHandlerRootView>
</Theme>
</TamaguiProvider>
);
}

function App(): React.JSX.Element {
return (
<PortalProvider>
<ThemeProvider>
<AppContent />
</ThemeProvider>
</PortalProvider>
);
}

export default App;
7 changes: 5 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
source 'https://rubygems.org'

# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby '>= 2.6.10'
ruby ">= 2.6.10"

gem 'cocoapods', '>= 1.11.2'
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
gem 'xcodeproj', '< 1.26.0'
4 changes: 3 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (>= 1.11.2)
activesupport (>= 6.1.7.5, != 7.1.0)
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
xcodeproj (< 1.26.0)

RUBY VERSION
ruby 2.6.10p210
Expand Down
Loading
Loading