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.

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

Turn KitchenOwl into a monorepo #356

Merged
merged 499 commits into from
Jan 22, 2024
Merged

Turn KitchenOwl into a monorepo #356

merged 499 commits into from
Jan 22, 2024

Conversation

beatbrot
Copy link
Contributor

@beatbrot beatbrot commented Jan 7, 2024

Second try of #351

Fixes:

  • Deleted all backend tags
  • Correctly link to issues/PRs in old repo
  • Do not relocate .github
  • Fix path in pytest action

TomBursch and others added 30 commits January 12, 2023 01:03
)

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/

* Translated using Weblate (German)

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/de/

* Added translation using Weblate (French)

* Added translation using Weblate (Norwegian Bokmål)

* Added translation using Weblate (Portuguese)

* Added translation using Weblate (Portuguese (Brazil))

* Added translation using Weblate (Spanish)

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt_BR/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/es/

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/es/

Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Iagocds <cdsiago@gmail.com>
Co-authored-by: German <martinezhectorgerman@gmail.com>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
)

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/

* Translated using Weblate (German)

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/de/

* Added translation using Weblate (French)

* Added translation using Weblate (Norwegian Bokmål)

* Added translation using Weblate (Portuguese)

* Added translation using Weblate (Portuguese (Brazil))

* Added translation using Weblate (Spanish)

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt_BR/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/es/

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/es/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/es/

* Added translation using Weblate (Indonesian)

* Translated using Weblate (Indonesian)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/id/

* Translated using Weblate (Indonesian)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/id/

* Added translation using Weblate (Russian)

* Translated using Weblate (Russian)

Currently translated at 3.5% (15 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/ru/

* Translated using Weblate (Portuguese)

Currently translated at 4.7% (20 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt/

---------

Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Iagocds <cdsiago@gmail.com>
Co-authored-by: German <martinezhectorgerman@gmail.com>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: liimee <alt3753.7@gmail.com>
Co-authored-by: Roman <cristalix223@mail.ru>
Co-authored-by: ssantos <ssantos@web.de>
…backend#21)

Bumps [werkzeug](https://github.com/pallets/werkzeug) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](pallets/werkzeug@2.2.2...2.2.3)

---
updated-dependencies:
- dependency-name: werkzeug
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
)

* Translated using Weblate (Portuguese)

Currently translated at 5.0% (21 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt/

* Translated using Weblate (Russian)

Currently translated at 66.3% (278 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/ru/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/nb_NO/

* Translated using Weblate (Russian)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/ru/

* Translated using Weblate (German)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/de/

---------

Co-authored-by: Tom Bursch <tombursch@gmail.com>
Co-authored-by: gekenson <gekenson@yandex.ru>
…-backend#22)

* fix: Amended a spelling error in "Chili Pepper"

* fix: other languages

---------

Co-authored-by: Tom Bursch <tombursch@gmail.com>
)

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/nb_NO/

* Translated using Weblate (Russian)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/ru/
)

* Added translation using Weblate (Danish)

* Translated using Weblate (Danish)

Currently translated at 5.7% (24 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/da/

* Translated using Weblate (Portuguese)

Currently translated at 7.1% (30 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt/

* Translated using Weblate (French)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/fr/

* Translated using Weblate (Portuguese)

Currently translated at 64.2% (269 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt/

* Translated using Weblate (Indonesian)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/id/

---------

Co-authored-by: Anders Obro <oebro@duck.com>
Co-authored-by: グヌーツマン <leognutzmann@gmail.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Iuri Pereira <iurialexandre@hotmail.com>
Co-authored-by: liimee <alt3753.7@gmail.com>
TomBursch and others added 15 commits December 7, 2023 10:25
…-backend#66)

Currently translated at 93.9% (464 of 494 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (494 of 494 strings)

Translated using Weblate (Portuguese)

Currently translated at 94.5% (467 of 494 strings)

Translated using Weblate (Finnish)

Currently translated at 100.0% (494 of 494 strings)

Translated using Weblate (Greek)

Currently translated at 100.0% (494 of 494 strings)






Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/el/
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/fi/
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt/
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/zh_Hans/
Translation: KitchenOwl/Default Items

Co-authored-by: BeardedWatermelon <BeardedWatermelon@users.noreply.hosted.weblate.org>
Co-authored-by: MiguelNdeCarvalho <geral@miguelndecarvalho.pt>
Co-authored-by: Petri Hämäläinen <petri.hamalainen@mailbox.org>
Co-authored-by: 一叶知秋 <407763781@qq.com>
Currently translated at 95.5% (472 of 494 strings)

Translated using Weblate (French)

Currently translated at 99.3% (491 of 494 strings)

Translated using Weblate (Swedish)

Currently translated at 80.1% (396 of 494 strings)

Translated using Weblate (French)

Currently translated at 99.3% (491 of 494 strings)

Translated using Weblate (German)

Currently translated at 100.0% (494 of 494 strings)

Translated using Weblate (Swedish)

Currently translated at 55.6% (275 of 494 strings)






Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/de/
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/fr/
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/nl/
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/sv/
Translation: KitchenOwl/Default Items

Co-authored-by: JBLOD <jolan.b@sfr.fr>
Co-authored-by: Willem F <socials@ikwillem.be>
Co-authored-by: Yannou90 <windaube.non.merci@gmail.com>
Co-authored-by: belanglos <stuff@belanglos.net>
@beatbrot

This comment was marked as resolved.

@beatbrot
Copy link
Contributor Author

beatbrot commented Jan 9, 2024

@TomBursch Alright, I fixed all remaining issues :)
Here is what I did to make this move:

  1. Install git-filter-repo
  2. Checkout and cd into kitchenowl-backend
  3. Create a file commit-msg.txt outside the repo with the content #==>TomBursch/kitchenowl-backend#
  4. Run in the repo python git-filter-repo --filename-callback 'return filename if filename.startswith(b".github") else b"backend/" + filename' --replace-message ../commit-msg.txt
  5. Push those changes to a git repo (NOT the new main repo)
  6. Checkout and cd into main repo and create a new branch
  7. Add the repo from step 5 as remote
  8. Call git merge --allow-unrelated-histories tempremote/refactored
  9. Done!

Now, I guess it's your turn :) Feel free to do with this PR whatever you want. I can re-do all those steps anytime so that we have the latest histories at all time. But of course you can also do that yourself.

@TomBursch TomBursch marked this pull request as ready for review January 19, 2024 11:07
@TomBursch
Copy link
Owner

@beatbrot I've moved the flutter app to the KitchenOwl subfolder. I know the naming is not great, but I'm not sure if having the folder name be different from the app name is supported by flutter.

I've also added the Dockerfile for the combined image 🎉

@TomBursch TomBursch added the enhancement New feature or request label Jan 19, 2024
@TomBursch TomBursch changed the title Experiment: Integrate backend into main repo - 2nd try Turn KitchenOwl into a monorepo Jan 19, 2024
@TomBursch TomBursch merged commit 0e84e37 into TomBursch:main Jan 22, 2024
3 checks passed
@beatbrot beatbrot deleted the backend-integration branch January 23, 2024 08:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants