Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
beasy-mobile
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
4
Issues
4
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
G
beasy-mobile
Commits
1a7556cf
Commit
1a7556cf
authored
Sep 11, 2024
by
G
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated with the card created for the moment
parent
f2c66620
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
24 deletions
+34
-24
HomePageWithPaymentOptions.tsx
src/screens/HomePageWithPaymentOptions.tsx
+19
-14
UserProfileScreen.tsx
src/screens/UserProfileScreen.tsx
+15
-10
No files found.
src/screens/HomePageWithPaymentOptions.tsx
View file @
1a7556cf
import
type
{
PaymentStackScreenComponentProps
}
from
"@/navigations/Types"
;
import
getPaymentTypes
from
"@/utils/requests/getPaymentTypes"
;
import
BarWithBeasyAndNotificationsIcon
from
"@components/BarWithBeasyAndNotificationsIcon"
;
import
PaymentOption
from
"@components/PaymentOption"
;
import
Box
from
"@components/bases/Box"
;
import
WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight
from
"@components/wrappers/WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight"
;
import
{
LOG
}
from
"@logger"
;
import
Card
from
"@re-card"
;
import
Text
from
"@re-text"
;
import
{
useQuery
}
from
"@tanstack/react-query"
;
import
{
useMemo
}
from
"react"
;
import
{
Dimensions
}
from
"react-native"
;
import
{
SafeAreaView
}
from
"react-native-safe-area-context"
;
const
log
=
LOG
.
extend
(
"HomePageWithPaymentOptions"
);
...
...
@@ -33,14 +36,16 @@ const HomePageWithPaymentOptions: PaymentStackScreenComponentProps<"homePageWith
return
(
// <BeasyDefaultBackgroundWrapper>
<
SafeAreaView
>
<
Box
style=
{
{
height
:
"100%"
}
}
>
<
WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight
>
<
Box
style=
{
{
height
:
"100%"
}
}
flexDirection=
{
"column"
}
>
<
BarWithBeasyAndNotificationsIcon
/>
{
/* <Box height={150} alignItems={"center"} justifyContent={"center"}>
<BalanceContainer balance={78000} label="Total des ventes" />
</Box> */
}
{
/* <Box flex={1} p={"l"}>
<
Card
variant=
{
"curvedTopContainer"
}
height=
{
Dimensions
.
get
(
"window"
).
height
/
2
+
150
}
// marginTop={"auto"}
style=
{
{
marginTop
:
"auto"
}
}
padding=
{
"l"
}
>
<
Box
height=
{
100
}
>
<
Text
fontSize=
{
20
}
fontWeight=
{
"bold"
}
>
Types de paiement
...
...
@@ -67,21 +72,21 @@ const HomePageWithPaymentOptions: PaymentStackScreenComponentProps<"homePageWith
<
PaymentOptionContainer
key=
{
paymentType
.
id
}
>
<
PaymentOption
onPress=
{
()
=>
navigation.navigate(
"paymentAmountInputScreen",
{
navigation
.
navigate
(
"paymentAmountInputScreen"
,
{
paymentType
:
paymentType
.
code
,
},
)
})
}
paymentMethod=
{
paymentType
.
code
}
/>
</
PaymentOptionContainer
>
))
}
</
Box
>
</
Card
>
{
/* <Box height={150} alignItems={"center"} justifyContent={"center"}>
<BalanceContainer balance={78000} label="Total des ventes" />
</Box> */
}
</
Box
>
</
SafeAreaView
>
</
WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight
>
// </BeasyDefaultBackgroundWrapper>
);
};
...
...
src/screens/UserProfileScreen.tsx
View file @
1a7556cf
import
Box
from
"@components/bases/Box"
;
import
{}
from
"react"
;
import
{}
from
"react-native"
;
import
{
useUserAuthenticationContext
}
from
"@/contexts/UserAuthenticationContext"
;
import
BarWithBeasyAndNotificationsIcon
from
"@components/BarWithBeasyAndNotificationsIcon"
;
import
Button
from
"@components/Button"
;
import
B
ackgroundWithBeasyIconAndWhiteContentArea
from
"@components/backgrounds/BackgroundWithBeasyIconAndWhiteContentArea
"
;
import
B
ox
from
"@components/bases/Box
"
;
import
Text
from
"@components/bases/Text"
;
import
WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight
from
"@components/wrappers/WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight"
;
import
{
LOG
}
from
"@logger"
;
import
Card
from
"@re-card"
;
const
log
=
LOG
.
extend
(
"UserProfileScreen"
);
const
UserProfileScreen
=
()
=>
{
...
...
@@ -17,10 +16,16 @@ const UserProfileScreen = () => {
const
{
userInformations
}
=
useUserAuthenticationContext
();
return
(
<
BackgroundWithBeasyIconAndWhiteContentArea
>
<
WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight
>
<>
<
Box
px=
{
"m"
}
mt=
{
"m"
}
gap=
{
"m"
}
>
{
/* User Informations */
}
<
BarWithBeasyAndNotificationsIcon
/>
<
Card
variant=
"curvedTopContainer"
height=
{
"100%"
}
padding=
{
"m"
}
gap=
{
"m"
}
marginTop=
{
"m"
}
>
<
Box
width=
{
"100%"
}
// height={200}
...
...
@@ -163,9 +168,9 @@ const UserProfileScreen = () => {
<
Text
textAlign=
{
"center"
}
>
{
userInformations
.
marchand
.
url_echec
}
</
Text
>
</
Box
>
</
Box
>
</
Box
>
</
Card
>
</>
</
BackgroundWithBeasyIconAndWhiteContentArea
>
</
WrapperWithDefaultBeasyBackgroundAndSafeAreaTopLeftRight
>
);
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment