Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New components (colors not touched) #35

Merged
merged 27 commits into from
Jan 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
06fd360
feat: created homepage
XenosG Jan 6, 2024
770c1bd
refactor: moved buttons to card footer
XenosG Jan 6, 2024
1fcc092
feat: added more cards
XenosG Jan 7, 2024
0bd5f8b
fix: merge branch 'main' into homepage
XenosG Jan 7, 2024
64fd031
feat: setup masonry layout for cards
XenosG Jan 8, 2024
af8575b
fix: Merge branch 'main' into homepage
XenosG Jan 8, 2024
63098bd
fix: fixed masonry layout (for now)
XenosG Jan 8, 2024
f097271
Merge remote-tracking branch 'origin/main' into homepage
maalni Jan 16, 2024
d739f11
fix: Run prettier format
maalni Jan 16, 2024
49247d8
fix: fixed temp info in cards
XenosG Jan 17, 2024
5ab00c6
Merge branch 'main' into homepage
XenosG Jan 19, 2024
dcde963
fix: fixed formatting
XenosG Jan 19, 2024
8d292e9
refactor: Changed all text to use Text component
XenosG Jan 19, 2024
c18d547
feat: Pity widget (uncompleted)
XenosG Jan 20, 2024
ee0a3f7
fix: fixed formatting, commented unused code
XenosG Jan 20, 2024
4f883f4
feat: added progress component (shadcn)
XenosG Jan 20, 2024
c9a316e
fix: Run Prettier formatter
XenosG Jan 20, 2024
2ebe36a
fix: Text component now doesnt have margin by default, has margin pro…
XenosG Jan 20, 2024
e5d2218
Merge branch 'main' into homepage
XenosG Jan 20, 2024
7116474
fix: Run formatter
XenosG Jan 20, 2024
139d630
fix: fixed achievement widget
XenosG Jan 20, 2024
5bc49be
Merge branch 'main' into homepage
XenosG Jan 20, 2024
182816b
feat: added a bunch of components for future development
XenosG Jan 20, 2024
5bf7167
fix: added dependencies
XenosG Jan 20, 2024
b1cfcee
fix: removed homepage stuff to make merging easier
XenosG Jan 20, 2024
9230715
fix: removed dragdrop pkg, since it doesnt have ts support
XenosG Jan 20, 2024
7a1d3f1
feat: modified dragdrop component
XenosG Jan 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: Run Prettier formatter
XenosG committed Jan 20, 2024
commit c9a316e69a4c19a82e408ea3e9f0960b7d59bf98
2 changes: 1 addition & 1 deletion src/lib/components/ui/progress/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Root from "./progress.svelte";
import Root from './progress.svelte';

export {
Root,
19 changes: 7 additions & 12 deletions src/lib/components/ui/progress/progress.svelte
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
<script lang="ts">
import { Progress as ProgressPrimitive } from "bits-ui";
import { cn } from "$lib/utils";
import { Progress as ProgressPrimitive } from 'bits-ui';
import { cn } from '$lib/utils';

type $$Props = ProgressPrimitive.Props;

let className: $$Props["class"] = undefined;
export let max: $$Props["max"] = 100;
export let value: $$Props["value"] = undefined;
let className: $$Props['class'] = undefined;
export let max: $$Props['max'] = 100;
export let value: $$Props['value'] = undefined;
export { className as class };
</script>

<ProgressPrimitive.Root
class={cn(
"relative h-4 w-full overflow-hidden rounded-full bg-fill/20",
className
)}
class={cn('relative h-4 w-full overflow-hidden rounded-full bg-fill/20', className)}
{...$$restProps}
>
<div
class="h-full w-full flex-1 bg-fill transition-all"
style={`transform: translateX(-${
100 - (100 * (value ?? 0)) / (max ?? 1)
}%)`}
style={`transform: translateX(-${100 - (100 * (value ?? 0)) / (max ?? 1)}%)`}
/>
</ProgressPrimitive.Root>
4 changes: 1 addition & 3 deletions src/routes/homepage/+page.svelte
Original file line number Diff line number Diff line change
@@ -155,9 +155,7 @@ New Characters
</Card.Title>
</Card.Header>
<Card.Content>
<Text type="p">
talent materials, weapon materials + corresponding chars/weaps
</Text>
<Text type="p">talent materials, weapon materials + corresponding chars/weaps</Text>
</Card.Content>
</Card.Root>
<!-- Achievements card -->