Merge branch 'change-eatfast-viaresto' into 'main'

Changed all occurrences of eatfast into ViaResto

See merge request !60

.gitlab-ci.yml

@@ -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

-# **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/>
 

backend/cameras.py

+restaurants = [
+    {
+        "restaurant": "local",
+        # the linear function estimating the waiting time t based on the number of people n and the number c of open checkouts is:
+        # t = a * n / c + b
+        "a_factor": 30,  # slope
+        "b_factor": 120,  # y-intercept
+        # list of all the cameras that correspond to a same restaurant
+        "cameras":
+            [
+                {
+                    # the RTSP url will be: rtsp://user:password@IP:stream
+                    "IP": "",
+                    "user": "",
+                    "password": "",
+                    "stream":  "stream1",
+                    # list of the coordinates of the points which constitue the region that should be masked on the picture
+                    "mask_points":
+                    [
+                        # polygon which should be part of the mask
+                        [
+                            # [x, y] coordinates of each vertex of the polygon (on a 1280*720 picture)
+                            [70, 370],
+                            [420, 720],
+                            [1280, 720],
+                            [1280, 250],
+                            [930, 215],
+                            [450, 550],
+                            [130, 350]
+                        ]
+                    ],
+                    # list of the coordinates of each checkout
+                    "checkouts":
+                    [
+                        # each checkout corresponds to a rectangle, indicated by two x and two y coordinates
+                        {
+                            "x1": 380,
+                            "x2": 435,
+                            "y1": 740,
+                            "y2": 780
+                        },
+                        {
+                            "x1": 300,
+                            "x2": 350,
+                            "y1": 830,
+                            "y2": 880
+                        }
+                    ]
+                }
+            ]
+    }
+]

backend/db/crud.py

@@ -395,7 +395,7 @@ def update_user(user: schemas.User, user_info: dict, db: Session):
     if existing_user:
         existing_user.cookie = user.cookie
         existing_user.expiration_date = expiration_date
-        existing_user.admin = "admin eatfast" in user_info["roles"]
+        existing_user.admin = "admin viaresto" in user_info["roles"]
         db.delete(user)
         db.add(existing_user)
         db.commit()
@@ -404,7 +404,7 @@ def update_user(user: schemas.User, user_info: dict, db: Session):
     else:
         user.username = full_name
         user.expiration_date = expiration_date
-        user.admin = "admin eatfast" in user_info["roles"]
+        user.admin = "admin viaresto" in user_info["roles"]
         db.add(user)
         db.commit()
         db.refresh(user)

frontend/public/index.html

 <!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

@@ -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 ? (