diff --git a/backend/main.go b/backend/main.go index 1590083..d4aee14 100644 --- a/backend/main.go +++ b/backend/main.go @@ -79,16 +79,18 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.String(http.StatusOK, "Connection is OK") case "check-connection": err = db.QueryRow("SELECT 1 AS result").Scan(&result) if err != nil { - c.AbortWithError(http.StatusBadGateway, err) + // c.AbortWithError(http.StatusBadRequest, err) + // c.String(http.StatusBadRequest, err.Error()) + // c.String(http.StatusBadGateway, "false") c.JSON(http.StatusBadGateway, gin.H{"result": false}) return + } c.JSON(http.StatusOK, gin.H{"result": true}) @@ -103,14 +105,12 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } for results.Next() { err = results.Scan(&result, &result2) if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } array = append(array, result) array2 = append(array2, result2) @@ -127,14 +127,12 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } for results.Next() { err = results.Scan(&result) if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } array = append(array, result) } @@ -152,14 +150,12 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } for results.Next() { err = results.Scan(&result, &result2) if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } array = append(array, result) array2 = append(array2, result2) @@ -176,14 +172,12 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } for results.Next() { err = results.Scan(&result) if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } array = append(array, result) } @@ -213,7 +207,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, @@ -224,7 +217,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, @@ -235,7 +227,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, @@ -246,7 +237,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, @@ -257,7 +247,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, @@ -270,7 +259,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, @@ -288,7 +276,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, @@ -304,7 +291,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, @@ -324,14 +310,12 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } for results.Next() { err = results.Scan(&result, &result2) if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } array = append(array, result) array2 = append(array2, result2) @@ -352,14 +336,12 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } for results.Next() { err = results.Scan(&result, &result2) if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } array = append(array, result) array2 = append(array2, result2) @@ -380,14 +362,12 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } for results.Next() { err = results.Scan(&result, &result2) if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } array = append(array, result) array2 = append(array2, result2) @@ -409,14 +389,12 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } for results.Next() { err = results.Scan(&result, &result2, &result3, &result4) if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } array = append(array, result) array2 = append(array2, result2) @@ -446,7 +424,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, @@ -457,7 +434,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, @@ -468,7 +444,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, @@ -479,7 +454,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, @@ -490,7 +464,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, @@ -501,7 +474,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, @@ -515,7 +487,6 @@ func connect() { } else { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } } @@ -531,7 +502,6 @@ func connect() { } else { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } } @@ -547,7 +517,6 @@ func connect() { } else { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } } c.JSON(http.StatusOK, gin.H{ @@ -574,14 +543,12 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } for results.Next() { err = results.Scan(&result, &result2, &result3, &result4, &result5, &result6, &result7, &result8, &result9, &result10, &result11, &result12) if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } array = append(array, result) array2 = append(array2, result2) @@ -617,7 +584,6 @@ func connect() { if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) - return } c.JSON(http.StatusOK, gin.H{ "result": result, diff --git a/src/assets/images/ocbologo.png b/src/assets/images/ocbologo.png deleted file mode 100644 index 6d9edca..0000000 Binary files a/src/assets/images/ocbologo.png and /dev/null differ diff --git a/src/assets/images/optimized/ocbologo.avif b/src/assets/images/optimized/ocbologo.avif deleted file mode 100644 index 8afd9c6..0000000 Binary files a/src/assets/images/optimized/ocbologo.avif and /dev/null differ diff --git a/src/assets/images/optimized/ocbologo.webp b/src/assets/images/optimized/ocbologo.webp deleted file mode 100644 index 0a2e473..0000000 Binary files a/src/assets/images/optimized/ocbologo.webp and /dev/null differ diff --git a/src/components/Copyright/Copyright.tsx b/src/components/Copyright/Copyright.tsx deleted file mode 100644 index b8338d7..0000000 --- a/src/components/Copyright/Copyright.tsx +++ /dev/null @@ -1,14 +0,0 @@ -interface Props { - year: string - name: string -} - -export default (props: Props) => { - return ( - <> - - Copyright © {props.year} {props.name} All Rights Reserved. - - - ) -} diff --git a/src/components/Footer/Footer.sass b/src/components/Footer/Footer.sass index f7138dc..0215b16 100644 --- a/src/components/Footer/Footer.sass +++ b/src/components/Footer/Footer.sass @@ -2,10 +2,10 @@ .footer padding: 1rem 0 - // margin: 0 2rem 0 0 + margin: 0 2rem position: fixed bottom: 0 - width: 95vw + width: 100% opacity: 0.8 font-size: 1rem diff --git a/src/components/index.ts b/src/components/index.ts index 8182ac0..3a7731d 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -21,7 +21,6 @@ export { default as File } from './File/File' export { default as QR } from './QR/QR' export { default as Input } from './Input/Input' export { default as Radio } from './Radio/Radio' -export { default as Copyright } from './Copyright/Copyright' // export { default as OptimizeBackground } from './Optimizers/OptimizeBackground' // export { default as OptimizeImage } from './Optimizers/OptimizeImage' // export { default as OptimizeLogo } from './Optimizers/OptimizeLogo' diff --git a/src/pages/IndexPage/Index.tsx b/src/pages/IndexPage/Index.tsx index b376092..f97052b 100644 --- a/src/pages/IndexPage/Index.tsx +++ b/src/pages/IndexPage/Index.tsx @@ -1,11 +1,7 @@ import './Index.sass' -import { Button, Page, Padding, Display, Row, Logo, Footer, Image, Copyright } from '../../components' +import { Button, Page, Padding, Display, Row, Logo } from '../../components' import { onMount } from 'solid-js' import { ofetch } from 'ofetch' -import ocboAvif from '../../assets/images/optimized/ocbologo.avif' -import ocboWebp from '../../assets/images/optimized/ocbologo.webp' -import patAvif from '../../assets/images/optimized/pat-alcala.avif' -import patWebp from '../../assets/images/optimized/pat-alcala.webp' const API = import.meta.env.VITE_BACKEND let assessorsNameList: string[] @@ -63,24 +59,6 @@ export default () => { - - ) diff --git a/src/pages/LoginPage/Login.tsx b/src/pages/LoginPage/Login.tsx index 3cfb38c..d135520 100644 --- a/src/pages/LoginPage/Login.tsx +++ b/src/pages/LoginPage/Login.tsx @@ -5,7 +5,6 @@ import { createSignal, Show, createEffect } from 'solid-js' import { ofetch } from 'ofetch' import { SHA1, SHA3 } from 'crypto-js' import { useNavigate } from '@solidjs/router' -import { checkConnection } from '../../utils/functions' export default () => { const API = import.meta.env.VITE_BACKEND @@ -19,15 +18,8 @@ export default () => { const [password, setPassword] = createSignal('') const [loggedin, setLoggedin] = createSignal(0) const [errorMessage, setErrorMessage] = createSignal('') - const [connected, setConnected] = createSignal(true) const login = async () => { - setConnected(await checkConnection()) - if (connected() === false) { - setErrorMessage('No Connection on Server') - return - } - const employeeid = await ofetch(API + 'get-employeeid/' + name(), { parseResponse: JSON.parse }) const dbpassword = await ofetch(API + 'get-password/' + employeeid.result, { parseResponse: JSON.parse }) const hashPassword = await securePassword() @@ -174,28 +166,6 @@ export default () => { - -
setConnected(true)}> - - - - - -

