diff --git a/frontend/public/index.html b/frontend/public/index.html index 907eff8..2b2c749 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -2,7 +2,7 @@ - + - React App + WATO Finance System diff --git a/frontend/public/manifest.json b/frontend/public/manifest.json index f01493f..ffecb77 100644 --- a/frontend/public/manifest.json +++ b/frontend/public/manifest.json @@ -1,21 +1,11 @@ { - "short_name": "React App", - "name": "Create React App Sample", + "short_name": "Finance", + "name": "WATO Finance System", "icons": [ { - "src": "favicon.ico", + "src": "wato.jpeg", "sizes": "64x64 32x32 24x24 16x16", "type": "image/x-icon" - }, - { - "src": "logo192.png", - "type": "image/png", - "sizes": "192x192" - }, - { - "src": "logo512.png", - "type": "image/png", - "sizes": "512x512" } ], "start_url": ".", diff --git a/frontend/public/wato.jpeg b/frontend/public/wato.jpeg new file mode 100644 index 0000000..1b978a2 Binary files /dev/null and b/frontend/public/wato.jpeg differ diff --git a/frontend/src/components/TicketContent/TicketContentTableRow.js b/frontend/src/components/TicketContent/TicketContentTableRow.js index b7369a9..0965f9d 100644 --- a/frontend/src/components/TicketContent/TicketContentTableRow.js +++ b/frontend/src/components/TicketContent/TicketContentTableRow.js @@ -1,5 +1,6 @@ import React from 'react' import { Input, Td, Th, Tr, Link } from '@chakra-ui/react' +import { addhttps } from '../../utils/utils' const TicketContentTableRow = ({ heading, value, onChange, type }) => { return ( @@ -25,7 +26,7 @@ const TicketContentTableRow = ({ heading, value, onChange, type }) => { {onChange ? ( ) : type === 'URL' ? ( - + {value} ) : ( diff --git a/frontend/src/utils/utils.js b/frontend/src/utils/utils.js index 4bdfd45..9a59a65 100644 --- a/frontend/src/utils/utils.js +++ b/frontend/src/utils/utils.js @@ -41,3 +41,11 @@ export const getFormattedCurrency = (currencyStr) => { }) return `CAD ${currencyFormatter.format(currencyStr)}` } + +// adds https protocol if the url doesnt contain it +export const addhttps = (url) => { + if (!/^(?:f|ht)tps?:\/\//.test(url)) { + url = 'https://' + url + } + return url +}