+ 
-
+
@@ -108,7 +108,7 @@ Each Lemmy server can set its own moderation policy; appointing site-wide admins ### Apps -- [lemmy-isomorphic-ui - The official web app for lemmy](https://github.com/LemmyNet/lemmy-isomorphic-ui) +- [lemmy-ui - The official web app for lemmy](https://github.com/LemmyNet/lemmy-ui) - [Lemmur - A flutter lemmy app ( under development )](https://github.com/krawieck/lemmur) - [Lemmy-mobile (Android / IOS) - React native ( under development )](https://github.com/koredefashokun/lemmy-mobile) diff --git a/ansible/templates/nginx.conf b/ansible/templates/nginx.conf index 7929ccc59..5c02eb137 100644 --- a/ansible/templates/nginx.conf +++ b/ansible/templates/nginx.conf @@ -78,7 +78,7 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } - # lemmy-isomorphic-ui + # lemmy-ui location / { proxy_pass http://0.0.0.0:1235; proxy_set_header X-Real-IP $remote_addr; diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index b6f86fec0..3269d5e86 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -15,9 +15,8 @@ services: - pictrs - postgres - iframely - lemmy-isomorphic-ui: - image: dessalines/lemmy-isomorphic-ui:v0.0.7 - # image: lemmy-isomorphic-ui:latest + lemmy-ui: + image: dessalines/lemmy-ui:v0.0.14 ports: - "1235:1234" environment: diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index d18d000fe..2a6e24b24 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -29,7 +29,7 @@ services: - ./volumes/pictrs_alpha:/mnt lemmy-alpha-ui: - image: dessalines/lemmy-isomorphic-ui:v0.0.7 + image: dessalines/lemmy-ui:v0.0.14 environment: - LEMMY_INTERNAL_HOST=lemmy-alpha:8541 - LEMMY_EXTERNAL_HOST=localhost:8541 @@ -68,7 +68,7 @@ services: - ./volumes/postgres_alpha:/var/lib/postgresql/data lemmy-beta-ui: - image: dessalines/lemmy-isomorphic-ui:v0.0.7 + image: dessalines/lemmy-ui:v0.0.14 environment: - LEMMY_INTERNAL_HOST=lemmy-beta:8551 - LEMMY_EXTERNAL_HOST=localhost:8551 @@ -107,7 +107,7 @@ services: - ./volumes/postgres_beta:/var/lib/postgresql/data lemmy-gamma-ui: - image: dessalines/lemmy-isomorphic-ui:v0.0.7 + image: dessalines/lemmy-ui:v0.0.14 environment: - LEMMY_INTERNAL_HOST=lemmy-gamma:8561 - LEMMY_EXTERNAL_HOST=localhost:8561 @@ -147,7 +147,7 @@ services: # An instance with only an allowlist for beta lemmy-delta-ui: - image: dessalines/lemmy-isomorphic-ui:v0.0.7 + image: dessalines/lemmy-ui:v0.0.14 environment: - LEMMY_INTERNAL_HOST=lemmy-delta:8571 - LEMMY_EXTERNAL_HOST=localhost:8571 @@ -187,7 +187,7 @@ services: # An instance who has a blocklist, with lemmy-alpha blocked lemmy-epsilon-ui: - image: dessalines/lemmy-isomorphic-ui:v0.0.7 + image: dessalines/lemmy-ui:v0.0.14 environment: - LEMMY_INTERNAL_HOST=lemmy-epsilon:8581 - LEMMY_EXTERNAL_HOST=localhost:8581 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 213eb749b..86d57df77 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -25,9 +25,8 @@ services: - pictrs - iframely - lemmy-isomorphic-ui: - image: dessalines/lemmy-isomorphic-ui:v0.0.7 - # image: lemmy-isomorphic-ui:latest + lemmy-ui: + image: dessalines/lemmy-ui:v0.0.14 ports: - "1235:1234" environment: diff --git a/docs/src/contributing.md b/docs/src/contributing.md index b28255896..02eb91774 100644 --- a/docs/src/contributing.md +++ b/docs/src/contributing.md @@ -18,7 +18,7 @@ Check out [Lemmy's Weblate](https://weblate.yerbamate.dev/projects/lemmy/) for t ### Front end - The front end is written in `typescript`, using a react-like framework called [inferno](https://infernojs.org/). All UI elements are reusable `.tsx` components. -- The front end repository is [lemmy-isomorphic-ui](https://github.com/LemmyNet/lemmy-isomorphic-ui). +- The front end repository is [lemmy-ui](https://github.com/LemmyNet/lemmy-ui). - The routes are at `src/shared/routes.ts`. - The components are located in `src/shared/components`. diff --git a/docs/src/contributing_local_development.md b/docs/src/contributing_local_development.md index 1be5ee881..5f53d3374 100644 --- a/docs/src/contributing_local_development.md +++ b/docs/src/contributing_local_development.md @@ -35,7 +35,7 @@ cargo build ### Get the front end source code ``` -git clone https://github.com/LemmyNet/lemmy-isomorphic-ui.git +git clone https://github.com/LemmyNet/lemmy-ui.git ``` ### Setup postgresql @@ -73,7 +73,7 @@ Then open [localhost:1235](http://localhost:1235) in your browser. To reload bac To do front end development: ``` -cd lemmy-isomorphic-ui +cd lemmy-ui yarn yarn dev ``` diff --git a/docs/src/contributing_theming.md b/docs/src/contributing_theming.md index d5ca29a0e..2610b5fb4 100644 --- a/docs/src/contributing_theming.md +++ b/docs/src/contributing_theming.md @@ -12,7 +12,7 @@ Lemmy uses [Bootstrap v4](https://getbootstrap.com/), and very few custom css cl ## Adding -1. Fork the [lemmy-isomorphic-ui](https://github.com/LemmyNet/lemmy-isomorphic-ui). +1. Fork the [lemmy-ui](https://github.com/LemmyNet/lemmy-ui). 1. Copy `{my-theme-name}.min.css` to `src/assets/css/themes`. (You can also copy the `_variables.scss` here if you want). 1. Go to `src/shared/utils.ts` and add `{my-theme-name}` to the themes list. 1. Test locally