diff --git a/src/main/java/biz/neustar/pc/ui/constants/UIRestPathConstants.java b/src/main/java/biz/neustar/pc/ui/constants/UIRestPathConstants.java index 84b2e56..e59fd1f 100644 --- a/src/main/java/biz/neustar/pc/ui/constants/UIRestPathConstants.java +++ b/src/main/java/biz/neustar/pc/ui/constants/UIRestPathConstants.java @@ -42,6 +42,7 @@ public class UIRestPathConstants { public static final String CSP_CLOUD_NAME = "cspCloudName"; public static final String CLOUD_NAME = "cloudName"; public static final String PRODUCT_NAME = "productName"; + public static final String EMAIL = "email"; public static final String BASE_URI_NAME_AVAILABILITY_API = PATH_WITH_CURRENT_API_VERSION + "/clouds/personalClouds/{cloudName}/available"; @@ -76,7 +77,8 @@ public class UIRestPathConstants { public static final String PERSONAL_CLOUD_CHANGE_PASSWORD_URI = REGISTER_PERSONAL_CLOUD_URI + "/{cloudName}/changePassword"; - + public static final String PERSONAL_CLOUD_PROV_FEEDBACK_URI = PATH_WITH_CURRENT_API_VERSION + + "/feedback"; public static final String GET_DEPENDENTS_URI = REGISTER_PERSONAL_CLOUD_URI + "/{cloudName}/dependents"; public static final String NAME_AVAILABILITY_API = PATH_WITH_CURRENT_API_VERSION @@ -89,10 +91,10 @@ public class UIRestPathConstants { public static final String GET_DEPENDENTS_API = PATH_WITH_CURRENT_API_VERSION + "/csp/{0}/clouds/personalClouds/{1}/dependents"; public static final String PERSONAL_CLOUD_FORGOT_PASSWORD_API = PATH_WITH_CURRENT_API_VERSION - + "/csp/{0}/clouds/personalCloud/{1}/forgotPassword"; + + "/csp/{0}/clouds/personalClouds/{1}/forgotPassword"; public static final String PERSONAL_CLOUD_RESET_PASSWORD_API = PATH_WITH_CURRENT_API_VERSION - + "/csp/{0}/clouds/personalCloud/{1}/resetPassword"; + + "/csp/{0}/clouds/personalClouds/{1}/resetPassword"; public static final String PERSONAL_CLOUD_AUTH_API = PATH_WITH_CURRENT_API_VERSION + "/csp/{0}/clouds/personalClouds/{1}/authenticate"; public static final String PAYMENT_API = PATH_WITH_CURRENT_API_VERSION + "/products/{0}/payments"; diff --git a/src/main/java/biz/neustar/pc/ui/controller/PersonalCloudRegistrationController.java b/src/main/java/biz/neustar/pc/ui/controller/PersonalCloudRegistrationController.java index 72a82d4..8bfc8df 100644 --- a/src/main/java/biz/neustar/pc/ui/controller/PersonalCloudRegistrationController.java +++ b/src/main/java/biz/neustar/pc/ui/controller/PersonalCloudRegistrationController.java @@ -24,12 +24,12 @@ of this software and associated documentation files (the "Software"), to deal package biz.neustar.pc.ui.controller; import java.io.IOException; -import java.io.PrintWriter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.FormParam; +import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,9 +40,11 @@ of this software and associated documentation files (the "Software"), to deal import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import biz.neustar.pc.ui.constants.UIRestPathConstants; +import biz.neustar.pc.ui.exception.PCloudErrorsUIException; import biz.neustar.pc.ui.exception.PCloudUIException; import biz.neustar.pc.ui.manager.impl.PCloudResponse; import biz.neustar.pc.ui.manager.impl.PersonalCloudManager; @@ -50,6 +52,8 @@ of this software and associated documentation files (the "Software"), to deal import biz.neustar.pcloud.rest.dto.CloudInfo; import biz.neustar.pcloud.rest.dto.CloudValidation; import biz.neustar.pcloud.rest.dto.DependentList; +import biz.neustar.pcloud.rest.dto.FeedbackInfo; +import biz.neustar.pcloud.rest.dto.PCloudError; import biz.neustar.pcloud.rest.dto.PaymentInfo; import biz.neustar.pcloud.rest.dto.PaymentResponse; import biz.neustar.pcloud.rest.dto.Synonym; @@ -164,15 +168,43 @@ PCloudResponse processChangePassword( return personalCloudManagerImpl.changePassword(cspCloudName, cloudName, cloudValidation); } + + @RequestMapping(value = UIRestPathConstants.PERSONAL_CLOUD_PROV_FEEDBACK_URI, method = RequestMethod.POST) + public @ResponseBody + PCloudResponse processFeedback(@RequestBody final FeedbackInfo feedbackInfo) { + return personalCloudManagerImpl.processFeedback(feedbackInfo); + + } + @SuppressWarnings("unchecked") @ExceptionHandler(PCloudUIException.class) - public @ResponseBody String handleUltraException(PCloudUIException exception, HttpServletRequest request, HttpServletResponse response) throws IOException { + public @ResponseBody + String handleException(PCloudUIException exception, HttpServletRequest request, HttpServletResponse response) + throws IOException { response.setStatus(exception.getStatusCode()); - + JSONArray errors = new JSONArray(); JSONObject error = new JSONObject(); - error.put("errorCode", exception.getErrorCode()); - error.put("errorMessage", exception.getErrorMessage()); - LOGGER.error("Error : {}", exception.getLocalizedMessage(), exception); - return error.toJSONString(); + error.put("errorCode", exception.getErrorCode()); + error.put("errorMessage", exception.getErrorMessage()); + errors.add(error); + LOGGER.debug("Errors : {}", exception.getLocalizedMessage(), exception); + return errors.toJSONString(); + } + + @SuppressWarnings("unchecked") + @ExceptionHandler(PCloudErrorsUIException.class) + public @ResponseBody + String handleUIException(PCloudErrorsUIException exception, HttpServletRequest request, HttpServletResponse response) + throws IOException { + response.setStatus(exception.getStatusCode()); + JSONArray errors = new JSONArray(); + for (PCloudError pCloudError : exception.getErrors()) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("errorCode", pCloudError.getErrorCode()); + jsonObject.put("errorMessage", pCloudError.getErrorMessage()); + errors.add(jsonObject); + } + LOGGER.debug("Errors : {}", errors, exception); + return errors.toJSONString(); } } diff --git a/src/main/java/biz/neustar/pc/ui/exception/PCloudErrorsUIException.java b/src/main/java/biz/neustar/pc/ui/exception/PCloudErrorsUIException.java new file mode 100644 index 0000000..a669e5d --- /dev/null +++ b/src/main/java/biz/neustar/pc/ui/exception/PCloudErrorsUIException.java @@ -0,0 +1,50 @@ +package biz.neustar.pc.ui.exception; + +import java.util.List; + +import biz.neustar.pc.ui.utils.PCloudErrorUtil; +import biz.neustar.pcloud.rest.dto.PCloudError; + +public class PCloudErrorsUIException extends RuntimeException { + + /** + * + */ + private static final long serialVersionUID = 1L; + + private List errors; + private int statusCode; + + public List getErrors() { + if (errors != null) { + for (PCloudError pCloudError : errors) { + pCloudError.setErrorMessage(PCloudErrorUtil.getProperty(Integer.toString(pCloudError.getErrorCode()))); + } + } + return errors; + } + + public void setErrors(List errors) { + this.errors = errors; + } + + public int getStatusCode() { + return statusCode; + } + + public void setStatusCode(int statusCode) { + this.statusCode = statusCode; + } + + public PCloudErrorsUIException(List errors, int statusCode) { + super(); + this.errors = errors; + this.statusCode = statusCode; + } + + @Override + public String toString() { + return "PCloudErrorsUIException [errors=" + errors + ", statusCode=" + statusCode + "]"; + } + +} diff --git a/src/main/java/biz/neustar/pc/ui/exception/PCloudUIException.java b/src/main/java/biz/neustar/pc/ui/exception/PCloudUIException.java index 8f684c9..8403665 100644 --- a/src/main/java/biz/neustar/pc/ui/exception/PCloudUIException.java +++ b/src/main/java/biz/neustar/pc/ui/exception/PCloudUIException.java @@ -1,53 +1,65 @@ package biz.neustar.pc.ui.exception; -public class PCloudUIException extends RuntimeException{ +import biz.neustar.pc.ui.utils.PCloudErrorUtil; - /** +public class PCloudUIException extends RuntimeException { + + /** * */ private static final long serialVersionUID = 1L; int errorCode; String errorMessage; - int statusCode; - - /** + int statusCode; + + /** * @return the errorCode */ public int getErrorCode() { return errorCode; } + /** - * @param errorCode the errorCode to set + * @param errorCode + * the errorCode to set */ public void setErrorCode(int errorCode) { this.errorCode = errorCode; } + public String getErrorMessage() { - return errorMessage; - } - public void setErrorMessage(String errorMessage) { - this.errorMessage = errorMessage; - } - public int getStatusCode() { - return statusCode; - } - public void setStatusCode(int statusCode) { - this.statusCode = statusCode; - } - public PCloudUIException(int errorCode, String errorMessage, int statusCode) { - super(); - this.errorCode = errorCode; - this.errorMessage = errorMessage; - this.statusCode = statusCode; - } - public PCloudUIException(String errorMessage) { - super(); - this.errorMessage = errorMessage; - } - @Override - public String toString() { - return "PCloudUIException [errorCode="+errorCode+",errorMessage=" + errorMessage - + ", statusCode=" + statusCode + "]"; - } - + return PCloudErrorUtil.getProperty(Integer.toString(errorCode)); + + } + + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } + + public int getStatusCode() { + return statusCode; + } + + public void setStatusCode(int statusCode) { + this.statusCode = statusCode; + } + + public PCloudUIException(int errorCode, String errorMessage, int statusCode) { + super(); + this.errorCode = errorCode; + this.errorMessage = errorMessage; + this.statusCode = statusCode; + } + + public PCloudUIException(String errorMessage) { + super(); + this.errorMessage = errorMessage; + } + + @Override + public String toString() { + return "PCloudUIException [errorCode=" + errorCode + ",errorMessage=" + errorMessage + ", statusCode=" + + statusCode + "]"; + } + } diff --git a/src/main/java/biz/neustar/pc/ui/manager/impl/PersonalCloudManager.java b/src/main/java/biz/neustar/pc/ui/manager/impl/PersonalCloudManager.java index 2350b32..cecdabf 100644 --- a/src/main/java/biz/neustar/pc/ui/manager/impl/PersonalCloudManager.java +++ b/src/main/java/biz/neustar/pc/ui/manager/impl/PersonalCloudManager.java @@ -28,6 +28,7 @@ of this software and associated documentation files (the "Software"), to deal import biz.neustar.pcloud.rest.dto.CloudInfo; import biz.neustar.pcloud.rest.dto.CloudValidation; import biz.neustar.pcloud.rest.dto.DependentList; +import biz.neustar.pcloud.rest.dto.FeedbackInfo; import biz.neustar.pcloud.rest.dto.PaymentInfo; import biz.neustar.pcloud.rest.dto.PaymentResponse; import biz.neustar.pcloud.rest.dto.Synonym; @@ -58,4 +59,6 @@ public interface PersonalCloudManager { public abstract PaymentResponse processPayment(ProductNames productName, PaymentInfo paymentInfo); public abstract PCloudResponse changePassword(String cspCloudName, String cloudName, CloudValidation cloudValidation); + + public abstract PCloudResponse processFeedback(FeedbackInfo feedbackInfo); } \ No newline at end of file diff --git a/src/main/java/biz/neustar/pc/ui/manager/impl/PersonalCloudManagerImpl.java b/src/main/java/biz/neustar/pc/ui/manager/impl/PersonalCloudManagerImpl.java index 1c1e207..5ac928f 100644 --- a/src/main/java/biz/neustar/pc/ui/manager/impl/PersonalCloudManagerImpl.java +++ b/src/main/java/biz/neustar/pc/ui/manager/impl/PersonalCloudManagerImpl.java @@ -25,12 +25,14 @@ of this software and associated documentation files (the "Software"), to deal import java.io.IOException; import java.text.MessageFormat; +import java.util.List; import org.apache.http.HttpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import biz.neustar.pc.ui.constants.UIRestPathConstants; +import biz.neustar.pc.ui.exception.PCloudErrorsUIException; import biz.neustar.pc.ui.exception.PCloudUIException; import biz.neustar.pcloud.PCRestClient; import biz.neustar.pcloud.ResponseData; @@ -38,6 +40,7 @@ of this software and associated documentation files (the "Software"), to deal import biz.neustar.pcloud.rest.dto.CloudInfo; import biz.neustar.pcloud.rest.dto.CloudValidation; import biz.neustar.pcloud.rest.dto.DependentList; +import biz.neustar.pcloud.rest.dto.FeedbackInfo; import biz.neustar.pcloud.rest.dto.PCloudError; import biz.neustar.pcloud.rest.dto.PaymentInfo; import biz.neustar.pcloud.rest.dto.PaymentResponse; @@ -45,6 +48,7 @@ of this software and associated documentation files (the "Software"), to deal import biz.neustar.pcloud.rest.dto.SynonymInfo; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.type.TypeFactory; import com.sun.jersey.api.representation.Form; /** @@ -56,9 +60,10 @@ public class PersonalCloudManagerImpl implements PersonalCloudManager { * */ private PCRestClient pcRestClient; - - public PersonalCloudManagerImpl(PCRestClient pcRestClient) { + private String feedbackEmail; + public PersonalCloudManagerImpl(PCRestClient pcRestClient, String feedbackEmail) { this.pcRestClient = pcRestClient; + this.feedbackEmail = feedbackEmail; } /* @@ -212,23 +217,30 @@ public Entity handleException(ResponseData responsedata, Class error = new ObjectMapper().readValue(responsedata.getBody(), PCloudError.class); throw new PCloudUIException(error.getErrorCode(), error.getErrorMessage(), responsedata.getStatus()); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LOGGER.error("Might be list of errors :"); + List errors; + try { + errors = new ObjectMapper().readValue(responsedata.getBody(), TypeFactory.defaultInstance() + .constructCollectionType(List.class, PCloudError.class)); + throw new PCloudErrorsUIException(errors, responsedata.getStatus()); + } catch (IOException e1) { + LOGGER.error("Error while parsing response data for error condition", e1); + } } - } else { - try { - entity = entityType.cast(new ObjectMapper().readValue(responsedata.getBody(), entityType)); - } catch (Exception e) { - LOGGER.info("inside exception"); - e.printStackTrace(); + LOGGER.error("Error while parsing response data for success", e); } - } return entity; + } + @Override + public PCloudResponse processFeedback(FeedbackInfo feedbackInfo) { + feedbackInfo.setToEmail(feedbackEmail); + return handleException(pcRestClient.post(UIRestPathConstants.PERSONAL_CLOUD_PROV_FEEDBACK_URI, feedbackInfo), + PCloudResponse.class); } } diff --git a/src/main/java/biz/neustar/pc/ui/utils/PCloudErrorUtil.java b/src/main/java/biz/neustar/pc/ui/utils/PCloudErrorUtil.java new file mode 100644 index 0000000..6d40b59 --- /dev/null +++ b/src/main/java/biz/neustar/pc/ui/utils/PCloudErrorUtil.java @@ -0,0 +1,58 @@ +package biz.neustar.pc.ui.utils; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import java.util.Set; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class PCloudErrorUtil { + private Logger LOGGER = LoggerFactory.getLogger(PCloudErrorUtil.class); + private static Properties props; + + static { + props = new Properties(); + try { + PCloudErrorUtil util = new PCloudErrorUtil(); + props = util.getPropertiesFromClasspath("errors.properties"); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + // private constructor + private PCloudErrorUtil() { + } + + public static String getProperty(String key) { + return props.getProperty(key).trim(); + } + + public static Set getkeys() { + return props.keySet(); + } + + /** + * Loads properties file from classpath + * + * @param fileName + * @return + * @throws IOException + */ + private Properties getPropertiesFromClasspath(String fileName) throws IOException { + Properties props = new Properties(); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(fileName); + + if (inputStream == null) { + LOGGER.error("Property file '" + fileName + "' not found in the classpath"); + throw new FileNotFoundException("Property file '" + fileName + "' not found in the classpath"); + } + props.load(inputStream); + return props; + } +} diff --git a/src/main/resources/errors.properties b/src/main/resources/errors.properties new file mode 100644 index 0000000..048db32 --- /dev/null +++ b/src/main/resources/errors.properties @@ -0,0 +1,65 @@ +1001=Invalid cynja id. +1002= is required field. +1003=Invalid input: +1004=Invalid phone number. +1005=Invalid email address. +1006=Invalid password. +1007=Password and confirm password should be same. +1008=Cynja id is not available. +1008=Invalid request type. +1009=is null +1010=Invalid identifier. +1011=Cynja id does not exist. +1012=payment ID does not exist. +1013=Object already exist in the system. +1014=Invalid cynja id or password. +1015=Guardian cynja id does not exist. +1016=Cloud entity id {} does not exist. +1017=Invalid guardian cynja id or password. +1018=Guardian cynja id provided not authorized. +// CSP related errors +2001=CSP provided does not exist in the system. +// Error messages +3001=Error while registering cynja id in user cloud. +3002=Error while registering phone and email in user cloud. +3003=Error while registering cynja id in csp cloud. +3004=Error while registering user cloud in csp cloud. +3005=Error while registering services in csp cloud. +3006=Error while registering cynja id in XDI registry. +3007=Error while registering cynja id in RN. +3008=Error while updating password. +3009=Error while fetching dependent cynja ids. +3010=Error while fetching synonym cynja ids. +3011=Error while setting guardianship in CSP. +3012=Error while setting guardianship in cloud. +3013=Problem with cynja id provided to retrieve signature private key. +3014=Problem in retrieving signature private key. +3015=You need to login first to logout. +// Auth error messages +6001=Token not found, expired or invalid +6002=User not Active +6003=Token format expected in header is \"Token: Bearer \" +6004=Authorization Header required +6005=grantType not supported +6006=invalid request +6007=invalid_request:username parameter is required for grantType=password +6008=invalid_request:password parameter is required for grantType=password +6009=invalid_request:refreshToken parameter is required for grantType=refreshToken +6010=Problem with authentication. +6011=The CSP cynja id or password is incorrect. +// Uniqueness check +7000=Email and phone number has already been used for a cynja id. +7001=Email has already been used for a cynja id. +7002=Phone number has already been used for a cynja id. +7003=Problem checking Phone/Email Uniqueness. +7004=System Error sending validation messages. Please check email and mobile phone number. +7005=Given email address does not match with registered email address. +7006=Given phone number does not match with registered phone number. +7007=The cynja id provided does not exist in CynjaSpace. +7008=No dependents found +7009=No synonyms found + +// Validation code +8001=Invalid codes. +8002=Problem validating code. +500=Sorry! Unable to process your request. Please contact customer support or try again after sometime. \ No newline at end of file diff --git a/src/main/resources/pcloud.default.properties b/src/main/resources/pcloud.default.properties index 7c9c699..68b90c2 100644 --- a/src/main/resources/pcloud.default.properties +++ b/src/main/resources/pcloud.default.properties @@ -2,4 +2,5 @@ pcloud.csp.cspUserName=+testcsp pcloud.csp.password=whitelabel123 pcloud.csp.cspTCURL=http://www.onexus.com/terms.html pcloud.csp.baseUrl=http://localhost:8080 -pcloud.csp.authUrl=/v1/authorization/token \ No newline at end of file +pcloud.csp.authUrl=/v1/authorization/token +pcloud.csp.feedbackEmail=feedback@cynjaspace.com \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/spring_context.xml b/src/main/webapp/WEB-INF/spring_context.xml index 981fdbb..cc69d70 100644 --- a/src/main/webapp/WEB-INF/spring_context.xml +++ b/src/main/webapp/WEB-INF/spring_context.xml @@ -57,8 +57,10 @@ + + +
+
+
+ + +
+ + + + + + + + +
Back   + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ {{successMessageAddDep}}
Guardian nameActionConfirmation status
{{guardianCloudName}} Yes
{{ addList }}Delete
No item found.
{{addGuardianCloud.cloudName}} No
+ +
+ + +
+ + +
+ + +
+ +
+ \ No newline at end of file diff --git a/src/main/webapp/angular/views/additionalCloud.html b/src/main/webapp/angular/views/additionalCloud.html index dbe9c24..4ef8988 100644 --- a/src/main/webapp/angular/views/additionalCloud.html +++ b/src/main/webapp/angular/views/additionalCloud.html @@ -77,7 +77,7 @@

