summaryrefslogtreecommitdiffstats
path: root/cds-ui/designer-client
diff options
context:
space:
mode:
authorshaaban Altanany <shaaban.eltanany.ext@orange.com>2020-01-29 11:28:00 +0200
committerKAPIL SINGAL <ks220y@att.com>2020-02-02 19:29:57 +0000
commit74ee6be955fbfc6c82ef693dc9a142e058fbb833 (patch)
tree92b7a730035529a612b8c26b07335ecec65c891d /cds-ui/designer-client
parent7b1469e1883097ab0c2b4dc76f5307667482be2d (diff)
add designer client build inside loopback server
Issue-ID: CCSDK-2067 Change-Id: I5acef65ee6703405b70708dd17a1be7acb808531 Signed-off-by: shaaban Altanany <shaaban.eltanany.ext@orange.com>
Diffstat (limited to 'cds-ui/designer-client')
-rw-r--r--cds-ui/designer-client/angular.json2
-rw-r--r--cds-ui/designer-client/package.json7
-rw-r--r--cds-ui/designer-client/pom.xml95
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html2
-rw-r--r--cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html2
5 files changed, 102 insertions, 6 deletions
diff --git a/cds-ui/designer-client/angular.json b/cds-ui/designer-client/angular.json
index 916ea2ff2..436a0df6d 100644
--- a/cds-ui/designer-client/angular.json
+++ b/cds-ui/designer-client/angular.json
@@ -13,7 +13,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
- "outputPath": "dist/designer-client",
+ "outputPath": "../server/public",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
diff --git a/cds-ui/designer-client/package.json b/cds-ui/designer-client/package.json
index 033fee1fa..22defe502 100644
--- a/cds-ui/designer-client/package.json
+++ b/cds-ui/designer-client/package.json
@@ -38,21 +38,22 @@
"ng2-ace-editor": "^0.3.9",
"ngx-file-drop": "^8.0.8",
"rxjs": "~6.4.0",
+ "stream": "0.0.2",
"tslib": "^1.10.0",
"zone.js": "~0.9.1"
},
"devDependencies": {
- "@angular-devkit/build-angular": "~0.803.9",
+ "@angular-devkit/build-angular": "^0.803.23",
"@angular/cli": "~8.3.9",
"@angular/compiler-cli": "~8.2.9",
"@angular/language-service": "~8.2.9",
+ "@types/backbone": "^1.4.1",
"@types/jasmine": "~3.3.8",
"@types/jasminewd2": "~2.0.3",
- "@types/node": "~8.9.4",
- "@types/backbone": "^1.4.1",
"@types/jointjs": "^2.0.0",
"@types/jquery": "^3.3.31",
"@types/lodash": "^3.10.1",
+ "@types/node": "~8.9.4",
"codelyzer": "^5.0.0",
"jasmine-core": "~3.4.0",
"jasmine-marbles": "^0.6.0",
diff --git a/cds-ui/designer-client/pom.xml b/cds-ui/designer-client/pom.xml
new file mode 100644
index 000000000..e341ac203
--- /dev/null
+++ b/cds-ui/designer-client/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START==========================================
+===================================================================
+Copyright (C) 2020 Orange. All rights reserved.
+===================================================================
+
+Unless otherwise specified, all software contained herein is licensed
+under the Apache License, Version 2.0 (the License);
+you may not use this software except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END============================================ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onap.ccsdk.cds</groupId>
+ <artifactId>ui</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>designer-client</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>CDS designer Client</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <npm.executable>npm</npm.executable>
+ <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <!-- Use the latest released version: https://repo1.maven.org/maven2/com/github/eirslett/frontend-maven-plugin/ -->
+ <version>1.3</version>
+ <configuration>
+ <nodeVersion>v13.7.0</nodeVersion>
+ <npmVersion>6.13.6</npmVersion>
+ <nodeDownloadRoot>https://nodejs.org/dist/</nodeDownloadRoot>
+ <installDirectory>./</installDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>install node and npm</id>
+ <goals>
+ <goal>install-node-and-npm</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ </execution>
+
+ <execution>
+ <id>npm install</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+
+ <phase>generate-resources</phase>
+
+ <configuration>
+ <arguments>install</arguments>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>npm build</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+
+ <phase>generate-resources</phase>
+
+ <configuration>
+ <arguments>run build</arguments>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html
index 8bc7adf8c..f45b2fed7 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages-dashboard/package-list/package-list.component.html
@@ -7,7 +7,7 @@
</div>
<div class="card-footer row">
<div class="col">
- <a href="/packages/createPackage" role="button" aria-pressed="true" class="btn-create-package float">Create Package
+ <a routerLink="/packages/createPackage" role="button" aria-pressed="true" class="btn-create-package float">Create Package
</a>
</div>
<div class="col">
diff --git a/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html b/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html
index 541b38d1a..24b492ffb 100644
--- a/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html
+++ b/cds-ui/designer-client/src/app/modules/shared-modules/header/header.component.html
@@ -5,7 +5,7 @@
<div class="overflow-container">
<ul class="menu-dropdown">
<li class="active">
- <a href="packages/list">Packages</a>
+ <a routerLink="packages/list">Packages</a>
<span class="icon">
<!-- <i class="fa fa-dashboard"></i> -->
<img src="../assets/img/icon-nav-packages.svg">