Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Derrick Hammer 2023-10-20 06:49:34 -04:00
commit 3007010860
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
8 changed files with 57 additions and 28 deletions

View File

@ -1,3 +1,38 @@
# [0.1.0-develop.43](https://git.lumeweb.com/LumeWeb/sdk/compare/v0.1.0-develop.42...v0.1.0-develop.43) (2023-10-20)
### Bug Fixes
* positioning error ([88e08d1](https://git.lumeweb.com/LumeWeb/sdk/commit/88e08d13e27093768e3dfed3c015fefe7bb1bb8b))
# [0.1.0-develop.42](https://git.lumeweb.com/LumeWeb/sdk/compare/v0.1.0-develop.41...v0.1.0-develop.42) (2023-10-20)
### Bug Fixes
* small ui problems ([2aa2a5f](https://git.lumeweb.com/LumeWeb/sdk/commit/2aa2a5ff30b43574e96b4057938a247ea72d446b))
# [0.1.0-develop.41](https://git.lumeweb.com/LumeWeb/sdk/compare/v0.1.0-develop.40...v0.1.0-develop.41) (2023-10-20)
### Bug Fixes
* patch ([fe8a6a7](https://git.lumeweb.com/LumeWeb/sdk/commit/fe8a6a7de4d2ba9a4918348b6139182cc1dac0ea))
# [0.1.0-develop.40](https://git.lumeweb.com/LumeWeb/sdk/compare/v0.1.0-develop.39...v0.1.0-develop.40) (2023-10-20)
### Bug Fixes
* patch ([a7f5ee2](https://git.lumeweb.com/LumeWeb/sdk/commit/a7f5ee266d8021996d55b3241e517ae273cea6fd))
# [0.1.0-develop.39](https://git.lumeweb.com/LumeWeb/sdk/compare/v0.1.0-develop.38...v0.1.0-develop.39) (2023-10-16)
### Bug Fixes
* export LumeStatusContextType ([d074ef5](https://git.lumeweb.com/LumeWeb/sdk/commit/d074ef507d30c94739f6a5e7aaf2af36ccbf7116))
# [0.1.0-develop.38](https://git.lumeweb.com/LumeWeb/sdk/compare/v0.1.0-develop.37...v0.1.0-develop.38) (2023-10-16) # [0.1.0-develop.38](https://git.lumeweb.com/LumeWeb/sdk/compare/v0.1.0-develop.37...v0.1.0-develop.38) (2023-10-16)

4
npm-shrinkwrap.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "@lumeweb/sdk", "name": "@lumeweb/sdk",
"version": "0.1.0-develop.38", "version": "0.1.0-develop.43",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@lumeweb/sdk", "name": "@lumeweb/sdk",
"version": "0.1.0-develop.38", "version": "0.1.0-develop.43",
"dependencies": { "dependencies": {
"@lumeweb/kernel-network-registry-client": "0.1.0-develop.10", "@lumeweb/kernel-network-registry-client": "0.1.0-develop.10",
"@lumeweb/libkernel": "0.1.0-develop.65", "@lumeweb/libkernel": "0.1.0-develop.65",

View File

@ -1,6 +1,6 @@
{ {
"name": "@lumeweb/sdk", "name": "@lumeweb/sdk",
"version": "0.1.0-develop.38", "version": "0.1.0-develop.43",
"type": "module", "type": "module",
"main": "lib/index.js", "main": "lib/index.js",
"types": "lib/src/index.d.ts", "types": "lib/src/index.d.ts",

View File

@ -1,5 +1,5 @@
diff --git a/node_modules/vite-plugin-scope-tailwind/dist/cjs/index.cjs b/node_modules/vite-plugin-scope-tailwind/dist/cjs/index.cjs diff --git a/node_modules/vite-plugin-scope-tailwind/dist/cjs/index.cjs b/node_modules/vite-plugin-scope-tailwind/dist/cjs/index.cjs
index 0e337b0..530cd41 100644 index 0e337b0..a4d7cbe 100644
--- a/node_modules/vite-plugin-scope-tailwind/dist/cjs/index.cjs --- a/node_modules/vite-plugin-scope-tailwind/dist/cjs/index.cjs
+++ b/node_modules/vite-plugin-scope-tailwind/dist/cjs/index.cjs +++ b/node_modules/vite-plugin-scope-tailwind/dist/cjs/index.cjs
@@ -1,2 +1,109 @@ @@ -1,2 +1,109 @@
@ -103,18 +103,18 @@ index 0e337b0..530cd41 100644
+ css: { + css: {
+ postcss: { + postcss: {
+ plugins: [...n, ...R(o).map(_ => require(p.join(process.cwd(), 'node_modules', _))), S({ + plugins: [...n, ...R(o).map(_ => require(p.join(process.cwd(), 'node_modules', _))), S({
+ prefix: `${prefix || g}.`, + prefix: `${prefix ? prefix : g}.`,
+ ignore: r + ignore: r
+ })] + })]
+ } + }
+ } + }
+ } + }
+ }, transform: e ? $(prefix || g, classNameTransformers) : k(prefix || g) + }, transform: e ? $(prefix ? prefix : g, classNameTransformers) : k(prefix ? prefix : g)
+}) +})
+module.exports = D +module.exports = D
//# sourceMappingURL=index.cjs.map //# sourceMappingURL=index.cjs.map
diff --git a/node_modules/vite-plugin-scope-tailwind/dist/es/index.mjs b/node_modules/vite-plugin-scope-tailwind/dist/es/index.mjs diff --git a/node_modules/vite-plugin-scope-tailwind/dist/es/index.mjs b/node_modules/vite-plugin-scope-tailwind/dist/es/index.mjs
index 9594d38..14bbb10 100644 index 9594d38..c86b6da 100644
--- a/node_modules/vite-plugin-scope-tailwind/dist/es/index.mjs --- a/node_modules/vite-plugin-scope-tailwind/dist/es/index.mjs
+++ b/node_modules/vite-plugin-scope-tailwind/dist/es/index.mjs +++ b/node_modules/vite-plugin-scope-tailwind/dist/es/index.mjs
@@ -111,6 +111,8 @@ const S = ({ @@ -111,6 +111,8 @@ const S = ({
@ -131,14 +131,14 @@ index 9594d38..14bbb10 100644
(_) => require(p.join(process.cwd(), "node_modules", _)) (_) => require(p.join(process.cwd(), "node_modules", _))
), ),
- S({ prefix: `${g}.`, ignore: r }) - S({ prefix: `${g}.`, ignore: r })
+ S({ prefix: `${prefix || g}.`, ignore: r }) + S({ prefix: `${prefix ? prefix : g}.`, ignore: r })
] ]
} }
} }
}; };
}, },
- transform: e ? $(g) : k(g) - transform: e ? $(g) : k(g)
+ transform: e ? $(prefix || g, classNameTransformers) : k(prefix || g ) + transform: e ? $(prefix ? prefix : g, classNameTransformers) : k(prefix ? prefix : g )
}); });
export { export {
M as default M as default

View File

@ -2,10 +2,10 @@ import * as Dialog from "@radix-ui/react-dialog";
import Logo from "../../../assets/lume-logo.png"; import Logo from "../../../assets/lume-logo.png";
import { cva } from "class-variance-authority"; import { cva } from "class-variance-authority";
import { cn } from "../../utils"; import { cn } from "../../utils";
import { useState, useEffect } from "react";
import React from "react"; import React from "react";
import camelCase from "camelcase"; import camelCase from "camelcase";
import { useNetworks, type Network } from "../../NetworksProvider"; import { useNetworks, type Network } from "../../NetworksProvider";
import { TW_PREFIX } from "../../../../scoped-tailwind-prefix";
const SYNCSTATE_TO_TEXT: Record<Network["syncState"], string> = { const SYNCSTATE_TO_TEXT: Record<Network["syncState"], string> = {
done: "Synced", done: "Synced",
@ -20,13 +20,8 @@ const LumeDashboard = (props: any) => {
const { children }: { children: React.PropsWithChildren } = props; const { children }: { children: React.PropsWithChildren } = props;
const { networks } = useNetworks(); const { networks } = useNetworks();
const [uniqueNetworkTypes, setUniqueNetworkTypes] = useState<string[]>([]);
useEffect(() => {
const networkTypes = networks.map((network) => network.type); const networkTypes = networks.map((network) => network.type);
const uniqueTypes = Array.from(new Set(networkTypes)); const uniqueNetworkTypes = Array.from(new Set(networkTypes));
setUniqueNetworkTypes(uniqueTypes);
}, [networks]);
const DefaultTrigger = (props: any) => ( const DefaultTrigger = (props: any) => (
<LumeDashboardTrigger asChild {...props}> <LumeDashboardTrigger asChild {...props}>
@ -124,12 +119,12 @@ const CircularProgress = ({
className?: string; className?: string;
}) => { }) => {
const size = 70; const size = 70;
const progressWidth = 2; const progressWidth = size * 0.03; // based on size
const circleWidth = 2; const circleWidth = size * 0.03; // based on size
const radius = size / 2 - 10; const radius = size / 2 - 10;
const circumference = 2 * radius * Math.PI; const circumference = 2 * radius * Math.PI;
const offset = circumference * ((100 - chain.sync) / 100); const offset = circumference * ((100 - chain.sync) / 100);
const fontSize = 15; const fontSize = size * 0.2; // based on size
return ( return (
<svg <svg
@ -139,9 +134,7 @@ const CircularProgress = ({
])} ])}
width={size} width={size}
height={size} height={size}
viewBox={`-${size * 0.125} -${size * 0.125} ${size * 1.25} ${ viewBox={`0 0 ${size} ${size}`}
size * 1.25
}`}
version="1.1" version="1.1"
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
style={{ transform: "rotate(-90deg)" }}> style={{ transform: "rotate(-90deg)" }}>

View File

@ -1,4 +1,4 @@
import React, { useState, type FC } from "react"; import React, { useState, type FC, useRef, useEffect } from "react";
import { Button } from "../../ui/button"; import { Button } from "../../ui/button";
import { import {
SwitchableComponent, SwitchableComponent,
@ -111,6 +111,7 @@ export const LumeIdentityTrigger = Dialog.Trigger;
LumeIdentityTrigger.displayName = "LumeIdentityTrigger"; LumeIdentityTrigger.displayName = "LumeIdentityTrigger";
export default function Wrapped({ children }: React.PropsWithChildren) { export default function Wrapped({ children }: React.PropsWithChildren) {
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const dialogContentEl = useRef<HTMLElement>();
const DefaultTrigger = () => ( const DefaultTrigger = () => (
<LumeIdentityTrigger asChild> <LumeIdentityTrigger asChild>
<button className="bg-primary text-primary-foreground p-2 px-4 text-sm font-semibold font-mono rounded-md"> <button className="bg-primary text-primary-foreground p-2 px-4 text-sm font-semibold font-mono rounded-md">
@ -135,8 +136,8 @@ export default function Wrapped({ children }: React.PropsWithChildren) {
<Trigger /> <Trigger />
<Dialog.Portal> <Dialog.Portal>
<Dialog.Overlay className="fixed z-40 inset-0 bg-black bg-opacity-50 backdrop-blur-sm" /> <Dialog.Overlay className="fixed z-40 inset-0 bg-black bg-opacity-50 backdrop-blur-sm" />
{/* @ditorodev: `left-[calc(50%-192px)] top-[calc(50vh-174px)]` these two are me being dumb and lazy, would be cool to fix with proper centering */} {/* @ditorodev: `left-[calc(50%-192px)]` these two are me being dumb and lazy, would be cool to fix with proper centering */}
<Dialog.Content className="absolute left-[calc(50%-192px)] top-[calc(50vh-174px)] mx-auto my-auto w-96 max-w-full h-auto z-40 flex items-center justify-center"> <Dialog.Content className="absolute left-[calc(50%-192px)] top-12 mx-auto my-auto w-96 max-w-full h-auto z-40 flex items-center justify-center" >
<SwitchableComponentProvider> <SwitchableComponentProvider>
<LumeIdentityContext.Provider value={{open, setOpen}}> <LumeIdentityContext.Provider value={{open, setOpen}}>
<LumeIdentity /> <LumeIdentity />

View File

@ -1,7 +1,7 @@
import React from "react"; import React from "react";
import { StoryFn, Meta } from "@storybook/react"; import { StoryFn, Meta } from "@storybook/react";
import LumeDashboard from "../src/components/lume/LumeDashboard/LumeDashboard.js"; import LumeDashboard from "../src/components/lume/LumeDashboard/LumeDashboard.js";
import NetworksProvider from "src/components/NetworksProvider.js"; import NetworksProvider from "../src/components/NetworksProvider.js";
export default { export default {
title: "LumeDashboard", title: "LumeDashboard",

View File

@ -1,7 +1,7 @@
import React from "react"; import React from "react";
import { StoryFn, Meta } from "@storybook/react"; import { StoryFn, Meta } from "@storybook/react";
import LumeIdentity from "../src/components/lume/LumeIdentity/LumeIdentity.js"; import LumeIdentity from "../src/components/lume/LumeIdentity/LumeIdentity.js";
import AuthProvider from "src/components/AuthProvider.js"; import AuthProvider from "../src/components/AuthProvider.js";
export default { export default {
title: "LumeIdentity", title: "LumeIdentity",