Merge branch 'main' into delete_setup_file_mobile

.gitmodules

@@ -9,10 +9,6 @@
 [submodule "auth/assets/simple-icons"]
 	path = auth/assets/simple-icons
 	url = https://github.com/simple-icons/simple-icons.git
-[submodule "desktop/bada-frame"]
-	path = desktop/ui
-	url = https://github.com/ente-io/bada-frame
-	branch = release
 [submodule "desktop/thirdparty/next-electron-server"]
 	path = desktop/thirdparty/next-electron-server
 	url = https://github.com/ente-io/next-electron-server.git

desktop/README.md

@@ -2,6 +2,12 @@
 
 Desktop app for [ente.io](https://ente.io) build with [electron](https://electronjs.org) and loads of ❤️.
 
+> [!CAUTION]
+>
+> We moved a few things around when switching to a monorepo recently, so this
+> folder might not build with the instructions below. Hang tight, we're on it,
+> will fix things.
+
 ## Disclaimer
 
 We are aware that electron is a sub-optimal choice for building desktop applications.

desktop/ui

@@ -1 +0,0 @@
-Subproject commit 855a58e4df492331f57672db1819e959886115dd

web/README.md

@@ -101,3 +101,11 @@ thoughts](mailto:feedback@ente.io) with us at any time.
 
 <br/>
 
+> [!NOTE]
+>
+> This folder is supposed to contain all our web related code. Most of it is
+> already here, but some code which is being deployed from our other
+> repositories like the family portal (https://github.com/ente-io/families)
+> still needs to be merged into here. Also, some of the Cloudflare workers we
+> use for fixing headers etc too. Hang tight, we're on it, will bring in the
+> remaining bits one by one.