Cleanup

Fixed layout and routing
Removed component
2025-09-24 17:56:32 +08:00 · 2025-09-24 17:55:40 +08:00 · 2025-09-24 17:54:35 +08:00
8 changed files with 54 additions and 210 deletions
--- a/index.html
+++ b/index.html
@ -18,6 +18,6 @@

  <body class="body">
    <div id="root"></div>
-    <script type="module" src="/src/layouts/Layout.tsx"></script>
+    <script type="module" src="./index.tsx"></script>
  </body>
 </html>
--- a/index.tsx
+++ b/index.tsx
@ -0,0 +1,8 @@
+import { render } from 'solid-js/web'
+import { Router } from '@solidjs/router'
+
+import routes from './src/routers/router'
+
+const root = document.getElementById('root')
+
+render(() => <Router>{routes}</Router>, root!)
--- a/src/components/Optimizers/OptimizeLogo.tsx
+++ b/src/components/Optimizers/OptimizeLogo.tsx
@ -1,5 +1,4 @@
 import sharp from 'sharp'
-import { Image } from '../index'

 interface Props {
  size?: number
@ -35,11 +34,4 @@ export default (props: Props) => {
  if (props.favicon) {
    generateFavicon()
  }
-
-  return (
-    <>
-      {/* <Image avif={avifImage} webp={webpImage} size={props.size}></Image> */}
-      <h1>Hello</h1>
-    </>
-  )
 }
--- a/src/components/RegistrationForm/RegistrationForm.sass
+++ b/src/components/RegistrationForm/RegistrationForm.sass
@ -1,147 +0,0 @@
-.aa
-  font-size: 5rem
-
-.combobox__control
-  display: inline-flex
-  justify-content: space-between
-  width: 200px
-  border-radius: 6px
-  font-size: 16px
-  line-height: 1
-  outline: none
-  background-color: white
-  border: 1px solid hsl(240 6% 90%)
-  color: hsl(240 4% 16%)
-  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
-
-  &::placeholder
-    color: hsl(240 4% 46%)
-
-.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: white
-  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
-
-  &[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
-
-  &[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)
--- a/src/components/RegistrationForm/RegistrationForm.tsx
+++ b/src/components/RegistrationForm/RegistrationForm.tsx
@ -1,29 +0,0 @@
-import './RegistrationForm.sass'
-import { Button, Logo, Link, Box, Page, Form, Row, Column, Image, Display, Padding } from '../../components'
-import { ofetch } from 'ofetch'
-import { Combobox } from '@kobalte/core/combobox'
-import { AiTwotoneCheckCircle } from 'solid-icons/ai'
-import { TiArrowSortedDown } from 'solid-icons/ti'
-import { createMemo, createSignal, createUniqueId, For, Show } from 'solid-js'
-
-const OPTIONS = ['Apple', 'Banana', 'Blueberry', 'Grapes', 'Pineapple']
-
-// const api = import.meta.env.BACKEND
-// const assessors = await ofetch(api + 'get-list-assessors', { parseResponse: JSON.parse })
-// const assessorsIDList = assessors.result
-// const assessorsNameList = assessors.result2
-
-// const [sample, setSample] = createSignal('')
-
-export default () => {
-  return (
-    <>
-      {/* <Form> */}
-      {/* <span>{OPTIONS}</span>
-      <span>{assessorsNameList}</span> */}
-
-      {/* <span>{sample()}</span> */}
-      {/* </Form> */}
-    </>
-  )
-}
--- a/src/layouts/Layout.tsx
+++ b/src/layouts/Layout.tsx
@ -1,27 +1,14 @@
 import './Layout.sass'
-import { lazy } from 'solid-js'
-import { render } from 'solid-js/web'
-import { Router } from '@solidjs/router'
+import type { JSXElement } from 'solid-js'

-const root = document.getElementById('root')
+interface Props {
+  children: JSXElement
+}

-const routes = [
-  {
-    path: '/',
-    component: lazy(() => import('../pages/IndexPage/Index.tsx')),
-  },
-  {
-    path: '/main',
-    component: lazy(() => import('../pages/MainPage/Main.tsx')),
-  },
-  {
-    path: '/register',
-    component: lazy(() => import('../pages/RegisterPage/Register.tsx')),
-  },
-  {
-    path: '/login',
-    component: lazy(() => import('../pages/LoginPage/Login.tsx')),
-  },
-]
-
-render(() => <Router>{routes}</Router>, root!)
+export default (props: Props) => {
+  return (
+    <>
+      <div class="layout">{props.children}</div>
+    </>
+  )
+}
--- a/src/routers/router.tsx
+++ b/src/routers/router.tsx
@ -0,0 +1,33 @@
+import { lazy } from 'solid-js'
+import Layout from '../layouts/Layout.tsx'
+
+const routes = [
+  {
+    path: '/',
+    component: (props: any) => <Layout>{props.children}</Layout>,
+    children: [
+      {
+        path: '/',
+        component: lazy(() => import('../pages/IndexPage/Index.tsx')),
+      },
+      {
+        path: '/main',
+        component: lazy(() => import('../pages/MainPage/Main.tsx')),
+      },
+      {
+        path: '/register',
+        component: lazy(() => import('../pages/RegisterPage/Register.tsx')),
+      },
+      {
+        path: '/login',
+        component: lazy(() => import('../pages/LoginPage/Login.tsx')),
+      },
+    ],
+  },
+  {
+    path: '**',
+    component: () => <div>404</div>,
+  },
+]
+
+export default routes
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@ -24,5 +24,5 @@
    "noFallthroughCasesInSwitch": true,
    "noUncheckedSideEffectImports": true
  },
-  "include": ["src"]
+  "include": ["src", "index.tsx"]
 }
Author	SHA1	Message	Date
Patrick Alvin Alcala	236b37f798	Cleanup	2025-09-24 17:56:32 +08:00
Patrick Alvin Alcala	ddff738d2e	Fixed layout and routing	2025-09-24 17:55:40 +08:00
Patrick Alvin Alcala	c57727e20a	Removed component	2025-09-24 17:54:35 +08:00