diff --git a/README.md b/README.md index 96ff090ac10fe9668678273d2f7783c3790559c7..33a307ca866254bf3dfb941eba0af4544264931a 100644 --- a/README.md +++ b/README.md @@ -226,7 +226,7 @@ The application is now `running on port 3000` of your local machine. ``` docker run -it \ -p 3000:3000 \ - -p 5000:5000 \ + -p 5002:5002 \ --volume ${PWD}/client/src:/web-client/client/src \ --volume ${PWD}/server/src:/web-client/server/src \ --volume ${PWD}/client/.env.development:/web-client/client/.env.development \ diff --git a/client/.env.development b/client/.env.development index 6d453cd59a33692e7605d13ddf244b9c4f8019e3..d3a49b70fee1a36f28b9a307d0a7060f3cae310d 100644 --- a/client/.env.development +++ b/client/.env.development @@ -1,2 +1,2 @@ ESLINT_NO_DEV_ERRORS=true -VITE_API_URL=http://localhost:5000 \ No newline at end of file +VITE_API_URL=http://localhost:5002 \ No newline at end of file diff --git a/client/cypress.env.example.json b/client/cypress.env.example.json index f6bea189cc02f0d50060317eb639643621ff49c7..447bbb94161e192af1d5216c8ed76cd9750f2ce3 100644 --- a/client/cypress.env.example.json +++ b/client/cypress.env.example.json @@ -1,6 +1,6 @@ { "CLIENT_URL": "http://localhost:3000", - "SERVER_URL": "http://localhost:5000", + "SERVER_URL": "http://localhost:5002", "TEST_USERNAME": "your-test-user", "TEST_USER_PASSWORD": "your-test-password", "USED_USERNAME": "your-used-username" diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index a900680136311b93fef3d900d1497f687a65e54f..1fbe52b19ebc817116e1e48bbdcfe4b1c5239d23 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -14,7 +14,7 @@ services: - ./client/.env.development:/web-client/client/.env.development ports: - '3000:3000' - - '5000:5000' + - '5002:5002' stdin_open: true depends_on: - jami-daemon diff --git a/server/src/index.ts b/server/src/index.ts index 6c93e8b6166fd09db9b5ef421c55e61d94f3b41a..565ee586cb5438379392f3e2ed50f4b372df2e8b 100644 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -35,7 +35,7 @@ const isDev = process.env.NODE_ENV === 'development' ? true : false log.setLevel(isDev ? 'trace' : 'error') -const port: string | number = isDev ? 5000 : 8080 +const port: string | number = isDev ? 5002 : 8080 await Container.get(SigningKeys).build() const jamid = Container.get(Jamid) diff --git a/server/src/routers/admin-router.ts b/server/src/routers/admin-router.ts index f72105109873bf8a74e2e413e25d06cab8ac6e5a..aaed0f37a87fc4598f183b61d9a3ccd528a8f472 100644 --- a/server/src/routers/admin-router.ts +++ b/server/src/routers/admin-router.ts @@ -402,7 +402,7 @@ adminRouter.get( const protocol = req.secure ? 'https' : 'http' const host = req.get('host') - const baseUrl = devMode ? 'http://localhost:5000' : `${protocol}://${host}` + const baseUrl = devMode ? 'http://localhost:5002' : `${protocol}://${host}` if (providerConfig === undefined) { res.status(HttpStatusCode.InternalServerError).send('Provider configuration not found')