bcgov · nikhila-aot · Jul 28, 2023 · Jul 26, 2023 · Jul 26, 2023 · Jul 27, 2023
diff --git a/.github/openshift/deploy.frontend.yml b/.github/openshift/deploy.frontend.yml
@@ -63,15 +63,15 @@ objects:
             "REACT_APP_NODE_ENV": "production",
             "REACT_APP_AUTH_AUTHORITY": "https://epd-keycloak-${ENV}.apps.silver.devops.gov.bc.ca/auth/realms/forms-flow-ai/",
             "REACT_APP_AUTH_CLIENT_ID": "${REACT_APP_AUTH_CLIENT_ID}",
-            "REACT_APP_AUTH_REDIRECT_URI": "https://epd-frontend-${ENV}.apps.silver.devops.gov.bc.ca/dashboard",            
+            "REACT_APP_AUTH_REDIRECT_URI": "https://forms-flow-web-root-config-${ENV}.apps.silver.devops.gov.bc.ca/",            
             "REACT_APP_AUTH_LOGOUT_REDIRECT_URI": "https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi?retnow=1&returl=https://epd-keycloak-${ENV}.apps.silver.devops.gov.bc.ca/auth/realms/forms-flow-ai/protocol/openid-connect/logout?post_logout_redirect_uri=https://epd-frontend-${ENV}.apps.silver.devops.gov.bc.ca",
             "REACT_APP_AUTH_RESPONSE_TYPE": "code",
             "REACT_APP_AUTH_SCOPE": "openid profile",
             "REACT_APP_BACKEND_API": "https://epd-backend-gateway-${ENV}.apps.silver.devops.gov.bc.ca",            
             "REACT_APP_AUTH_FILTER_PROTOCOL_CLAIMS": "true",
             "REACT_APP_AUTH_LOAD_USER_INFO": "true",  
             "REACT_APP_AUTH_REVOKE_TOKENS_ON_SIGNOUT": "true",
-            "REACT_APP_FORMSFLOW_WEB_URL": "https://forms-flow-web-e38158-${ENV}.apps.silver.devops.gov.bc.ca/",
+            "REACT_APP_FORMSFLOW_WEB_URL": "https://forms-flow-web-root-config-${ENV}.apps.silver.devops.gov.bc.ca/",
             "REACT_APP_CUSTOM_MAP_URL": "https://epd-frontend-${ENV}.apps.silver.devops.gov.bc.ca/map"
           }
   - apiVersion: v1

diff --git a/backend/applications/src/app/controllers/form.controller.ts b/backend/applications/src/app/controllers/form.controller.ts
@@ -39,8 +39,6 @@ export class FormController {
     @Param('formId') formId,
     @Body() content,
   ): Promise<SubmissionResponse> {
-    console.log(content);
-    console.log('formId 2' + formId);
     const savedSubmission = await this.formService.create(formId, content.data);
     const submissionResponse: SubmissionResponse =
       this.transformResult(savedSubmission);
@@ -53,7 +51,6 @@ export class FormController {
    * @returns saved form in formflow expected format
    */
   transformResult(savedSubmission: Form) {
-    console.log(savedSubmission);
     const submissionResponse: SubmissionResponse = new SubmissionResponse();
     submissionResponse._id = savedSubmission.id;
     submissionResponse.form = savedSubmission.formId;
@@ -75,7 +72,6 @@ export class FormController {
     @Param('submissionId') submissionId,
     @Body() content,
   ): Promise<any> {
-    console.log('Update Called,', content.data);
     return await this.formService.update(submissionId, formId, content.data);
   }
 
@@ -91,7 +87,6 @@ export class FormController {
     @Param('submissionId') submissionId,
     @Body() content,
   ) {
-    console.log('Partial Update Called,', content.data);
     //const toUpdateContent = JSON.parse(content.data);
     //let i=0;
     return await this.formService.partialUpdate(

diff --git a/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json b/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json
diff --git a/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json b/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json
diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -25,7 +25,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>Site Remediation Services | British Columbia</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -36,3 +36,10 @@
     transform: rotate(360deg);
   }
 }
+
+
+
+#landing-container {
+  /* 58px = height of footer (48px) plus 10px for centering */
+  min-height: calc(100vh - 58px);
+}
diff --git a/frontend/src/app/components/landing/LoginPanel.css b/frontend/src/app/components/landing/LoginPanel.css
@@ -3,6 +3,12 @@
     height: 250px;
 }
 
+#idir-login-panel {
+    justify-content: center;
+    display: flex;
+    align-items: center;
+    margin-top: 46px; /* button-height */
+}
 
 #lrs-signup-button{
     background-color: #FFFFFF;

