Commit graph

23845 commits

Author SHA1 Message Date
Manav Rathi e9d76688ce Move to monorepo
Move all of our code into a monorepo in preparation of open sourcing our server.

First I describe the general plan, then later I've kept an exact log of the
commands that I used. This was all done prior to this commit, but this commit
(that introduces the various top level files) seems like a good way to summarize
the entire process.

Clone auth. Auth is our base repository.

```sh
git clone https://github.com/ente-io/auth.git && cd auth
```

Move all of auth's files into `auth/`.

```sh
mkdir auth
git mv `find . -maxdepth 1 | grep -v -e '\.$' -e '\.\/.git$' -e '\.\/auth$'` auth
git commit -m 'Move into auth/'
```

Add photos-web as a new remote, and fetch its main.

```sh
git remote add photos-web https://github.com/ente-io/photos-web.git
git fetch photos-web main
```

Switch to main of web-photos.

```sh
git checkout -b photos-web-main photos-web/main
```

Move all of its files into `web` (note, the find now has an extra exclusion for
`web`, but we keep all the old ones too):

```sh
mkdir web
git mv `find . -maxdepth 1 | grep -v -e '^\.$' -e '^\.\/.git$' -e '^\.\/auth$' -e '^\.\/web$'` web
git commit -m 'Move into web/'
```

Switch back to main main, and merge the photos-web branch. The
`--allow-unrelated-histories` flag is needed (since these two branches don't
have any previous common ancestor).

```sh
git checkout main
git merge --allow-unrelated-histories photos-web-main
```

That's it. We then repeat this process for all the other repositories that we
need to bring in.

There is no magic involved here, so regular git commands will continue working.
However, all the files get renamed, so to track the git history prior to this
rename commit we'll need to pass the `--follow` flag.

    git log --follow -p -- auth/migration-guides/encrypted_export.md

For some file names like README.md which exist in multiple repositories, this
doesn't seem to work so good (I don't fully understand why). For example,
`git log --follow -p -- auth/README.md lists the changes to all the READMEs,
not just the auth README.md.

```sh

git clone https://github.com/ente-io/auth.git ente
cd ente

mkdir auth
git mv `find . -maxdepth 1 | grep -v -e '\.$' -e '\.\/.git$' -e '\.\/auth$'` auth
git commit -m 'Move into auth/'

git remote add photos-web https://github.com/ente-io/photos-web.git
git fetch photos-web main
git checkout -b photos-web-main photos-web/main

mkdir web
git mv `find . -maxdepth 1 | grep -v -e '^\.$' -e '^\.\/.git$' -e '^\.\/auth$' -e '^\.\/web$'` web
git commit -m 'Move into web/'

git checkout main
git merge --allow-unrelated-histories photos-web-main
git branch -D photos-web-main
git remote remove photos-web

git remote add photos-app https://github.com/ente-io/photos-app.git
git fetch photos-app main
git checkout -b photos-app-main photos-app/main

mkdir mobile
git mv `find . -maxdepth 1 | grep -v -e '^\.$' -e '^\.\/.git$' -e '^\.\/auth$' -e '^\.\/web$' -e '^\.\/mobile$'` mobile
git commit -m 'Move into mobile/'

git checkout main
git merge --allow-unrelated-histories photos-app-main
git branch -D photos-app-main
git remote remove photos-app

git remote add photos-desktop https://github.com/ente-io/photos-desktop.git
git fetch photos-desktop main
git checkout -b photos-desktop-main photos-desktop/main

mkdir desktop
git mv `find . -maxdepth 1 | grep -v -e '^\.$' -e '^\.\/.git$' -e '^\./.gitmodules$' -e '^\.\/desktop$'` desktop
git mv .gitmodules desktop
git commit -m 'Move into desktop/'

git checkout main
git merge --allow-unrelated-histories photos-desktop-main
git branch -D photos-desktop-main
git remote remove photos-desktop

git remote add cli https://github.com/ente-io/cli.git
git fetch cli main
git checkout -b cli-main cli/main

mkdir cli
git mv `find . -maxdepth 1 | grep -v -e '^\.$' -e '^\.\/.git$' -e '^\.\/cli$'` cli
git commit -m 'Move into cli/'

git checkout main
git merge --allow-unrelated-histories cli-main
git branch -D cli-main
git remote remove cli

git remote add docs https://github.com/ente-io/docs.git
git fetch docs main
git checkout -b docs-main docs/main

mkdir docs-1
git mv `find . -maxdepth 1 | grep -v -e '^\.$' -e '^\.\/.git$' -e '^\.\/docs-1$'` docs-1
git mv docs-1 docs
git commit -m 'Move into docs/'

