- 
+
SolidStart
diff --git a/solid-start/src/contexts/auth.tsx b/solid-start/src/contexts/auth.tsx
index 294f1f5..ee09bc8 100644
--- a/solid-start/src/contexts/auth.tsx
+++ b/solid-start/src/contexts/auth.tsx
@@ -1,54 +1,65 @@
-import { Action, action, createAsync } from '@solidjs/router';
-import { ParentProps, createContext, useContext } from 'solid-js';
-import { useSession } from 'vinxi/http';
+import { Action, action, cache, createAsync, reload } from '@solidjs/router';
+import { Accessor, ParentProps, createContext, useContext } from 'solid-js';
-const sessionSecret = '7eBCGZ!A6&8C#@^#Ohv1Zub1AciX2!RL';
const user = {
+ id: 10,
name: 'Chris P Bacon',
image: 'data:image/webp;base64,UklGRjoFAABXRUJQVlA4WAoAAAAQAAAAPwAAPwAAQUxQSAsCAAABkJvtn6NGv1l2C9D5K4CHTB0QqgseIkUuJVRIBhud6YH4XCoTkwkiqQDvzc785xdgZ39XQEQwcNtIUbO8xzj9AtbAFQDQ6pT/phcvZi8X039lpwUAhUMNuBxAezB+5Qpex4M2gDy9kQPvexOStGAxzhSjBSPJSe89kKep4bDRvyXNW1xVRPNG3vY34BoJKoCdK9Ib18Q8ebUDFAnbbJ6QVWQCsSJPmutuMnPoelbGRKyi78Jl62RgSHrWgCeHQLZOHjEYa8ECR0C2Ov9ixdqo+GtVcg4jvrFG3jiCc8uf1uF8u87mEPnS563LwJoJ7C55/hpoelrdMvomGgvzOKFn7XiewC0stMOKAiruIJ9rb1zRFDJebcDN6v6s1lR95HB4f8uoUeTte7gCPXqK8OyhACY0lYwTAO1Z1qU2MKDXyXMAjLXFGK1XRp0iX1udWa2sOiWDUoHlP3XxbzqbUU5ML9S6eKGYF1PL9NJ39IvoN6R/bvXvjf691X835N8t/XfzP/hu6/8b+v+W/r8p/2/r4wZ53CKPm/RxmzxulMet+rhZHrfLfYPct6zvm5Jfwbjgm+S+LcE37j+k+saHfaBI862fyicyrDNgPpBP5Se4RrJv/npwRpJhuW8OJHl28BXIkUqWA/nWt9OV71E4/bY1O6IMNZAVs+U2t38ent/NdHd++HN7MwNQrNMCAFZQOCAIAwAAkBEAnQEqQABAAD6JNphHpSMioS4dvHCgEQlsALzdlv5Lz4FWu9fkr0B/NUgLYDzqG9vWPtwPMB5yXRAdQ1vJjgRBgdpMZArcRLehVozfgESLV7jrt6y3+1xCUHeHw5uQIchuYTkWMZY/H16HwZaOk7pLyW8vC8wxNXvPkIcv6W76nqk1MV4/vwaGYo+r1ru9w69xfwAA/v7Naw6aULM/DSQY6u+buV7b5okV9a0ijHNF1T/oBM7qOZA6U8ci9P8k/gYHDifqZbkUnGBUibLFp47ofvCO0bh2De+IFqZfiudyAbBhr5r5LAZd4gHCeT+nchE7nungjI1NLXxB0jqMS0QA85bVy78qM0905rW3E+BdNlS/QZL/zMBcyf41hmkydnjlAHW9LCf8XI8oUgsyCRGPniE3X46k1n3Pez+fGiqTHOumFf6N0PHtxZZl5wX4RGOSuBqZkgjhTwA7o0qlJgWvNBnDOLE2i7KSdCMEhCKcVuEjfIyY/q2ZtVimj7K/lnIgocN4ABDsBQSvPcuZEKis9Q+y6W1qps4AnLXruFTduIFfoxxjIo7H7ZcNIMnoGBfmLl6IrWKCixcN1TvinUHYlMZMHb5qmz5Lr7RUcCF2d0ea07ONaoDeOZm05NQ8VJw1pshZUoJd901zzXzcwrZYPi9lIE8lUtZnpmTOlsXQXpCQeoz0uilaaHLZbagBFcnptXzJ5MKdsHmguvu+rwh1uyGVworgWn0ZZ9CKiTm6mEmjPDhqcAptyqfWlALf/R6wvdZTVJB9OCXJVzUmt/l/93Vot/nXuJb5KOAG9C6nh8j4hUe1PtunS7KWk/oLIt/6fxSBIbIPK3c6rscH2otpvERMd/4SNgWJy3vtuvZvoZUn8M8HQLkvT2ffsEqMkG2tYN0coNjrD9gvoPCbccvgIG1Qtd10ygfGRv3NkOTTnDXQR2QqjXBO6N5XOsUFogu+MNVUr+fPsr1dDdZkzTW0ruPE0HV4fZ2PSnXSlZAVbu7RM+kfTagE7TYXwBtJtfxOlsjzgAA=',
};
type User = typeof user;
-const Context = createContext<{
- user: User|undefined,
- login: Action<[data: FormData], void>
- logout: Action<[data: FormData], void>
-}>();
+const getSession = async () => {
+ 'use server';
-export const AuthProvider = (props: ParentProps) => {
- const getUser = createAsync(async () => {
- "use server";
+ const { useSession } = await import('vinxi/http');
+
+ return useSession
({
+ password: process.env.SESSION_SECRET!,
+ });
+}
+
+const userInfo = cache(async () => {
+ 'use server';
+
+ const { data: user } = await getSession();
- const session = await useSession({
- password: sessionSecret,
- });
+ return user.id !== undefined ? user : undefined;
+}, 'userinfo');
- console.log(session.data);
-
- return user;
+const login = action(async (data: FormData) => {
+ 'use server';
+
+ const session = await getSession();
+
+ await session.update(() => ({...user}));
+
+ return reload({
+ revalidate: 'userinfo'
});
+}, 'login');
- const login = action(async (data: FormData) => {
- "use server";
+const logout = action(async (data: FormData) => {
+ 'use server';
- const session = await useSession({
- password: sessionSecret,
- });
+ const session = await getSession();
- await session.update(data => ({...user}));
- }, 'login');
+ await session.clear();
- const logout = action(async (data: FormData) => {
- "use server";
+ return reload({
+ revalidate: 'userinfo'
+ });
+}, 'logout');
- const session = await useSession({
- password: sessionSecret,
- });
+const Context = createContext<{
+ user: Accessor,
+ login: Action<[data: FormData], void>
+ logout: Action<[data: FormData], void>
+}>({ user: () => undefined, login, logout });
- await session.clear();
- }, 'logout');
+export const AuthProvider = (props: ParentProps) => {
+ const user = createAsync(() => userInfo());
- return
+ return
{props.children}
};
diff --git a/solid-start/src/contexts/shop/cart.tsx b/solid-start/src/contexts/shop/cart.tsx
index 404c222..2d56337 100644
--- a/solid-start/src/contexts/shop/cart.tsx
+++ b/solid-start/src/contexts/shop/cart.tsx
@@ -95,8 +95,6 @@ function createLocalStore(initState: T, version: number): [Sto
const name = `cart.v${version}`;
onMount(() => {
- console.log(localStorage[name]);
-
if (localStorage[name]) {
try {
setState(JSON.parse(localStorage[name]));
diff --git a/solid-start/src/entry-server.tsx b/solid-start/src/entry-server.tsx
index 661fd95..61a6038 100644
--- a/solid-start/src/entry-server.tsx
+++ b/solid-start/src/entry-server.tsx
@@ -1,5 +1,5 @@
import { createHandler, StartServer } from "@solidjs/start/server";
-import favicon from '~/../public/favicon.ico';
+import favicon from '~/favicon.ico';
export default createHandler(() => (
diff --git a/solid-start/src/routes/(customer)/shop/[productId].tsx b/solid-start/src/routes/(customer)/shop/[productId].tsx
index 965b9c4..d141e0c 100644
--- a/solid-start/src/routes/(customer)/shop/[productId].tsx
+++ b/solid-start/src/routes/(customer)/shop/[productId].tsx
@@ -29,7 +29,7 @@ export default function Details(props: RouteSectionProps
}>
{product => <>
- .image})
+ .images[0]})