Add Additional Cloud

-
+
@@ -90,7 +90,7 @@

Add Additional Cloud

- +
diff --git a/src/main/webapp/angular/views/contactUs.html b/src/main/webapp/angular/views/contactUs.html new file mode 100644 index 0000000..f5462b8 --- /dev/null +++ b/src/main/webapp/angular/views/contactUs.html @@ -0,0 +1,103 @@ + +
+
+
+
+
+ + +
+ + + + + + + + +
Get in touch.
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{successContactmsg}}
+ {{errorContactmsg}}
Contact Us
+
+ Email +
+
+ +
Email is required
+
+
+ Message +
+
+ +
Message is required
+
+
+
+ +
+
+
+
+
+ + + + +
+
+
+
+
\ No newline at end of file diff --git a/src/main/webapp/angular/views/faqs.html b/src/main/webapp/angular/views/faqs.html new file mode 100644 index 0000000..ab8d7ee --- /dev/null +++ b/src/main/webapp/angular/views/faqs.html @@ -0,0 +1,66 @@ + +
+
+
+ +
+ + +
+ +
+
+
\ No newline at end of file diff --git a/src/main/webapp/angular/views/footer.html b/src/main/webapp/angular/views/footer.html index 3cc848e..69f7525 100644 --- a/src/main/webapp/angular/views/footer.html +++ b/src/main/webapp/angular/views/footer.html @@ -33,11 +33,11 @@

