hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 18:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace mentions of demo7.dspace.org and api7.dspace.org with demo or sandbox

Browse Source
This commit is contained in:
Tim Donohue
2023-08-22 16:32:55 -05:00
parent 77e994dcd6
commit b51fd46536
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -157,8 +157,8 @@ DSPACE_UI_SSL => DSPACE_SSL
The same settings can also be overwritten by setting system environment variables instead, E.g.: The same settings can also be overwritten by setting system environment variables instead, E.g.:
```bash ```bash
export DSPACE_HOST=api7.dspace.org export DSPACE_HOST=demo.dspace.org
export DSPACE_UI_PORT=4200 export DSPACE_UI_PORT=4000
``` ```
The priority works as follows: **environment variable** overrides **variable in `.env` file** overrides external config set by `DSPACE_APP_CONFIG_PATH` overrides **`config.(prod or dev).yml`** The priority works as follows: **environment variable** overrides **variable in `.env` file** overrides external config set by `DSPACE_APP_CONFIG_PATH` overrides **`config.(prod or dev).yml`**
@@ -288,7 +288,7 @@ E2E tests (aka integration tests) use [Cypress.io](https://www.cypress.io/). Con
The test files can be found in the `./cypress/integration/` folder. The test files can be found in the `./cypress/integration/` folder.
Before you can run e2e tests, two things are REQUIRED: Before you can run e2e tests, two things are REQUIRED:
1. You MUST be running the DSpace backend (i.e. REST API) locally. The e2e tests will *NOT* succeed if run against our demo REST API (https://api7.dspace.org/server/), as that server is uncontrolled and may have content added/removed at any time. 1. You MUST be running the DSpace backend (i.e. REST API) locally. The e2e tests will *NOT* succeed if run against our demo/sandbox REST API (https://demo.dspace.org/server/ or https://sandbox.dspace.org/server/), as those sites may have content added/removed at any time.
* After starting up your backend on localhost, make sure either your `config.prod.yml` or `config.dev.yml` has its `rest` settings defined to use that localhost backend. * After starting up your backend on localhost, make sure either your `config.prod.yml` or `config.dev.yml` has its `rest` settings defined to use that localhost backend.
* If you'd prefer, you may instead use environment variables as described at [Configuring](#configuring). For example: * If you'd prefer, you may instead use environment variables as described at [Configuring](#configuring). For example:
``` ```

2
config/config.example.yml
View File

@@ -22,7 +22,7 @@ ui:
# 'synced' with the 'dspace.server.url' setting in your backend's local.cfg. # 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
rest: rest:
ssl: true ssl: true
host: api7.dspace.org host: sandbox.dspace.org
port: 443 port: 443
# NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript # NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
nameSpace: /server nameSpace: /server

2
config/config.yml
View File

@@ -1,5 +1,5 @@
rest: rest:
ssl: true ssl: true
host: api7.dspace.org host: sandbox.dspace.org
port: 443 port: 443
nameSpace: /server nameSpace: /server

4
docker/README.md
View File

@@ -101,8 +101,8 @@ and the backend at http://localhost:8080/server/
## Run DSpace Angular dist build with DSpace Demo site backend ## Run DSpace Angular dist build with DSpace Demo site backend
This allows you to run the Angular UI in *production* mode, pointing it at the demo backend This allows you to run the Angular UI in *production* mode, pointing it at the demo or sandbox backend
(https://api7.dspace.org/server/). (https://demo.dspace.org/server/ or https://sandbox.dspace.org/server/).
``` ```
docker-compose -f docker/docker-compose-dist.yml pull docker-compose -f docker/docker-compose-dist.yml pull

2
docker/docker-compose-dist.yml
View File

@@ -24,7 +24,7 @@ services:
# This is because Server Side Rendering (SSR) currently requires a public URL, # This is because Server Side Rendering (SSR) currently requires a public URL,
# see this bug: https://github.com/DSpace/dspace-angular/issues/1485 # see this bug: https://github.com/DSpace/dspace-angular/issues/1485
DSPACE_REST_SSL: 'true' DSPACE_REST_SSL: 'true'
DSPACE_REST_HOST: api7.dspace.org DSPACE_REST_HOST: sandbox.dspace.org
DSPACE_REST_PORT: 443 DSPACE_REST_PORT: 443
DSPACE_REST_NAMESPACE: /server DSPACE_REST_NAMESPACE: /server
image: dspace/dspace-angular:${DSPACE_VER:-latest}-dist image: dspace/dspace-angular:${DSPACE_VER:-latest}-dist

4
docs/Configuration.md
View File

@@ -48,7 +48,7 @@ dspace-angular connects to your DSpace installation by using its REST endpoint.
```yaml ```yaml
rest: rest:
ssl: true ssl: true
host: api7.dspace.org host: demo.dspace.org
port: 443 port: 443
nameSpace: /server nameSpace: /server
} }
@@ -57,7 +57,7 @@ rest:
Alternately you can set the following environment variables. If any of these are set, it will override all configuration files: Alternately you can set the following environment variables. If any of these are set, it will override all configuration files:
``` ```
DSPACE_REST_SSL=true DSPACE_REST_SSL=true
DSPACE_REST_HOST=api7.dspace.org DSPACE_REST_HOST=demo.dspace.org
DSPACE_REST_PORT=443 DSPACE_REST_PORT=443
DSPACE_REST_NAMESPACE=/server DSPACE_REST_NAMESPACE=/server
``` ```

4
src/app/core/services/browser-hard-redirect.service.ts
View File

@@ -38,8 +38,8 @@ export class BrowserHardRedirectService extends HardRedirectService {
/** /**
* Get the origin of the current URL * Get the origin of the current URL
* i.e. <scheme> "://" <hostname> [ ":" <port> ] * i.e. <scheme> "://" <hostname> [ ":" <port> ]
* e.g. if the URL is https://demo7.dspace.org/search?query=test, * e.g. if the URL is https://demo.dspace.org/search?query=test,
* the origin would be https://demo7.dspace.org * the origin would be https://demo.dspace.org
*/ */
getCurrentOrigin(): string { getCurrentOrigin(): string {
return this.location.origin; return this.location.origin;

4
src/app/core/services/hard-redirect.service.ts
View File

@@ -25,8 +25,8 @@ export abstract class HardRedirectService {
/** /**
* Get the origin of the current URL * Get the origin of the current URL
* i.e. <scheme> "://" <hostname> [ ":" <port> ] * i.e. <scheme> "://" <hostname> [ ":" <port> ]
* e.g. if the URL is https://demo7.dspace.org/search?query=test, * e.g. if the URL is https://demo.dspace.org/search?query=test,
* the origin would be https://demo7.dspace.org * the origin would be https://demo.dspace.org
*/ */
abstract getCurrentOrigin(): string; abstract getCurrentOrigin(): string;
} }

4
src/app/core/services/server-hard-redirect.service.ts
View File

@@ -69,8 +69,8 @@ export class ServerHardRedirectService extends HardRedirectService {
/** /**
* Get the origin of the current URL * Get the origin of the current URL
* i.e. <scheme> "://" <hostname> [ ":" <port> ] * i.e. <scheme> "://" <hostname> [ ":" <port> ]
* e.g. if the URL is https://demo7.dspace.org/search?query=test, * e.g. if the URL is https://demo.dspace.org/search?query=test,
* the origin would be https://demo7.dspace.org * the origin would be https://demo.dspace.org
*/ */
getCurrentOrigin(): string { getCurrentOrigin(): string {
return this.req.protocol + '://' + this.req.headers.host; return this.req.protocol + '://' + this.req.headers.host;