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

Add lounge access page for users who qualify for lounge membership #20881

Merged
merged 18 commits into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
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
23 changes: 23 additions & 0 deletions assets/images/lounge-access.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5,710 changes: 5,710 additions & 0 deletions assets/images/product-illustrations/lounge-top-bg.svg
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@narefyev91 - I think this file is why there's so many line changes 😅

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep - it's cause of the SVG files

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/ROUTES.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export default {
SETTINGS_TIMEZONE: 'settings/profile/timezone',
SETTINGS_TIMEZONE_SELECT: 'settings/profile/timezone/select',
SETTINGS_PRONOUNS: 'settings/profile/pronouns',
SETTINGS_LOUNGE_ACCESS: 'settings/profile/lounge-access',
SETTINGS_PREFERENCES: 'settings/preferences',
SETTINGS_PRIORITY_MODE: 'settings/preferences/priority-mode',
SETTINGS_LANGUAGE: 'settings/preferences/language',
Expand Down
2 changes: 2 additions & 0 deletions src/components/Icon/Expensicons.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import Keyboard from '../../../assets/images/keyboard.svg';
import Link from '../../../assets/images/link.svg';
import LinkCopy from '../../../assets/images/link-copy.svg';
import Lock from '../../../assets/images/lock.svg';
import LoungeAccess from '../../../assets/images/lounge-access.svg';
import Luggage from '../../../assets/images/luggage.svg';
import MagnifyingGlass from '../../../assets/images/magnifying-glass.svg';
import Mail from '../../../assets/images/mail.svg';
Expand Down Expand Up @@ -185,6 +186,7 @@ export {
Link,
LinkCopy,
Lock,
LoungeAccess,
Luggage,
MagnifyingGlass,
Mail,
Expand Down
8 changes: 8 additions & 0 deletions src/components/Icon/Illustrations.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import Abracadabra from '../../../assets/images/product-illustrations/abracadabr
import BankArrowPink from '../../../assets/images/product-illustrations/bank-arrow--pink.svg';
import BankMouseGreen from '../../../assets/images/product-illustrations/bank-mouse--green.svg';
import BankUserGreen from '../../../assets/images/product-illustrations/bank-user--green.svg';
import ChatBubbles from '../../../assets/images/simple-illustrations/simple-illustration__chatbubbles.svg';
import CoffeeMug from '../../../assets/images/simple-illustrations/simple-illustration__coffeemug.svg';
import ConciergeBlue from '../../../assets/images/product-illustrations/concierge--blue.svg';
import ConciergeExclamation from '../../../assets/images/product-illustrations/concierge--exclamation.svg';
import CreditCardsBlue from '../../../assets/images/product-illustrations/credit-cards--blue.svg';
Expand All @@ -18,6 +20,7 @@ import ReceiptYellow from '../../../assets/images/product-illustrations/receipt-
import RocketBlue from '../../../assets/images/product-illustrations/rocket--blue.svg';
import RocketOrange from '../../../assets/images/product-illustrations/rocket--orange.svg';
import SafeBlue from '../../../assets/images/product-illustrations/safe.svg';
import SanFrancisco from '../../../assets/images/simple-illustrations/simple-illustration__sanfrancisco.svg';
import TadaYellow from '../../../assets/images/product-illustrations/tada--yellow.svg';
import TadaBlue from '../../../assets/images/product-illustrations/tada--blue.svg';
import ToddBehindCloud from '../../../assets/images/product-illustrations/todd-behind-cloud.svg';
Expand All @@ -28,6 +31,7 @@ import PinkBill from '../../../assets/images/simple-illustrations/simple-illustr
import CreditCardsNew from '../../../assets/images/simple-illustrations/simple-illustration__credit-cards.svg';
import InvoiceBlue from '../../../assets/images/simple-illustrations/simple-illustration__invoice.svg';
import LockOpen from '../../../assets/images/simple-illustrations/simple-illustration__lockopen.svg';
import Lounge from '../../../assets/images/product-illustrations/lounge-top-bg.svg';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NAB/nit picks, but 1) I wonder if we should just name this lounge.svg instead (to stay consistent with how the result of product illustrations are named - doesn't seem like they incorporate placement details into the name), 2) there's some dubious alpha ordering in this import section 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM!

import Luggage from '../../../assets/images/simple-illustrations/simple-illustration__luggage.svg';
import MoneyIntoWallet from '../../../assets/images/simple-illustrations/simple-illustration__moneyintowallet.svg';
import MoneyWings from '../../../assets/images/simple-illustrations/simple-illustration__moneywings.svg';
Expand All @@ -46,6 +50,8 @@ export {
BankArrowPink,
BankMouseGreen,
BankUserGreen,
ChatBubbles,
CoffeeMug,
ConciergeBlue,
ConciergeExclamation,
CreditCardsBlue,
Expand All @@ -61,6 +67,7 @@ export {
ReceiptYellow,
RocketBlue,
RocketOrange,
SanFrancisco,
SafeBlue,
TadaYellow,
TadaBlue,
Expand All @@ -72,6 +79,7 @@ export {
CreditCardsNew,
InvoiceBlue,
LockOpen,
Lounge,
Luggage,
MoneyIntoWallet,
MoneyWings,
Expand Down
8 changes: 8 additions & 0 deletions src/languages/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,14 @@ export default {
offline: 'Offline',
syncing: 'Syncing',
},
loungeAccessPage: {
loungeAccess: 'Lounge access',
headline: 'You qualify for access to our exclusive lounges.',
description: 'The Expensify Lounge is where a "high-end airport lounge" meets a vibrant "co-working space" optimized for like-minded individuals.',
coffeePromo: 'Great coffee and cocktails',
networkingPromo: 'Network with other members',
viewsPromo: 'Incredible views of San Francisco',
},
pronounsPage: {
pronouns: 'Pronouns',
isShownOnProfile: 'Your pronouns are shown on your profile.',
Expand Down
8 changes: 8 additions & 0 deletions src/languages/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,14 @@ export default {
offline: 'Desconectado',
syncing: 'Sincronizando',
},
loungeAccessPage: {
loungeAccess: 'Acceso al lounge',
headline: 'Podrás acceder a nuestras salas vip exclusivas.',
description: 'La sala vip Expensify es el punto de encuentro entre una “sala vip de aeropuerto de alta gama” y un vibrante “espacio de co-working” optimizado para personas con ideas afines.',
coffeePromo: 'Buen café y buenos cócteles',
networkingPromo: 'Conecta con otros miembros',
viewsPromo: 'Increíbles vistas de San Francisco',
},
pronounsPage: {
pronouns: 'Pronombres',
isShownOnProfile: 'Tus pronombres se muestran en tu perfil.',
Expand Down
7 changes: 7 additions & 0 deletions src/libs/Navigation/AppNavigator/ModalStackNavigators.js
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,13 @@ const SettingsModalStackNavigator = createModalStackNavigator([
},
name: 'Settings_App_Download_Links',
},
{
getComponent: () => {
const SettingsLoungeAccessPage = require('../../../pages/settings/LoungeAccessPage').default;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's nest this under Profile to follow existing directory organization patterns

Suggested change
const SettingsLoungeAccessPage = require('../../../pages/settings/LoungeAccessPage').default;
const SettingsLoungeAccessPage = require('../../../pages/settings/Profile/LoungeAccessPage').default;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thoughts on this one @yuwenmemon?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh sorry missed this! Sounds good one sec...

return SettingsLoungeAccessPage;
},
name: 'Settings_Lounge_Access',
},
{
getComponent: () => {
const SettingsPaymentsPage = require('../../../pages/settings/Payments/PaymentsPage').default;
Expand Down
3 changes: 3 additions & 0 deletions src/libs/Navigation/linkingConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ export default {
Settings_ContactMethodDetails: {
path: ROUTES.SETTINGS_CONTACT_METHOD_DETAILS,
},
Settings_Lounge_Access: {
path: ROUTES.SETTINGS_LOUNGE_ACCESS,
},
Settings_NewContactMethod: {
path: ROUTES.SETTINGS_NEW_CONTACT_METHOD,
exact: true,
Expand Down
Loading