git checkout main
git merge --allow-unrelated-histories docs-main
git branch -D docs-main
git remote remove docs
```
2024-03-01 13:01:41 +05:30
Manav Rathi 0ccc98425e Merge branch 'docs-main' 2024-03-01 12:44:05 +05:30
Manav Rathi 6dfc059073 Move into docs/ 2024-03-01 12:43:55 +05:30
Manav Rathi 40c31cc24e Merge branch 'cli-main' 2024-03-01 12:39:09 +05:30
Manav Rathi 39ef006532 Move into cli/ 2024-03-01 12:39:01 +05:30
Manav Rathi 52334204fa Merge branch 'photos-desktop-main' 2024-03-01 12:36:43 +05:30
Manav Rathi 1ac5222b09 Move into desktop/ 2024-03-01 12:36:35 +05:30
Manav Rathi d683d905e3 Merge branch 'photos-app-main' 2024-03-01 12:25:48 +05:30
Manav Rathi 41b2581b8f Move into mobile/ 2024-03-01 12:25:37 +05:30
Manav Rathi 4b1850914d Merge branch 'photos-web-main' 2024-03-01 12:21:44 +05:30
Manav Rathi e15c7e1642 Move into web/ 2024-03-01 12:21:07 +05:30
Manav Rathi c76b96a74b Move into auth/ 2024-03-01 12:19:20 +05:30
Manav Rathi bc2551e544 Remove accidentally committed vscode 2024-03-01 12:06:06 +05:30
Manav Rathi 7a3d29da24
Merge pull request #2 from ente-io/prepare-for-merge
Prepare for merge
2024-03-01 12:05:26 +05:30
Manav Rathi 22af3e4359 Prepare for merge 2024-03-01 12:01:52 +05:30
Vishnu Mohandas 7ac35b0167
New Translations (#1757) 2024-03-01 12:01:15 +05:30
Manav Rathi f5a27f2b2c Resize image
https://github.com/vuejs/vitepress/discussions/1611
2024-03-01 11:46:32 +05:30
Manav Rathi a509043627 Auto sidebar didn't kinda work for us 2024-03-01 11:43:48 +05:30
Ashil e26141033c
[FEAT] Home Widget for Favorites Album (#1703) 2024-03-01 11:40:52 +05:30
Manav Rathi dadfb82c2e Cleanup 2024-03-01 11:17:44 +05:30
Manav Rathi fb386098c9 Give the automatic sidebar generation plugin a shot 2024-03-01 11:05:31 +05:30
Manav Rathi d460584808 Tweak config 2024-03-01 10:56:34 +05:30
Manav Rathi f9cdf477f1 vars 2024-03-01 10:37:27 +05:30
Manav Rathi 4d7ac418f5 Cloudflare likely supports them
...didn't find it mentione in docs though, if it doesn't work will revert.
2024-03-01 10:27:04 +05:30
Manav Rathi 34efae430c Drop unnecessary support for web apps 2024-03-01 10:21:08 +05:30
Manav Rathi dcdab150dc Mention the pending publishing 2024-03-01 10:18:44 +05:30
Ashil b62ee0c30f
Merge branch 'main' into homewidget 2024-03-01 10:10:40 +05:30
Manav Rathi 04f273cf56 96x96 favicon png, single 2024-03-01 10:09:37 +05:30
Manav Rathi 20ef0bef6a Don't require the m prefix on extensions 2024-03-01 09:58:05 +05:30
Manav Rathi 1709b1e5c1 Fix warning 2024-03-01 09:57:28 +05:30
Manav Rathi a8e89fe131 Cleanup gitignore 2024-03-01 09:54:00 +05:30
Manav Rathi 5fc7fc2f4e Do the actual prose wrap 2024-03-01 09:50:21 +05:30
Manav Rathi 84c0e7a78a Prose wrap using Prettier 2024-03-01 09:50:06 +05:30
Manav Rathi 71920538a1 Prettier 2024-03-01 09:35:56 +05:30
Manav Rathi aa06f10668 Switch to yarn (classic) to match the rest of our JS code 2024-03-01 09:33:39 +05:30
Crowdin Bot 596141f6d8 New Crowdin translations by GitHub Action 2024-03-01 00:09:50 +00:00
Vishnu Mohandas ef6890dcdb
Redesigned Discovery Tab (#1755) 2024-02-29 23:46:37 +05:30
ashilkn 09b9a1e231 refactor 2024-02-29 23:35:39 +05:30
ashilkn 5d31662a35 Remove search section widget 2024-02-29 23:08:08 +05:30
ashilkn 3c70a23fc4 change order of search sections 2024-02-29 22:57:31 +05:30
ashilkn b37347859e change copy 2024-02-29 22:54:25 +05:30
ashilkn faa40119b4 Merge branch 'main' into redesign_search_tab 2024-02-29 22:46:01 +05:30
Prateek Sunal 28fcb43103 fix: null last image pref after clear 2024-02-29 18:48:47 +05:30
Prateek Sunal 063559e795 feat: count home widgets and then run cron 2024-02-29 18:44:51 +05:30
Prateek Sunal aafc7aa175 fix: not init home on login 2024-02-29 18:17:55 +05:30
ashilkn af2086b02d refactor by moving homewidget related methods to home_widget_util.dart from main.dart 2024-02-29 11:46:30 +05:30
Prateek Sunal f8643e8630 Revert "remove unnecessary check"
This reverts commit 0c569d7e97.
2024-02-28 20:44:15 +05:30
Prateek Sunal ce6e5e18cc fix: clear home_widget on logout, init in login 2024-02-28 19:55:31 +05:30
ashilkn 0c569d7e97 remove unnecessary check 2024-02-28 19:07:35 +05:30
ashilkn 5d919b13fd use RepainBoundary for children in location section to improve performance 2024-02-28 16:35:03 +05:30