- +
+
\ No newline at end of file diff --git a/src/main/webapp/angular/views/header.html b/src/main/webapp/angular/views/header.html index e82a726..0d645ca 100644 --- a/src/main/webapp/angular/views/header.html +++ b/src/main/webapp/angular/views/header.html @@ -22,5 +22,5 @@ THE SOFTWARE. -->
- +
\ No newline at end of file diff --git a/src/main/webapp/angular/views/home.html b/src/main/webapp/angular/views/home.html index 18c16ec..04dbcf3 100644 --- a/src/main/webapp/angular/views/home.html +++ b/src/main/webapp/angular/views/home.html @@ -25,7 +25,7 @@
-
\ No newline at end of file diff --git a/src/main/webapp/angular/views/manageDependent.html b/src/main/webapp/angular/views/manageDependent.html index 8493931..b46fae8 100644 --- a/src/main/webapp/angular/views/manageDependent.html +++ b/src/main/webapp/angular/views/manageDependent.html @@ -31,9 +31,12 @@
+ + + - @@ -45,7 +48,7 @@ - + @@ -57,12 +60,20 @@ - + +
Add children to your digital family.
Back   - + Back   +
{{successMessageAddDep}}
Cloud NameCynja Id
{{ deplist.cloudName}}
No item found.
No item found.
+ + +
Once you've finished registering your children—hit the back button to download the CynjaSpace app.
+Or click here to download cynjaspace app. +
+ +
@@ -72,40 +83,40 @@
-

