diff --git a/fwt/components/HTML.tsx b/fwt/components/HTML.tsx index dda61e9..8520e28 100644 --- a/fwt/components/HTML.tsx +++ b/fwt/components/HTML.tsx @@ -28,7 +28,7 @@ export default (props: Props) => { - + diff --git a/fwt/images/background.avif b/fwt/images/background.avif index e40c88f..866a070 100644 Binary files a/fwt/images/background.avif and b/fwt/images/background.avif differ diff --git a/fwt/images/background.webp b/fwt/images/background.webp index d82c586..ce8cfe4 100644 Binary files a/fwt/images/background.webp and b/fwt/images/background.webp differ diff --git a/fwt/images/esign.avif b/fwt/images/esign.avif new file mode 100644 index 0000000..18c2a52 Binary files /dev/null and b/fwt/images/esign.avif differ diff --git a/fwt/images/esign.webp b/fwt/images/esign.webp new file mode 100644 index 0000000..9702e61 Binary files /dev/null and b/fwt/images/esign.webp differ diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000..db134d0 Binary files /dev/null and b/public/favicon.ico differ diff --git a/public/favicon.png b/public/favicon.png deleted file mode 100644 index 09cf6de..0000000 Binary files a/public/favicon.png and /dev/null differ diff --git a/src/components/Card.astro b/src/components/Card.astro new file mode 100644 index 0000000..e213617 --- /dev/null +++ b/src/components/Card.astro @@ -0,0 +1,52 @@ +--- +import { Image, Column, Link } from '../../fwt' + +interface Props { + avif: string + webp: string + name: string + description: string + site: string +} + +const { avif, webp, name, description, site } = Astro.props +--- + +
+ + + + {name} + {description} + + +
+ + diff --git a/src/components/Card/Card.sass b/src/components/Card/Card.sass deleted file mode 100644 index 886d7ee..0000000 --- a/src/components/Card/Card.sass +++ /dev/null @@ -1,22 +0,0 @@ -.card - // display: flex - // flex-direction: column - // align-items: flex-start - // justify-content: flex-start - border: 1px solid transparent - border-radius: 20px - padding: 2rem - cursor: pointer - width: 15rem - - &:hover - border: 1px solid white - - &__name - padding: 1rem 0 0 0 - font-size: 1rem - font-weight: 500 - - &__description - padding: 0.5rem 0 0 0 - font-size: 0.75rem diff --git a/src/components/Card/Card.tsx b/src/components/Card/Card.tsx deleted file mode 100644 index ec80ac4..0000000 --- a/src/components/Card/Card.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import './Card.sass' -import { Image, Column, Row } from '../../../fwt' - -interface Props { - avif: string - webp: string - name: string - description: string -} - -export default (props: Props) => { - return ( - <> -
- - - {props.name} - {props.description} - -
- - ) -} diff --git a/src/components/Counter/Counter.sass b/src/components/Counter/Counter.sass deleted file mode 100644 index 5906f01..0000000 --- a/src/components/Counter/Counter.sass +++ /dev/null @@ -1,47 +0,0 @@ -.counter - display: flex - flex-direction: column - align-items: center - gap: 1rem - margin: 2rem - color: white - border: 1px solid rgba(22, 34, 60, 0.5) - padding: 1rem 2rem - border-radius: 16px - background: rgba(134, 152, 217, 0.1) - - &__display - font-size: 1.75rem - font-weight: bold - - &__buttons - display: flex - justify-content: center - gap: 0.25rem - - // &:hover - // background: color.adjust(vars.$primaryColor, $blackness: 20%) - - - &__decrement - width: 2rem - height: 2.25rem - padding: auto - font-size: 1rem - font-weight: bold - cursor: pointer - text-decoration: none - background-color: rgba(86, 14, 14, 0.915) - border-radius: 8px - color: white - border: 1px solid rgba(255,255,255,0.2) - - &:active - transform: scale(0.95) - - &__increment - @extend .counter__decrement - background-color: rgb(14, 42, 86, 0.915) - - &:active - transform: scale(0.95) diff --git a/src/components/Counter/Counter.tsx b/src/components/Counter/Counter.tsx deleted file mode 100644 index e45cf73..0000000 --- a/src/components/Counter/Counter.tsx +++ /dev/null @@ -1,30 +0,0 @@ -import './Counter.sass' -import { createSignal } from 'solid-js' - -let [count, setCount] = createSignal(0) - -const increment = () => { - setCount(count() + 1) -} - -const decrement = () => { - setCount(count() - 1) -} - -export default () => { - return ( - <> -
-
{count()}
-
- - -
-
- - ) -} diff --git a/src/components/Input/Input.tsx b/src/components/Input/Input.tsx deleted file mode 100644 index aa0d701..0000000 --- a/src/components/Input/Input.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import Input from '../../../fwt/components/Input' -import { createSignal } from 'solid-js' - -const [sample, setSample] = createSignal('') - -export default () => { - return ( - <> - setSample(val)}> - - ) -} diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index 7c76ea9..eaa1581 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -4,10 +4,11 @@ const { title } = Astro.props const websiteName = 'Template' const websiteDescription = 'This is just a template.' -import { Background, HTML } from '../../fwt' +import { Background, HTML, OptimizeBackground } from '../../fwt' --- - + + diff --git a/src/pages/index.astro b/src/pages/index.astro index 78a3bef..04768ba 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,29 +1,49 @@ --- import Layout from '../layouts/Layout.astro' -import { Button, Logo, Link, Page, Row, Image, Column } from '../../fwt/' -import Card from '../components/Card/Card' -import OLA from '../../fwt/images/ocbo-portal.avif' -import OLW from '../../fwt/images/ocbo-portal.webp' -import OcboLogoA from '../../fwt/images/ocbologo.avif' -import OcboLogoW from '../../fwt/images/ocbologo.webp' +import { Button, Logo, Link, Page, Row, Image, Column, OptimizeBackground } from '../../fwt/' +// import Card from '../components/Card/Card' +import Card from '../components/Card.astro' +import portalA from '../../fwt/images/ocbo-portal.avif' +import portalW from '../../fwt/images/ocbo-portal.webp' +import esignA from '../../fwt/images/esign.avif' +import esignW from '../../fwt/images/esign.webp' --- - + + + OCBO Portal - -

OCBO Portal for Applications

+ +

Welcome to OCBO Application Portal

+
+
+ + + + - -
- -
+ + diff --git a/src/styles/classes.sass b/src/styles/classes.sass index 4e8b0e5..1a6a36c 100644 --- a/src/styles/classes.sass +++ b/src/styles/classes.sass @@ -1,5 +1,8 @@ .fullscreen - position: absolute + display: flex + align-items: center + justify-content: center + position: fixed top: 0 left: 0 width: 100vw diff --git a/src/styles/variables.sass b/src/styles/variables.sass index cb81aaa..8c72513 100644 --- a/src/styles/variables.sass +++ b/src/styles/variables.sass @@ -1,6 +1,6 @@ @use 'sass:color' -$background: #0c1b31 +$background: rgb(12, 26, 48) $textColor: #f0f8ff $fontSize: 1rem