diff --git a/.gitignore b/.gitignore index 0eaed1fc..d71511f4 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ npm-debug.log t/*.xml sass/example/fashion.html sass/example/render.js +rtc/ diff --git a/Readme.md b/Readme.md index 641f6c51..df121f9f 100644 --- a/Readme.md +++ b/Readme.md @@ -165,3 +165,30 @@ Create and run Docker Image (see instructions inside the Dockerfile). Inside docker: ```cd /code && ./t/testrunner``` + +### RTC:engine integration + +By default you will get a 404 NotFound for the file cdk-prod.js. +Since both, the CSC panel and the RTC:engine are running under the same +base url in production, the file will be available. But in your local +development environment you need to put the file in the required path manually. + +1. Checkout RTC:engine repository +2. Install dependencies + +``` +npm install +``` + +3. Run build command + +``` +npm run build-cdk +``` + +4. Copy file from build folder to CSC folder + +``` +cp /ngcp-rtcengine/built/client/cdk-prod.js /ngcp-csc/rtc/files/dist/ +``` + diff --git a/app.json b/app.json index fa227e9f..1ce1c3b8 100644 --- a/app.json +++ b/app.json @@ -187,12 +187,16 @@ * */ "js": [{ + "path": "/rtc/files/dist/cdk-prod.js", + "remote": true + },{ "path": "initLocalStorage.js", "includeInBundle": true },{ "path": "app.js", "bundle": true - }], + } + ], /** * Settings specific to classic toolkit builds. diff --git a/classic/src/view/login/Login.js b/classic/src/view/login/Login.js index 43420a06..58952aa9 100644 --- a/classic/src/view/login/Login.js +++ b/classic/src/view/login/Login.js @@ -5,7 +5,6 @@ Ext.define('NgcpCsc.view.login.Login', { autoShow: true, bodyPadding: 20, closable: false, - autoShow: true, standardSubmit: true, viewModel: 'login', width: 500,