Add Dependent Cloud Name

+

Add Child

-
+
-
{{errorMessageAddDep}}
-
{{successMessageAddDep}}
+
{{errorMessageAddDep}}
+
{{successMessageAddDep}}
- - -
Cloud Name Is Required.
+ + +
Cynja ID is required.
- -
Password Is Required.
-
Passwords Must Be Between 8 And 20 Characters.
-
Must Contain One Lower & Uppercase Letter, And One Non-alpha Character (a number or a symbol.)
+ +
Password is required.
+
Passwords must be between 8 and 20 characters.
+
Passwords must be 8-20 characters, have at least 2 letters, 2 numbers and at least one special character, e.g. @, #, $
- -
Confirm Password Is Required.
-
Must Contain One Lower & Uppercase Letter, And One Non-alpha Character (a number or a symbol.)
+ +
Confirm password is required.
+
Passwords must be 8-20 characters, have at least 2 letters, 2 numbers and at least one special character, e.g. @, #, $
- + -
Date Of Birth Is Required.
+
Date of birth is required.
@@ -115,12 +126,12 @@

Add Dependent Cloud Name

-

I Agree To CSP Terms Of Service

-

Please Agree With Terms And Condition. +

I consent to my child obtaining a Cynja ID

+

Please agree with above consent.

