Restructures + New Evironment Variables (#1230)

* Use document base uri for react router

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Rename getAndSetUser to fetchAndSetUser

Getter should be reserved for simple get functions.
Everything that does a bit more logic should use a more meaningful verb.

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Rename getFrontPageContent to fetchFrontPageContent

Getter should be reserved for simple get functions.
Everything that does a bit more logic should use a more meaningful verb.

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Reformat code

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Use PUBLIC_URL env var in index.html

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Introduce new environment variables

For better testing (especially if you have multiple endpoints) this commit introduces
REACT_APP_BACKEND_BASE_URL, REACT_APP_FRONTEND_ASSETS_URL and REACT_APP_CUSTOMIZE_ASSETS_URL

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Remove redundant license information

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Remove redundant license information

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Fix rebase issues

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Remove unused file

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Correct parameter

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Fix run tasks

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Force use of bash

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Fix link to cypress picture

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* revert change

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* fix url

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Remove license info

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Revert rebase issues

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Add missing banner code

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Fix test url

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Useless change to trigger github

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

* Don't set backend base url because this break the mock mode detection

Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>

Co-authored-by: Philip Molares <philip.molares@udo.edu>
This commit is contained in:
Tilman Vatteroth 2021-05-02 22:38:43 +02:00 committed by GitHub
parent 9cf7980334
commit 2c5a03b3ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 193 additions and 162 deletions

View file

@ -31,7 +31,7 @@ describe('File upload', () => {
beforeEach(() => {
cy.intercept({
method: 'POST',
url: '/api/private/media/upload'
url: '/mock-backend/api/private/media/upload'
}, {
statusCode: 201,
body: {
@ -86,7 +86,7 @@ describe('File upload', () => {
it('upload fails', () => {
cy.intercept({
method: 'POST',
url: '/api/private/media/upload'
url: '/mock-backend/api/private/media/upload'
}, {
statusCode: 400
})

View file

@ -26,7 +26,7 @@ describe('History', () => {
describe('Pinning', () => {
describe('working', () => {
beforeEach(() => {
cy.intercept('PUT', '/api/private/me/history/features', (req) => {
cy.intercept('PUT', '/mock-backend/api/private/me/history/features', (req) => {
req.reply(200, req.body)
})
})
@ -60,7 +60,7 @@ describe('History', () => {
describe('failing', () => {
beforeEach(() => {
cy.intercept('PUT', '/api/private/me/history/features', {
cy.intercept('PUT', '/mock-backend/api/private/me/history/features', {
statusCode: 401
})
})

View file

@ -7,7 +7,7 @@
/* eslint-disable @typescript-eslint/no-unsafe-call */
describe('Intro page', () => {
beforeEach(() => {
cy.intercept('/intro.md', 'test content')
cy.intercept('/mock-backend/public/intro.md', 'test content')
cy.visit('/')
})

View file

@ -7,7 +7,7 @@
describe('profile page', () => {
beforeEach(() => {
cy.intercept({
url: '/api/private/tokens',
url: '/mock-backend/api/private/tokens',
method: 'GET'
}, {
body: [
@ -18,7 +18,7 @@ describe('profile page', () => {
]
})
cy.intercept({
url: '/api/private/tokens',
url: '/mock-backend/api/private/tokens',
method: 'POST'
}, {
body: {
@ -28,7 +28,7 @@ describe('profile page', () => {
}
})
cy.intercept({
url: '/api/private/tokens/1601991518',
url: '/mock-backend/api/private/tokens/1601991518',
method: 'DELETE'
}, {
body: []

View file

@ -83,7 +83,7 @@ describe('When logged-out ', () => {
cy.get('[data-cy=sign-in-button]')
.should('be.visible')
// The absolute URL is used because it is defined as API base URL absolute.
.should('have.attr', 'href', 'http://127.0.0.1:3001/api/private/auth/saml')
.should('have.attr', 'href', '/mock-backend/api/private/auth/saml')
})
})