diff options
| author |   Kotagiri, Ramprasad (rp5662) <rp5662@att.com> | 2020-08-07 15:54:10 -0400 |
|---|---|---|
| committer | Kotagiri, Ramprasad (rp5662) <rp5662@att.com> | 2020-08-12 12:38:26 -0400 |
| commit | 09762dc92a06fb885f7055796db390a3a1baa535 (patch) | |
| tree | e377c24a2cccb0a7d90b7b8560a7d8eef048a610 /ccsdk-app-os/src/main/webapp/WEB-INF | |
| parent | f796af3a840d0fd9319e3dfe45ef0e548cd90171 (diff) | |
CCSDK DCAE dashboard feature changes
Issue-ID: DCAEGEN2-1857
Issue-ID: DCAEGEN2-2074
Issue-ID: DCAEGEN2-2364
Change-Id: I97f5ec4599512ed848136971b11d4c2a137a4999
Signed-off-by: Kotagiri, Ramprasad (rp5662) <rp5662@att.com>
Diffstat (limited to 'ccsdk-app-os/src/main/webapp/WEB-INF')
5 files changed, 266 insertions, 27 deletions
diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties index 9e221cd..a43f85c 100644 --- a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties +++ b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties @@ -21,24 +21,25 @@ # Properties for the ONAP Controller Dashboard webapp -# Set to true to use local copies of controller data -controller.mock.data = false +# dashboard.properties -# for ONAP or other type -controller.type = os +# Properties for the Dashboard webapp +# YAML would represent this more elegantly, but Spring likes properties. +# Controllers - a key for each set of properties "key.propKey" below. controller.env = dev -# YAML would represent this more elegantly, but Spring likes properties. -controller.key.list = dev +controller.site.list = primary -dev.name = Local -dev.url = https://dashboard.onap.svc.cluster.local/api/v3.1 -dev.inventory.url = https://inventory.onap.svc.cluster.local:8443/ -dev.dhandler.url = https://dplh.onap.svc.cluster.local:8443/ -dev.consul.url = https://cnsl.onap.svc.cluster.local:9500/ +site.primary.name = mtn23a +site.primary.cloudify.url = https://eom-orcl-d14.ecomp.idns.cip.att.com/api/v3.1 +site.primary.consul.url = https://eom-cnsl-d14.ecomp.idns.cip.att.com:9500/ +site.primary.inventory.url = https://eom-invt-d14.ecomp.idns.cip.att.com:30123 +site.primary.dhandler.url = https://eom-dplh-d14.ecomp.idns.cip.att.com:30125/ +site.primary.dbcl.url = https://ecompc-dbclgui-dev-s5.ecomp.idns.cip.att.com:30162/dmaap-bc-app/doLogin +site.primary.feed_m.url = https://feedM.com +site.primary.cloudify.username = admin +site.primary.cloudify.password = Cloudify_local +site.primary.cloudify.is_encrypted = false -dev.username = admin -dev.password = admin -dev.is_encrypted = false diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp b/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp index b0b63dd..f54662f 100644 --- a/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp +++ b/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp @@ -24,6 +24,9 @@ final String appDisplayName = SystemProperties.containsProperty(SystemProperties.APP_DISPLAY_NAME)
? SystemProperties.getProperty(SystemProperties.APP_DISPLAY_NAME)
: SystemProperties.APP_DISPLAY_NAME;
+ String signUpPage = "signup.htm";
+ String signupUrl = (request.isSecure() ? "https://" : "http://") + request.getServerName() + ":"
+ + request.getServerPort() + request.getContextPath() + "/" + signUpPage;
%>
<html>
@@ -73,6 +76,30 @@ margin-left: auto;
margin-right: auto;
}
+ .formIn {
+ width: 200px;
+ height:25px;
+ border-radius: 4px;
+ font-size:18px;
+ padding-left:5px;
+ background-color: #f1ecec;
+ }
+ #regLink {
+ background: #0081a4;
+ border-radius: 3px;
+ padding: 4px;
+ font-size: large;
+ font-weight: bold;
+ text-decoration: none;
+ color: black;
+ }
+ #formDiv {
+ background-color: #0081a4b0;
+ width: 300px;
+ margin-left: auto;
+ margin-right: auto;
+ padding-bottom: 10px;
+ }
</style>
</head>
<body>
@@ -81,19 +108,20 @@ <h2>
<%=appDisplayName%>
</h2>
- <br />
- <form action="login_external" method="POST">
- <label for="loginId">Login ID:</label>
- <input id="loginId" name="loginId" type="text" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;" maxlength="30">
- <br/>
- <br/>
- <label for="password">Password:</label>
- <input id="password" name="password" type="password" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;"
- maxlength="30" >
- <br />
- <br />
- <input id="loginBtn" type="submit" alt="Login" value="Login">
- </form>
+ <div id="formDiv">
+ <form action="login_external" method="POST">
+ <h3> Login </h3>
+ <input class="formIn" id="loginId" name="loginId" type="text" maxlength="30" placeholder="User ID">
+ <br>
+ <br>
+ <input class="formIn" id="password" name="password" type="password" maxlength="30" placeholder="Password">
+ <br>
+ <br>
+ <input id="loginBtn" type="submit" alt="Login" value="LOG IN" style="width: 200px; font-weight: bolder;">
+ </form>
+ <br>
+ <p>Not registered yet? <a id="regLink" href="<%=signupUrl%>">Sign up</a></p>
+ </div>
</div>
<br />
<br />
diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/signup.jsp b/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/signup.jsp new file mode 100644 index 0000000..421f72a --- /dev/null +++ b/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/signup.jsp @@ -0,0 +1,128 @@ +<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%> +<!DOCTYPE html> +<% + // Name is defined by app; do not throw if missing + final String appDisplayName = SystemProperties.containsProperty(SystemProperties.APP_DISPLAY_NAME) + ? SystemProperties.getProperty(SystemProperties.APP_DISPLAY_NAME) + : SystemProperties.APP_DISPLAY_NAME; + String loginPage = "login_external.htm"; + String loginUrl = (request.isSecure() ? "https://" : "http://") + request.getServerName() + ":" + + request.getServerPort() + request.getContextPath() + "/" + loginPage; +%> +<html> +<head> +<meta charset="ISO-8859-1"> +<title>Sign up / Register</title> +<style> + html { + font-family: Verdana, Arial, Helvetica, sans-serif; + } + body { + padding-top: 15px; + } + .logo { + position: fixed; + left: 15px; + top: 15px; + z-index: -1; + } + .loginError { + font-size: 18px; + color: red; + text-align: center; + } + .login { + font-size: 16px; + display: block; + margin-left: auto; + margin-right: auto; + text-align: center; + width: 100%; + } + .login input[type=submit] { + font-size: 16px; + } + .terms { + font-size: 10px; + text-align: center; + margin-left: auto; + margin-right: auto; + } + .terms a { + font-size: 10px; + text-align: center; + margin-left: auto; + margin-right: auto; + } + .formIn { + width: 200px; + height:25px; + border-radius: 4px; + font-size:18px; + padding-left:5px; + background-color: #f1ecec; + } + #regLink { + background: #0081a4; + border-radius: 3px; + padding: 4px; + font-size: large; + font-weight: bold; + text-decoration: none; + color: black; + } + #formDiv { + background-color: #0081a4b0; + width: 300px; + margin-left: auto; + margin-right: auto; + padding-bottom: 10px; + } + </style> + +</head> +<body> + <div class="login"> + <img src="app/ccsdk/images/onap_logo_2257x496.png" style="height: 150px;" /> + <h2> + <%=appDisplayName%> + </h2> + <div id="formDiv"> + <form action="signup" method="POST"> + <h3>Sign Up</h3> + <input id="first" class="formIn" name="first" type="text" maxlength="30" placeholder="First Name"> + <br/> + <br/> + <input id="last" class="formIn" name="last" type="text" maxlength="30" placeholder="Last Name"> + <br/> + <br/> + <input id="loginId" class="formIn" name="loginId" type="text" maxlength="30" placeholder="User ID"> + <br/> + <br/> + <input id="password" class="formIn" name="password" type="password" maxlength="30" placeholder="Password"> + <br /> + <br /> + <input id="email" class="formIn" name="email" type="text" maxlength="30" placeholder="Email"> + <br /> + <br /> + <input id="loginBtn" type="submit" alt="Login" value="SIGN UP" style="width: 200px; font-weight: bolder;"> + </form> + <br> + <p>Already registered? <a id="regLink" href="<%=loginUrl%>"> Login</a></p> + </div> + </div> + <br /> + <br /> + <div class="loginError">${model.error}</div> + <br /> + <br /> + <br /> + <div id="footer"> + <div class="terms"> + <p class="copyright-text"> + © 2020 ONAP. The Linux Foundation. + </p> + </div> + </div> +</body> +</html>
\ No newline at end of file diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/oom-app-definitions.xml b/ccsdk-app-os/src/main/webapp/WEB-INF/oom-app-definitions.xml new file mode 100644 index 0000000..5fcc6c8 --- /dev/null +++ b/ccsdk-app-os/src/main/webapp/WEB-INF/oom-app-definitions.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + =============LICENSE_START========================================================= + + ================================================================================= + Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file 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========================================================= + + ECOMP is a trademark and service mark of AT&T Intellectual Property. + --> + +<!DOCTYPE tiles-definitions PUBLIC + "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" + "http://tiles.apache.org/dtds/tiles-config_3_0.dtd"> +<tiles-definitions> + + <!-- Main page for the single-page app --> + <definition name="ecd_home_tdkey" template="/app/ccsdk/home/oom_spa.html"/> + <definition name="welcome" + template="/app/fusion/scripts/DS2-view-models/welcome.html" /> +</tiles-definitions> diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/oom-app.hbm.xml b/ccsdk-app-os/src/main/webapp/WEB-INF/oom-app.hbm.xml new file mode 100644 index 0000000..b302346 --- /dev/null +++ b/ccsdk-app-os/src/main/webapp/WEB-INF/oom-app.hbm.xml @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!-- + =============LICENSE_START========================================================= + + ================================================================================= + Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file 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========================================================= + + ECOMP is a trademark and service mark of AT&T Intellectual Property. + --> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping package="org.onap.ccsdk.dashboard.domain"> + + <!-- class mapping details --> + <class name="ControllerEndpoint" table="ecd_endpoint"> + <id name="userId" column="user_id" /> + <property name="name" column="name"/> + <property name="url" column="url"/> + </class> + <class name="EcdComponent" table="ecd_component"> + <id name="compId" column="ecd_component_id"> + <generator class="native"> + <param name="sequence">seq_ecd_component</param> + </generator> + </id> + <property name="cname" column="ecd_component_name"/> + <property name="dname" column="ecd_component_display"/> + </class> + <query name="getAllComponents"> + FROM EcdComponent + </query> + +</hibernate-mapping> |