- +
@@ -165,4 +176,5 @@

Enter Payment Detail

+
\ No newline at end of file diff --git a/src/main/webapp/angular/views/registration.html b/src/main/webapp/angular/views/registration.html index 1479431..f8847b7 100644 --- a/src/main/webapp/angular/views/registration.html +++ b/src/main/webapp/angular/views/registration.html @@ -25,122 +25,143 @@
- -
-
-
+ +
+
+
-
+
-

Choose Your Cloud Name:

+

Choose your Cynja ID:

+
Your Cynja ID is your name in CynjaSpace!
+Parents-please register for your own personal ID here & you'll register for your kids once inside our portal.
-
Cloud Name is required.
+
Cloud Name is required.
- - + +
-
e.g: =jane,=john
+
e.g, =grant, =grantwiley, =grant.wiley
- +
-
+
-

Registration Details

+

To ensure a secure CynjaSpace we need to verify your email and phone by sending a verification code.

- +
-
Email is required
-
Given email address is invalid
+
Email is required
+
Given email address is invalid
- -
Phone number must contain 10 digits
-
Country Code is required
-
Phone number is required
+ +
Should be a number and must contain minimum 6 and max 14 digits
+
Country code is required
+
Phone number is required
- -
Password is required
-
Passwords must be between 8 and 20 characters.
-
Must contain one lower & uppercase letter, and one non-alpha character (a number or a symbol.)
+ +
Passwords must be 8-20 characters, have at least 2 letters, 2 numbers and at least one special character, e.g. @, #, $
+ +
Password is required
+ +
-
Confirm password is required.
+
Confirm password is required.
- - + +
-
+
-

Enter Verification Code sent to your email and Mobile

+

Verification codes have been sent to your email and phone. Enter both codes in the fields below.

-
{{user.errorMessage}}
+
{{user.errorMessage}}
-
required
+
Email code is required
-
required
+
Phone code is required
- -
-

I agree to CSP trust framework and one person one account rule

- -
- - + +
+
+ +
+

+ I agree to Respect Trust Framework and the one-person account rule.

+
+
Please agree on rule.
+
+ +
+
+ +
+

+ I agree to terms of service.

+
+
Please agree on terms of service.
+
+
+ +
-
+
-

Select Your Payment method

+

Select Your Payment method

{{user.errorMessage}}
-
+

Credit Card
Life Hosting + Lifetime Connection

@@ -150,12 +171,13 @@

Select Your Payment method

-

I agree to CSP terms of service

+

I agree to CSP terms of service

required
-
+ +
@@ -194,16 +216,666 @@

Enter Payment Detail

+
+ Already a cynja click here + FAQ +
-

Thank you {{user.cloudName}} for your personal cloud order. - - We will shortly notify once we complete registering your cloud with the network.
- - We are processing your order and will notify you once it completes registration in the network.

-

Click Here for login Page.

-
+

+Welcome {{user.cloudName}} to CynjaSpace!
+Cyberspace will never look the same again!
+Start Your Cynja Adventure By Creating Cynja IDs for Your Kids!
+Each child will need its own ID. +

+

Click Here to register your kids!

