Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"dependencies": {
"@auth/core": "^0.40.0",
"@headlessui/react": "^2.2.9",
"@heroicons/react": "^2.2.0",
"@react-three/postprocessing": "^3.0.4",
"@tanstack/react-query": "^5.90.19",
"@uidotdev/usehooks": "^2.4.1",
Expand Down
12 changes: 2 additions & 10 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/app/donate/[form]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import styles from './page.module.css'
import { useCurrentUser } from '@/util/hooks'
import { ArrowPathIcon } from '@heroicons/react/24/outline'
import { useParams, useSearchParams } from 'next/navigation'
import { FaArrowsRotate } from 'react-icons/fa6'

export default function Page() {
const routeParams = useParams()
Expand Down Expand Up @@ -35,7 +35,7 @@ export default function Page() {
return (
<div className={styles.page}>
<div className={styles.content}>
<ArrowPathIcon className={styles.spinner} />
<FaArrowsRotate className={styles.spinner} />
<p className={styles.text}>Redirecting...</p>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/app/login/LoginPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { LoginCard } from './LoginCard'
import styles from './login.module.css'
import { HalftoneBackground } from '@/components/halftone/HalftoneBackground'
import { MainLayout } from '@/components/layout'
import { InformationCircleIcon } from '@heroicons/react/24/solid'
import Link from 'next/link'
import { Suspense } from 'react'
import { FaCircleInfo } from 'react-icons/fa6'

export default function Login() {
return (
Expand All @@ -19,7 +19,7 @@ export default function Login() {
<LoginCard />
</Suspense>
<div className={styles.footer}>
<InformationCircleIcon className={styles.infoIcon} />
<FaCircleInfo className={styles.infoIcon} />

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you may wanna check out the styles on this one; the other use of this icon is fine but this one seems a little off

before:
Image

after:
Image

By signing in you agree to our
<Link
href="/privacy"
Expand Down
4 changes: 2 additions & 2 deletions src/app/volunteer/stages/CompleteStage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styles from './stages.module.css'
import { cn } from '@/util'
import { CakeIcon, TrophyIcon } from '@heroicons/react/24/solid'
import { FaCakeCandles, FaTrophy } from 'react-icons/fa6'

export interface CompleteStageProps {
isInServer: boolean
Expand All @@ -13,7 +13,7 @@ export function CompleteStage({
isPending,
onRejoin,
}: CompleteStageProps) {
const Icon = isInServer ? CakeIcon : TrophyIcon
const Icon = isInServer ? FaCakeCandles : FaTrophy
const subtitle = isInServer
? 'Congrats, you are in the server!'
: "Looks like you're no longer in the server!"
Expand Down
8 changes: 6 additions & 2 deletions src/app/volunteer/stages/JoiningStage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styles from './stages.module.css'
import { cn } from '@/util'
import { useInit } from '@/util/hooks'
import { ArrowPathIcon } from '@heroicons/react/24/solid'
import { FaArrowsRotate } from 'react-icons/fa6'

export interface JoiningStageProps {
isPending: boolean
Expand Down Expand Up @@ -33,7 +33,11 @@ export function JoiningStage({ isPending, error, onJoin }: JoiningStageProps) {
</>
) : (
<>
<ArrowPathIcon className={cn(styles.icon, styles.spin)} />
{
<FaArrowsRotate
className={cn(styles.icon, styles.spin)}
/>
}
<p className={styles.subtitle}>
Joining you to the server...
</p>
Expand Down
4 changes: 2 additions & 2 deletions src/app/volunteer/stages/UnderageStage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styles from './stages.module.css'
import { cn } from '@/util'
import { useInit } from '@/util/hooks'
import { CalendarIcon } from '@heroicons/react/24/solid'
import { FaCalendar } from 'react-icons/fa6'

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: FaRegCalendar is closer to the original

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will switch now, thanks for the feedback


export interface UnderageStageProps {
isPending: boolean
Expand All @@ -13,7 +13,7 @@ export function UnderageStage({ isPending, onAgeUp }: UnderageStageProps) {

return (
<div className={styles.container}>
<CalendarIcon className={cn(styles.icon, styles.success)} />
<FaCalendar className={cn(styles.icon, styles.success)} />
<p className={styles.subtitle}>
Sorry! You have to be 18 years old or older to volunteer with
Progressive Victory.
Expand Down
4 changes: 2 additions & 2 deletions src/app/volunteer/stages/components/Toggle.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styles from './components.module.css'
import { cn } from '@/util'
import { InformationCircleIcon } from '@heroicons/react/24/solid'
import { ReactElement } from 'react'
import { FaCircleInfo } from 'react-icons/fa6'

export function Toggle({
name,
Expand All @@ -22,7 +22,7 @@ export function Toggle({
<div className={styles.toggleContainer}>
<div className={styles.toggleLabelContainer}>
<div tabIndex={0} className={styles.tooltipContainer}>
<InformationCircleIcon className={styles.tooltipIcon} />
<FaCircleInfo className={styles.tooltipIcon} />
<div className={styles.tooltipElement}>
<span className={styles.tooltipContent}>{tooltip}</span>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/components/DropdownQuestion.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use client'

import styles from '@/components/content_sections/ContentSections.module.css'
import { PlusIcon, MinusIcon } from '@heroicons/react/24/solid'
import type React from 'react'
import { useEffect, useRef, useState } from 'react'
import { FaPlus, FaMinus } from 'react-icons/fa6'

export interface DropdownQuestionProps {
question: string
Expand Down Expand Up @@ -58,9 +58,9 @@ export function DropdownQuestion({

<span style={iconWrapperStyle}>
{isOpen ? (
<MinusIcon style={iconStyle} />
<FaMinus style={iconStyle} />
) : (
<PlusIcon style={iconStyle} />
<FaPlus style={iconStyle} />
)}
</span>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/dropdown/DropdownButton.tsx

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note for us: no uses of this one to validate against

Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
'use client'

import styles from './DropdownButton.module.css'
import { EllipsisVerticalIcon } from '@heroicons/react/24/outline'
import {
forwardRef,
useEffect,
useRef,
useState,
type MouseEvent as ReactMouseEvent,
} from 'react'
import { FaEllipsisVertical } from 'react-icons/fa6'
import { FiChevronDown } from 'react-icons/fi'
import { IoClose } from 'react-icons/io5'

Expand Down Expand Up @@ -193,7 +193,7 @@ export const DropdownButton = forwardRef<
icon
)
) : variant.showEllipsisIcon ? (
<EllipsisVerticalIcon
<FaEllipsisVertical
className={styles.shortIcon}
aria-hidden="true"
/>
Expand Down
36 changes: 14 additions & 22 deletions src/components/common/twitter_card_element/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,6 @@
import styles from './Card.module.css'
import { BaseButton } from '@/components/common/buttons/Button'
import { cn } from '@/util'
import {
HeartIcon,
ChatBubbleLeftRightIcon,
ArrowUpOnSquareIcon,
EllipsisHorizontalIcon,
} from '@heroicons/react/24/outline'
import {
HeartIcon as SolidHeartIcon,
ChatBubbleLeftRightIcon as SolidChatBubbleLeftRightIcon,
ArrowUpOnSquareIcon as SolidArrowUpOnSquareIcon,
} from '@heroicons/react/24/solid'
import {
motion,
useSpring,
Expand All @@ -24,6 +13,13 @@ import {
import Image from 'next/image'
import type React from 'react'
import { useState, useMemo } from 'react'
import {
FaHeart as SolidHeart,
FaRegHeart as Heart,
FaRegComment as FaComment,
FaRegShareFromSquare as FaShare,
FaEllipsis,
} from 'react-icons/fa6'

interface MotionProps {
initial?: TargetAndTransition
Expand Down Expand Up @@ -350,7 +346,7 @@ export function Message({
e.stopPropagation()
}
>
<EllipsisHorizontalIcon
<FaEllipsis
className={
styles.ellipsisIcon
}
Expand Down Expand Up @@ -399,15 +395,15 @@ export function Message({
aria-label="Comment"
>
{clickedBubble ? (
<SolidChatBubbleLeftRightIcon
<FaComment
className={cn(
styles.iconSolid,
styles.bubbleActive,
styles.iconGrowPop
)}
/>
) : (
<ChatBubbleLeftRightIcon
<FaComment
className={styles.icon}
/>
)}
Expand All @@ -423,17 +419,15 @@ export function Message({
aria-label="Share"
>
{clickedShare ? (
<SolidArrowUpOnSquareIcon
<FaShare
className={cn(
styles.iconSolid,
styles.shareActive,
styles.iconGrowPop
)}
/>
) : (
<ArrowUpOnSquareIcon
className={styles.icon}
/>
<FaShare className={styles.icon} />
)}
</button>

Expand All @@ -447,17 +441,15 @@ export function Message({
aria-label="Like"
>
{clickedHeart ? (
<SolidHeartIcon
<SolidHeart
className={cn(
styles.iconSolid,
styles.heartActive,
styles.iconGrowPop
)}
/>
) : (
<HeartIcon
className={styles.icon}
/>
<Heart className={styles.icon} />
)}
</button>
</div>
Expand Down