diff --git a/.env b/.env
index 9744809..9709ce0 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
VITE_BACKEND=http://localhost:4320/api/
-# VITE_BACKEND=https://ocboapps.davaocity.gov.ph/esign-server/api/
+#VITE_BACKEND=https://ocboapps.davaocity.gov.ph/esign-server/api/
# VITE_BACKEND=http://192.168.7.163/server/api/
VITE_HEAD=ARCH. KHASHAYAR L. TOGHYANI
VITE_PESO=₱
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 32334f6..350ec34 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,15 +1,13 @@
FROM golang:1.25.3 AS build
-ENV GIN_MODE=release
-ENV PORT=4320
WORKDIR /app
COPY go.mod go.sum ./
RUN go mod download
COPY . .
-RUN GOOS=linux GOARCH=amd64 GOAMD64=v1 go build -pgo=auto -ldflags="-s -w" -o /bin/esign-server main.go
+RUN GOOS=linux GOARCH=amd64 GOAMD64=v1 go build -pgo=auto -ldflags="-s -w" -o bin/esign-server main.go
FROM alpine:latest
WORKDIR /app
-COPY --from=build /bin/esign-server ./server
-EXPOSE $PORT
-CMD ["./server"]
\ No newline at end of file
+COPY --from=build /app/bin/esign-server .
+EXPOSE 4320
+CMD ["./esign-server"]
\ No newline at end of file
diff --git a/index.html b/index.html
index 2bf4428..48829a6 100644
--- a/index.html
+++ b/index.html
@@ -8,8 +8,7 @@
-
-
+
diff --git a/src/components/Input/Input.tsx b/src/components/Input/Input.tsx
index 139823f..990d391 100644
--- a/src/components/Input/Input.tsx
+++ b/src/components/Input/Input.tsx
@@ -8,7 +8,6 @@ interface Props {
onChange: Setter
onKeyDown?: (event: KeyboardEvent) => void
isPassword?: boolean
- placeholder?: string
}
export default (props: Props) => {
@@ -18,7 +17,7 @@ export default (props: Props) => {
{props.label}
-
+
>
)
diff --git a/src/index.sass b/src/index.sass
index 46459c5..0d42bad 100644
--- a/src/index.sass
+++ b/src/index.sass
@@ -15,7 +15,10 @@
z-index: -1
opacity: 1
background-attachment: fixed
- background-size: cover
+
+ // @media only screen and (max-width: views.$mobile)
+ // background-image: url('/src/assets/images/svg/background-mobile.svg')
+ // height: 100%
.close-text
padding: 3rem 0 0 0
diff --git a/src/pages/AssessorPage/Assessor.tsx b/src/pages/AssessorPage/Assessor.tsx
index fc4671a..b292998 100644
--- a/src/pages/AssessorPage/Assessor.tsx
+++ b/src/pages/AssessorPage/Assessor.tsx
@@ -3,7 +3,7 @@ import { Logo, Page, Row, Padding, ModalButton, Button, Clickable, Link, Modal,
import { FiLogOut } from 'solid-icons/fi'
import { Tabs } from '@kobalte/core/tabs'
import { ofetch } from 'ofetch'
-import { onMount, createSignal, Show, createEffect } from 'solid-js'
+import { onMount, createSignal, Show } from 'solid-js'
import dayjs from 'dayjs'
import { checkConnection, createPdf } from '../../utils/functions'
import { FaSolidThumbsUp } from 'solid-icons/fa'
@@ -55,18 +55,18 @@ export default () => {
}
}
- // const handleFilterChange = (value: string) => {
- // // setFilter(value)
- // if (value.trim() === '') {
- // setApplicationList(fullIDList())
- // setNameList(fullNameList())
- // } else {
- // const filteredApplications = fullIDList().filter((app) => app.toLowerCase().includes(value.toLowerCase()))
- // const filteredNames = fullNameList().slice(0, filteredApplications.length)
- // setApplicationList(filteredApplications)
- // setNameList(filteredNames)
- // }
- // }
+ const handleFilterChange = (value: string) => {
+ // setFilter(value)
+ if (value.trim() === '') {
+ setApplicationList(fullIDList())
+ setNameList(fullNameList())
+ } else {
+ const filteredApplications = fullIDList().filter((app) => app.toLowerCase().includes(value.toLowerCase()))
+ const filteredNames = fullNameList().slice(0, filteredApplications.length)
+ setApplicationList(filteredApplications)
+ setNameList(filteredNames)
+ }
+ }
const getPrintDetails = async (id: number) => {
const response = await ofetch(API + 'get-printdetails-electrical/' + id)
@@ -161,8 +161,8 @@ export default () => {
const approversignId = await geteSignId(276)
getApprovedDate(approversignId, applicationNo)
- // const assessorId = await getEmployeeId(op.result7[0])
- // const assessorsignId = await geteSignId(assessorId)
+ const assessorId = await getEmployeeId(op.result7[0])
+ const assessorsignId = await geteSignId(assessorId)
getAssessedDate(op.result11[0])
}
@@ -171,20 +171,22 @@ export default () => {
return total
}
- const getListForPrinting = async () => {
+ const getListForPrinting = async (query?: string) => {
try {
const response = await ofetch(API + 'get-listopprinting-electrical', { parseResponse: JSON.parse })
-
- if (filter() !== '' && filter().trim().length !== 0) {
- const filteredApplications = response.result.filter((item: string) => item.includes(filter()))
- const filteredIndices = response.result.map((item: string, index: number) => (item.includes(filter()) ? index : -1)).filter((index: number) => index !== -1)
- const filteredNames = filteredIndices.map((index: number) => response.result2[index])
- setApplicationList(filteredApplications)
- setNameList(filteredNames)
- return
- }
- setApplicationList(response.result)
- setNameList(response.result2)
+ const filteredApplications = response.result.filter((item: any) =>
+ item
+ .toString()
+ .toLowerCase()
+ .includes((query ?? '').toLowerCase())
+ )
+ const filteredNames = response.result2.filter((item: any) =>
+ item.toString().toLowerCase().includes((query ?? '').toLowerCase())
+ )
+ // setApplicationList(response.result)
+ // setNameList(response.result2)
+ setApplicationList(filteredApplications)
+ setNameList(filteredNames)
} catch (error) {
console.error(error)
}
@@ -350,14 +352,6 @@ export default () => {
}
})
- createEffect(async () => {
- if (filter() !== '') {
- await getListForPrinting()
- } else if (filter() === '') {
- await getListForPrinting()
- }
- })
-
return (
<>
@@ -457,7 +451,7 @@ export default () => {
-
+
diff --git a/src/pages/IndexPage/Index.tsx b/src/pages/IndexPage/Index.tsx
index 3641eb4..4ae2ac8 100644
--- a/src/pages/IndexPage/Index.tsx
+++ b/src/pages/IndexPage/Index.tsx
@@ -42,12 +42,7 @@ export default () => {
sessionStorage.setItem('registered', JSON.stringify([...registeredNameList]))
}
- const clearCache = async () => {
- caches.keys()
- }
-
onMount(async () => {
- await clearCache()
await getAssessors()
await getRegistered()
})
diff --git a/src/styles/classes.sass b/src/styles/classes.sass
index 84f05df..a5fb9f4 100644
--- a/src/styles/classes.sass
+++ b/src/styles/classes.sass
@@ -2,10 +2,7 @@
@use 'sass:color'
.fullscreen
- display: flex
- align-items: center
- justify-content: center
- position: fixed
+ position: absolute
top: 0
left: 0
width: 100vw