+
+ +
+
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/main/webapp/angular/views/userFooter.html b/src/main/webapp/angular/views/userFooter.html index eaad7dd..cfc7852 100644 --- a/src/main/webapp/angular/views/userFooter.html +++ b/src/main/webapp/angular/views/userFooter.html @@ -21,10 +21,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --> - @@ -43,7 +43,7 @@ Home
  • - Contact Us + Contact Us
      • @@ -82,10 +82,10 @@

      Change Password

      - +
      Password is required
      Passwords must be between 8 and 20 characters.
      -
      Must contain one lower & uppercase letter, and one non-alpha character (a number or a symbol.)
      +
      Passwords must be 8-20 characters, have at least 2 letters, 2 numbers and at least one special character, e.g. @, #, $
      @@ -95,7 +95,7 @@

      Change Password

      - +
      diff --git a/src/main/webapp/angular/views/userHome.html b/src/main/webapp/angular/views/userHome.html index 5c64726..3d25111 100644 --- a/src/main/webapp/angular/views/userHome.html +++ b/src/main/webapp/angular/views/userHome.html @@ -26,47 +26,56 @@
      -
      - -
      - -
      -

      Welcome To The Future Of Personal Data

      -

      Personal cloud is the individual’s collection of digital content, services and apps which are seamlessly accessible across any device.The personal cloud is not a tangible entity, but rather the realization of four different types of experience in which users store, synchronize,stream and share content on a contextual basis, moving from one platform, screen and location to another.

      - Read More +
      + +

      CynjaSpace, in partnership with Respect Network, is enabling secure, authentic and trusted relationships in the digital world.

      To do so we have made it possible for you to be an individual with 100% complete ownership and control over your data, your relationships, your communications- your digital life.

      + This is your dashboard to your Personal Private Cloud - think of it as your command center for your digital self.       +

      - + +
      -
      - -
      Dependents
      +
      +
      +
      Children
      - -
      + +
      +
      + +
      +
      Add Guardian
       +
      +
      +
      +
      +
      Download CynjaSpace App
       +
      Currently this Beta Test is only available for iPad.
      - + \ No newline at end of file diff --git a/src/main/webapp/css/angular-bootstrap-datepicker.css b/src/main/webapp/css/angular-bootstrap-datepicker.css index 03bd90d..afead95 100644 --- a/src/main/webapp/css/angular-bootstrap-datepicker.css +++ b/src/main/webapp/css/angular-bootstrap-datepicker.css @@ -428,10 +428,13 @@ .datepicker thead tr:first-child th, .datepicker tfoot tr th { cursor: pointer; + background-color: #0050CC; + color:white; } .datepicker thead tr:first-child th:hover, .datepicker tfoot tr th:hover { background: #eeeeee; + color:black; } .datepicker .cw { font-size: 10px; diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css index 74279fa..f15d870 100644 --- a/src/main/webapp/css/style.css +++ b/src/main/webapp/css/style.css @@ -42,7 +42,7 @@ a{ } .bg-img-one{ - background: url('../images/background2.jpg') 50% no-repeat; + background: url('../images/background_001.jpg') 50% no-repeat; background-size: cover; background-attachment: fixed; display: block; @@ -52,12 +52,12 @@ a{ } .bg-img-two{ - background: url('../images/background3.jpg') 50% no-repeat; + background: url('../images/week7.jpg') 50% no-repeat; background-size: cover; background-attachment: fixed; display: block; width: 100%; - min-height: 92%; + min-height: 100%; } .bg-img-three{ @@ -72,21 +72,23 @@ a{ .login-container{ padding:20px; - box-shadow: 0px 0px 10px 0px #000; - margin:50px auto; + box-shadow: 0px 0px 47px 26px #fff; + margin:10px auto; display: block; width: 40%; border-radius: 10px; - background-color:; + /*background-color:#4DAFD6; */ + background-color:#00709A; + } .registration-container{ padding:20px; - box-shadow: 0px 0px 10px 0px #000; - margin:50px auto 0; + box-shadow: 0px 0px 47px 26px #fff; + margin:10px auto ; display: block; - width: 38%; + width: 40%; border-radius: 10px; - background-color:; + background-color:#00709A; } .cloudName-container{ padding:20px; @@ -152,7 +154,7 @@ a{ .registration-container input,.registration-container textarea{ - padding:10px 15px; + padding:10px 11px; width: 90%; margin: 15px 0 0 21px; border-radius: 10px; @@ -235,8 +237,8 @@ header { } .header-logo{ - text-align: left; - margin-top: 30px; + text-align: center; + /*margin-top: 30px;*/ } .space{ @@ -271,8 +273,8 @@ nav{ nav ul li{ - float:left; - padding: 10px 26px 10px 14px; + float:none; + padding: 0px 41px 5px 5px; } @@ -319,7 +321,7 @@ nav ul li:hover{ box-shadow:none; } nav ul li a{ - color:#000; + color:#fff; font-weight: bold; text-decoration: none; cursor: pointer; @@ -393,10 +395,10 @@ footer{ } .step2{ - padding: 10px 33px 10px 24px; + /*padding: 10px 33px 10px 24px;*/ } .checkbox{ - margin-bottom: 16px; + margin-bottom: 20px; width: 20px; padding-left:11px; } @@ -406,7 +408,7 @@ footer{ } .checkbox-three{ - width: 42% !important + width: 43% !important } .tele{ @@ -419,9 +421,9 @@ footer{ } .para{ - margin: -14px 116px 30px 28px; + margin: -14px 66px 30px 28px; display: block; - padding-left: 15px; + padding-left: 11px; text-indent: -15px; } @@ -429,7 +431,9 @@ footer{ margin: -9px 116px 11px -170px; display: block; padding: 10px 33px -13px 24px; - text-indent: -15px; + text-indent: 58px; + color:#68b8d8; + font-weight: bold; } .checkbox-four{ @@ -452,10 +456,10 @@ footer{ } #para1 { - font-size:180%; + font-size:x-large; - padding:190px 135px 0px 150px; - text-align:justify; + padding:94px 0 0; + text-align:center; } #para2 { @@ -502,10 +506,10 @@ footer{ display:block; border-radius:100%; color:#000; - width: 150px; - height: 150px; + width: 160px; + height: 160px; text-align: center; - padding: 25px 43px; + padding:17px 31px; margin:20px auto; } @@ -547,7 +551,7 @@ footer{ .table-heading{ margin-top: 150px; - background-image: linear-gradient(#337ab7, #337ab7); + background-color: #337ab7; border-bottom: 1px solid #337ab7; border-right: 1px solid #337ab7; color: #fff; @@ -690,9 +694,8 @@ footer{ box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset; } .hasError .control-label { - color: #b94a48; + color: red; border-color: #a94442; - } .nav-pills li{ background-color :#f8f8ff; @@ -784,4 +787,41 @@ footer{ .head-padding{ padding: 8px 11px; } - +.font-white{ + font-weight: 900; + color : #fff; +} + +.navbar-inverse .navbar-nav > li > a { + color : #000; +} +.navbar-inverse .navbar-nav > li > a:hover ,.navbar-inverse .navbar-nav > li > a:focus{ + + color : #68B8D8; +} +.dropdown-menu > li > a { + color : #000; + font-weight : bold; +} +.dropdown-menu > li > a:hover ,.dropdown-menu li > a:focus{ + + color : #68B8D8; +} +.orange{ + background-color: #f26522; + color : white; + font-weight: 900 !important; +} +.purple{ + background-color: #9c398c; + color : white; + font-weight: 900 !important; +} +.verifyCode{ + width: 37% !important; + float: inherit !important; +} +.pullCenter{ + width: 44% !important; + float: inherit !important; +} \ No newline at end of file diff --git a/src/main/webapp/images/background 003_low res.jpg b/src/main/webapp/images/background 003_low res.jpg new file mode 100644 index 0000000..b4708e1 Binary files /dev/null and b/src/main/webapp/images/background 003_low res.jpg differ diff --git a/src/main/webapp/images/background_001.jpg b/src/main/webapp/images/background_001.jpg new file mode 100644 index 0000000..cdc1fef Binary files /dev/null and b/src/main/webapp/images/background_001.jpg differ diff --git a/src/main/webapp/images/cynjapp.png b/src/main/webapp/images/cynjapp.png new file mode 100644 index 0000000..4ff356d Binary files /dev/null and b/src/main/webapp/images/cynjapp.png differ diff --git a/src/main/webapp/images/kids_cynja.png b/src/main/webapp/images/kids_cynja.png new file mode 100644 index 0000000..ccac454 Binary files /dev/null and b/src/main/webapp/images/kids_cynja.png differ diff --git a/src/main/webapp/images/kids_jo.png b/src/main/webapp/images/kids_jo.png new file mode 100644 index 0000000..ec1b371 Binary files /dev/null and b/src/main/webapp/images/kids_jo.png differ diff --git a/src/main/webapp/images/logo.png b/src/main/webapp/images/logo.png new file mode 100644 index 0000000..2df3da1 Binary files /dev/null and b/src/main/webapp/images/logo.png differ diff --git a/src/main/webapp/images/portal.png b/src/main/webapp/images/portal.png new file mode 100644 index 0000000..912b4dc Binary files /dev/null and b/src/main/webapp/images/portal.png differ diff --git a/src/main/webapp/images/smileyface.png b/src/main/webapp/images/smileyface.png new file mode 100644 index 0000000..73cc3e7 Binary files /dev/null and b/src/main/webapp/images/smileyface.png differ diff --git a/src/main/webapp/images/week7.jpg b/src/main/webapp/images/week7.jpg new file mode 100644 index 0000000..d984509 Binary files /dev/null and b/src/main/webapp/images/week7.jpg differ diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index b7930b3..a6d75a8 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -60,7 +60,7 @@ THE SOFTWARE. - + diff --git a/src/main/webapp/vendor/js/angular-bootstrap-datepicker.js b/src/main/webapp/vendor/js/angular-bootstrap-datepicker.js index cef1cba..a8a2635 100644 --- a/src/main/webapp/vendor/js/angular-bootstrap-datepicker.js +++ b/src/main/webapp/vendor/js/angular-bootstrap-datepicker.js @@ -2099,7 +2099,7 @@ dp.directive('ngDatepicker', function() { ngOptions: '=', ngModel: '=' }, - template: "
      \n \n
      ", + template: "
      \n \n
      ", link: function(scope, element) { scope.inputHasFocus = false; element.datepicker(scope.ngOptions).on('changeDate', function(e) {