Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge main changes to backend/python #93

Merged
merged 3 commits into from
Apr 18, 2023
Merged

Merge main changes to backend/python #93

merged 3 commits into from
Apr 18, 2023

Conversation

ctmbl
Copy link
Contributor

@ctmbl ctmbl commented Apr 17, 2023

one PR in particular needs to be in backend/python: it's the recent #92

amtoine and others added 3 commits April 15, 2023 01:08
@amtoine
FIX: remove the with block under actions/checkout@v3 in prettier (
233a183 
#91)

* remove the `with` block under `actions/checkout@v3`

* TEST: break the formatting of the JS source

* Revert "TEST: break the formatting of the JS source"

This reverts commit 9d52551.
@atxr
Fix login redirection when browsing to /blog/create-article (#81)
e34757f 
* Add "next" prop to Login and Signup

New parameter "next" for Login and Signup
These components redirect to "next" if:
- the user exists in the context
- when the user is logged/signed in
Use this next property to redirect to /blog/createArticle after login
Fix 76

* Format files and fix a minor bug

Remove a duplicate in the router
@atxr
Migrate database to localhost (#92)
5764dba 
This PR removes the *hardcoded* values of the remote atlas database.
It introduces a new local database deployment in the docker-compose
workflow.
The database is secured thanks to docker networking.

I tested the whole migration ✔️ 

⚠️ This PR doesn't migrate the current atlas db to the new local
one. This action must be done "by hand" when the website will be bumped.
@ctmbl ctmbl added Priority: High The Issue must be addressed as soon as possible backend about the website backend (endpoints, API,...) labels Apr 17, 2023
@ctmbl ctmbl requested review from atxr and amtoine April 17, 2023 14:12
@ctmbl ctmbl self-assigned this Apr 17, 2023
@amtoine amtoine marked this pull request as draft April 17, 2023 16:44
@amtoine
Copy link
Member

amtoine commented Apr 17, 2023

just to avoid a bad merge until we figure out how to do it 😉

@ctmbl
Copy link
Contributor Author

ctmbl commented Apr 18, 2023

This will not do 👍
GH suggests to solve conflicts and push on main we don't want to do that
We could solve it on backend then merge without conflicts but we would consciously destroy backend/python on one commit and this would never pass a potential CI so this is not what we want

instead I'll simply merge and solve properly on local then push it to backend/python this will be much more clean, if I do it without screwing up

@ctmbl ctmbl merged commit e0c16cd into backend/python Apr 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@atxr atxr Awaiting requested review from atxr

@amtoine amtoine Awaiting requested review from amtoine

Assignees

@ctmbl ctmbl

Labels
backend about the website backend (endpoints, API,...) Priority: High The Issue must be addressed as soon as possible
Projects
iScsc website
Status: Done
Milestone
Backend re-writing in `python` with f...
Development

Successfully merging this pull request may close these issues.
3 participants
@ctmbl @amtoine @atxr