Skip to content
Snippets Groups Projects
Commit cc629ec7 authored by Guilhem CARRON's avatar Guilhem CARRON
Browse files

Merge branch 'dev' of...

parents ecd88441 57bac963
No related branches found
No related tags found
2 merge requests!10refactor: deleted baseurl variable,!7feat: add front office
Pipeline #15493 passed
NODE_TLS_REJECT_UNAUTHORIZED = '0'
HTTPS=true
SSL_CRT_FILE=cert.pem
SSL_KEY_FILE=key.pem
\ No newline at end of file
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies # dependencies
/configs/tokenskey.json
/node_modules /node_modules
/.pnp /.pnp
.pnp.js .pnp.js
# testing # testing
/coverage /coverage
# production # production
/build /build
# misc # misc
.DS_Store .DS_Store
.env /.env
.env.local .env.local
.env.development.local .env.development.local
.env.test.local .env.test.local
...@@ -21,4 +21,4 @@ ...@@ -21,4 +21,4 @@
npm-debug.log* npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
\ No newline at end of file
{
"Key": "IZOEJFgX0z/Bfx403KdRjfA6FTMcJiOtUb9a4vMWhlU="
}
\ No newline at end of file
File moved
version: '3.7' version: '3.7'
services: services:
nginx: nginx:
image: registry.forge.grandlyon.com/web-et-numerique/llle_project/backoffice-client:no-baseurl image: registry.forge.grandlyon.com/web-et-numerique/llle_project/backoffice-client:dev
restart: unless-stopped restart: unless-stopped
ports: ports:
- 443:443 - 443:443
...@@ -29,7 +29,7 @@ services: ...@@ -29,7 +29,7 @@ services:
retries: 60 retries: 60
backend: backend:
image: registry.forge.grandlyon.com/web-et-numerique/llle_project/backoffice-server:no-cors image: registry.forge.grandlyon.com/web-et-numerique/llle_project/backoffice-server:dev
networks: networks:
backoffice: backoffice:
depends_on: depends_on:
......
{ {
"short_name": "React App", "short_name": "Ecolyo Backoffice",
"name": "Create React App Sample", "name": "Ecolyo Backoffice",
"icons": [ "icons": [
{ {
"src": "favicon.ico", "src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16", "sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon" "type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
} }
], ],
"start_url": ".", "start_url": ".",
......
/// <reference types="react-scripts" />
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment