generated from bcgov/quickstart-openshift
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #419 from bcgov/dev
Merge dev->main, including epd-frontend changes
- Loading branch information
Showing
14 changed files
with
296 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json
Large diffs are not rendered by default.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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> | ||
| ) | ||
| } | ||
|
|
||
83 changes: 83 additions & 0 deletions
83
openshift/templates/forms-flow-ai-micro-front-ends/forms-flow-web-ee.build.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" |
Oops, something went wrong.