Skip to content
Snippets Groups Projects
Commit e1e37a26 authored by Aymeric Chaumont's avatar Aymeric Chaumont
Browse files

Merge branch 'fix_https' into 'main'

from http to https

See merge request !31
parents f58d1284 610ad440
Branches
No related tags found
1 merge request!31from http to https
Pipeline #43990 passed
...@@ -161,8 +161,8 @@ lint-front: ...@@ -161,8 +161,8 @@ lint-front:
docker-compose up -d && docker-compose up -d &&
exit" ; else exit" ; else
- cd ./frontend - cd ./frontend
- echo 'REACT_APP_BASE_URL_BACK="http://eatfast.cs-campus.fr/api"' > .env; - echo 'REACT_APP_BASE_URL_BACK="https://eatfast.cs-campus.fr/api"' > .env;
- echo 'REACT_APP_BASE_URL_FRONT="http://eatfast.cs-campus.fr"' >> .env; - echo 'REACT_APP_BASE_URL_FRONT="https://eatfast.cs-campus.fr"' >> .env;
- npm run build; - npm run build;
- scp -r build/ eatfast@"$DOMAIN":/var/www/eatfast-website/frontend ; fi - scp -r build/ eatfast@"$DOMAIN":/var/www/eatfast-website/frontend ; fi
......
...@@ -282,7 +282,7 @@ def delete_opening_hours(id: int, db: Session): ...@@ -282,7 +282,7 @@ def delete_opening_hours(id: int, db: Session):
def get_restaurants(db: Session): def get_restaurants(db: Session):
current_date = datetime.now(tz=pytz.timezone("Europe/Paris")) current_date = datetime.now(tz=pytz.timezone("Europe/Paris"))
weekday, current_time = current_date.weekday(), current_date.time() weekday, current_time = current_date.weekday(), current_date.time()
restaurant_names = [r.place for r in db.query(models.OpeningHours.place.distinct).distinct()] restaurant_names = [r.place for r in db.query(models.OpeningHours.place).distinct()]
restaurants = [] restaurants = []
for name in restaurant_names: for name in restaurant_names:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment