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:
# - job_id=$(cat job_id)
- if [ $IMAGE = "back" ] ; then
- >
ssh "eatfast@$DOMAIN"
"cd /var/www/eatfast-website/backend &&
ssh "viaresto@$DOMAIN"
"cd /var/www/viaresto-website/backend &&
git stash &&
git fetch &&
git checkout "$CI_COMMIT_BRANCH" &&
......@@ -147,7 +147,7 @@ test-back:
- echo 'REACT_APP_BASE_URL_BACK="https://$DOMAIN/api"' > .env;
- echo 'REACT_APP_BASE_URL_FRONT="https://$DOMAIN"' >> .env;
- 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:
......@@ -156,7 +156,7 @@ deploy-back-prod:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: always
variables:
DOMAIN: eatfast.viarezo.fr
DOMAIN: viaresto.viarezo.fr
PRIVATE_KEY: "$SSH_PRIVATE_KEY"
IMAGE: "back"
dependencies: []
......@@ -168,7 +168,7 @@ deploy-front-prod:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: always
variables:
DOMAIN: eatfast.viarezo.fr
DOMAIN: viaresto.viarezo.fr
PRIVATE_KEY: "$SSH_PRIVATE_KEY"
IMAGE: "front"
dependencies:
......@@ -185,7 +185,7 @@ deploy-back-staging:
- if: $CI_COMMIT_BRANCH
when: always
variables:
DOMAIN: eatfast.test.viarezo.fr
DOMAIN: viaresto.test.viarezo.fr
PRIVATE_KEY: "$SSH_PRIVATE_KEY_STAGING"
IMAGE: "back"
dependencies: []
......@@ -201,7 +201,7 @@ deploy-front-staging:
- if: $CI_COMMIT_BRANCH
when: always
variables:
DOMAIN: eatfast.test.viarezo.fr
DOMAIN: viaresto.test.viarezo.fr
PRIVATE_KEY: "$SSH_PRIVATE_KEY_STAGING"
IMAGE: "front"
dependencies:
......
README.md
+ 2
− 2
View file @ cfee398b
# **Eatfast**
Eatfast is a website developed by ViaRézo for monitoring the waiting time in CROUS restaurants.
# **ViaResto**
ViaResto is a website developed by ViaRézo for monitoring the waiting time in CROUS restaurants.
<br/>
......
frontend/public/index.html
+ 18
− 18
View file @ cfee398b
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/thumbnail_violet.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site developed by ViaRézo"
/>
<meta name="description" content="Web site developed by ViaRézo" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
......@@ -18,8 +16,9 @@
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`.
-->
<title>Eatfast</title>
<title>ViaResto</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
......@@ -34,4 +33,5 @@
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</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 }) {
: `${selection.name} : actuellement ${selection.status ? "ouvert" : "fermé"}`)}
</div>
<Link id="header-home-link" to="/" onClick={() => setSelection(null)}>
<h2>{width || !selection ? "Eatfast" : selection.name}</h2>
<h2>{width || !selection ? "ViaResto" : selection.name}</h2>
</Link>
<div id="header-timetable">
{selection ? (
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment