@fy-/fws-vue 0.0.944 → 0.0.946

package/composables/rest.ts

@@ -43,7 +43,7 @@ export function useRest(): <ResultType extends APIResult>(
     if (isServerRendered()) {
       const hasResult = restStore.getResult(requestHash);
       if (hasResult !== undefined) {
-        const result = { ...hasResult } as ResultType;
+        const result = hasResult as ResultType;
         restStore.removeResult(requestHash);
         if (result.result === "error") {
           eventBus.emit("rest-error", result);
@@ -56,10 +56,10 @@ export function useRest(): <ResultType extends APIResult>(
     try {
       const restResult: ResultType = await rest(url, method, params);
       if (getMode() === "ssr") {
-        restStore.addResult(requestHash, restResult);
-      }
-      if (restResult.result === "error") {
-        eventBus.emit("rest-error", restResult);
+        restStore.addResult(
+          requestHash,
+          JSON.parse(JSON.stringify(restResult)),
+        );
       }
       return Promise.resolve(restResult);
     } catch (error) {

package/composables/ssr.ts

@@ -21,7 +21,9 @@ export interface SSRResult {
 }
 
 export function isServerRendered() {
-  return getInitialState().isSSR;
+  const state = getInitialState();
+  if (state && state.isSSR) return true;
+  return false;
 }
 
 export function initVueClient(router: Router, pinia: Pinia) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fy-/fws-vue",
-  "version": "0.0.944",
+  "version": "0.0.946",
   "author": "Florian 'Fy' Gasquez <m@fy.to>",
   "license": "MIT",
   "repository": {

package/stores/rest.ts

@@ -2,7 +2,7 @@ import { defineStore } from "pinia";
 import { APIResult } from "../composables/rest";
 
 type SharedState = {
-  results: Record<number, APIResult | undefined>;
+  results: Record<number, any | undefined>;
 };
 
 export const useRestStore = defineStore({
@@ -11,9 +11,12 @@ export const useRestStore = defineStore({
     results: {},
   }),
   actions: {
-    addResult(id: number, result: APIResult) {
+    addResult(id: number, result: any) {
       this.results[id] = result;
     },
+    hasResult(id: number) {
+      return this.results[id] !== undefined;
+    },
     getResult(id: number) {
       return this.results[id];
     },

package/style.css

@@ -10,25 +10,41 @@
 }
 
 .btn {
-  @apply inline-flex gap-1 text-white focus:ring-4 font-medium rounded-lg focus:outline-none transition-colors ease-in-out motion-reduce:transition-none;
+  @apply inline-flex gap-1 border-none text-white focus:ring-1 font-medium rounded-lg focus:outline-none transition-colors ease-in-out motion-reduce:transition-none;
   &.primary {
     @apply bg-fv-primary-700 hover:bg-fv-primary-800 focus:ring-fv-primary-300 dark:bg-fv-primary-600 dark:hover:bg-fv-primary-700 dark:focus:ring-fv-primary-800;
+    &.outline {
+      @apply bg-transparent !border border-fv-primary-800 text-fv-primary-700 dark:border-fv-primary-800 dark:text-fv-primary-800 hover:bg-fv-primary-800 hover:text-white dark:hover:bg-fv-primary-800 dark:hover:text-white;
+    }
   }
   &.accent {
     @apply bg-fv-accent-700 hover:bg-fv-accent-800 focus:ring-fv-accent-300 dark:bg-fv-accent-600 dark:hover:bg-fv-accent-700 dark:focus:ring-fv-accent-800;
+    &.outline {
+      @apply bg-transparent border border-fv-accent-800 text-fv-accent-700 dark:border-fv-accent-800 dark:text-fv-accent-800 hover:bg-fv-accent-800 hover:text-white dark:hover:bg-fv-accent-800 dark:hover:text-white;
+    }
   }
   &.success,
   &.valid {
     @apply bg-green-700 hover:bg-green-800 focus:ring-green-300 dark:bg-green-600 dark:hover:bg-green-700 dark:focus:ring-green-800;
+    &.outline {
+      @apply bg-transparent border border-green-800 text-green-700 dark:border-green-800 dark:text-green-800 hover:bg-green-800 hover:text-white dark:hover:bg-green-800 dark:hover:text-white;
+    }
   }
   &.error,
   &.danger {
     @apply bg-red-700 hover:bg-red-800 focus:ring-red-300 dark:bg-red-600 dark:hover:bg-red-700 dark:focus:ring-red-800;
+    &.outline {
+      @apply bg-transparent border border-red-800 text-red-700 dark:border-red-800 dark:text-red-800 hover:bg-red-800 hover:text-white dark:hover:bg-red-800 dark:hover:text-white;
+    }
   }
   &.neutral {
     @apply bg-fv-neutral-700 hover:bg-fv-neutral-800 focus:ring-fv-neutral-300 dark:bg-fv-neutral-600 dark:hover:bg-fv-neutral-700 dark:focus:ring-fv-neutral-800;
+    &.outline {
+      @apply bg-transparent border border-fv-neutral-800 text-fv-neutral-700 dark:border-fv-neutral-800 dark:text-fv-neutral-800 hover:bg-fv-neutral-800 hover:text-white dark:hover:bg-fv-neutral-800 dark:hover:text-white;
+    }
   }
 
+
   &.defaults {
     @apply px-2 py-1;
   }
@@ -41,4 +57,4 @@
   &.small {
     @apply px-2 py-1 text-xs;
   }
-}
+}