Merge pull request #113 from P4-Games/feature/icp-deploy

merge feature/icp-deploy into develop

Author: dappsar

package.json

@@ -11,7 +11,6 @@
     "build": "next build",
     "create-env": "printenv > .env",
     "serve": "yarn build && npm i -g http-server && http-server ./.next",
-    "export": "yarn build && next export -o _static",
     "lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\"",
     "lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx}\"",
     "prettier": "prettier --write \"src/**/*.{js,jsx,ts,tsx}\"",

src/config-global.ts

@@ -1,5 +1,3 @@
-import { paths } from 'src/routes/paths'
-
 import { Network } from './types/networks'
 
 // ----------------------------------------------------------------------
@@ -31,16 +29,15 @@ export const handleVercelFreePlanTimeOut =
 export const UI_API_URL = process.env.NEXT_PUBLIC_UI_URL
 export const USE_MOCK = (process.env.NEXT_PUBLIC_USE_MOCK || 'true') === 'true'
 export const ALLOWED_ORIGINS = process.env.NEXT_PUBLIC_ALLOWED_ORIGINS || '*'
-export const fromICP = (process.env.NEXT_PUBLIC_FROM_ICP || 'false') === 'true'
+export const fromICP = (process.env.NEXT_PUBLIC_FROM_ICP || 'true') === 'true'
 export const RECAPTCHA_SITE_KEY = process.env.NEXT_PUBLIC_RECAPTCHA_SITE_KEY || ''
 export const NFT_IMAGE_REPOSITORY = (
   process.env.NEXT_PUBLIC_NFT_IMAGE_REPOSITORY || 'gcp'
 ).toLowerCase()
 // ----------------------------------------------------------------------
 
 // internal
-export const DOMAIN_TO_USE_WITH_ICP = fromICP ? 'https://chatterpay.net' : ''
-export const PATH_AFTER_LOGIN = `${DOMAIN_TO_USE_WITH_ICP}$/dashboard`   
+export const PATH_AFTER_LOGIN = `/dashboard`
 export const BOT_WAPP_URL =
   'https://api.whatsapp.com/send/?phone=5491164629653&text=MESSAGE&type=phone_number&app_absent=0'
 

src/layouts/common/login-button.tsx

@@ -5,6 +5,7 @@ import { paths } from 'src/routes/paths'
 import { RouterLink } from 'src/routes/components'
 
 import { useTranslate } from 'src/locales'
+import { fromICP } from 'src/config-global'
 
 // ----------------------------------------------------------------------
 
@@ -18,18 +19,19 @@ export default function LoginButton({ sx }: Props) {
   return (
     <>
       <Button
-        component={RouterLink}
+        component={fromICP ? 'a' : RouterLink}
         href={paths.auth.jwt.register}
         variant='contained'
         sx={{ mr: 1, ...sx }}
       >
         {t('home.header.sign-up')}
       </Button>
-      <Button 
-        component={RouterLink} 
-        href={paths.auth.jwt.login} 
-        variant='soft' 
-        sx={{ mr: 1, ...sx }}>
+      <Button
+        component={fromICP ? 'a' : RouterLink}
+        href={paths.auth.jwt.login}
+        variant='soft'
+        sx={{ mr: 1, ...sx }}
+      >
         {t('home.header.sign-in')}
       </Button>
     </>

src/layouts/main/header.tsx

@@ -11,7 +11,6 @@ import { useResponsive } from 'src/hooks/use-responsive'
 
 import { bgBlur } from 'src/theme/css'
 import { useTranslate } from 'src/locales'
-import { PATH_AFTER_LOGIN } from 'src/config-global'
 
 import Logo from 'src/components/logo'
 import Iconify from 'src/components/iconify'

src/routes/paths.ts

@@ -1,6 +1,5 @@
 const ROOTS = {
   AUTH: '/auth',
-  AUTH_DEMO: '/auth-demo',
   DASHBOARD: '/dashboard'
 }
 
@@ -18,22 +17,6 @@ export const paths = {
       register: `${ROOTS.AUTH}/jwt/register`
     }
   },
-  authDemo: {
-    classic: {
-      login: `${ROOTS.AUTH_DEMO}/classic/login`,
-      register: `${ROOTS.AUTH_DEMO}/classic/register`,
-      forgotPassword: `${ROOTS.AUTH_DEMO}/classic/forgot-password`,
-      newPassword: `${ROOTS.AUTH_DEMO}/classic/new-password`,
-      verify: `${ROOTS.AUTH_DEMO}/classic/verify`
-    },
-    modern: {
-      login: `${ROOTS.AUTH_DEMO}/modern/login`,
-      register: `${ROOTS.AUTH_DEMO}/modern/register`,
-      forgotPassword: `${ROOTS.AUTH_DEMO}/modern/forgot-password`,
-      newPassword: `${ROOTS.AUTH_DEMO}/modern/new-password`,
-      verify: `${ROOTS.AUTH_DEMO}/modern/verify`
-    }
-  },
   dashboard: {
     root: `${ROOTS.DASHBOARD}`,
     nfts: {