Skip to content

Commit

Permalink
Migrate demonstration deployment from brainsimulation.eu to apps.ebra…
Browse files Browse the repository at this point in the history
…ins.eu
  • Loading branch information
apdavison committed Dec 18, 2024
1 parent ff72192 commit 773bf59
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 30 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ spike trains etc.) stored in any of the file formats supported by the
both AngularJS and ReactJS.

Homepage:
https://neo-viewer.brainsimulation.eu/
https://neoviewer.apps.ebrains.eu/

## Quick overview

Expand All @@ -16,7 +16,7 @@ The component was developed to produce graphical representations of neural activ
## AngularJS (v1) component

Live demo:
https://neo-viewer.brainsimulation.eu/angularjs
https://neoviewer.apps.ebrains.eu/angularjs


For more details, see [here](/js/angularjs/README.md).
Expand All @@ -25,20 +25,20 @@ For more details, see [here](/js/angularjs/README.md).
## ReactJS component

Live demo:
https://neo-viewer.brainsimulation.eu/react
https://neoviewer.apps.ebrains.eu/react

For more details, see [here](/js/react/README.md).


## Deploying the file server

By default, the visualizer uses the Neo file server at https://neo-viewer.brainsimulation.eu/. This is fine for testing and light use, but for better performance you may wish to deploy your own server on a more powerful machine.
By default, the visualizer uses the Neo file server at https://neoviewer.apps.ebrains.eu/. This is fine for testing and light use, but for better performance you may wish to deploy your own server on a more powerful machine.
Instructions for doing this are [here](/api/README.md#deployment).


## Reference: the file server REST API

See [here](https://neo-viewer.brainsimulation.eu/api/docs).
See [here](https://neoviewer.apps.ebrains.eu/api/docs).


<div><img src="eu_logo.jpg" alt="EU Logo" width="15%" align="right"></div>
Expand Down
2 changes: 1 addition & 1 deletion api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ It is implemented with [FastAPI](https://fastapi.tiangolo.com/).

## API Documentation

See [here](https://neo-viewer.brainsimulation.eu/api/docs).
See [here](https://neoviewer.apps.ebrains.eu/api/docs).

## Deployment

Expand Down
2 changes: 1 addition & 1 deletion deployment/Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ RUN ln -s $BASEDIR/deployment/supervisor-app.conf /etc/supervisor/conf.d/
RUN ln -sf /dev/stdout /var/log/nginx/access.log
RUN ln -sf /dev/stderr /var/log/nginx/error.log

EXPOSE 80 443
EXPOSE 80
CMD ["supervisord", "-n", "-c", "/etc/supervisor/conf.d/supervisor-app.conf"]
15 changes: 1 addition & 14 deletions deployment/nginx-app.conf
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,10 @@ upstream uvicorn {
server unix:/tmp/uvicorn.sock;
}


server {
# todo: maybe we don't need to redirect to 443, as long as we're not using
# credentials for throttling
listen 80;

server_name neo-viewer.brainsimulation.eu;
return 301 https://neo-viewer.brainsimulation.eu$request_uri;
}

server {
listen 443 ssl;
#listen 80;
ssl_certificate /etc/letsencrypt/live/neo-viewer.brainsimulation.eu/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/neo-viewer.brainsimulation.eu/privkey.pem;
listen 80;

server_name neo-viewer.brainsimulation.eu;
charset utf-8;
client_max_body_size 75M;
keepalive_timeout 70;
Expand Down
10 changes: 5 additions & 5 deletions js/angularjs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ the [Neo](http://neuralensemble.org/neo) library.
</div>
```

For an example of the visualizer in action, see https://neo-viewer.brainsimulation.eu
For an example of the visualizer in action, see https://neoviewer.apps.ebrains.eu

## Using the visualizer component

Expand All @@ -36,8 +36,8 @@ In the `<body>` block, add `<div ng-app="neo-visualizer">...</div` around the pa

You can have multiple visualizers on a single page. Wherever you want to have a visualizer, include
```
<visualizer-view
source="https://example.com/my_data_file.abf"
<visualizer-view
source="https://example.com/my_data_file.abf"
height=300>
</visualizer-view>
```
Expand All @@ -46,15 +46,15 @@ where `source` should be the URL of a publicly available data file you want to v

## Deploying the file server

By default, the visualizer uses the Neo file server at https://neo-viewer.brainsimulation.eu/. This is fine for testing and light use, but for better performance you may
By default, the visualizer uses the Neo file server at https://neoviewer.apps.ebrains.eu/. This is fine for testing and light use, but for better performance you may
wish to deploy your own server on a more powerful machine.

Instructions for doing this are [here](https://github.com/NeuralEnsemble/neo-viewer/blob/master/api/README.md#deployment).


## Reference: the file server REST API

See [here](https://neo-viewer.brainsimulation.eu/api/docs).
See [here](https://neoviewer.apps.ebrains.eu/api/docs).


<div><img src="../../eu_logo.jpg" alt="EU Logo" width="15%" align="right"></div>
Expand Down
2 changes: 1 addition & 1 deletion js/angularjs/src/services.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

angular.module('neo-visualizer')

.value('baseURL', 'https://neo-viewer.brainsimulation.eu/api/')
.value('baseURL', 'https://neoviewer.apps.ebrains.eu/api/')

.factory('BlockData', ['$resource', 'baseURL',
function($resource, baseURL) {
Expand Down
4 changes: 2 additions & 2 deletions js/react/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ https://neo-viewer.netlify.app/

## Deploying the file server

By default, the visualizer uses the Neo file server at https://neo-viewer.brainsimulation.eu/. This is fine for testing and light use, but for better performance you may
By default, the visualizer uses the Neo file server at https://neoviewer.apps.ebrains.eu/. This is fine for testing and light use, but for better performance you may
wish to deploy your own server on a more powerful machine.

Instructions for doing this are [here](https://github.com/NeuralEnsemble/neo-viewer/blob/master/api/README.md#deployment).


## Reference: the file server REST API

See [here](https://neo-viewer.brainsimulation.eu/api/docs).
See [here](https://neoviewer.apps.ebrains.eu/api/docs).


<div><img src="../../eu_logo.jpg" alt="EU Logo" width="15%" align="right"></div>
Expand Down
2 changes: 1 addition & 1 deletion js/react/src/globals.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const defaultBaseUrl = "https://neo-viewer.brainsimulation.eu/api";
export const defaultBaseUrl = "https://neoviewer.apps.ebrains.eu/api";

0 comments on commit 773bf59

Please sign in to comment.