Skip to content

Commit

Permalink
Move directories outside app + minor changes (#49)
Browse files Browse the repository at this point in the history
* 10 - core: move directories

* 1 - desktop: remove desktop folder

* 1- core: add bin/init on root folder

* 0 - core: ignore root code folder from search and side bar

* 1 - core: remove escape game mods code and assets

* 0 - doc: update paths in the README

* 1 - doc: remove fake news

* 1 - doc: fix path for the deploy script

* 1 - core: fix paths in docker files

* 1 - core: move meet-low-level files

* 1 - core: move main files to the ui folder

* 1 - levels: save level template id on level cloned

* 1 - core: remove old code using escape mods

* 1 - core: add scene world ready event
  • Loading branch information
Donorhan authored Jun 16, 2022
1 parent fa89bd5 commit 3cf9521
Show file tree
Hide file tree
Showing 352 changed files with 1,371 additions and 9,386 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/core/*

This comment has been minimized.

Copy link
@ramnes

ramnes Jul 13, 2022

Contributor

What's the point of using Eslint if most of the code is ignored? Genuinely asking, this diff looks weird!

This comment has been minimized.

Copy link
@Donorhan

Donorhan Jul 13, 2022

Author Contributor

The "core" folder is ignored at the root of the project only but it is parsed by eslint from the app folder as a symbolic link. This is to avoid errors of not found dependencies, yes it is a bit tricky. This folder is also ignored in VSCode searches and does not appear in the tree structure 🙂

This comment has been minimized.

Copy link
@ramnes

ramnes Jul 13, 2022

Contributor

Oh, okay, thanks!

1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ module.exports = {
'operator-linebreak': ['error', 'after'],
'no-promise-executor-return': 0,
'default-param-last': 'off',
'class-methods-use-this': 'off',
},
globals: {
// Meteor
Expand Down
1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM geoffreybooth/meteor-base:2.5 AS builder

# Copy app package.json and package-lock.json into container
COPY ./app/package*.json $APP_SOURCE_FOLDER/
COPY ./public/app/package*.json $APP_SOURCE_FOLDER/

RUN bash $SCRIPTS_FOLDER/build-app-npm-dependencies.sh

# Copy app source into container
COPY ./app $APP_SOURCE_FOLDER/
COPY ./public/app $APP_SOURCE_FOLDER/

RUN bash $SCRIPTS_FOLDER/build-meteor-bundle.sh

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ FROM geoffreybooth/meteor-base:2.5
# Disney Meteor base image

# Copy app package.json and package-lock.json into container
COPY ./app/package*.json $APP_SOURCE_FOLDER/
COPY ./public/app/package*.json $APP_SOURCE_FOLDER/

RUN bash $SCRIPTS_FOLDER/build-app-npm-dependencies.sh

# Copy app source into container
COPY ./app $APP_SOURCE_FOLDER/
COPY ./public/app $APP_SOURCE_FOLDER/
RUN apt update && apt install -y \
bash \
ca-certificates \
Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[![Open Source? Yes!](https://badgen.net/badge/Open%20Source%20%3F/Yes%21/blue?icon=github)](https://github.com/l3mpire/lemverse)
[![License: AGPL v3](https://img.shields.io/badge/License-AGPL_v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)

<img alt="lemverse" src="./app/public/lemverse.png" width="128" height="128" style="margin-top: 10px;">
<img alt="lemverse" src="./public/app/public/lemverse.png" width="128" height="128" style="margin-top: 10px;">

</div>

Expand Down Expand Up @@ -48,7 +48,7 @@ To upload a new tileset, visit the url `http://localhost:9000/editor` or `http:/
ℹ️ Only people with `admin` role can access this page.

Here are the description of all parts:
<img alt="login" src="./app/public/tileset-editor.png">
<img alt="login" src="./public/app/public/tileset-editor.png">

1) As stated, you drag and drop your image file(s) to upload them.
2) This part is just a reminder about the index of the layers for all tiles.
Expand All @@ -72,7 +72,7 @@ This editor takes place at the same place as the tilesets editor.
To add a new resource, simply drag & drop over the page.

Here are the description of all parts:
<img alt="login" src="./app/public/character-editor.png">
<img alt="login" src="./public/app/public/character-editor.png">

1) Different type of filter to change the dropdown
2) Here are the list of all resources available in the current category
Expand All @@ -87,7 +87,7 @@ To move to the editor mode, simply it `e` and you should see it!
### Level edit

Once you hit `e` you will see something like this:
<img alt="login" src="./app/public/level-editor.png">
<img alt="login" src="./public/app/public/level-editor.png">

Here are the description of all parts:
1. All tiles that you can select. Move your mouse over them and click to select.
Expand All @@ -104,7 +104,7 @@ Here are the description of all parts:
### Zone edit

Once you hit `e` again you will see something like this:
<img alt="login" src="./app/public/zone-editor.png">
<img alt="login" src="./public/app/public/zone-editor.png">

You can add a zone then select on the map the top left followed by the bottom right corner of the new zone.

Expand Down Expand Up @@ -150,7 +150,7 @@ In lemverse you have only few but useful shortcuts!
What to know more about the `explorers` in the same universe?
Hit `Tab` and you will see them! And maybe ghosts...

<img alt="login" src="./app/public/tab.png">
<img alt="login" src="./public/app/public/tab.png">

Only `admin` can see others admin (with the 👑).
You can allow other users to edit your universe by clicking on the hammer and spanner 🛠.
Expand Down Expand Up @@ -486,7 +486,7 @@ Once you have cloned the repo, launch `./bin/init` and wait, that's all!

Due to image manipulation, please read [GraphicsMagick & ImageMagick](https://www.npmjs.com/package/gm) to install any additional library.

Launch `./bin/run` to run the app, accessible at `http://localhost:9000`.
Go to the `public/app` folder then launch `./bin/run` to run the app, accessible at `http://localhost:9000`.
The mongodb database is accessible at `http://localhost:9001`.

## LocalTunnel to debug with other computers
Expand Down Expand Up @@ -558,7 +558,7 @@ Restart the Mongo service using `systemctl restart mongod` and initiate the repl
If you do have some sensitive information, you can copy the file `settings.json` and paste it on the server at `/usr/local/etc/lemverse.json` (Server side only).
At the startup of the application, those settings will be merged with the current ones.

After those preparation steps, run `./bin/setup` in `app` folder from your workstation.
After those preparation steps, run `./bin/setup` from the `public/app` folder from your workstation.

## Nginx configuration example

Expand Down Expand Up @@ -609,7 +609,7 @@ server {
```
## Other deployments

Once you have done it, the subsequent deployments will be done using the command `./deploy`.
Once you have done it, the subsequent deployments will be done using the command `./public/app/bin/deploy`.

## Docker images

Expand Down Expand Up @@ -700,7 +700,7 @@ Website with images API :
# Assets

We use paid assets from [limezu](https://limezu.itch.io/) on [itch.io](https://limezu.itch.io/moderninteriors) in the *version 35*. Please keep in mind than lemverse doesn't support the new character format for the moment.
We use paid assets from [limezu](https://limezu.itch.io/) on [itch.io](https://limezu.itch.io/moderninteriors).

By default lemverse appears in black because you have no textures in the project, you must go to the editor to upload the different textures.

Expand All @@ -718,6 +718,6 @@ AGPLv3

# Screenshots

<img alt="login" src="./app/public/screenshot-login.png">
<img alt="Enter Zone" src="./app/public/screenshot-zone.png">
<img alt="I see ghost everywhere!" src="./app/public/screenshot-ghost.png">
<img alt="login" src="./public/app/public/screenshot-login.png">
<img alt="Enter Zone" src="./public/app/public/screenshot-zone.png">
<img alt="I see ghost everywhere!" src="./public/app/public/screenshot-ghost.png">
82 changes: 0 additions & 82 deletions app/modules/escape-mods/client/escapeA.js

This file was deleted.

124 changes: 0 additions & 124 deletions app/modules/escape-mods/client/escapeB.hbs.html

This file was deleted.

Loading

0 comments on commit 3cf9521

Please sign in to comment.