Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
ViaResto-website
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Aymeric Chaumont
ViaResto-website
Commits
e1e37a26
Commit
e1e37a26
authored
Jul 12, 2022
by
Aymeric Chaumont
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix_https' into 'main'
from http to https See merge request
!31
parents
f58d1284
610ad440
Branches
Branches containing commit
No related tags found
1 merge request
!31
from http to https
Pipeline
#43990
passed
Jul 12, 2022
Stage: build
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
backend/db/crud.py
+1
-1
1 addition, 1 deletion
backend/db/crud.py
with
3 additions
and
3 deletions
.gitlab-ci.yml
+
2
−
2
View file @
e1e37a26
...
@@ -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="http
s
://eatfast.cs-campus.fr/api"' > .env;
-
echo 'REACT_APP_BASE_URL_FRONT="http://eatfast.cs-campus.fr"' >> .env;
-
echo 'REACT_APP_BASE_URL_FRONT="http
s
://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
...
...
This diff is collapsed.
Click to expand it.
backend/db/crud.py
+
1
−
1
View file @
e1e37a26
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment