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

Andrew testing #1344

Merged
merged 202 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from 201 commits
Commits
Show all changes
202 commits
Select commit Hold shift + click to select a range
111710e
Landing Page Layour Design Changed
Aug 7, 2024
2ffe2d7
Landing Page Refactored
Aug 9, 2024
ad14f93
Refactored Changes
Aug 12, 2024
b089830
Applied Requested Changes
Aug 12, 2024
32235e8
Minor Changes
Aug 14, 2024
28e5e02
Merge branch 'andrew_testing' into feat/tamagui_landing_page
MuhammadHassan03 Aug 14, 2024
e5063a0
Merge branch 'andrew_testing' into feat/tamagui_landing_page
MuhammadHassan03 Aug 19, 2024
748f001
Pocket Template Implementation First
MuhammadHassan03 Aug 23, 2024
1eedbb4
Merge branch 'feat/tamagui_landing_page' of https://github.com/andrew…
MuhammadHassan03 Aug 23, 2024
f3427b8
some changes
MuhammadHassan03 Aug 24, 2024
71f10cf
Merge branch 'andrew_testing' into feat/tamagui_landing_page
MuhammadHassan03 Aug 26, 2024
6165ab2
Landing Page UI Changed
MuhammadHassan03 Aug 26, 2024
d13b455
Merge branch 'feat/tamagui_landing_page' of https://github.com/andrew…
MuhammadHassan03 Aug 26, 2024
0f2d8bd
applied responsivenes
MuhammadHassan03 Aug 27, 2024
6f9cf71
Background Color Fixed
MuhammadHassan03 Aug 27, 2024
a802044
Merge branch 'andrew_testing' into feat/tamagui_landing_page
MuhammadHassan03 Aug 27, 2024
5c1ef27
Landing Page and Sign in Page Complete
MuhammadHassan03 Aug 27, 2024
c717f2a
Merge branch 'andrew_testing' into feat/tamagui_landing_page
MuhammadHassan03 Aug 28, 2024
4e2d1ae
Footor and Navbar Changed
MuhammadHassan03 Aug 28, 2024
56be9d1
server changes refactored
MuhammadHassan03 Aug 28, 2024
55895be
FAQ and Others Added
MuhammadHassan03 Aug 29, 2024
b3aaa59
Updating Some Sections
MuhammadHassan03 Sep 3, 2024
8c18904
Added Mpre Components
MuhammadHassan03 Sep 4, 2024
64a0beb
Landing Page Done
MuhammadHassan03 Sep 6, 2024
a1416e7
Merge branch 'andrew_testing' into feat/tamagui_landing_page
MuhammadHassan03 Sep 7, 2024
226c3c3
Fixed FAQS Alignment
MuhammadHassan03 Sep 9, 2024
06b60b2
Merge branch 'feat/tamagui_landing_page' of https://github.com/andrew…
MuhammadHassan03 Sep 9, 2024
f4786af
fixed faqs box
MuhammadHassan03 Sep 9, 2024
cd89662
fixed some bugs
MuhammadHassan03 Sep 9, 2024
07013c9
fix(client): add space below `FeedSearchFilter` card [skip ci]
mikib0 Sep 10, 2024
aed6ebd
chore(trpc): 🎨 add RouterInput and RouterOutput types for typing proc…
mikib0 Sep 11, 2024
b581d64
WIP: pack template feature [skip ci]
mikib0 Sep 11, 2024
ab5cc60
Fixed Native Failure
MuhammadHassan03 Sep 13, 2024
7f09a3d
Merge branch 'andrew_testing' of https://github.com/andrew-bierman/Pa…
mikib0 Sep 13, 2024
c15ab37
WIP: new approach -prebaked templates [skip ci]
mikib0 Sep 13, 2024
038f98b
refactor(ui): 🎨 bento table [skip ci]
mikib0 Sep 14, 2024
3ab0e97
feat: ✨ pack templates
mikib0 Sep 17, 2024
4804e81
Merge branch 'andrew_testing' into feat/pack-templates
mikib0 Sep 17, 2024
c63e6f5
test: use preview environment for tests
mikib0 Sep 17, 2024
a418017
refactor(server): similar packs & items retrieval
mikib0 Sep 17, 2024
d331054
Merge branch 'andrew_testing' of https://github.com/andrew-bierman/Pa…
mikib0 Sep 19, 2024
b218e5e
fix(pack-templates): 🐛 duplicate items to user
mikib0 Sep 19, 2024
aa468a1
fix(pack-templates): 🐛 add name for pack copy
mikib0 Sep 19, 2024
9c306cb
Merge branch 'andrew_testing' into feat/pack-templates
mikib0 Sep 19, 2024
9a4b911
Merge branch 'development' into feat/pack-templates
mikib0 Sep 28, 2024
81c7088
Merge branch 'development' into feat/pack-templates
mikib0 Sep 28, 2024
377f7fd
Merge branch 'development' into feat/tamagui_landing_page
MuhammadHassan03 Oct 8, 2024
66bc687
Refactored Border
MuhammadHassan03 Oct 8, 2024
a8f0e65
Merge branch 'feat/tamagui_landing_page' of https://github.com/andrew…
MuhammadHassan03 Oct 8, 2024
c8eca3a
Merge branch 'development' of github.com:andrew-bierman/PackRat into …
taronaleksanian Oct 8, 2024
6681363
Merge branch 'development' into feat/pack-templates
mikib0 Oct 8, 2024
8c0f103
fix(pack-templates): regenerate migration
mikib0 Oct 8, 2024
a9e6487
feat(pack-templates): ✨ add searching
mikib0 Oct 8, 2024
87745ae
Merge branch 'development' into feat/pack-templates
mikib0 Oct 8, 2024
1d86093
refactor(pack-template): 🧹 remove vestigial pack template code
mikib0 Oct 9, 2024
afb9716
Settings Ui Refactored
MuhammadHassan03 Oct 9, 2024
1d07cfb
feat(pack-templates): ✨ add sorting
mikib0 Oct 9, 2024
5355413
Fixed Some Stucture
MuhammadHassan03 Oct 9, 2024
b4d60f3
Settings Ui Complete
MuhammadHassan03 Oct 9, 2024
971529a
Merge branch 'development' into settings-ui-refactored
MuhammadHassan03 Oct 9, 2024
349dbb4
Applied Old Design for NAtive
MuhammadHassan03 Oct 9, 2024
2c44002
Landing PAge Accordation Changed to old design for native
MuhammadHassan03 Oct 9, 2024
ba186d9
"Refactored landing page styles to separate web and non-web styles, a…
MuhammadHassan03 Oct 9, 2024
560eee1
Applied Old Native Light Theme
MuhammadHassan03 Oct 9, 2024
069091b
"Update API URL and comment out/remove unnecessary RButton components…
MuhammadHassan03 Oct 9, 2024
c4ddf4e
"Added hasProfileImage prop to ImageUpload component and updated its …
MuhammadHassan03 Oct 9, 2024
f08c802
Merge pull request #1294 from andrew-bierman/settings-ui-refactored
taronaleksanian Oct 9, 2024
99064ba
Merge pull request #1160 from andrew-bierman/feat/tamagui_landing_page
taronaleksanian Oct 9, 2024
c8a4b75
feat(pack-templates): ✨ add pagination
mikib0 Oct 9, 2024
1b26a37
revert(pack-templates): generating migration for production
mikib0 Oct 9, 2024
eefc225
Add item details section
Isthisanmol Oct 9, 2024
de95da3
fix(bulkAddGlobalItemService): sync with vectorize
mikib0 Oct 10, 2024
0bfa91e
feat(global-items): add new scrapped fields
mikib0 Oct 10, 2024
e1372c8
Merge pull request #1232 from andrew-bierman/feat/pack-templates
taronaleksanian Oct 10, 2024
fb649b3
Merge pull request #1297 from andrew-bierman/feat/add-new-global-item…
taronaleksanian Oct 10, 2024
8910d1a
make component for native
Isthisanmol Oct 10, 2024
6ecf5b5
Merge branch 'feat/items-redesign' into redesign-item-details
Isthisanmol Oct 10, 2024
85cb587
Merge pull request #1298 from andrew-bierman/redesign-item-details
taronaleksanian Oct 10, 2024
9316df6
improve ui
taronaleksanian Oct 10, 2024
dc92d72
add image gallery
taronaleksanian Oct 10, 2024
7d9c1ac
fix csv headers
taronaleksanian Oct 10, 2024
a1613f6
add item card on items screen
Isthisanmol Oct 10, 2024
f52c071
Merge pull request #1299 from andrew-bierman/add-item-card
taronaleksanian Oct 11, 2024
06247b1
feat: items feed
taronaleksanian Oct 11, 2024
cdcfc22
card native
Isthisanmol Oct 11, 2024
a64fc40
use itemCard for both the platforms
Isthisanmol Oct 11, 2024
1488bda
add itemData
Isthisanmol Oct 11, 2024
810bf0b
Merge pull request #1300 from andrew-bierman/add-card-native
taronaleksanian Oct 11, 2024
537e48c
use single component for both platforms
Isthisanmol Oct 11, 2024
8a0cec9
Merge pull request #1301 from andrew-bierman/merge-itemdetailssection…
taronaleksanian Oct 11, 2024
8e3b55b
feat/items-redesign
taronaleksanian Oct 11, 2024
fc80c56
fix RLink
taronaleksanian Oct 12, 2024
69a673d
chore(eas-submit-workflow): fix ios submission
mikib0 Oct 12, 2024
4bcd99d
make ui responsive
Isthisanmol Oct 12, 2024
5884344
Merge pull request #1302 from andrew-bierman/improve-itemsFeed
taronaleksanian Oct 12, 2024
035c526
add breadcrumb and similar items
Isthisanmol Oct 12, 2024
8da4c57
feat: add pack picker modal
taronaleksanian Oct 12, 2024
b5e1f63
Merge pull request #1303 from andrew-bierman/enhance-item-details-screen
taronaleksanian Oct 12, 2024
a0f4394
Merge branch 'development' of github.com:andrew-bierman/PackRat into …
taronaleksanian Oct 12, 2024
9c31e29
fix item images on native
taronaleksanian Oct 13, 2024
825e0fb
add external link for item
taronaleksanian Oct 13, 2024
7577747
Merge pull request #1304 from andrew-bierman/fix/ios-submission
mikib0 Oct 14, 2024
ee305c3
fix image issue
taronaleksanian Oct 14, 2024
984d32a
Merge branch 'development' of github.com:andrew-bierman/PackRat into …
taronaleksanian Oct 14, 2024
8313388
Fixed Cropped Button
MuhammadHassan03 Oct 14, 2024
828e7c8
Merge pull request #1305 from andrew-bierman/cropped-button
taronaleksanian Oct 14, 2024
127313d
style changes
Isthisanmol Oct 14, 2024
bbdb1f6
Merge pull request #1306 from andrew-bierman/fix-item-details
taronaleksanian Oct 14, 2024
30358dc
change item delete from pack
taronaleksanian Oct 15, 2024
5fde349
Merge branch 'feat/items-redesign' of github.com:andrew-bierman/PackR…
taronaleksanian Oct 15, 2024
dbbbf90
center the pagination component
Isthisanmol Oct 15, 2024
3aef63f
add sort to itemsFeed
Isthisanmol Oct 15, 2024
2589040
add search on itemsFeed
Isthisanmol Oct 15, 2024
003b7d3
Merge branch 'feat/items-redesign' into enhance-item-feed
Isthisanmol Oct 15, 2024
12ae69f
Merge pull request #1307 from andrew-bierman/enhance-item-feed
taronaleksanian Oct 15, 2024
36c64b4
use listItem instead of table for pack deatils
Isthisanmol Oct 15, 2024
d3b967d
change border width and font size
Isthisanmol Oct 16, 2024
92fdc10
Merge pull request #1310 from andrew-bierman/item-list-ui-enhancement
taronaleksanian Oct 16, 2024
abba306
add items sorting
taronaleksanian Oct 16, 2024
7d4e24a
Merge branch 'feat/items-redesign' of github.com:andrew-bierman/PackR…
taronaleksanian Oct 16, 2024
d210b89
change layout for pack items
Isthisanmol Oct 16, 2024
4ad5b2a
Merge pull request #1312 from andrew-bierman/layout-enhancement-packD…
taronaleksanian Oct 16, 2024
681725c
Merge branch 'feat/items-redesign' of github.com:andrew-bierman/PackR…
taronaleksanian Oct 16, 2024
111518b
style changes
Isthisanmol Oct 16, 2024
8d16748
Merge pull request #1313 from andrew-bierman/fix-createTrip-packDetails
taronaleksanian Oct 16, 2024
95a84be
Merge branch 'feat/items-redesign' of github.com:andrew-bierman/PackR…
taronaleksanian Oct 16, 2024
31b987c
add pack picker modal for item
taronaleksanian Oct 16, 2024
8d75981
add creatable option to search
Isthisanmol Oct 17, 2024
f155421
remove creatable
Isthisanmol Oct 17, 2024
4f72500
fix: 🐛 move quantity from item to item_packs
mikib0 Oct 17, 2024
a85e638
move create option to the top
Isthisanmol Oct 17, 2024
3c4f418
revert app folder changes
taronaleksanian Oct 17, 2024
6f7d7d8
Merge branch 'feat/items-redesign' of github.com:andrew-bierman/PackR…
taronaleksanian Oct 17, 2024
2e0931c
Merge pull request #1315 from andrew-bierman/fix/move-quantity-to-ite…
taronaleksanian Oct 17, 2024
78a1e71
Merge branch 'feat/items-redesign' of github.com:andrew-bierman/PackR…
taronaleksanian Oct 17, 2024
3224008
Merge branch 'feat/items-redesign' into add-creatable-option-to-search
Isthisanmol Oct 18, 2024
ce591ba
add loading placeholder to image
Isthisanmol Oct 18, 2024
428cedb
change item quantity
taronaleksanian Oct 18, 2024
91b36a0
Merge branch 'add-creatable-option-to-search' of github.com:andrew-bi…
taronaleksanian Oct 18, 2024
73a0de8
remove react-select package
taronaleksanian Oct 18, 2024
595b5cd
Merge pull request #1314 from andrew-bierman/add-creatable-option-to-…
taronaleksanian Oct 18, 2024
27e0629
add placeholder image
Isthisanmol Oct 18, 2024
9a21471
Merge pull request #1317 from andrew-bierman/add-loading-plaholder
taronaleksanian Oct 19, 2024
d28739f
Merge branch 'feat/items-redesign' of github.com:andrew-bierman/PackR…
taronaleksanian Oct 20, 2024
41496d8
add products route
taronaleksanian Oct 20, 2024
79682b3
fix add pack items input items
taronaleksanian Oct 21, 2024
10bf2a2
fix uncertian weight import
taronaleksanian Oct 21, 2024
09b00a6
fix quantity input
taronaleksanian Oct 21, 2024
4a08328
add weight unit to quantity
taronaleksanian Oct 21, 2024
ba228ae
fix breadcrumb
taronaleksanian Oct 21, 2024
c585f5c
Merge pull request #1318 from andrew-bierman/feat/items-redesign
taronaleksanian Oct 21, 2024
bddc461
fix first time load in packs select
taronaleksanian Oct 22, 2024
814b8ae
Merge pull request #1321 from andrew-bierman/fix/pack-select
taronaleksanian Oct 22, 2024
95e3fbd
Merge branch 'andrew_testing' of github.com:andrew-bierman/PackRat in…
taronaleksanian Oct 22, 2024
d4ae5c4
make reusable list component
Isthisanmol Oct 23, 2024
a0b382c
Merge pull request #1322 from andrew-bierman/make-reusable-list-compo…
taronaleksanian Oct 23, 2024
0bf0b8a
use list component in product screen
Isthisanmol Oct 23, 2024
1edcdc4
make refresh optional
Isthisanmol Oct 23, 2024
eaf4585
use list component on feed screen
Isthisanmol Oct 23, 2024
f1be973
Remove invalid add statement in the migration file
Tadjaur Oct 24, 2024
8bb22f6
Merge pull request #1324 from andrew-bierman/fix-backend-migration-issue
taronaleksanian Oct 24, 2024
ecda4f2
Merge branch 'development' of github.com:andrew-bierman/PackRat into …
taronaleksanian Oct 24, 2024
2fd847f
Merge pull request #1323 from andrew-bierman/use-list-component
taronaleksanian Oct 24, 2024
f8c8c54
Merge branch 'development' of github.com:andrew-bierman/PackRat into …
taronaleksanian Oct 24, 2024
b015a8e
revert the backen changes
Tadjaur Oct 24, 2024
f0afea8
Merge branch 'development' of github.com:andrew-bierman/PackRat into …
taronaleksanian Oct 24, 2024
0cfec58
Fix invalid migration journal and generate the latest journal.
Tadjaur Oct 24, 2024
4754945
Merge pull request #1325 from andrew-bierman/fix-backend-migration-issue
taronaleksanian Oct 24, 2024
030219d
Merge branch 'development' of github.com:andrew-bierman/PackRat into …
taronaleksanian Oct 24, 2024
a9a7e8a
offline map support
taronaleksanian Oct 29, 2024
d39314e
Merge pull request #1328 from andrew-bierman/fix/offline-maps
taronaleksanian Oct 29, 2024
a16be97
Merge branch 'development' of github.com:andrew-bierman/PackRat into …
taronaleksanian Oct 29, 2024
c5259bf
change for backend workflow
taronaleksanian Oct 29, 2024
44aee1b
Fix items similar product
Tadjaur Oct 30, 2024
075ea5d
add similar items cards
taronaleksanian Nov 1, 2024
5b01e51
Merge pull request #1332 from andrew-bierman/fix/similar-item-not-sho…
taronaleksanian Nov 1, 2024
5716ab1
Merge branch 'andrew_testing' of github.com:andrew-bierman/PackRat in…
taronaleksanian Nov 1, 2024
0e42cd2
Merge branch 'development' of github.com:andrew-bierman/PackRat into …
taronaleksanian Nov 1, 2024
8fe4eb4
Fix backend similar item issue
Tadjaur Nov 2, 2024
9a5cff7
restore format
Tadjaur Nov 2, 2024
aa6a322
Fix vectorize algorith categorization
Tadjaur Nov 5, 2024
63fba47
Change line height
Isthisanmol Nov 5, 2024
cf4d73c
Merge pull request #1334 from andrew-bierman/fix-broken-secondary-card
taronaleksanian Nov 6, 2024
bfd14b2
Merge pull request #1333 from andrew-bierman/fix/similar-item-backend
taronaleksanian Nov 6, 2024
4c663ea
move see all button to top right
Isthisanmol Nov 7, 2024
ef0d657
Merge pull request #1335 from andrew-bierman/enhance-settings-ui
taronaleksanian Nov 7, 2024
a49037a
Ensure we display download feautre only for natie application
Tadjaur Nov 11, 2024
565d662
Merge pull request #1337 from andrew-bierman/fix-offline-manager-issu…
Isthisanmol Nov 11, 2024
412c912
Revert "Fix offline manager issue"
Isthisanmol Nov 11, 2024
b6c8072
Merge pull request #1338 from andrew-bierman/revert-1337-fix-offline-…
Isthisanmol Nov 11, 2024
597598b
Create web version of downlaod button
Tadjaur Nov 11, 2024
437dbca
Merge pull request #1339 from andrew-bierman/fix-offline-manager-issu…
taronaleksanian Nov 13, 2024
c3e1bc2
Merge branch 'development' of github.com:andrew-bierman/PackRat into …
taronaleksanian Nov 13, 2024
a574035
make style changes
Isthisanmol Nov 13, 2024
7f39286
Generate a production migration
Tadjaur Nov 27, 2024
a213b70
Create Offline App Mode
taronaleksanian Nov 28, 2024
db7f389
Merge pull request #1343 from andrew-bierman/feat/offline-app
taronaleksanian Nov 28, 2024
5730968
Merge pull request #1340 from andrew-bierman/fix-createtrip-and-items-ui
taronaleksanian Nov 28, 2024
c51c675
Merge pull request #1342 from andrew-bierman/generate-prod-migration
taronaleksanian Dec 3, 2024
df45000
Merge pull request #1296 from andrew-bierman/development
taronaleksanian Dec 4, 2024
d8866da
fix build issue
taronaleksanian Dec 4, 2024
746afd3
Merge pull request #1345 from andrew-bierman/fix/deployment-issue
taronaleksanian Dec 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/eas-cloud.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Native production pipeline
# Native production pipeline
# Builds on EAS Cloud with auto submission
name: EAS Build & Submit