Connection Error

-
-
- - -

{errorMessage()}

-
- - - Click anywhere to close - -
-
-
-
) } diff --git a/src/pages/MainPage/Main.tsx b/src/pages/MainPage/Main.tsx index b037982..db627da 100644 --- a/src/pages/MainPage/Main.tsx +++ b/src/pages/MainPage/Main.tsx @@ -5,7 +5,6 @@ import { Tabs } from '@kobalte/core/tabs' import { ofetch } from 'ofetch' import { onMount, createSignal } from 'solid-js' import dayjs from 'dayjs' -import { checkConnection } from '../../utils/functions' const API = import.meta.env.VITE_BACKEND const PESO = import.meta.env.VITE_PESO @@ -31,9 +30,6 @@ export default () => { const [applicationList, setApplicationList] = createSignal([]) const [nameList, setNameList] = createSignal([]) - const [errorMessage, setErrorMessage] = createSignal('') - const [connected, setConnected] = createSignal(true) - const getListForApproval = async () => { try { const response = await ofetch(API + 'get-listopapproval-electrical', { parseResponse: JSON.parse }) @@ -45,12 +41,6 @@ export default () => { } const load = async () => { - setConnected(await checkConnection()) - if (connected() === false) { - setErrorMessage('Could not gather list of applicaitons') - return - } - await getListForApproval() } @@ -96,9 +86,11 @@ export default () => { signed = await setNewStatus('ELECTRICAL ORDER OF PAYMENT APPROVED AND SIGNED', '170', 'ELECOPAPPROVEDSIGNED') if (signed) { + console.log('Signed') forprinting = await setNewStatus('FOR ELECTRICAL ORDER OF PAYMENT PRINTING', '95', 'ELECOPPRINT') } if (forprinting) { + console.log('For Printing') } } diff --git a/src/utils/functions/checkConnection.ts b/src/utils/functions/checkConnection.ts deleted file mode 100644 index 87e8311..0000000 --- a/src/utils/functions/checkConnection.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { ofetch } from 'ofetch' - -const API = import.meta.env.VITE_BACKEND - -export default async () => { - try { - const check = await ofetch(API + 'check-connection') - const result = check.result - return result - } catch { - return false - } -} diff --git a/src/utils/functions/index.ts b/src/utils/functions/index.ts deleted file mode 100644 index 33c1f54..0000000 --- a/src/utils/functions/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default as checkConnection } from './checkConnection'