diff --git a/packages/gui/src-tauri/tauri.conf.json b/packages/gui/src-tauri/tauri.conf.json index 6696831..3fd334d 100644 --- a/packages/gui/src-tauri/tauri.conf.json +++ b/packages/gui/src-tauri/tauri.conf.json @@ -102,7 +102,7 @@ "height": 600, "resizable": true, "title": "gui", - "width": 1024, + "width": 1200, "decorations": false } ] diff --git a/packages/gui/src/components/PackageBanner/PackageBanner.svelte b/packages/gui/src/components/PackageBanner/PackageBanner.svelte index 4d88d9d..f6a0fe3 100644 --- a/packages/gui/src/components/PackageBanner/PackageBanner.svelte +++ b/packages/gui/src/components/PackageBanner/PackageBanner.svelte @@ -2,27 +2,39 @@ import '$appcss'; import '@tea/ui/icons/icons.css'; import type { Package } from '@tea/ui/types'; + import Button from '@tea/ui/Button/Button.svelte'; + import StarRating from '@tea/ui/StarRating/StarRating.svelte'; export let pkg: Package; + + let packageRating = 0; -
+
{pkg.full_name}
-

{pkg.full_name}

+

{pkg.full_name}

{#if pkg.maintainer}

* {pkg.maintainer}

{/if} - stars -

{pkg.desc}

+
+ +
+

{pkg.desc}

-
diff --git a/packages/gui/src/components/SearchPackages/SearchPackages.svelte b/packages/gui/src/components/SearchPackages/SearchPackages.svelte index e45c8ad..32b7f5a 100644 --- a/packages/gui/src/components/SearchPackages/SearchPackages.svelte +++ b/packages/gui/src/components/SearchPackages/SearchPackages.svelte @@ -55,7 +55,7 @@
diff --git a/packages/gui/src/routes/packages/[slug]/+page.svelte b/packages/gui/src/routes/packages/[slug]/+page.svelte index 09905d9..fbf2ee6 100644 --- a/packages/gui/src/routes/packages/[slug]/+page.svelte +++ b/packages/gui/src/routes/packages/[slug]/+page.svelte @@ -16,7 +16,7 @@ let pkg: Package; packagesStore.subscribe((allPackages) => { - const foundPackage = allPackages.find(({ full_name }) => full_name === data?.title) as Package; + const foundPackage = allPackages.find(({ slug }) => slug === data?.slug) as Package; if (foundPackage) { pkg = foundPackage; } diff --git a/packages/ui/scripts/update-icons.js b/packages/ui/scripts/update-icons.js index 513b2da..797c01c 100644 --- a/packages/ui/scripts/update-icons.js +++ b/packages/ui/scripts/update-icons.js @@ -39,7 +39,7 @@ async function main() { const newCssFile = cssFile .replaceAll('https://file.myfontastic.com/Fd33ifaooDVpESwnDXETgR/', '') - .replaceAll('1669684803', 'tea-icons'); + .replaceAll(fileVersion, 'tea-icons'); await fs.writeFileSync(path.join(iconsFolder, 'icons.css'), newCssFile, { encoding: 'utf-8' }); } diff --git a/packages/ui/src/Button/Button.stories.ts b/packages/ui/src/Button/Button.stories.ts index be7d74a..edbb27e 100644 --- a/packages/ui/src/Button/Button.stories.ts +++ b/packages/ui/src/Button/Button.stories.ts @@ -27,27 +27,6 @@ export default { // More on writing stories with args: https://storybook.js.org/docs/7.0/svelte/writing-stories/args export const Primary = { args: { - primary: true, - label: 'Button' - } -}; - -export const Secondary = { - args: { - label: 'Button' - } -}; - -export const Large = { - args: { - size: 'large', - label: 'Button' - } -}; - -export const Small = { - args: { - size: 'small', - label: 'Button' + primary: true } }; diff --git a/packages/ui/src/Button/Button.svelte b/packages/ui/src/Button/Button.svelte index a23bbe9..45096da 100644 --- a/packages/ui/src/Button/Button.svelte +++ b/packages/ui/src/Button/Button.svelte @@ -1,44 +1,29 @@ + + diff --git a/packages/ui/src/Button/button.css b/packages/ui/src/Button/button.css deleted file mode 100644 index 0ff1a55..0000000 --- a/packages/ui/src/Button/button.css +++ /dev/null @@ -1,31 +0,0 @@ -@import '../app.css'; - -.storybook-button { - font-family: 'Nunito Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-weight: 700; - border: 0; - border-radius: 3em; - cursor: pointer; - display: inline-block; - line-height: 1; -} -.storybook-button--primary { - color: white; -} -.storybook-button--secondary { - color: #333; - background-color: transparent; - box-shadow: rgba(0, 0, 0, 0.15) 0px 0px 0px 1px inset; -} -.storybook-button--small { - font-size: 12px; - padding: 10px 16px; -} -.storybook-button--medium { - font-size: 14px; - padding: 11px 20px; -} -.storybook-button--large { - font-size: 16px; - padding: 12px 24px; -} diff --git a/packages/ui/src/StarRating/StarRating.svelte b/packages/ui/src/StarRating/StarRating.svelte new file mode 100644 index 0000000..dffb069 --- /dev/null +++ b/packages/ui/src/StarRating/StarRating.svelte @@ -0,0 +1,25 @@ + + +
+ {#each stars as star} + + {/each} +
diff --git a/packages/ui/src/StarRating/StartRating.stories.ts b/packages/ui/src/StarRating/StartRating.stories.ts new file mode 100644 index 0000000..cace923 --- /dev/null +++ b/packages/ui/src/StarRating/StartRating.stories.ts @@ -0,0 +1,25 @@ +import StarRating from './StarRating.svelte'; + +export default { + title: 'Example/StarRating', + component: StarRating, + // This component will have an automatically generated docsPage entry: https://storybook.js.org/docs/7.0/svelte/writing-docs/docs-page + tags: [], + render: (args) => ({ + Component: StarRating, + props: args + }), + parameters: { + // More on how to position stories at: https://storybook.js.org/docs/7.0/svelte/configure/story-layout + // layout: 'fullscreen' + }, + argTypes: { + // onLogin: { action: 'onLogin' }, + // onLogout: { action: 'onLogout' }, + // onCreateAccount: { action: 'onCreateAccount' } + } +}; + +export const Example = { + args: {} +}; diff --git a/packages/ui/src/icons/fonts/tea-icons.eot b/packages/ui/src/icons/fonts/tea-icons.eot index e13dfdc..c0e6c9a 100644 Binary files a/packages/ui/src/icons/fonts/tea-icons.eot and b/packages/ui/src/icons/fonts/tea-icons.eot differ diff --git a/packages/ui/src/icons/fonts/tea-icons.svg b/packages/ui/src/icons/fonts/tea-icons.svg index 0d1148a..ed7a7a8 100644 --- a/packages/ui/src/icons/fonts/tea-icons.svg +++ b/packages/ui/src/icons/fonts/tea-icons.svg @@ -25,4 +25,7 @@ + + + diff --git a/packages/ui/src/icons/fonts/tea-icons.ttf b/packages/ui/src/icons/fonts/tea-icons.ttf index 9608afe..bfc9423 100644 Binary files a/packages/ui/src/icons/fonts/tea-icons.ttf and b/packages/ui/src/icons/fonts/tea-icons.ttf differ diff --git a/packages/ui/src/icons/fonts/tea-icons.woff b/packages/ui/src/icons/fonts/tea-icons.woff index 98940c7..bc848f3 100644 Binary files a/packages/ui/src/icons/fonts/tea-icons.woff and b/packages/ui/src/icons/fonts/tea-icons.woff differ diff --git a/packages/ui/src/icons/icons.css b/packages/ui/src/icons/icons.css index e5385e2..78036fd 100644 --- a/packages/ui/src/icons/icons.css +++ b/packages/ui/src/icons/icons.css @@ -91,3 +91,12 @@ .icon-search-icon:before { content: '\72'; } +.icon-star-full:before { + content: '\73'; +} +.icon-star-half:before { + content: '\74'; +} +.icon-star-empty:before { + content: '\75'; +}