diff --git a/.env b/.env index c0bbd09..5258a73 100644 --- a/.env +++ b/.env @@ -1,5 +1,7 @@ -# VITE_BACKEND=http://localhost:4320/api/ -VITE_BACKEND=https://ocboapps.davaocity.gov.ph/esign-server/api/ +VITE_BACKEND=http://localhost:4320/api/ +# VITE_BACKEND=https://ocboapps.davaocity.gov.ph/esign-server/api/ +# VITE_BACKEND=http://192.168.7.163/server/api/ +# VITE_BACKEND_=http://192.168.7.165/server/api/ VITE_PESO=₱ VITE_PUBLICIP=58.69.136.59 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 3cb166d..5b75f16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,4 +9,4 @@ RUN pnpm build FROM nginx:alpine AS runtime COPY ./nginx/nginx.conf /etc/nginx/nginx.conf COPY --from=build /app/dist /usr/share/nginx/html -EXPOSE 8089 \ No newline at end of file +EXPOSE 8080 \ No newline at end of file diff --git a/backend/go.mod b/backend/go.mod index d99e4a6..ae8c627 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -35,9 +35,9 @@ require ( github.com/ugorji/go/codec v1.3.1 // indirect go.uber.org/mock v0.6.0 // indirect golang.org/x/arch v0.24.0 // indirect - golang.org/x/crypto v0.48.0 // indirect - golang.org/x/net v0.50.0 // indirect + golang.org/x/crypto v0.47.0 // indirect + golang.org/x/net v0.49.0 // indirect golang.org/x/sys v0.41.0 // indirect - golang.org/x/text v0.34.0 // indirect + golang.org/x/text v0.33.0 // indirect google.golang.org/protobuf v1.36.11 // indirect ) diff --git a/backend/go.sum b/backend/go.sum index be20b6f..8b6a06e 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -82,12 +82,8 @@ golang.org/x/arch v0.24.0 h1:qlJ3M9upxvFfwRM51tTg3Yl+8CP9vCC1E7vlFpgv99Y= golang.org/x/arch v0.24.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A= golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8= golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A= -golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= -golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= -golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60= -golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= @@ -95,8 +91,6 @@ golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE= golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8= -golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= -golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/backend/main.go b/backend/main.go index 2ee9908..832919d 100644 --- a/backend/main.go +++ b/backend/main.go @@ -6,7 +6,6 @@ import ( "log" "net/http" "os" - "time" "ocbo-esign-backend/connections" "ocbo-esign-backend/middleware" @@ -449,15 +448,8 @@ func connect() { "result": result, }) - case "get-datetime": - now := time.Now() - formattedDateTime := now.Format(time.RFC3339) - - c.JSON(http.StatusOK, gin.H{ - "result": formattedDateTime, - }) - } + }) router.GET("/api/:method/:data/fetch-data", func(c *gin.Context) { @@ -1418,7 +1410,6 @@ func connect() { c.JSON(http.StatusOK, gin.H{ "result": result, }) - } }) @@ -1502,35 +1493,35 @@ func connect() { case "get-infoapproval-electrical": var result2, result3, result4 string + array := []string{} + array2 := []string{} + array3 := []string{} + array4 := []string{} - err := db.QueryRow(`SELECT IF(c.firstName IS NULL OR c.firstName = '', c.lastName, CONCAT(c.firstName, ' ', IF(c.middleInitial IS NULL OR c.middleInitial = '', '', CONCAT(c.middleInitial, '. ')), c.lastName)) AS result, DATE_FORMAT(et.date_signed, '%M') AS result2, DATE_FORMAT(et.date_signed, '%e') AS result3, DATE_FORMAT(et.date_signed, '%Y') AS result4 - FROM electrical e JOIN customer c ON e.customerid = c.customerid JOIN esign_transactions et ON e.electricalNo = et.referenceNo WHERE e.electricalNo = ? AND et.esignid = ?`, data, data2).Scan(&result, &result2, &result3, &result4) + results, err := db.Query(`SELECT IF(c.firstName IS NULL OR c.firstName = '', c.lastName, CONCAT(c.firstName, ' ', IF(c.middleInitial IS NULL OR c.middleInitial = '', '', CONCAT(c.middleInitial, '. ')), c.lastName)) AS result, DATE_FORMAT(et.date_signed, '%M') AS result2, DATE_FORMAT(et.date_signed, '%e') AS result3, DATE_FORMAT(et.date_signed, '%Y') AS result4 + FROM electrical e JOIN customer c ON e.customerid = c.customerid JOIN esign_transactions et ON e.electricalNo = et.referenceNo WHERE e.electricalNo = ? AND et.esignid = ?`, data, data2) if err != nil { c.AbortWithError(http.StatusBadRequest, err) c.String(http.StatusBadRequest, err.Error()) return } - c.JSON(http.StatusOK, gin.H{ - "result": result, - "result2": result2, - "result3": result3, - "result4": result4, - }) - - case "get-infoprinted-electrical": - var result2, result3 string - - err := db.QueryRow(`SELECT DATE_FORMAT(et.date_signed, '%M') AS result, DATE_FORMAT(et.date_signed, '%e') AS result2, DATE_FORMAT(et.date_signed, '%Y') AS result3 - FROM electrical e JOIN customer c ON e.customerid = c.customerid JOIN esign_transactions et ON e.electricalNo = et.referenceNo WHERE e.electricalNo = ? AND et.esignid <> ?`, data, data2).Scan(&result, &result2, &result3) - 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) + array3 = append(array3, result3) + array4 = append(array4, result4) } c.JSON(http.StatusOK, gin.H{ - "result": result, - "result2": result2, - "result3": result3, + "result": array, + "result2": array2, + "result3": array3, + "result4": array4, }) } }) diff --git a/docker-compose.yml b/docker-compose.yml index 786862b..53e08d2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,4 +6,4 @@ services: context: . dockerfile: Dockerfile ports: - - 8089:8080 + - 8080:8080 diff --git a/package.json b/package.json index 26756a0..9c6dfb6 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@biomejs/biome": "^2.3.14", "@nanostores/solid": "^1.1.1", "@types/crypto-js": "^4.2.2", - "@types/node": "^24.10.13", + "@types/node": "^24.10.12", "sass-embedded": "^1.97.3", "typescript": "~5.8.3", "vite": "^7.3.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e38b80e..6fe7915 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -82,8 +82,8 @@ importers: specifier: ^4.2.2 version: 4.2.2 '@types/node': - specifier: ^24.10.13 - version: 24.10.13 + specifier: ^24.10.12 + version: 24.10.12 sass-embedded: specifier: ^1.97.3 version: 1.97.3 @@ -92,13 +92,13 @@ importers: version: 5.8.3 vite: specifier: ^7.3.1 - version: 7.3.1(@types/node@24.10.13)(sass-embedded@1.97.3)(sass@1.97.3) + version: 7.3.1(@types/node@24.10.12)(sass-embedded@1.97.3)(sass@1.97.3) vite-plugin-compression2: specifier: ^2.4.0 version: 2.4.0(rollup@4.52.1) vite-plugin-solid: specifier: ^2.11.10 - version: 2.11.10(solid-js@1.9.11)(vite@7.3.1(@types/node@24.10.13)(sass-embedded@1.97.3)(sass@1.97.3)) + version: 2.11.10(solid-js@1.9.11)(vite@7.3.1(@types/node@24.10.12)(sass-embedded@1.97.3)(sass@1.97.3)) packages: @@ -1076,8 +1076,8 @@ packages: '@types/node@16.9.1': resolution: {integrity: sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==} - '@types/node@24.10.13': - resolution: {integrity: sha512-oH72nZRfDv9lADUBSo104Aq7gPHpQZc4BTx38r9xf9pg5LfP6EzSyH2n7qFmmxRQXh7YlUXODcYsg6PuTDSxGg==} + '@types/node@24.10.12': + resolution: {integrity: sha512-68e+T28EbdmLSTkPgs3+UacC6rzmqrcWFPQs1C8mwJhI/r5Uxr0yEuQotczNRROd1gq30NGxee+fo0rSIxpyAw==} '@types/pako@2.0.4': resolution: {integrity: sha512-VWDCbrLeVXJM9fihYodcLiIv0ku+AlOa/TQ1SvYOaBuyrSKgEcro95LJyIsJ4vSo6BXIxOKxiJAat04CmST9Fw==} @@ -2750,7 +2750,7 @@ snapshots: '@types/node@16.9.1': {} - '@types/node@24.10.13': + '@types/node@24.10.12': dependencies: undici-types: 7.16.0 @@ -3504,7 +3504,7 @@ snapshots: transitivePeerDependencies: - rollup - vite-plugin-solid@2.11.10(solid-js@1.9.11)(vite@7.3.1(@types/node@24.10.13)(sass-embedded@1.97.3)(sass@1.97.3)): + vite-plugin-solid@2.11.10(solid-js@1.9.11)(vite@7.3.1(@types/node@24.10.12)(sass-embedded@1.97.3)(sass@1.97.3)): dependencies: '@babel/core': 7.28.4 '@types/babel__core': 7.20.5 @@ -3512,12 +3512,12 @@ snapshots: merge-anything: 5.1.7 solid-js: 1.9.11 solid-refresh: 0.6.3(solid-js@1.9.11) - vite: 7.3.1(@types/node@24.10.13)(sass-embedded@1.97.3)(sass@1.97.3) - vitefu: 1.1.1(vite@7.3.1(@types/node@24.10.13)(sass-embedded@1.97.3)(sass@1.97.3)) + vite: 7.3.1(@types/node@24.10.12)(sass-embedded@1.97.3)(sass@1.97.3) + vitefu: 1.1.1(vite@7.3.1(@types/node@24.10.12)(sass-embedded@1.97.3)(sass@1.97.3)) transitivePeerDependencies: - supports-color - vite@7.3.1(@types/node@24.10.13)(sass-embedded@1.97.3)(sass@1.97.3): + vite@7.3.1(@types/node@24.10.12)(sass-embedded@1.97.3)(sass@1.97.3): dependencies: esbuild: 0.27.2 fdir: 6.5.0(picomatch@4.0.3) @@ -3526,14 +3526,14 @@ snapshots: rollup: 4.52.1 tinyglobby: 0.2.15 optionalDependencies: - '@types/node': 24.10.13 + '@types/node': 24.10.12 fsevents: 2.3.3 sass: 1.97.3 sass-embedded: 1.97.3 - vitefu@1.1.1(vite@7.3.1(@types/node@24.10.13)(sass-embedded@1.97.3)(sass@1.97.3)): + vitefu@1.1.1(vite@7.3.1(@types/node@24.10.12)(sass-embedded@1.97.3)(sass@1.97.3)): optionalDependencies: - vite: 7.3.1(@types/node@24.10.13)(sass-embedded@1.97.3)(sass@1.97.3) + vite: 7.3.1(@types/node@24.10.12)(sass-embedded@1.97.3)(sass@1.97.3) webworkify@1.5.0: {} diff --git a/podman.container b/podman.container index 0dfb872..ef4590e 100644 --- a/podman.container +++ b/podman.container @@ -1,10 +1,10 @@ [Unit] -Description=OCBO e-Sign +Description=FWT [Container] -ContainerName=esign -Image=localhost/esign_e-sign -PublishPort=8089:8080 +ContainerName=fwt +Image=localhost/fwt +PublishPort=8080:8080 [Service] Restart=always diff --git a/src/pages/AssessorPage/Assessor.tsx b/src/pages/AssessorPage/Assessor.tsx index 10e4216..591501a 100644 --- a/src/pages/AssessorPage/Assessor.tsx +++ b/src/pages/AssessorPage/Assessor.tsx @@ -32,7 +32,7 @@ import { _type, _units, } from '../../stores/pdfinfo.ts'; -import { checkConnection, createPdfElectrical, createPdfOccupancy, getApi, getApiMulti, postApi, statusPopsApi, voidPopsApi, saveNewName, saveNewPassword, securePassword, getDateTime } from '../../utils/functions/index.ts'; +import { checkConnection, createPdfElectrical, createPdfOccupancy, getApi, getApiMulti, postApi, statusPopsApi, voidPopsApi, saveNewName, saveNewPassword, securePassword } from '../../utils/functions/index.ts'; import './Assessor.sass'; import { FaSolidUserGear } from 'solid-icons/fa' @@ -399,7 +399,7 @@ export default () => { } const setNewStatus = async (division: string, status: string, tag: string, tagword: string, approved: number) => { - const today = await getDateTime() + const today = new Date() const formattedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss') const statusid = parseInt(applicationId().toString(), 10) @@ -449,7 +449,7 @@ export default () => { const postTransaction = async (application: string) => { const id = await geteSignId(employeeId()) - const today = await getDateTime() + const today = new Date() const formatedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss') await postApi('post-esigntransaction', { diff --git a/src/pages/MainPage/Main.tsx b/src/pages/MainPage/Main.tsx index a711881..b4ee49e 100644 --- a/src/pages/MainPage/Main.tsx +++ b/src/pages/MainPage/Main.tsx @@ -6,7 +6,7 @@ import { FiLogOut } from 'solid-icons/fi' import { VsRefresh } from 'solid-icons/vs' import { createSignal, onMount, createEffect } from 'solid-js' import { Box, Button, Clickable, Column, Link, Logo, Modal, ModalButton, Padding, Page, Row, Input } from '../../components/' -import { checkConnection, getApi, getApiMulti, getDateTime, postApi, saveNewName, saveNewPassword, securePassword } from '../../utils/functions' +import { checkConnection, getApi, getApiMulti, postApi, saveNewName, saveNewPassword, securePassword } from '../../utils/functions' import { FaSolidUserGear } from 'solid-icons/fa' import { Show } from 'solid-js/web' import './Main.sass' @@ -182,8 +182,7 @@ export default () => { } const setNewStatus = async (division: string, status: string, tag: string, tagword: string, approved: number) => { - // const today = new Date() - const today = await getDateTime() + const today = new Date() const formattedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss') const statusid = parseInt(applicationId().toString()) @@ -194,8 +193,6 @@ export default () => { } } - - const updateOp = async (division: string) => { if (division === 'electrical') { return await postApi('update-opapproved-electrical', { data: parseInt(applicationId().toString()) }) @@ -224,7 +221,7 @@ export default () => { const boList = response.result8 const codeList = response.result9 - const today = await getDateTime() + const today = new Date() const formattedDate = dayjs(today).format('YYYY-MM-DD') const formattedDatewithTime = dayjs(today).format('YYYY-MM-DD HH:mm:ss') @@ -298,7 +295,7 @@ export default () => { const postTransaction = async () => { const id = await geteSignId() - const today = await getDateTime() + const today = new Date() const formatedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss') await postApi('post-esigntransaction', { data: parseInt(id), data2: approvedApplication(), data3: formatedDate }) diff --git a/src/utils/functions/getDateTime.ts b/src/utils/functions/getDateTime.ts deleted file mode 100644 index 5980360..0000000 --- a/src/utils/functions/getDateTime.ts +++ /dev/null @@ -1,6 +0,0 @@ -import getApi from "./getApi.ts" - -export default async () => { - const response = await getApi('get-datetime') - return response.result -} \ No newline at end of file diff --git a/src/utils/functions/index.ts b/src/utils/functions/index.ts index aad7471..114d5b2 100644 --- a/src/utils/functions/index.ts +++ b/src/utils/functions/index.ts @@ -9,4 +9,3 @@ export { default as voidPopsApi } from './voidPopsApi.ts'; export { default as securePassword } from './securePassword.ts'; export { default as saveNewName } from './saveNewName.ts'; export { default as saveNewPassword } from './saveNewPassword.ts'; -export { default as getDateTime } from './getDateTime.ts';