[web] Doesn't require submodules anymore (#5258)

This commit is contained in:
Manav Rathi
2025-03-07 20:33:53 +05:30
committed by GitHub
12 changed files with 28 additions and 24 deletions

View File

@@ -26,8 +26,6 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive
- name: Setup node and enable yarn caching
uses: actions/setup-node@v4

View File

@@ -26,8 +26,6 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive
- name: Setup node and enable yarn caching
uses: actions/setup-node@v4

View File

@@ -34,7 +34,6 @@ jobs:
uses: actions/checkout@v4
with:
ref: ${{ steps.select-branch.outputs.branch }}
submodules: recursive
- name: Setup node and enable yarn caching
uses: actions/setup-node@v4

View File

@@ -30,8 +30,6 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive
- name: Setup node and enable yarn caching
uses: actions/setup-node@v4

View File

@@ -45,7 +45,6 @@ jobs:
"${{ startsWith(github.ref, 'refs/tags/v') &&
format('photosd-{0}', github.ref_name) || ( inputs.source
|| 'main' ) }}"
submodules: recursive
- name: Setup node
uses: actions/setup-node@v4

View File

@@ -12,13 +12,12 @@ The getting started instructions mention using `yarn dev` (which is an alias of
>[!IMPORTANT]
> Please note that Ente's Web App supports the Yarn version 1.22.xx or 1.22.22 specifically.
> Make sure to install the right version or modify your yarn installation to meet the requirements.
> Make sure to install the right version or modify your yarn installation to meet the requirements.
> The user might end up into unknown version and dependency related errors if yarn
> is on different version.
```sh
cd ente/web
git submodule update --init --recursive
yarn install
NEXT_PUBLIC_ENTE_ENDPOINT=http://localhost:8080 yarn dev:photos
```
@@ -163,7 +162,7 @@ npm install pm2@latest
Copy the below contents to a file called `ecosystem.config.js` inside the
`ente/web` directory.
```js
```js
module.exports = {
apps: [
{
@@ -212,16 +211,16 @@ pm2 start
pm2 logs all
```
## Configure App Endpoints
## Configure App Endpoints
> [!NOTE]
> [!NOTE]
> Previously, this was dependent on the env variables `NEXT_ENTE_PUBLIC_ACCOUNTS_ENDPOINT`
> and etc. Please check the below documentation to update your setup configurations
You can configure the web endpoints for the other apps including Accounts, Albums
Family and Cast in your `museum.yaml` configuration file. Checkout
Family and Cast in your `museum.yaml` configuration file. Checkout
[`local.yaml`](https://github.com/ente-io/ente/blob/543411254b2bb55bd00a0e515dcafa12d12d3b35/server/configurations/local.yaml#L76-L89)
to configure the endpoints. Make sure to setup up your DNS Records accordingly to the
to configure the endpoints. Make sure to setup up your DNS Records accordingly to the
similar URL's you set up in `museum.yaml`.
Next part is to configure the web server.

View File

@@ -49,7 +49,6 @@ Then in a separate terminal, you can run (e.g) the web client
```sh
cd ente/web
git submodule update --init --recursive
yarn install
NEXT_PUBLIC_ENTE_ENDPOINT=http://localhost:8080 yarn dev
```

View File

@@ -12,12 +12,6 @@ To know more about Ente, see [our main README](../README.md) or visit
## Building from source
Fetch submodules
```sh
git submodule update --init --recursive
```
Install dependencies
```sh

View File

@@ -2,7 +2,7 @@ import config from "@/build-config/eslintrc-next-app.mjs";
export default [
...config,
{ ignores: ["thirdparty", ".next-desktop"] },
{ ignores: [".next-desktop"] },
{
rules: {
/* TODO:

View File

@@ -11,6 +11,23 @@
top: calc(env(titlebar-area-height, 0px) * 0.4);
}
/* The PhotoSwipe CSS already disables and re-enables pointer-events for hidden
UI elements, but for a reason that I didn't investigate more, that isn't
working, and the hidden buttons still remain clickable.
As a workaround, repeat the CSS, but with a higher specificity by including
the button selector */
.pswp .pswp__hide-on-close button {
pointer-events: none;
}
.pswp--ui-visible .pswp__hide-on-close button {
pointer-events: auto;
}
/* Tweak the visual look of the preloader to match the rest of the elements */
.pswp-ente .pswp__preloader--active .pswp__icn {
opacity: 0.4;
}

View File

@@ -22,5 +22,5 @@
"../../packages/base/components/utils/mui-theme.d.ts",
"../../packages/base/global-electron.d.ts"
],
"exclude": ["node_modules", "out", ".next", "thirdparty"]
"exclude": ["node_modules", "out", ".next", ".next-desktop"]
}

View File

@@ -219,6 +219,9 @@ via [@fontsource-variable/inter](https://fontsource.org/fonts/inter/install).
## Photos app specific
- [PhotoSwipe](https://photoswipe.com) provides the base image viewer on top of
which we've built our file viewer.
- [react-dropzone](https://github.com/react-dropzone/react-dropzone/) is a React
hook to create a drag-and-drop input zone. Note that we pin to the last
version in the 14.2 series, since if we use 14.3 onwards (I tested till