Skip to content
Snippets Groups Projects
Commit cfee398b authored by sucreCS's avatar sucreCS
Browse files

Changed all occurrences of eatfast into ViaResto

parent 31ba82a6
No related branches found
No related tags found
1 merge request!60Changed all occurrences of eatfast into ViaResto
Pipeline #45907 failed
Stage: install
Stage: test
Show whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 7
− 7
View file @ cfee398b
...@@ -133,8 +133,8 @@ test-back: ...@@ -133,8 +133,8 @@ test-back:
# - job_id=$(cat job_id) # - job_id=$(cat job_id)
- if [ $IMAGE = "back" ] ; then - if [ $IMAGE = "back" ] ; then
- > - >
ssh "eatfast@$DOMAIN" ssh "viaresto@$DOMAIN"
"cd /var/www/eatfast-website/backend && "cd /var/www/viaresto-website/backend &&
git stash && git stash &&
git fetch && git fetch &&
git checkout "$CI_COMMIT_BRANCH" && git checkout "$CI_COMMIT_BRANCH" &&
...@@ -147,7 +147,7 @@ test-back: ...@@ -147,7 +147,7 @@ test-back:
- echo 'REACT_APP_BASE_URL_BACK="https://$DOMAIN/api"' > .env; - echo 'REACT_APP_BASE_URL_BACK="https://$DOMAIN/api"' > .env;
- echo 'REACT_APP_BASE_URL_FRONT="https://$DOMAIN"' >> .env; - echo 'REACT_APP_BASE_URL_FRONT="https://$DOMAIN"' >> .env;
- npm run build; - npm run build;
- scp -r build/ eatfast@"$DOMAIN":/var/www/eatfast-website/frontend ; fi - scp -r build/ viaresto@"$DOMAIN":/var/www/viaresto-website/frontend ; fi
deploy-back-prod: deploy-back-prod:
...@@ -156,7 +156,7 @@ deploy-back-prod: ...@@ -156,7 +156,7 @@ deploy-back-prod:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: always when: always
variables: variables:
DOMAIN: eatfast.viarezo.fr DOMAIN: viaresto.viarezo.fr
PRIVATE_KEY: "$SSH_PRIVATE_KEY" PRIVATE_KEY: "$SSH_PRIVATE_KEY"
IMAGE: "back" IMAGE: "back"
dependencies: [] dependencies: []
...@@ -168,7 +168,7 @@ deploy-front-prod: ...@@ -168,7 +168,7 @@ deploy-front-prod:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: always when: always
variables: variables:
DOMAIN: eatfast.viarezo.fr DOMAIN: viaresto.viarezo.fr
PRIVATE_KEY: "$SSH_PRIVATE_KEY" PRIVATE_KEY: "$SSH_PRIVATE_KEY"
IMAGE: "front" IMAGE: "front"
dependencies: dependencies:
...@@ -185,7 +185,7 @@ deploy-back-staging: ...@@ -185,7 +185,7 @@ deploy-back-staging:
- if: $CI_COMMIT_BRANCH - if: $CI_COMMIT_BRANCH
when: always when: always
variables: variables:
DOMAIN: eatfast.test.viarezo.fr DOMAIN: viaresto.test.viarezo.fr
PRIVATE_KEY: "$SSH_PRIVATE_KEY_STAGING" PRIVATE_KEY: "$SSH_PRIVATE_KEY_STAGING"
IMAGE: "back" IMAGE: "back"
dependencies: [] dependencies: []
...@@ -201,7 +201,7 @@ deploy-front-staging: ...@@ -201,7 +201,7 @@ deploy-front-staging:
- if: $CI_COMMIT_BRANCH - if: $CI_COMMIT_BRANCH
when: always when: always
variables: variables:
DOMAIN: eatfast.test.viarezo.fr DOMAIN: viaresto.test.viarezo.fr
PRIVATE_KEY: "$SSH_PRIVATE_KEY_STAGING" PRIVATE_KEY: "$SSH_PRIVATE_KEY_STAGING"
IMAGE: "front" IMAGE: "front"
dependencies: dependencies:
......
README.md
+ 2
− 2
View file @ cfee398b
# **Eatfast** # **ViaResto**
Eatfast is a website developed by ViaRézo for monitoring the waiting time in CROUS restaurants. ViaResto is a website developed by ViaRézo for monitoring the waiting time in CROUS restaurants.
<br/> <br/>
......
frontend/public/index.html
+ 18
− 18
View file @ cfee398b
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/thumbnail_violet.png" /> <link rel="icon" href="%PUBLIC_URL%/thumbnail_violet.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" /> <meta name="theme-color" content="#000000" />
<meta <meta name="description" content="Web site developed by ViaRézo" />
name="description"
content="Web site developed by ViaRézo"
/>
<!-- <!--
Notice the use of %PUBLIC_URL% in the tags above. Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build. It will be replaced with the URL of the `public` folder during the build.
...@@ -18,8 +16,9 @@ ...@@ -18,8 +16,9 @@
work correctly both with client-side routing and a non-root public URL. work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`. Learn how to configure a non-root public URL by running `npm run build`.
--> -->
<title>Eatfast</title> <title>ViaResto</title>
</head> </head>
<body> <body>
<noscript>You need to enable JavaScript to run this app.</noscript> <noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div> <div id="root"></div>
...@@ -34,4 +33,5 @@ ...@@ -34,4 +33,5 @@
To create a production bundle, use `npm run build` or `yarn build`. To create a production bundle, use `npm run build` or `yarn build`.
--> -->
</body> </body>
</html> </html>
\ No newline at end of file
frontend/src/components/Header.js
+ 1
− 1
View file @ cfee398b
...@@ -34,7 +34,7 @@ export default function Header({ selection, setSelection }) { ...@@ -34,7 +34,7 @@ export default function Header({ selection, setSelection }) {
: `${selection.name} : actuellement ${selection.status ? "ouvert" : "fermé"}`)} : `${selection.name} : actuellement ${selection.status ? "ouvert" : "fermé"}`)}
</div> </div>
<Link id="header-home-link" to="/" onClick={() => setSelection(null)}> <Link id="header-home-link" to="/" onClick={() => setSelection(null)}>
<h2>{width || !selection ? "Eatfast" : selection.name}</h2> <h2>{width || !selection ? "ViaResto" : selection.name}</h2>
</Link> </Link>
<div id="header-timetable"> <div id="header-timetable">
{selection ? ( {selection ? (
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment