Skip to content

Commit

Permalink
feat(frontend): UI (#45)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mishraomp
mishraomp authored Mar 21, 2024
1 parent 633b111 commit 62be88e
Show file tree
Hide file tree
Showing 16 changed files with 397 additions and 339 deletions.
16 changes: 0 additions & 16 deletions charts/nr-omrr-transparency/templates/backend/templates/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,6 @@ spec:
securityContext:
{{- toYaml .Values.backend.podSecurityContext | nindent 12 }}
{{- end }}
initContainers:
- name: {{ include "backend.fullname" . }}-init
image: "{{.Values.global.registry}}/{{.Values.global.repository}}/migrations:{{ .Values.global.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ default "IfNotPresent" .Values.backend.imagePullPolicy }}
envFrom:
- secretRef:
name: {{.Release.Name}}
env:
- name: FLYWAY_BASELINE_ON_MIGRATE
value: "true"
- name: FLYWAY_DEFAULT_SCHEMA
value: "USERS"
- name: FLYWAY_CONNECT_RETRIES
value: "10"
resources:
{{- toYaml .Values.backend.initContainerResources | nindent 12 }}
containers:
- name: {{ include "backend.fullname" . }}
{{- if .Values.backend.securityContext }}
Expand Down
2 changes: 1 addition & 1 deletion charts/nr-omrr-transparency/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ crunchy: # enable it for TEST and PROD, for PR based pipelines simply use single
memory: 128Mi

bitnami-pg:
enabled: true
enabled: false
image:
registry: ghcr.io
repository: bcgov/nr-containers/bitnami/postgresql
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/App.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default function App() {
<Grid item xs={12}>
<Header />
</Grid>
<Grid item style={{ flexGrow: 1, minHeight:'93vh' }} xs={12}>
<Grid item style={{ flexGrow: 1, minHeight: '93vh' }} xs={12}>
{status === 'loading' ? (
<CircularProgress />
) : status === 'failed' ? (
Expand Down
6 changes: 6 additions & 0 deletions frontend/src/assets/BC.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions frontend/src/assets/font-awesome-government.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions frontend/src/assets/font-awesome-identity.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions frontend/src/assets/font-awesome-verification.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/homepage-banner-unsplash.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions frontend/src/components/AuthorizationDetails.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default function AuthorizationDetails() {
<Stack direction="row" justifyContent="space-between">
<span style={{
color:'#000000',
fontFamily: 'BC Sans',
fontFamily: 'BCSans',
fontStyle: 'bold',
fontSize: '2em',
lineHeight: '3em',
Expand All @@ -53,7 +53,7 @@ export default function AuthorizationDetails() {
<Grid item xs={3}>
<span style={{
color: '#000000',
fontFamily: 'BC Sans',
fontFamily: 'BCSans',
fontStyle: 'normal',
fontWeight: 'bold',
fontSize: '1em',
Expand All @@ -63,7 +63,7 @@ export default function AuthorizationDetails() {
<Grid item xs={3}>
<span style={{
color: '#000000',
fontFamily: 'BC Sans',
fontFamily: 'BCSans',
fontStyle: 'normal',
fontWeight: 'bold',
fontSize: '1em',
Expand All @@ -73,7 +73,7 @@ export default function AuthorizationDetails() {
<Grid item xs={3}>
<span style={{
color: '#000000',
fontFamily: 'BC Sans',
fontFamily: 'BCSans',
fontStyle: 'normal',
fontWeight: 'bold',
fontSize: '1em',
Expand All @@ -83,7 +83,7 @@ export default function AuthorizationDetails() {
<Grid item xs={3}>
<span style={{
color: '#000000',
fontFamily: 'BC Sans',
fontFamily: 'BCSans',
fontStyle: 'normal',
fontWeight: 'bold',
fontSize: '1em',
Expand Down
30 changes: 16 additions & 14 deletions frontend/src/components/AuthorizationList.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default function AuthorizationList() {
<Typography
variant="h6"
sx={{
fontFamily: 'BC Sans',
fontFamily: 'BCSans',
fontWeight: 700,
fontSize: 48,
color: '#000000',
Expand All @@ -120,7 +120,7 @@ export default function AuthorizationList() {
>
Authorizations
</Typography>
<Typography component="div">
<Typography variant="h6" gutterBottom sx={{fontFamily: 'BCSans',}}>
Authorized compost and biosolid facilities in B.C.
</Typography>
</CardContent>
Expand All @@ -129,11 +129,13 @@ export default function AuthorizationList() {
<Grid container spacing={2} sx={{ marginTop: '4vh' }}>
<Grid item xs={12}>
<Card
elevation={0}
variant="outlined"
sx={{
padding: '2em',
marginTop: '0.1em',
backgroundColor: '#D1CFCD',
backgroundColor: '#FCC85D',
borderRadius:'0'
}}
>
{headerCard}
Expand Down Expand Up @@ -329,22 +331,23 @@ export default function AuthorizationList() {
</Grid>
{pagination}
<Grid item xs={12}>
<Grid container spacing={2}>
<Grid container spacing={3}>
{filteredValue &&
filteredValue.length > 0 &&
filteredValue
.slice((page - 1) * 10, page * 10)
.map((item, index) => (
<Grid key={index} item xs={12} sx={{ width: '90vw' }}>
<Card
sx={{ background: '#E0DEDC', order: 5, width: '90vw' }}
elevation={0}
sx={{ background: '#F1F8FE', order: 5, width: '90vw' }}
key={index}
>
<CardContent>
<Typography variant="body2" color="text.secondary">
<span
style={{
fontFamily: 'BC Sans',
fontFamily: 'BCSans',
fontStyle: 'normal',
fontWeight: 700,
}}
Expand All @@ -365,7 +368,7 @@ export default function AuthorizationList() {
<Typography variant="h5" component="div">
<span
style={{
fontFamily: 'BC Sans',
fontFamily: 'BCSans',
fontStyle: 'normal',
fontWeight: 700,
}}
Expand All @@ -378,7 +381,7 @@ export default function AuthorizationList() {
<Grid item xs={6}>
<span
style={{
fontFamily: 'BC Sans',
fontFamily: 'BCSans',
fontStyle: 'normal',
fontWeight: 700,
}}
Expand All @@ -389,7 +392,7 @@ export default function AuthorizationList() {
<Grid item xs={6}>
<span
style={{
fontFamily: 'BC Sans',
fontFamily: 'BCSans',
fontStyle: 'normal',
fontWeight: 700,
}}
Expand All @@ -406,7 +409,7 @@ export default function AuthorizationList() {
<Grid item xs={6}>
<span
style={{
fontFamily: 'BC Sans',
fontFamily: 'BCSans',
fontStyle: 'normal',
}}
>
Expand All @@ -416,7 +419,7 @@ export default function AuthorizationList() {
<Grid item xs={6}>
<span
style={{
fontFamily: 'BC Sans',
fontFamily: 'BCSans',
fontStyle: 'normal',
}}
>
Expand Down Expand Up @@ -462,12 +465,11 @@ export default function AuthorizationList() {
<Button
size="large"
sx={{
border: '1px solid #353433',
border: '1px solid #053662;',
borderRadius: '4px',
color: '#000000',
boxSizing: 'border-box',
backgroundColor: '#D1CFCD',
textTransform: 'none',
color: '#255A90;',
}}
onClick={() =>
buttonClicked(
Expand Down
Loading

0 comments on commit 62be88e

Please sign in to comment.