diff --git a/frontend/src/app/components/landing/LoginPanel.tsx b/frontend/src/app/components/landing/LoginPanel.tsx
@@ -5,15 +5,15 @@ import "./LoginPanel.css"
 
 
 export const LoginPanel = () =>{
-    const loginDropdownTitle = "Log in to my LRS Account";
+    const loginDropdownTitle = "Login to my account";
     return(
-        <Row  className="login-panel py-5 mb-3  " id="login-panel">
-            <Col id="idir-login-panel" className="mt-auto mb-2 col-xs-12 col-md-6 text-center text-sm-end">
+        <Row  className="login-panel py-5 mb-3 d-flex" id="login-panel">
+            <div id="idir-login-panel">
                 {LoginDropdown(loginDropdownTitle)}
-            </Col>
-            <Col id="lrs-signup-panel" className="mt-auto mb-2 col-xs-12  col-md-6 text-center text-sm-start">
+            </div>
+            {/* <Col id="lrs-signup-panel" className="mt-auto mb-2 col-xs-12  col-md-6 text-center text-sm-start">
                 <Button id="lrs-signup-button" href="/signup" className="login-btn-lh">
                     Sign Up</Button>
-            </Col>        
+            </Col>         */}
         </Row>       
     )}
diff --git a/frontend/src/app/components/navigation/Footer.tsx b/frontend/src/app/components/navigation/Footer.tsx
@@ -6,12 +6,12 @@ const Footer = () => {
     <footer className="footer">
     <div className="container">
     <ul>
-      <li><a href=".">Home</a></li>
-      <li><a href=".">Disclaimer</a></li>
-      <li><a href=".">Privacy</a></li>
-      <li><a href=".">Accessibility</a></li>
-      <li><a href=".">Copyright</a></li>
-      <li><a href=".">Contact Us</a></li>
+      <li><a href="/">Home</a></li>
+      <li><a href="https://www2.gov.bc.ca/gov/content/home/disclaimer">Disclaimer</a></li>
+      <li><a href="https://www2.gov.bc.ca/gov/content/home/privacy">Privacy</a></li>
+      <li><a href="https://www2.gov.bc.ca/gov/content/home/accessible-government">Accessibility</a></li>
+      <li><a href="https://www2.gov.bc.ca/gov/content/home/copyright">Copyright</a></li>
+      <li><a href="https://www2.gov.bc.ca/gov/content/home/get-help-with-government-services">Contact Us</a></li>
     </ul>
     </div>
     </footer>

diff --git a/frontend/src/app/components/navigation/Header.tsx b/frontend/src/app/components/navigation/Header.tsx
@@ -20,7 +20,7 @@ const Header = () => {
         <a href="https://gov.bc.ca">
           <img src={logo} alt="BC Government Logo" />
         </a>
-        <h1>Land Remediation Services</h1>
+        <h1>Site Remediation Services</h1>
       </div>
       {auth.isAuthenticated ? (
         <Dropdown>

diff --git a/frontend/src/app/features/landing/Landing.tsx b/frontend/src/app/features/landing/Landing.tsx
@@ -10,7 +10,7 @@ const Landing = () =>{
     return(
         <Container fluid className="landing-container mt-3" id="landing-container">
             <LoginPanel/>
-            <Row id="responsive-lrs-nav" className="">
+            {/* <Row id="responsive-lrs-nav" className="">
                 <Col className="col-12 col-md-3" >
                     <ResponsiveNavigationSidebar/>
                 </Col>
@@ -22,7 +22,39 @@ const Landing = () =>{
                     {LRSFormAccordion(forms)}
                     </Row>
                 </Col>
+            </Row> */}
+
+            <Row>
+                <Col className="col-12 col-sm-6 offset-sm-3">
+                    <p>Welcome to the new Site Remediation Services (SRS) web app.</p>
+
+                    <p>You can now easily submit applications for site remediation services and track the status of your application.</p>
+
+                    <p>Use the Site Remediation Services (SRS) web app to complete an application for:</p>
+
+                    <ul>
+                        <li>Contaminated Site Services Application (CSSA)</li>
+                        <li>Site Disclosure Statement</li>
+                        <li>Site Risk Classification Report</li>
+                    </ul>
+
+                    <p>These, as well as all other forms can be completed using the Site Remediation Forms</p>
+
+                    <p>Site remediation forms - Province of British Columbia</p>
+
+                    <p>Forms for site remediation procedures for land, air and water in B.C.</p>
+                </Col>
+
+
+                <Col className="col-12 col-sm-6 offset-sm-3 small">
+                    <hr />
+                    <p>Collection Notice for Environmental Protection Platform:</p>
+                    <p>Your personal information is collected under 26(c) of the Freedom of Information and Protection of Privacy Act for the purpose of accessing services of the Environmental Protection Division. If you have any questions about the collection of your information, please contact Site Remediation Services at <a href="mailto:[email protected]">[email protected]</a>.</p>
+                    <p>Collection Notice for Site Remediation Forms:</p>
+                    <p>Your personal information is collected under 26(c) of the Freedom of Information and Protection of Privacy Act for the purpose of receiving site remediation services. If you have any questions about the collection of your information, please contact Site Remediation Services at <a href="mailto:[email protected]">[email protected]</a></p>        
+                </Col>
             </Row>
+
         </Container>
         )
 }

diff --git a/openshift/templates/forms-flow-ai-micro-front-ends/forms-flow-web-ee.build.yaml b/openshift/templates/forms-flow-ai-micro-front-ends/forms-flow-web-ee.build.yaml
@@ -0,0 +1,83 @@
+---
+kind: Template
+apiVersion: v1
+metadata:
+  name: "${API_NAME}-build-template"
+  creationTimestamp: 
+objects:
+- kind: ImageStream
+  apiVersion: v1
+  metadata:
+    name: "${API_NAME}"
+- kind: BuildConfig
+  apiVersion: v1
+  metadata:
+    name: "${API_NAME}-build"
+    labels:
+      app: "${API_NAME}-build"
+  spec:
+    completionDeadlineSeconds: 3600 # NOT WORKING?: Custom build time of 1hr, as builds are looong - STILL FAILS AFTER 30m
+    resources:
+      limits:
+        cpu: "1500m" 
+        memory: "4Gi"    
+      requests:
+        cpu: "500m"
+        memory: "2Gi" 
+    runPolicy: Serial
+    source:
+      type: Git
+      git:
+        uri: "${GIT_REPO_URL}"
+        ref: "${GIT_REF}"
+      contextDir: "${SOURCE_CONTEXT_DIR}"
+    strategy:
+      type: Docker
+      dockerStrategy:
+        dockerfilePath: "${DOCKER_FILE_PATH}"
+        env:
+        - name: ssh_prv_key
+          valueFrom:
+            secretKeyRef:
+              name: ff-ee-deploy-key
+              key: ssh-privatekey
+        - name: ssh_pub_key
+          valueFrom:
+            secretKeyRef:
+              name: ff-ee-deploy-key-pub
+              key: ssh-privatekey
+    output:
+      to:
+        kind: ImageStreamTag
+        name: "${API_NAME}:${ENV_TAG}"
+parameters:
+- name: API_NAME
+  displayName: Name
+  description: The name assigned to all of the resources defined in this template.
+  required: true
+  value: forms-flow-web-ee
+- name: ENV_TAG
+  displayName: Environment name
+  description: The name of the environment, in build names and image stream tags
+  required: true
+  value: dev
+- name: GIT_REPO_URL
+  displayName: Git Repo URL
+  description: The URL to your GIT repo.
+  required: true
+  value: https://github.com/bcgov/nr-epd-digital-services
+- name: GIT_REF
+  displayName: Git Reference
+  description: The git reference or branch.
+  required: true
+  value: dev
+- name: SOURCE_CONTEXT_DIR
+  displayName: Source Context Directory
+  description: The source context directory.
+  required: false
+  value: forms-flow-ai/forms-flow-ai-ee/forms-flow-web
+- name: DOCKER_FILE_PATH
+  displayName: Docker File Path
+  description: The path to the docker file defining the build.
+  required: false
+  value: "Dockerfile"