on:
workflow_dispatch:
workflow_dispatch:
push:
branches:
branches:
- main
paths:
- 'packages/app/**'
Expand Down Expand Up @@ -46,4 +46,4 @@ jobs:

- name: Build on EAS
working-directory: ./apps/expo
run: eas build --platform all --profile production --non-interactive --no-wait --auto-submit
run: eas build --platform all --profile production --non-interactive --no-wait --auto-submit
14 changes: 14 additions & 0 deletions app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"expo": {
"name": "packrat-world",
"slug": "packrat-world",
"version": "0.0.1",
"description": "PackRat is the ultimate adventure planner designed for those who love to explore the great outdoors. Our app helps users plan and organize their trips with ease, whether it's a weekend camping trip, a day hike, or a cross-country road trip.",
"sdkVersion": "50.0.0",
"platforms": [
"ios",
"android",
"web"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@ export default function Item() {
<Stack.Screen
options={{
// https://reactnavigation.org/docs/headers#setting-the-header-title
title: 'Pack',
title: 'Item',
// https://reactnavigation.org/docs/headers#adjusting-header-styles

// https://reactnavigation.org/docs/headers#replacing-the-title-with-a-custom-component
}}
/>
{/* <DetailsComponent type='pack'/> */}
<ItemDetailsScreen />
</>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import React from 'react';
import { Platform } from 'react-native';
import { Stack } from 'expo-router';
import Head from 'expo-router/head';
import useTheme from 'app/hooks/useTheme';
import { DrawerToggleButton } from '@react-navigation/drawer';
import { PackTemplateDetailsScreen } from 'app/modules/pack-templates';

export default function Pack() {
const { currentTheme } = useTheme();

return (
<>
{Platform.OS === 'web' && (
<Head>
<title>Pack Template</title>
<meta name="description" content="Pack Template" />
</Head>
)}
<Stack.Screen
options={{
// https://reactnavigation.org/docs/headers#setting-the-header-title
title: 'Pack Template',
headerRight: () => (
<DrawerToggleButton tintColor={currentTheme.colors.tertiaryBlue} />
),

headerStyle: {
backgroundColor: currentTheme.colors.background,
},
headerTitleStyle: {
fontSize: 24,
},
headerTintColor: currentTheme.colors.tertiaryBlue,
// https://reactnavigation.org/docs/headers#adjusting-header-styles

// https://reactnavigation.org/docs/headers#replacing-the-title-with-a-custom-component
}}
/>
<PackTemplateDetailsScreen />
</>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import React from 'react';
import { FeedScreen } from 'app/modules/feed';
import { Platform } from 'react-native';
import { Stack } from 'expo-router';
import Head from 'expo-router/head';
import useTheme from 'app/hooks/useTheme';
import { DrawerToggleButton } from '@react-navigation/drawer';

export default function PackTemplates() {
const { currentTheme } = useTheme();

return (
<>
{Platform.OS === 'web' && (
<Head>
<title>Pack Templates</title>
</Head>
)}
<Stack.Screen
options={{
// https://reactnavigation.org/docs/headers#setting-the-header-title
title: 'Pack Templates',
headerRight: () => (
<DrawerToggleButton tintColor={currentTheme.colors.tertiaryBlue} />
),

headerStyle: {
backgroundColor: currentTheme.colors.background,
},
headerTitleStyle: {
fontSize: 24,
},
headerTintColor: currentTheme.colors.tertiaryBlue,

// https://reactnavigation.org/docs/headers#adjusting-header-styles

// https://reactnavigation.org/docs/headers#replacing-the-title-with-a-custom-component
}}
/>
<FeedScreen feedType="packTemplates" />
</>
);
}
42 changes: 42 additions & 0 deletions apps/expo/app/(app)/(drawer)/(tabs)/(stack)/products/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import React from 'react';
import { ProductsScreen } from 'app/modules/item';
import { Platform } from 'react-native';
import { Stack } from 'expo-router';
import Head from 'expo-router/head';
import useTheme from 'app/hooks/useTheme';
import { DrawerToggleButton } from '@react-navigation/drawer';

export default function ProductsPage() {
const { currentTheme } = useTheme();

return (
<>
{Platform.OS === 'web' && (
<Head>
<title>Products</title>
</Head>
)}
<Stack.Screen
options={{
// https://reactnavigation.org/docs/headers#setting-the-header-title
title: 'Products',
headerRight: () => (
<DrawerToggleButton tintColor={currentTheme.colors.tertiaryBlue} />
),

headerStyle: {
backgroundColor: currentTheme.colors.background,
},
headerTitleStyle: {
fontSize: 24,
},
headerTintColor: currentTheme.colors.tertiaryBlue,
// https://reactnavigation.org/docs/headers#adjusting-header-styles

// https://reactnavigation.org/docs/headers#replacing-the-title-with-a-custom-component
}}
/>
<ProductsScreen />
</>
);
}
13 changes: 9 additions & 4 deletions apps/expo/app/(app)/(drawer)/(tabs)/index.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import React from 'react';
import { Platform, View } from 'react-native';
import { Stack } from 'expo-router';
import { Redirect, Stack } from 'expo-router';
import { theme } from 'app/theme';
import { DashboardScreen } from 'app/modules/dashboard';
import useTheme from 'app/hooks/useTheme';
import { useAuthUser, LoginScreen } from 'app/modules/auth';
import Head from 'expo-router/head';
import { useOfflineStore } from 'app/atoms';

export default function HomeScreen() {
const {
Expand All @@ -17,6 +18,7 @@ export default function HomeScreen() {
} = useTheme();

const user = useAuthUser();
const { connectionStatus } = useOfflineStore();

const mutualStyles = {
backgroundColor: currentTheme.colors.background,
Expand All @@ -35,9 +37,12 @@ export default function HomeScreen() {
title: 'Home',
}}
/>
<View style={mutualStyles}>
{!user ? <LoginScreen /> : <DashboardScreen />}
</View>
{connectionStatus === 'connected' && (
<View style={mutualStyles}>
{!user ? <LoginScreen /> : <DashboardScreen />}
</View>
)}
{connectionStatus === 'offline' && <Redirect href="offline/maps" />}
</>
);
}
17 changes: 17 additions & 0 deletions apps/expo/app/entry.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import LandingPage from 'app/components/landing_page';
import { ConnectionGate } from 'app/components/ConnectionGate';
import { Redirect } from 'expo-router';

export default function Entry() {
return (
<>
<ConnectionGate mode="connected">
<LandingPage />
</ConnectionGate>
<ConnectionGate mode="offline">
<Redirect href="offline/maps" />
</ConnectionGate>
</>
);
}
18 changes: 18 additions & 0 deletions apps/expo/app/offline/_layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react';
import { OfflineTabs } from 'app/components/navigation/OfflineTabs';
import { useUserInOfflineMode } from 'app/modules/auth';
import { Redirect } from 'expo-router';
import { SafeArea } from 'app/provider/safe-area';

export default function OfflineLayout() {
const { isLoading } = useUserInOfflineMode();
if (isLoading) {
return null;
}

return (
<SafeArea>
<OfflineTabs />
</SafeArea>
);
}
27 changes: 27 additions & 0 deletions apps/expo/app/offline/maps.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from 'react';
import { Stack } from 'expo-router';
import { OfflineMapsScreen } from 'app/modules/map/screens/OfflineMapsScreen';
import { EmptyState } from '@packrat/ui';
import { MapPin } from '@tamagui/lucide-icons';
import { OfflineMessage } from 'app/components/OfflineMessage';

export default function OfflineMaps() {
return (
<>
<Stack.Screen
options={{
title: 'Map',
}}
/>
<OfflineMessage />
<OfflineMapsScreen
fallback={
<EmptyState
icon={<MapPin size={32} />}
text="No maps available. Connect to the network to add maps."
/>
}
/>
</>
);
}
19 changes: 19 additions & 0 deletions apps/expo/app/offline/pack.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from 'react';
import { Stack } from 'expo-router';
import { FeedScreen } from 'app/modules/feed';
import { OfflineMessage } from 'app/components/OfflineMessage';

export default function OfflineMaps() {
return (
<>
<Stack.Screen
options={{
title: 'Packs',
headerShown: false,
}}
/>
<OfflineMessage />
<FeedScreen feedType="userPacks" listStyle={{ paddingTop: 50 }} />
</>
);
}
1 change: 1 addition & 0 deletions apps/expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
"react-native": "0.73.6",
"react-native-dotenv": "^3.4.8",
"react-native-elements": "^3.4.3",
"react-native-fast-image": "^8.6.3",
"react-native-flash-message": "^0.4.2",
"react-native-gesture-handler": "~2.14.0",
"react-native-google-places-autocomplete": "^2.5.1",
Expand Down
19 changes: 19 additions & 0 deletions apps/next/pages/pack-templates/[id].tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from 'react';
import { PackTemplateDetailsScreen } from 'app/modules/pack-templates';
import { AuthWrapper } from 'app/modules/auth';

// export const runtime = 'experimental-edge'

function PackTemplate() {
return (
<>
<PackTemplateDetailsScreen />
</>
);
}

export default PackTemplate;

PackTemplate.getLayout = function getLayout(page: any) {
return <AuthWrapper>{page}</AuthWrapper>;
};
15 changes: 15 additions & 0 deletions apps/next/pages/pack-templates/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react';
import { FeedScreen } from 'app/modules/feed';
import { AuthWrapper } from 'app/modules/auth';

// export const runtime = 'experimental-edge'

function PackTemplates() {
return <FeedScreen feedType="packTemplates" />;
}

export default PackTemplates;

PackTemplates.getLayout = function getLayout(page: any) {
return <AuthWrapper>{page}</AuthWrapper>;
};
15 changes: 15 additions & 0 deletions apps/next/pages/products/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { ProductsScreen } from 'app/modules/item';
import { AuthWrapper } from 'app/modules/auth';
// export const runtime = 'experimental-edge';

export default function ProductsPage() {
return (
<>
<ProductsScreen />
</>
);
}

ProductsPage.getLayout = function getLayout(page: any) {
return <AuthWrapper>{page}</AuthWrapper>;
};
Loading
Loading