Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update php8.1 #542

Open
wants to merge 12 commits into
base: staging
Choose a base branch
from
Prev Previous commit
Next Next commit
Updated README.md and composer update
GeniJaho committed Apr 8, 2023
commit d3cad9a4c62ef3dcbccec10fa0cba9b4e44dd964
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ You should now have a "Homestead" folder on your machine at `~/Users/You/Homeste
<p>Open the Homestead.yaml file, add a new site and create a database.</p>

```
ip: "192.168.10.10"
ip: "192.168.56.56"
memory: 2048
cpus: 1
provider: virtualbox
@@ -65,7 +65,7 @@ buckets:
policy: public
```

Next, update your hosts file on your host machine (`sudo nano /etc/hosts` on windows it's `C:\Windows\System32\Drivers\etc\hosts`) and include `192.168.10.10 olm.test`
Next, update your hosts file on your host machine (`sudo nano /etc/hosts` on windows it's `C:\Windows\System32\Drivers\etc\hosts`) and include `192.168.56.56 olm.test`

When you want to boot up the VM, cd into the Homestead folder on your host machine and run `vagrant up`

@@ -92,9 +92,9 @@ If you would like to contribute something, make a new branch locally `git checko
<p>You might notice there are some websocket errors in the browser. Some operations like adding photos broadcast live events to the client. It's easy to get websockets set up to resolve this.</p>

```
In your .env file, add "WEBSOCKET_BROADCAST_HOST=192.168.10.10"
In your .env file, add "WEBSOCKET_BROADCAST_HOST=192.168.56.56"
In broadcasting.php, change 'host' => env('WEBSOCKET_BROADCAST_HOST')
In one window, run `php artisan websockets:serve --host=192.168.10.10`
In one window, run `php artisan websockets:serve --host=192.168.56.56`
Then, in another window, run `php artisan horizon`
To test it's working, open another window. Open tinker and run event new(\App\Events\UserSignedUp(1));
```
@@ -107,7 +107,7 @@ tab and in http://olm.test/world/Ireland/County%20Cork/Cork/map

The project uses AWS S3 to store photos on production. On development, however, it uses [Minio](https://laravel.com/docs/8.x/homestead#configuring-minio),
an open source object storage server with an Amazon S3 compatible API. If you copied the .env.example file into .env
you should be able to access the Minio control panel at http://192.168.10.10:9600 (homestead:secretkey).
you should be able to access the Minio control panel at http://192.168.56.56:9600 (homestead:secretkey).
Remember to update the Access Policy to public for your buckets, on the admin panel.
<p>You are now ready to get started!</p>
<p>Have fun and thanks for taking an interest in OpenLitterMap</p>
1,313 changes: 842 additions & 471 deletions composer.lock

Large diffs are not rendered by default.

431 changes: 92 additions & 339 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

155 changes: 1 addition & 154 deletions public/js/manifest.js
97,438 changes: 2 additions & 97,436 deletions public/js/vendor.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"/js/app.js": "/js/app.js?id=3f7b44fc180df2e799f9",
"/js/app.js": "/js/app.js?id=04df6c0b7b2001bb17d0",
"/css/app.css": "/css/app.css?id=d4d7bd115735441b2d66",
"/js/manifest.js": "/js/manifest.js?id=3c768977c2574a34506e",
"/js/vendor.js": "/js/vendor.js?id=91b109b10d958b21d64c"
"/js/vendor.js": "/js/vendor.js?id=e64488324f18976d8ed2"
}