Merge branch 'preprod' into staging
This commit is contained in:
commit
d444bf0063
3
.github/workflows/ppd.yml
vendored
3
.github/workflows/ppd.yml
vendored
@ -12,7 +12,6 @@ env:
|
|||||||
PROJECT_ID_LECOFFRE: 72d08499-37c2-412b-877e-f8af0471654a
|
PROJECT_ID_LECOFFRE: 72d08499-37c2-412b-877e-f8af0471654a
|
||||||
NAMESPACE_ID_LECOFFRE: e975f056-967e-43fe-b237-84bfa8032e64
|
NAMESPACE_ID_LECOFFRE: e975f056-967e-43fe-b237-84bfa8032e64
|
||||||
CONTAINER_REGISTRY_ENDPOINT_LECOFFRE: rg.fr-par.scw.cloud/funcscwlecoffreppdmp73pool
|
CONTAINER_REGISTRY_ENDPOINT_LECOFFRE: rg.fr-par.scw.cloud/funcscwlecoffreppdmp73pool
|
||||||
|
|
||||||
|
|
||||||
IMAGE_NAME: front
|
IMAGE_NAME: front
|
||||||
CONTAINER_NAME: front
|
CONTAINER_NAME: front
|
||||||
@ -104,7 +103,7 @@ jobs:
|
|||||||
deploy-to-scaleway-lecoffre:
|
deploy-to-scaleway-lecoffre:
|
||||||
needs: build-and-push-image-lecoffre
|
needs: build-and-push-image-lecoffre
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
environment: staging
|
environment: preprod
|
||||||
steps:
|
steps:
|
||||||
- name: Install CLI
|
- name: Install CLI
|
||||||
uses: scaleway/action-scw@v0
|
uses: scaleway/action-scw@v0
|
||||||
|
2
.github/workflows/prd.yml
vendored
2
.github/workflows/prd.yml
vendored
@ -103,7 +103,7 @@ jobs:
|
|||||||
deploy-to-scaleway-lecoffre:
|
deploy-to-scaleway-lecoffre:
|
||||||
needs: build-and-push-image-lecoffre
|
needs: build-and-push-image-lecoffre
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
environment: staging
|
environment: preprod
|
||||||
steps:
|
steps:
|
||||||
- name: Install CLI
|
- name: Install CLI
|
||||||
uses: scaleway/action-scw@v0
|
uses: scaleway/action-scw@v0
|
||||||
|
3
.github/workflows/stg.yml
vendored
3
.github/workflows/stg.yml
vendored
@ -13,7 +13,6 @@ env:
|
|||||||
NAMESPACE_ID_LECOFFRE: f8137e85-47ad-46a5-9e2e-18af5de829c5
|
NAMESPACE_ID_LECOFFRE: f8137e85-47ad-46a5-9e2e-18af5de829c5
|
||||||
CONTAINER_REGISTRY_ENDPOINT_LECOFFRE: rg.fr-par.scw.cloud/funcscwlecoffrestgbqbfhtv6
|
CONTAINER_REGISTRY_ENDPOINT_LECOFFRE: rg.fr-par.scw.cloud/funcscwlecoffrestgbqbfhtv6
|
||||||
|
|
||||||
|
|
||||||
IMAGE_NAME: front
|
IMAGE_NAME: front
|
||||||
CONTAINER_NAME: front
|
CONTAINER_NAME: front
|
||||||
|
|
||||||
@ -135,4 +134,4 @@ jobs:
|
|||||||
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
|
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
|
||||||
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
|
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
|
||||||
SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
|
SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
|
||||||
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
|
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
|
@ -18,10 +18,10 @@ lecoffreFront:
|
|||||||
limits:
|
limits:
|
||||||
memory: 2Gi
|
memory: 2Gi
|
||||||
ingress:
|
ingress:
|
||||||
host: app.ppd.lecoffre.smart-chain.fr
|
host: app-tp.ppd.lecoffre.smart-chain.fr
|
||||||
tls:
|
tls:
|
||||||
hosts:
|
hosts:
|
||||||
- app.ppd.lecoffre.smart-chain.fr
|
- app-tp.ppd.lecoffre.smart-chain.fr
|
||||||
secretName: front-tls
|
secretName: front-tls
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: nginx
|
kubernetes.io/ingress.class: nginx
|
||||||
|
@ -7,7 +7,7 @@ export const DefaultLayout = ({ children }: DefaultLayoutProps) => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Head>
|
<Head>
|
||||||
<title>LECoffre</title>
|
<title>LEcoffre</title>
|
||||||
{/* <link rel="shortcut icon" href="/favicon.svg" /> */}
|
{/* <link rel="shortcut icon" href="/favicon.svg" /> */}
|
||||||
</Head>
|
</Head>
|
||||||
<main>
|
<main>
|
||||||
|
@ -63,7 +63,7 @@ export default function Login() {
|
|||||||
<Typography typo={ITypo.P_18}>
|
<Typography typo={ITypo.P_18}>
|
||||||
<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
|
<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
|
||||||
</Typography>
|
</Typography>
|
||||||
<Link href="mailto:g.texier@notaires.fr">
|
<Link href="mailto:support@lecoffre.io">
|
||||||
<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
|
<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
|
@ -72,7 +72,7 @@ export default function LoginCallBack() {
|
|||||||
<Typography typo={ITypo.P_18}>
|
<Typography typo={ITypo.P_18}>
|
||||||
<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
|
<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
|
||||||
</Typography>
|
</Typography>
|
||||||
<Link href="mailto:g.texier@notaires.fr">
|
<Link href="mailto:support@lecoffre.io">
|
||||||
<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
|
<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
|
@ -58,7 +58,7 @@ export default function LoginCallBackCustomer() {
|
|||||||
<Typography typo={ITypo.P_18}>
|
<Typography typo={ITypo.P_18}>
|
||||||
<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
|
<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
|
||||||
</Typography>
|
</Typography>
|
||||||
<Link href="mailto:g.texier@notaires.fr">
|
<Link href="mailto:support@lecoffre.io">
|
||||||
<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
|
<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
|
@ -54,7 +54,7 @@ export default function StepEmail(props: IProps) {
|
|||||||
{/* <Typography typo={ITypo.P_18}>
|
{/* <Typography typo={ITypo.P_18}>
|
||||||
<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
|
<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
|
||||||
</Typography>
|
</Typography>
|
||||||
<Link href="mailto:g.texier@notaires.fr">
|
<Link href="mailto:support@lecoffre.io">
|
||||||
<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
|
<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
|
||||||
</Link> */}
|
</Link> */}
|
||||||
</div>
|
</div>
|
||||||
|
@ -37,7 +37,7 @@ export default function LoginHome() {
|
|||||||
<Typography typo={ITypo.P_18}>
|
<Typography typo={ITypo.P_18}>
|
||||||
<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
|
<div className={classes["forget-password"]}>Vous n'arrivez pas à vous connecter ?</div>
|
||||||
</Typography>
|
</Typography>
|
||||||
<Link href="mailto:g.texier@notaires.fr">
|
<Link href="mailto:support@lecoffre.io">
|
||||||
<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
|
<Button variant={EButtonVariant.LINE}>Contacter l'administrateur</Button>
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user