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.

Sign up for GitHub

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

Jump to bottom

fix: group & proposal theme and layout #41

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+327 −276
Open

fix: group & proposal theme and layout #41

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fd7c320
fix: group & proposal theme and layout
fmorency Nov 14, 2024
1c22999
fix: parent container overflow
fmorency Nov 14, 2024
8901001
fix: tally close button render
fmorency Nov 15, 2024
16c9c64
fix: alignment
fmorency Nov 15, 2024
abb9199
test: vote detail modal
fmorency Nov 18, 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
47 changes: 0 additions & 47 deletions components/admins/components/__tests__/adminOptions.test.tsx
View file
Open in desktop

This file was deleted.

71 changes: 0 additions & 71 deletions components/admins/components/adminOptions.tsx
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion components/admins/components/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export * from './adminOptions';
export * from './stakingParams';
export * from './validatorList';
4 changes: 2 additions & 2 deletions components/groups/components/CountdownTimer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ export default function CountdownTimer({ endTime }: { endTime: Date }) {

return (
<div className="grid grid-flow-col gap-5 mt-2 text-center auto-cols-max">
<div className="grid grid-flow-col gap-5 mt-2 text-center auto-cols-max">
<div className="grid grid-flow-col gap-5 mt-2 text-center auto-cols-max text-primary-content">
<div className="flex flex-col">
<span className="countdown text-xl">
<span className="countdown text-xl">
<span
style={{ '--value': timeLeft.days } as React.CSSProperties}
aria-label="days"
Expand Down
2 changes: 1 addition & 1 deletion components/groups/components/__tests__/groupProposals.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ describe('ProposalsForPolicy Component', () => {
}),
}));
renderWithChainProvider(<ProposalsForPolicy {...mockProps} />);
expect(screen.getByText('No proposals found')).toBeInTheDocument();
expect(screen.getByText('No proposal was found.')).toBeInTheDocument();
});

test('renders proposals list correctly', () => {
Expand Down
45 changes: 21 additions & 24 deletions components/groups/components/groupProposals.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,12 @@ export default function GroupProposals({
return (
<div className="h-full flex flex-col p-4">
{/* Header section */}
<div className="flex items-center justify-between mb-8">
<div className="flex items-center space-x-6">
<button
onClick={onBack}
className="btn btn-circle rounded-[16px] dark:bg-[#FFFFFF0F] bg-[#FFFFFF] btn-md"
>
<div className="flex items-center justify-between mb-4">
<div className="flex items-center space-x-4">
<button onClick={onBack} className="btn btn-circle rounded-[16px] bg-secondary btn-md">
<ArrowRightIcon className="text-primary" />
</button>
<h1 className="text-2xl font-bold">{groupName}</h1>
<h1 className="text-2xl font-bold text-primary-content">{groupName}</h1>
<ProfileAvatar walletAddress={policyAddress} size={40} />
</div>
<div className="flex items-center space-x-4">
Expand All @@ -269,25 +266,25 @@ export default function GroupProposals({
</div>

{/* Search and New Proposal section */}
<div className="flex justify-between items-center mb-6">
<h2 className="text-xl font-semibold">Proposals</h2>
<div className="flex justify-between items-center mb-4">
<div className="flex items-center space-x-4">
<h2 className="text-xl font-semibold text-primary-content">Proposals</h2>
<div className="relative">
<input
type="text"
placeholder="Search for a group..."
className="input input-bordered w-[224px] h-[40px] rounded-[12px] border-none bg-[#0000000A] dark:bg-[#FFFFFF1F] pl-10"
placeholder="Search for a proposal..."
className="input input-bordered w-[224px] h-[40px] rounded-[12px] border-none bg-secondary text-secondary-content pl-10"
value={searchTerm}
onChange={e => setSearchTerm(e.target.value)}
/>
<SearchIcon className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400" />
<SearchIcon className="h-6 w-6 absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400 " />
</div>
<Link href={`/groups/submit-proposal/${policyAddress}`} passHref>
<button className="btn btn-gradient rounded-[12px] w-[140px] text-white h-[52px]">
New proposal
</button>
</Link>
</div>
<Link href={`/groups/submit-proposal/${policyAddress}`} passHref>
<button className="btn btn-gradient rounded-[12px] w-[140px] text-white h-[52px]">
New proposal
</button>
</Link>
</div>

{/* Table section - will fill remaining space */}
Expand Down Expand Up @@ -357,25 +354,25 @@ export default function GroupProposals({
<tr
key={proposal.id.toString()}
onClick={() => handleRowClick(proposal)}
className="hover:bg-base-200 text-black dark:text-white rounded-lg cursor-pointer"
className="group text-black dark:text-white rounded-lg cursor-pointer"
>
<td className="dark:bg-[#FFFFFF0F] bg-[#FFFFFF] rounded-l-[12px] px-4 py-4 w-[25%]">
<td className="bg-secondary group-hover:bg-base-300 rounded-l-[12px] px-4 py-4 w-[25%]">
{proposal.id.toString()}
</td>
<td className="dark:bg-[#FFFFFF0F] bg-[#FFFFFF] truncate max-w-xs px-4 py-4 w-[25%]">
<td className="bg-secondary group-hover:bg-base-300 truncate max-w-xs px-4 py-4 w-[25%]">
{proposal.title}
</td>
<td className="dark:bg-[#FFFFFF0F] bg-[#FFFFFF] px-4 py-4 w-[25%]">
<td className="bg-secondary group-hover:bg-base-300 px-4 py-4 w-[25%]">
{timeLeft}
</td>
<td className="dark:bg-[#FFFFFF0F] bg-[#FFFFFF] px-4 py-4 w-[25%]">
<td className="bg-secondary group-hover:bg-base-300 px-4 py-4 w-[25%]">
{proposal.messages.length > 0
? proposal.messages.map((message, index) => (
<div key={index}>{getHumanReadableType((message as any)['@type'])}</div>
))
: 'No messages'}
</td>
<td className="dark:bg-[#FFFFFF0F] bg-[#FFFFFF] rounded-r-[12px] px-4 py-4 w-[25%]">
<td className="bg-secondary group-hover:bg-base-300 rounded-r-[12px] px-4 py-4 w-[25%]">
{isTalliesLoading ? (
<span className="loading loading-spinner loading-xs"></span>
) : (
Expand All @@ -388,7 +385,7 @@ export default function GroupProposals({
</tbody>
</table>
) : (
<div className="text-center py-8 text-gray-500">No proposals found</div>
<div className="text-center py-8 text-gray-500">No proposal was found.</div>
)}
</div>

Expand Down
Loading
Loading