diff --git a/client/src/components/cards/Member-cart.tsx b/client/src/components/cards/Member-cart.tsx index b75e746..09a8efa 100644 --- a/client/src/components/cards/Member-cart.tsx +++ b/client/src/components/cards/Member-cart.tsx @@ -1,4 +1,5 @@ import { Component } from "solid-js"; +import { A } from "@solidjs/router"; export type Members = { id: string; @@ -21,7 +22,7 @@ const MemberCard: Component = ({ props }) => { alt="Bonnie Avatar" />

- {props.name} + {props.name}

{props.position}

diff --git a/client/src/components/cards/NewsCard.tsx b/client/src/components/cards/NewsCard.tsx index 113cfd1..cb4cb25 100644 --- a/client/src/components/cards/NewsCard.tsx +++ b/client/src/components/cards/NewsCard.tsx @@ -1,5 +1,5 @@ import { Component } from "solid-js"; -import { NavLink } from "@solidjs/router"; +import { NavLink, A } from "@solidjs/router"; export type NewsData = { id: string; @@ -22,12 +22,12 @@ const NewsCard: Component = ({ props }) => {

- {props.title} - +

{props.des}

diff --git a/client/src/components/layouts/Footer.tsx b/client/src/components/layouts/Footer.tsx index 01f892b..d1f584e 100644 --- a/client/src/components/layouts/Footer.tsx +++ b/client/src/components/layouts/Footer.tsx @@ -1,4 +1,4 @@ -import { NavLink } from "@solidjs/router"; +import { A } from "@solidjs/router"; import { Component } from "solid-js"; const Footer: Component = () => { @@ -8,12 +8,12 @@ const Footer: Component = () => {
- - +

#18C1, Sangkat Tuek Thlar, Khan Sen Sok, Phnom Penh, Cambodia

@@ -64,36 +64,36 @@ const Footer: Component = () => {

Resources

@@ -103,36 +103,36 @@ const Footer: Component = () => {

Company

@@ -142,36 +142,36 @@ const Footer: Component = () => {

Quick Links

@@ -180,7 +180,7 @@ const Footer: Component = () => {

Follow Us On

- @@ -192,8 +192,8 @@ const Footer: Component = () => { > - - + @@ -205,8 +205,8 @@ const Footer: Component = () => { > - - + @@ -218,8 +218,8 @@ const Footer: Component = () => { > - - + @@ -231,7 +231,7 @@ const Footer: Component = () => { > - +

© 2025 Camprotec

diff --git a/client/src/components/layouts/Navbar.tsx b/client/src/components/layouts/Navbar.tsx index 9828f18..c309d5b 100644 --- a/client/src/components/layouts/Navbar.tsx +++ b/client/src/components/layouts/Navbar.tsx @@ -1,5 +1,5 @@ import { Component } from "solid-js"; -import { NavLink } from "@solidjs/router"; +import { A } from "@solidjs/router"; import { useCartContext } from "../../context/CartContext"; import NavActive from "./NavActive"; @@ -17,9 +17,9 @@ const Navbar: Component<{}> = () => {
@@ -350,28 +351,28 @@ const SinglePageNews: Component = () => { aria-labelledby="dropdownMenuIconHorizontalButton" >
  • - Edit - +
  • - Remove - +
  • - Report - +
    • @@ -447,28 +448,28 @@ const SinglePageNews: Component = () => { aria-labelledby="dropdownMenuIconHorizontalButton" >
  • - Edit - +
  • - Remove - +
  • - Report - +
    • diff --git a/client/src/pages/order.tsx b/client/src/pages/order.tsx index baa5727..92d5b8b 100644 --- a/client/src/pages/order.tsx +++ b/client/src/pages/order.tsx @@ -1,3 +1,5 @@ +import { A } from "@solidjs/router"; + const Order = () => { return (
    @@ -10,12 +12,12 @@ const Order = () => {

    You'll find lots to explore on the home page.{" "}

    - Back to Homepage - +
    diff --git a/client/src/pages/products/details.tsx b/client/src/pages/products/details.tsx index c11153d..f05754f 100644 --- a/client/src/pages/products/details.tsx +++ b/client/src/pages/products/details.tsx @@ -1,5 +1,5 @@ import { Component, createEffect, createResource, For } from "solid-js"; -import { useParams } from "@solidjs/router"; +import { A, useParams } from "@solidjs/router"; import { useCartContext } from "../../context/CartContext"; import { useNavigate } from "@solidjs/router"; import Image from "../../components/Image"; @@ -48,9 +48,9 @@ const ProductDetail: Component<{}> = (props) => { >
  • - + Accessories - + = (props) => {
  • - + Printer - + = (props) => {
  • - Ribbon - +
    • @@ -207,9 +207,9 @@ const ProductDetail: Component<{}> = (props) => {

    4 out of 5 stars

    - + 117 reviews - + @@ -277,12 +277,12 @@ const ProductDetail: Component<{}> = (props) => { {/*

    Size

    - Size guide - +
    diff --git a/client/src/pages/products/index.tsx b/client/src/pages/products/index.tsx index 9e206c1..b0a5feb 100644 --- a/client/src/pages/products/index.tsx +++ b/client/src/pages/products/index.tsx @@ -1,6 +1,7 @@ import { Component, For } from "solid-js"; import Cards from "../../components/cards/Cards"; import CoreProducts from "../../data/Core-Product"; +import { A } from "@solidjs/router"; const Products: Component<{}> = () => { return ( @@ -42,29 +43,29 @@ const Products: Component<{}> = () => {

    Categories

    @@ -485,44 +486,44 @@ const Products: Component<{}> = () => { aria-labelledby="dropdownDefaultButton" >
  • - Most Popular - +
  • - Best Rating - +
  • - Newest - +
  • - Low to High - +
  • - High to Low - +
    • @@ -543,28 +544,28 @@ const Products: Component<{}> = () => { class="space-y-4 border-b border-gray-200 pb-6 text-sm font-medium text-gray-900" >
  • - Equipment + Equipment
  • - Ink Cartridge + Ink Cartridge
  • - CAM-TONER CARTRIDGE + CAM-TONER CARTRIDGE
  • - Printer + Printer
  • - Bill Counter + Bill Counter
  • - IT Services + IT Services
  • - Ribbon + Ribbon
  • - Accessories + Accessories