Skip to content

Commit

Permalink
Update env.config.ts and version number to 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
aelassas committed May 6, 2024
1 parent 878d111 commit 4336def
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions api/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "api",
"version": "3.0.0",
"version": "3.1.0",
"description": "",
"main": "index.js",
"type": "module",
Expand Down
4 changes: 2 additions & 2 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backend",
"version": "3.0.0",
"version": "3.1.0",
"private": true,
"dependencies": {
"@craco/craco": "^7.1.0",
Expand Down
12 changes: 6 additions & 6 deletions backend/src/config/env.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ const env = {
isMobile: () => window.innerWidth <= 960,

APP_TYPE: movininTypes.AppType.Backend,
API_HOST: process.env.REACT_APP_MI_API_HOST,
API_HOST: String(process.env.REACT_APP_MI_API_HOST),
LANGUAGES: LANGUAGES.map((l) => l.code),
_LANGUAGES: LANGUAGES,
DEFAULT_LANGUAGE: process.env.REACT_APP_MI_DEFAULT_LANGUAGE || 'en',
DEFAULT_LANGUAGE: String(process.env.REACT_APP_MI_DEFAULT_LANGUAGE || 'en'),
PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_PAGE_SIZE), 10) || 30,
PROPERTIES_PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_PROPERTIES_PAGE_SIZE), 10) || 15,
BOOKINGS_PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_BOOKINGS_PAGE_SIZE), 10) || 20,
BOOKINGS_MOBILE_PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_BOOKINGS_MOBILE_PAGE_SIZE), 10) || 10,
CDN_USERS: process.env.REACT_APP_MI_CDN_USERS,
CDN_TEMP_USERS: process.env.REACT_APP_MI_CDN_TEMP_USERS,
CDN_PROPERTIES: process.env.REACT_APP_MI_CDN_PROPERTIES,
CDN_TEMP_PROPERTIES: process.env.REACT_APP_MI_CDN_TEMP_PROPERTIES,
CDN_USERS: String(process.env.REACT_APP_MI_CDN_USERS),
CDN_TEMP_USERS: String(process.env.REACT_APP_MI_CDN_TEMP_USERS),
CDN_PROPERTIES: String(process.env.REACT_APP_MI_CDN_PROPERTIES),
CDN_TEMP_PROPERTIES: String(process.env.REACT_APP_MI_CDN_TEMP_PROPERTIES),
PAGE_OFFSET: 200,
INFINITE_SCROLL_OFFSET: 40,
AGENCY_IMAGE_WIDTH: Number.parseInt(String(process.env.REACT_APP_MI_AGENCY_IMAGE_WIDTH), 10) || 60,
Expand Down
4 changes: 2 additions & 2 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "frontend",
"version": "3.0.0",
"version": "3.1.0",
"private": true,
"dependencies": {
"@craco/craco": "^7.1.0",
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/config/env.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ const env = {
isMobile: () => window.innerWidth <= 960,

APP_TYPE: movininTypes.AppType.Frontend,
API_HOST: process.env.REACT_APP_MI_API_HOST,
API_HOST: String(process.env.REACT_APP_MI_API_HOST),
LANGUAGES: LANGUAGES.map((l) => l.code),
_LANGUAGES: LANGUAGES,
DEFAULT_LANGUAGE: process.env.REACT_APP_MI_DEFAULT_LANGUAGE || 'en',
DEFAULT_LANGUAGE: String(process.env.REACT_APP_MI_DEFAULT_LANGUAGE || 'en'),
PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_PAGE_SIZE), 10) || 30,
PROPERTIES_PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_PROPERTIES_PAGE_SIZE), 10) || 15,
BOOKINGS_PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_BOOKINGS_PAGE_SIZE), 10) || 20,
BOOKINGS_MOBILE_PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_BOOKINGS_MOBILE_PAGE_SIZE), 10) || 10,
CDN_USERS: process.env.REACT_APP_MI_CDN_USERS,
CDN_PROPERTIES: process.env.REACT_APP_MI_CDN_PROPERTIES,
CDN_USERS: String(process.env.REACT_APP_MI_CDN_USERS),
CDN_PROPERTIES: String(process.env.REACT_APP_MI_CDN_PROPERTIES),
PAGE_OFFSET: 200,
INFINITE_SCROLL_OFFSET: 40,
AGENCY_IMAGE_WIDTH: Number.parseInt(String(process.env.REACT_APP_MI_AGENCY_IMAGE_WIDTH), 10) || 60,
Expand All @@ -39,7 +39,7 @@ const env = {
PROPERTY_OPTION_IMAGE_HEIGHT: 85,
SELECTED_PROPERTY_OPTION_IMAGE_HEIGHT: 30,
RECAPTCHA_ENABLED: (process.env.REACT_APP_MI_RECAPTCHA_ENABLED && process.env.REACT_APP_MI_RECAPTCHA_ENABLED.toLowerCase()) === 'true',
RECAPTCHA_SITE_KEY: process.env.REACT_APP_MI_RECAPTCHA_SITE_KEY,
RECAPTCHA_SITE_KEY: String(process.env.REACT_APP_MI_RECAPTCHA_SITE_KEY),
MINIMUM_AGE: Number.parseInt(String(process.env.REACT_APP_MI_MINIMUM_AGE), 10) || 21,
// PAGINATION_MODE: CLASSIC or INFINITE_SCROLL
// If you choose CLASSIC, you will get a classic pagination with next and previous buttons on desktop and infinite scroll on mobile.
Expand All @@ -50,7 +50,7 @@ const env = {
? Const.PAGINATION_MODE.INFINITE_SCROLL
: Const.PAGINATION_MODE.CLASSIC,
SIZE_UNIT: 'm²',
STRIPE_PUBLISHABLE_KEY: process.env.REACT_APP_MI_STRIPE_PUBLISHABLE_KEY,
STRIPE_PUBLISHABLE_KEY: String(process.env.REACT_APP_MI_STRIPE_PUBLISHABLE_KEY),
}

export default env
2 changes: 1 addition & 1 deletion frontend/src/pages/Checkout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ import '../assets/css/checkout.css'
// Make sure to call `loadStripe` outside of a component’s render to avoid
// recreating the `Stripe` object on every render.
//
const stripePromise = loadStripe(env.STRIPE_PUBLISHABLE_KEY as string)
const stripePromise = loadStripe(env.STRIPE_PUBLISHABLE_KEY)

const Checkout = () => {
const reactLocation = useLocation()
Expand Down
4 changes: 2 additions & 2 deletions mobile/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"expo": {
"jsEngine": "hermes",
"name": "Movin' In",
"version": "3.0.0",
"version": "3.1.0",
"slug": "movinin",
"icon": "./assets/icon.png",
"assetBundlePatterns": [
Expand All @@ -26,7 +26,7 @@
"package": "com.movinin"
},
"ios": {
"buildNumber": "3.0.0",
"buildNumber": "3.1.0",
"supportsTablet": true,
"icon": "./assets/icon.png",
"splash": {
Expand Down
4 changes: 2 additions & 2 deletions mobile/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion mobile/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "movinin",
"version": "3.0.0",
"version": "3.1.0",
"main": "node_modules/expo/AppEntry.js",
"scripts": {
"start": "tsc --build --verbose && expo start --port 8081",
Expand Down

0 comments on commit 4336def

Please sign in to comment.