grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changing lemmy-isomorphic-ui to lemmy-ui

Browse source
This commit is contained in:
Dessalines 2020-09-15 13:14:46 -05:00
parent ee1e58d148
commit eb286f8288
8 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md vendored
View file

@ -11,7 +11,7 @@
<p align="center"> <p align="center">
<a href="https://dev.lemmy.ml/" rel="noopener"> <a href="https://dev.lemmy.ml/" rel="noopener">
<img width=200px height=200px src="https://raw.githubusercontent.com/LemmyNet/lemmy-isomorphic-ui/main/src/assets/icons/favicon.svg"></a> <img width=200px height=200px src="https://raw.githubusercontent.com/LemmyNet/lemmy-ui/main/src/assets/icons/favicon.svg"></a>
<h3 align="center"><a href="https://dev.lemmy.ml">Lemmy</a></h3> <h3 align="center"><a href="https://dev.lemmy.ml">Lemmy</a></h3>
<p align="center"> <p align="center">
@ -108,7 +108,7 @@ Each Lemmy server can set its own moderation policy; appointing site-wide admins
### Apps ### 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) - [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) - [Lemmy-mobile (Android / IOS) - React native ( under development )](https://github.com/koredefashokun/lemmy-mobile)

2
ansible/templates/nginx.conf vendored
View file

@ -78,7 +78,7 @@ server {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
} }
# lemmy-isomorphic-ui # lemmy-ui
location / { location / {
proxy_pass http://0.0.0.0:1235; proxy_pass http://0.0.0.0:1235;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;

5
docker/dev/docker-compose.yml vendored
View file

@ -15,9 +15,8 @@ services:
- pictrs - pictrs
- postgres - postgres
- iframely - iframely
lemmy-isomorphic-ui: lemmy-ui:
image: dessalines/lemmy-isomorphic-ui:v0.0.7 image: dessalines/lemmy-ui:v0.0.14
# image: lemmy-isomorphic-ui:latest
ports: ports:
- "1235:1234" - "1235:1234"
environment: environment:

10
docker/federation/docker-compose.yml vendored
View file

@ -29,7 +29,7 @@ services:
- ./volumes/pictrs_alpha:/mnt - ./volumes/pictrs_alpha:/mnt
lemmy-alpha-ui: lemmy-alpha-ui:
image: dessalines/lemmy-isomorphic-ui:v0.0.7 image: dessalines/lemmy-ui:v0.0.14
environment: environment:
- LEMMY_INTERNAL_HOST=lemmy-alpha:8541 - LEMMY_INTERNAL_HOST=lemmy-alpha:8541
- LEMMY_EXTERNAL_HOST=localhost:8541 - LEMMY_EXTERNAL_HOST=localhost:8541
@ -68,7 +68,7 @@ services:
- ./volumes/postgres_alpha:/var/lib/postgresql/data - ./volumes/postgres_alpha:/var/lib/postgresql/data
lemmy-beta-ui: lemmy-beta-ui:
image: dessalines/lemmy-isomorphic-ui:v0.0.7 image: dessalines/lemmy-ui:v0.0.14
environment: environment:
- LEMMY_INTERNAL_HOST=lemmy-beta:8551 - LEMMY_INTERNAL_HOST=lemmy-beta:8551
- LEMMY_EXTERNAL_HOST=localhost:8551 - LEMMY_EXTERNAL_HOST=localhost:8551
@ -107,7 +107,7 @@ services:
- ./volumes/postgres_beta:/var/lib/postgresql/data - ./volumes/postgres_beta:/var/lib/postgresql/data
lemmy-gamma-ui: lemmy-gamma-ui:
image: dessalines/lemmy-isomorphic-ui:v0.0.7 image: dessalines/lemmy-ui:v0.0.14
environment: environment:
- LEMMY_INTERNAL_HOST=lemmy-gamma:8561 - LEMMY_INTERNAL_HOST=lemmy-gamma:8561
- LEMMY_EXTERNAL_HOST=localhost:8561 - LEMMY_EXTERNAL_HOST=localhost:8561
@ -147,7 +147,7 @@ services:
# An instance with only an allowlist for beta # An instance with only an allowlist for beta
lemmy-delta-ui: lemmy-delta-ui:
image: dessalines/lemmy-isomorphic-ui:v0.0.7 image: dessalines/lemmy-ui:v0.0.14
environment: environment:
- LEMMY_INTERNAL_HOST=lemmy-delta:8571 - LEMMY_INTERNAL_HOST=lemmy-delta:8571
- LEMMY_EXTERNAL_HOST=localhost:8571 - LEMMY_EXTERNAL_HOST=localhost:8571
@ -187,7 +187,7 @@ services:
# An instance who has a blocklist, with lemmy-alpha blocked # An instance who has a blocklist, with lemmy-alpha blocked
lemmy-epsilon-ui: lemmy-epsilon-ui:
image: dessalines/lemmy-isomorphic-ui:v0.0.7 image: dessalines/lemmy-ui:v0.0.14
environment: environment:
- LEMMY_INTERNAL_HOST=lemmy-epsilon:8581 - LEMMY_INTERNAL_HOST=lemmy-epsilon:8581
- LEMMY_EXTERNAL_HOST=localhost:8581 - LEMMY_EXTERNAL_HOST=localhost:8581

5
docker/prod/docker-compose.yml vendored
View file

@ -25,9 +25,8 @@ services:
- pictrs - pictrs
- iframely - iframely
lemmy-isomorphic-ui: lemmy-ui:
image: dessalines/lemmy-isomorphic-ui:v0.0.7 image: dessalines/lemmy-ui:v0.0.14
# image: lemmy-isomorphic-ui:latest
ports: ports:
- "1235:1234" - "1235:1234"
environment: environment:

2
docs/src/contributing.md vendored
View file

@ -18,7 +18,7 @@ Check out [Lemmy's Weblate](https://weblate.yerbamate.dev/projects/lemmy/) for t
### Front end ### 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 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 routes are at `src/shared/routes.ts`.
- The components are located in `src/shared/components`. - The components are located in `src/shared/components`.

4
docs/src/contributing_local_development.md vendored
View file

@ -35,7 +35,7 @@ cargo build
### Get the front end source code ### 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 ### Setup postgresql
@ -73,7 +73,7 @@ Then open [localhost:1235](http://localhost:1235) in your browser. To reload bac
To do front end development: To do front end development:
``` ```
cd lemmy-isomorphic-ui cd lemmy-ui
yarn yarn
yarn dev yarn dev
``` ```

2
docs/src/contributing_theming.md vendored
View file

@ -12,7 +12,7 @@ Lemmy uses [Bootstrap v4](https://getbootstrap.com/), and very few custom css cl
## Adding ## 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. 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. Go to `src/shared/utils.ts` and add `{my-theme-name}` to the themes list.
1. Test locally 1. Test locally