Skip to content

Its time #268

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

Closed
wants to merge 43 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
d73b120
feat: block time
biwasxyz Mar 13, 2025
7dc4b76
feat: helper
biwasxyz Mar 13, 2025
c47383c
feat: status badge
biwasxyz Mar 13, 2025
e4ee647
feat: labeled field
biwasxyz Mar 13, 2025
9e4ed75
feat: copy button
biwasxyz Mar 13, 2025
9ff45d5
feat: message display
biwasxyz Mar 13, 2025
854c187
feat: block visual
biwasxyz Mar 13, 2025
bba4c23
feat: vote progress
biwasxyz Mar 13, 2025
b5654d0
feat: proposal metrics
biwasxyz Mar 13, 2025
a072793
feat: Time Status
biwasxyz Mar 13, 2025
4290a31
feat: proposalCard
biwasxyz Mar 13, 2025
3049570
feat: DAO Proposal
biwasxyz Mar 13, 2025
62ed386
fix: update import
biwasxyz Mar 13, 2025
23815de
fix: remove single long component
biwasxyz Mar 13, 2025
e198dec
fix: update import
biwasxyz Mar 13, 2025
9986058
fix: remove unused piece
biwasxyz Mar 13, 2025
c679300
Merge branch 'staging' into fix-2
biwasxyz Mar 13, 2025
0f607ec
fix: more fixes
biwasxyz Mar 13, 2025
70e98fa
fix: more css fixes
biwasxyz Mar 13, 2025
90f2b22
fix: more css fixes
biwasxyz Mar 13, 2025
5b37ea2
Merge pull request #264 from aibtcdev/fix-2
whoabuddy Mar 13, 2025
12f3302
fix: voting progress bar
biwasxyz Mar 14, 2025
82cb579
fix: message ui
biwasxyz Mar 14, 2025
886e595
fix: use tanstack to fetch block times
biwasxyz Mar 14, 2025
48a5d4a
fix: ref errors
biwasxyz Mar 14, 2025
839e247
fix: more fixups
biwasxyz Mar 14, 2025
fe3f588
fix: more fixups
biwasxyz Mar 14, 2025
5d587bc
fix: remove block time hooks
biwasxyz Mar 14, 2025
988d673
fix: add borders
biwasxyz Mar 14, 2025
9674f26
fixes
biwasxyz Mar 14, 2025
e02b49d
fix: use server action to fetch the bolck time
biwasxyz Mar 15, 2025
8454427
fix: eslint
biwasxyz Mar 15, 2025
0d25ce0
fix: 12 minutes -> 10 minutes
biwasxyz Mar 16, 2025
7cd65b0
fix: custom scrollbar
biwasxyz Mar 16, 2025
929d303
fix: remove custom scrollbar from chat
biwasxyz Mar 16, 2025
a59374c
Merge pull request #265 from aibtcdev/fix-3
whoabuddy Mar 16, 2025
0cfd44b
add media2
biwasxyz Mar 18, 2025
635e338
Update daos-table.tsx
biwasxyz Mar 18, 2025
5486db4
Update layout-client.tsx
biwasxyz Mar 18, 2025
0c9ca67
Merge pull request #266 from aibtcdev/biwasxyz-patch-1
whoabuddy Mar 18, 2025
92eada3
Update daos-table.tsx
biwasxyz Mar 18, 2025
758d580
Merge pull request #267 from aibtcdev/more-update
biwasxyz Mar 18, 2025
0465bce
fix: voting progress ui
biwasxyz Mar 18, 2025
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
4 changes: 2 additions & 2 deletions src/app/daos/[id]/layout-client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,11 @@ export function DAOLayoutClient({ children }: { children: React.ReactNode }) {
)}
<div className="mt-3">
{/* WE NEED TO CHANGE IT BASED ON WHAT THE NAME WILL BE ON MAINNET. AS OF NOW SINCE WE ARE TESTING ON THESE TWO ON STAGING I HAVE ENABLED PARTICIPATION FOR THESE TWO ONLY */}
{dao?.name === "FACES" || dao?.name === "CARA5" ? (
{dao?.name === "FACES" || dao?.name === "MEDIA2" ? (
<DAOChatButton daoId={id} />
) : (
<Button className="cursor-not-allowed" disabled>
Not available for participation yet.
Participate
</Button>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/daos/[id]/proposals/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useParams } from "next/navigation";
import { useQuery } from "@tanstack/react-query";
import { Suspense } from "react";
import { Loader2 } from "lucide-react";
import DAOProposals from "@/components/daos/dao-proposals";
import DAOProposals from "@/components/daos/proposal/DAOProposal";
import { fetchProposals } from "@/queries/daoQueries";

export const runtime = "edge";
Expand Down
29 changes: 28 additions & 1 deletion src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,33 @@ body {
font-family: var(--font-roc-grotesk-regular), Arial, Helvetica, sans-serif;
}

/* Custom Scrollbar Styles */
/* For WebKit-based browsers */
::-webkit-scrollbar {
width: 8px;
height: 8px;
}

::-webkit-scrollbar-track {
background: hsl(var(--background));
border-radius: var(--radius);
}

::-webkit-scrollbar-thumb {
background: hsl(var(--primary));
border-radius: var(--radius);
}

::-webkit-scrollbar-thumb:hover {
background: hsl(var(--primary));
}

/* For Firefox */
body {
scrollbar-width: thin;
scrollbar-color: hsl(var(--primary)) hsl(var(--background)); /* Now using primary orange */
}

@layer utilities {
.text-balance {
text-wrap: balance;
Expand Down Expand Up @@ -122,7 +149,7 @@ body {
}
}

/* Add gradient utilities to match Chakra gradients */
/* Gradient Utilities to match Chakra gradients */
@layer utilities {
.bg-gradient-up {
background: linear-gradient(
Expand Down
2 changes: 1 addition & 1 deletion src/components/daos/dao-extensions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useState } from "react";
import { Button } from "@/components/ui/button";
import { Badge } from "@/components/ui/badge";
import type { Extension } from "@/types/supabase";
import { CopyButton } from "./dao-proposals";
import CopyButton from "./proposal/CopyButton";

interface DAOExtensionsProps {
extensions: Extension[];
Expand Down
Loading