diff --git a/backend/main.go b/backend/main.go
index c962671..13744d6 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -43,8 +43,8 @@ func connect() {
//DEV
router.Use(cors.New(cors.Config{
- AllowOrigins: []string{"http://localhost:5173"},
- AllowMethods: []string{"GET", "POST"},
+ AllowOrigins: []string{"http://localhost"},
+ AllowMethods: []string{"GET"},
AllowHeaders: []string{"Origin", "OCBO-ShieldConnection"},
ExposeHeaders: []string{"Content-Length"},
AllowCredentials: true,
@@ -121,32 +121,7 @@ func connect() {
array := []string{}
array2 := []string{}
- results, err := db.Query("SELECT IFNULL(employeeid, '') AS result, IFNULL(employeename, '') AS result2 FROM employee WHERE is_assessment = ? AND is_delete = ? AND employeename NOT LIKE ? AND employeename NOT LIKE ? AND employeename NOT LIKE ?", 1, 0, "%OFFICE%", "%TEST%", "%SAMPLE%")
- if err != nil {
- c.AbortWithError(http.StatusBadRequest, err)
- c.String(http.StatusBadRequest, err.Error())
- }
- for results.Next() {
- err = results.Scan(&result, &result2)
- if err != nil {
- c.AbortWithError(http.StatusBadRequest, err)
- c.String(http.StatusBadRequest, err.Error())
- }
- array = append(array, result)
- array2 = append(array2, result2)
- }
- c.JSON(http.StatusOK, gin.H{
- "result": array,
- "result2": array2,
- })
-
- case "get-list-approvers":
- var result2 string
-
- array := []string{}
- array2 := []string{}
-
- results, err := db.Query("SELECT IFNULL(employeeid, '') AS result, IFNULL(employeename, '') AS result2 FROM employee WHERE is_finalapprover = ? AND is_delete = ? AND NOT (employeename LIKE ? OR employeename LIKE ? OR employeename LIKE ? OR employeename LIKE ? OR employeename LIKE ?)", 1, 0, "%OFFICE%", "%TEST%", "%SAMPLE%", "%BUILDING%", "%OCCUPANCY%")
+ results, err := db.Query("SELECT IFNULL(employeeid, '') AS result, IFNULL(employeename, '') AS result2 FROM employee WHERE is_assessment = ? AND is_delete = ? AND employeename NOT LIKE ? AND employeename NOT LIKE ?", 1, 0, "%OFFICE%", "%TEST%")
if err != nil {
c.AbortWithError(http.StatusBadRequest, err)
c.String(http.StatusBadRequest, err.Error())
@@ -309,7 +284,7 @@ func connect() {
array := []string{}
array2 := []string{}
- results, err := db.Query(`SELECT IFNULL(DATE_FORMAT(b.txndate, '%M %d, %Y'), '') AS result, IFNULL(REPLACE(b.remarks, 'RECEIVE', 'RECEIVED'), '') AS result2
+ results, err := db.Query(`SELECT IFNULL(DATE_FORMAT(b.txndate, '%M %d, %Y')0 '') AS result, REPLACE(b.remarks, 'RECEIVE', 'RECEIVED') AS result2
FROM occupancydocflowtxn b, occupancy o WHERE o.occupancyid = b.occupancyreceivingid AND o.controlNo = ? ORDER BY b.occupancydocflowtxnid DESC`, data)
if err != nil {
c.AbortWithError(http.StatusBadRequest, err)
diff --git a/package.json b/package.json
index 5092a09..d693c56 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "ocbo-esign",
+ "name": "ocbo-esign-solid",
"private": true,
"version": "0.0.0",
"type": "module",
diff --git a/src/assets/images/svg/background.svg b/src/assets/images/svg/background.svg
deleted file mode 100644
index 2230978..0000000
--- a/src/assets/images/svg/background.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
diff --git a/src/components/Box/Box.tsx b/src/components/Box/Box.tsx
index 80cf5a4..947b06a 100644
--- a/src/components/Box/Box.tsx
+++ b/src/components/Box/Box.tsx
@@ -6,14 +6,13 @@ interface Props {
color?: string
children: JSXElement
curved?: boolean
- padding?: number
}
export default (props: Props) => {
const boxClass = createMemo(() => (props.curved ? 'curvedbox' : 'box'))
return (
-
+
)
diff --git a/src/components/Combobox/Combobox.sass b/src/components/Combobox/Combobox.sass
deleted file mode 100644
index 39cdbb3..0000000
--- a/src/components/Combobox/Combobox.sass
+++ /dev/null
@@ -1,149 +0,0 @@
-.combobox__control
- display: inline-flex
- justify-content: space-between
- width: 500px
- border-radius: 6px
- font-size: 16px
- line-height: 1
- outline: none
- background-color: #16212c96
- border: 1px solid hsl(240 6% 90%)
- transition: border-color 250ms, color 250ms
-
- &[data-invalid]
- border-color: hsl(0 72% 51%)
- color: hsl(0 72% 51%)
-
- &_multi
- width: 100%
- min-width: 200px
- max-width: 300px
-
-.combobox__input
- appearance: none
- display: inline-flex
- min-width: 0
- min-height: 40px
- padding-left: 16px
- font-size: 16px
- background: transparent
- border-top-left-radius: 6px
- border-bottom-left-radius: 6px
- outline: none
- color: white
- width: 40rem
-
- &::placeholder
- color: #517aa2d2
-
-.combobox__trigger
- appearance: none
- display: inline-flex
- justify-content: center
- align-items: center
- width: auto
- outline: none
- border-top-right-radius: 6px
- border-bottom-right-radius: 6px
- padding: 0 10px
- background-color: hsl(240 5% 96%)
- border-left: 1px solid hsl(240 6% 90%)
- color: hsl(240 4% 16%)
- font-size: 16px
- line-height: 0
- transition: 250ms background-color
-
-.combobox__icon
- height: 20px
- width: 20px
- flex: 0 0 20px
-
-.combobox__description
- margin-top: 8px
- color: hsl(240 5% 26%)
- font-size: 12px
- user-select: none
-
-.combobox__error-message
- margin-top: 8px
- color: hsl(0 72% 51%)
- font-size: 12px
- user-select: none
-
-.combobox__content
- background-color: #00000037
- backdrop-filter: blur(8px)
- border-radius: 6px
- border: 1px solid hsl(240 6% 90%)
- box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1)
- transform-origin: var(--kb-combobox-content-transform-origin)
- animation: contentHide 250ms ease-in forwards
- color: red
-
- &[data-expanded]
- animation: contentShow 250ms ease-out
-
-.combobox__listbox
- overflow-y: auto
- max-height: 360px
- padding: 8px
-
-
- &:focus
- outline: none
-
-.combobox__item
- font-size: 16px
- line-height: 1
- color: hsl(240 4% 16%)
- border-radius: 4px
- display: flex
- align-items: center
- justify-content: space-between
- height: 32px
- padding: 0 8px
- position: relative
- user-select: none
- outline: none
- color: white
-
- &[data-disabled]
- color: hsl(240 5% 65%)
- opacity: 0.5
- pointer-events: none
-
- &[data-highlighted]
- outline: none
- background-color: hsl(200 98% 39%)
- color: white
-
-.combobox__section
- padding: 8px 0 0 8px
- font-size: 14px
- line-height: 32px
- color: hsl(240 4% 46%)
-
-.combobox__item-indicator
- height: 20px
- width: 20px
- display: inline-flex
- align-items: center
- justify-content: center
-
-@keyframes contentShow
- from
- opacity: 0
- transform: translateY(-8px)
-
- to
- opacity: 1
- transform: translateY(0)
-
-@keyframes contentHide
- from
- opacity: 1
- transform: translateY(0)
-
- to
- opacity: 0
- transform: translateY(-8px)
diff --git a/src/components/Combobox/Combobox.tsx b/src/components/Combobox/Combobox.tsx
deleted file mode 100644
index 7733c92..0000000
--- a/src/components/Combobox/Combobox.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import './Combobox.sass'
-import { Combobox } from '@kobalte/core/combobox'
-import { FaSolidAngleDown } from 'solid-icons/fa'
-import { AiOutlineCheck } from 'solid-icons/ai'
-
-interface Props {
- options: any[]
- placeholder: string
- value: string
- onChange: (value: string | null) => void
-}
-
-export default (props: Props) => {
- return (
- <>
- (
-
- {props.item.textValue}
-
-
-
-
- )}
- >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- )
-}
diff --git a/src/components/Form/Form.tsx b/src/components/Form/Form.tsx
index 45df0e6..a53c7aa 100644
--- a/src/components/Form/Form.tsx
+++ b/src/components/Form/Form.tsx
@@ -3,13 +3,12 @@ import type { JSXElement } from 'solid-js'
interface Props {
children: JSXElement
- class?: string
}
export default (props: Props) => {
return (
<>
-
diff --git a/src/components/index.ts b/src/components/index.ts
index 42f3b3f..e96f4a4 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -15,7 +15,7 @@ export { default as Display } from './Display/Display'
export { default as Padding } from './Padding/Padding'
export { default as Modal } from './Modal/Modal'
export { default as Table } from './Table/Table'
-export { default as Combobox } from './Combobox/Combobox'
+// export { default as Input } from './components/Input'
// export { default as OptimizeBackground } from './Optimizers/OptimizeBackground'
// export { default as OptimizeImage } from './Optimizers/OptimizeImage'
diff --git a/src/layouts/Layout.sass b/src/layouts/Layout.sass
index 65b2f13..ec64564 100644
--- a/src/layouts/Layout.sass
+++ b/src/layouts/Layout.sass
@@ -5,7 +5,7 @@
.body
color: vars.$textColor
font-family: fonts.$Roboto
- background-image: url('/src/assets/images/svg/background.svg')
+ background-image: url('/src/assets/images/optimized/background.avif'), url('/src/assets/images/optimized/background.webp')
position: absolute
top: 0
left: 0
diff --git a/src/pages/RegisterPage/Register.sass b/src/pages/RegisterPage/Register.sass
index e0f9cfd..e69de29 100644
--- a/src/pages/RegisterPage/Register.sass
+++ b/src/pages/RegisterPage/Register.sass
@@ -1,2 +0,0 @@
-.back-button-text
- font-size: 1rem
diff --git a/src/pages/RegisterPage/Register.tsx b/src/pages/RegisterPage/Register.tsx
index 5ac29d4..d7c6442 100644
--- a/src/pages/RegisterPage/Register.tsx
+++ b/src/pages/RegisterPage/Register.tsx
@@ -1,54 +1,34 @@
-import './Register.sass'
-import { Logo, Link, Page, Row, Padding, Form, Combobox, Box } from '../../components'
-import { IoChevronBack } from 'solid-icons/io'
-import { Show, createSignal } from 'solid-js'
+import { Button, Logo, Link, Page, Row, Column, Display, Padding } from '../../components'
+// import RegistrationForm from '../components/RegistrationForm/RegistrationForm'
export default () => {
- const assessors = JSON.parse(sessionStorage.getItem('assessors')!)
- const approvers = JSON.parse(sessionStorage.getItem('approvers')!)
- const roles = ['ASSESSOR', 'APPROVER']
-
- const [role, setRole] = createSignal('')
- const [name, setName] = createSignal('')
-
return (
<>
-
-
-
-
- OCBO e-Sign
-
-
+
+
+
+
+
+ OCBO e-Sign
+
+
-
-
-
- Back
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+ OCBO e-Sign
+
+
+
+
+
+