Skip to content

Commit

Permalink
Merge pull request #2508 from beckn/fix/issue-2505
Browse files Browse the repository at this point in the history
fix(dragon-foods): modified code to add description to signinpage and…
  • Loading branch information
aniketceminds authored Nov 18, 2024
2 parents cece273 + acb64b7 commit 305c47c
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 10 deletions.
2 changes: 1 addition & 1 deletion apps/dragon-foods/lib/config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const DOMAIN = 'climate'
export const DOMAIN = 'dragon_foods'

export const currencyMap = {
EUR: '€',
Expand Down
3 changes: 2 additions & 1 deletion apps/dragon-foods/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ const en: { [key: string]: string } = {
backtoHomepage: 'Back to Homepage',
contactSupport: 'Contact support',
noProduct: 'There are no products in this category yet! New products will be added soon.',
itemSourceText: 'Provided by'
itemSourceText: 'Provided by',
applicationDescription: 'Platform for Climate Resilient Data Highways'
}
export default en
12 changes: 10 additions & 2 deletions apps/dragon-foods/pages/signIn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,16 @@ const Login = () => {
return (
<SignInPage
logos={{
mobile: { src: dragonMobLogo, alt: 'dragon foods logo' },
desktop: { src: dragonDeskLogo, alt: 'dragon foods logo' }
mobile: {
src: dragonMobLogo,
alt: 'dragon foods logo',
description: t.applicationDescription
},
desktop: {
src: dragonDeskLogo,
alt: 'dragon foods logo',
description: t.applicationDescription
}
}}
onSignIn={() => {}}
onSignUp={handleSignUp}
Expand Down
4 changes: 2 additions & 2 deletions apps/dragon-foods/pages/signUp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ const Register = () => {
<SignUpPage
baseUrl={process.env.NEXT_PUBLIC_STRAPI_URL!}
logos={{
mobile: { src: dragonMobLogo, alt: 'dragon foods logo' },
desktop: { src: dragonDeskLogo, alt: 'dragon foods logo' }
mobile: { src: dragonMobLogo, alt: 'dragon foods logo', description: t.applicationDescription },
desktop: { src: dragonDeskLogo, alt: 'dragon foods logo', description: t.applicationDescription }
}}
onSignIn={handleSignIn}
onSignUp={() => {}}
Expand Down
2 changes: 1 addition & 1 deletion apps/harmoni-aids/lib/config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const DOMAIN = 'retail:1.1.0'
export const DOMAIN = 'harmoniaid'

export const currencyMap = {
EUR: '€',
Expand Down
2 changes: 1 addition & 1 deletion apps/sky-analytics/lib/config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const DOMAIN = 'retail:1.1.0'
export const DOMAIN = 'skyanalytics_flow'

export const currencyMap = {
EUR: '€',
Expand Down
13 changes: 13 additions & 0 deletions packages/becknified-components/src/pages/auth/auth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,19 @@ const Auth: React.FC<AuthProps> = ({ schema, isLoading, dataTestForm }) => {
alt={logo.alt}
pt="15px"
/>
{logo?.description && (
<Typography
text={logo?.description!}
style={{
fontSize: '17px',
fontFamily: 'poppins',
color: '#564C4D',
fontWeight: '800',
alignSelf: 'center',
textAlign: 'center'
}}
/>
)}
</Flex>
</Box>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export interface AuthProps {
logo?: {
src: string
alt: string
description?: string
}
chooseAuthType?: {
id: string
Expand Down
1 change: 1 addition & 0 deletions packages/common/lib/types/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export interface ProfileProps {
export interface LogoDetails {
src: string
alt: string
description?: string
}

export interface Logos {
Expand Down
3 changes: 2 additions & 1 deletion packages/common/src/components/signIn/SignIn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ const SignIn: React.FC<SignInComponentProps> = ({
schema={{
logo: {
src: currentLogo.src,
alt: currentLogo.alt
alt: currentLogo.alt,
description: currentLogo?.description || ''
},
buttons: [
{
Expand Down
3 changes: 2 additions & 1 deletion packages/common/src/components/signUp/signUp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ const SignUp: React.FC<SignUpComponentProps> = ({
schema={{
logo: {
src: currentLogo.src,
alt: currentLogo.alt //'Suppliflow logo'
alt: currentLogo.alt, //'Suppliflow logo'
description: currentLogo?.description || ''
},
buttons: [
{
Expand Down

0 comments on commit 305c47c

Please sign in to comment.