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
4 changes: 2 additions & 2 deletions packages/web/app/components/activity-feed/ascents-feed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ const getGroupStatusSummary = (group: GroupedAscentFeedItem): { text: string; ic
let color: string;
if (group.flashCount > 0) {
icon = <ThunderboltOutlined />;
color = 'gold';
color = 'default';
} else if (group.sendCount > 0) {
icon = <CheckCircleOutlined />;
color = 'green';
color = 'default';
} else {
icon = <CloseCircleOutlined />;
color = 'default';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ export function TickAction({
);
}, [logbook, climb, angle]);

const hasSuccessfulAscent = filteredLogbook.some((asc) => asc.is_ascent);
const badgeCount = filteredLogbook.length;

const handleClick = useCallback((e?: React.MouseEvent) => {
Expand Down Expand Up @@ -91,7 +90,7 @@ export function TickAction({
const iconSize = size === 'small' ? 14 : size === 'large' ? 20 : 16;

const icon = <CheckOutlined style={{ fontSize: iconSize }} />;
const badgeColor = hasSuccessfulAscent ? 'cyan' : 'red';
const badgeColor = themeTokens.neutral[400];

const drawers = (
<>
Expand Down
2 changes: 1 addition & 1 deletion packages/web/app/components/logbook/logbook-section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const LogbookSection: React.FC<LogbookSectionProps> = ({ climb }) => {
{summary.totalAttempts} attempt{summary.totalAttempts !== 1 ? 's' : ''} in {summary.sessionCount} session{summary.sessionCount !== 1 ? 's' : ''}
</Text>
{summary.successfulAscents > 0 && (
<Tag icon={<CheckCircleOutlined />} color="success">
<Tag icon={<CheckCircleOutlined />} color="default">
{summary.successfulAscents} send{summary.successfulAscents !== 1 ? 's' : ''}
</Tag>
)}
Expand Down
5 changes: 3 additions & 2 deletions packages/web/app/components/logbook/logbook-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Card, Rate, Tag, Typography, Space, Flex, Empty } from 'antd';
import { CheckOutlined, CloseOutlined } from '@ant-design/icons';
import { Climb } from '@/app/lib/types';
import { useBoardProvider } from '../board-provider/board-provider-context';
import { themeTokens } from '@/app/theme/theme-config';
import dayjs from 'dayjs';

const { Text } = Typography;
Expand Down Expand Up @@ -41,9 +42,9 @@ export const LogbookView: React.FC<LogbookViewProps> = ({ currentClimb }) => {
<>
<Tag color="blue">{ascent.angle}°</Tag>
{ascent.is_ascent ? (
<CheckOutlined style={{ color: '#52c41a' }} />
<CheckOutlined style={{ color: themeTokens.neutral[400] }} />
) : (
<CloseOutlined style={{ color: '#ff4d4f' }} />
<CloseOutlined style={{ color: themeTokens.neutral[400] }} />
)}
</>
)}
Expand Down
4 changes: 2 additions & 2 deletions packages/web/app/components/logbook/tick-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { track } from '@vercel/analytics';
import { LogAscentDrawer } from './log-ascent-drawer';
import AuthModal from '../auth/auth-modal';
import { constructClimbInfoUrl } from '@/app/lib/url-utils';
import { themeTokens } from '@/app/theme/theme-config';

const { Text, Paragraph } = Typography;

Expand Down Expand Up @@ -43,7 +44,6 @@ export const TickButton: React.FC<TickButtonProps> = ({ currentClimb, angle, boa
() => logbook.filter((asc) => asc.climb_uuid === currentClimb?.uuid && Number(asc.angle) === angle),
[logbook, currentClimb?.uuid, angle],
);
const hasSuccessfulAscent = filteredLogbook.some((asc) => asc.is_ascent);
const badgeCount = filteredLogbook.length;

return (
Expand All @@ -52,7 +52,7 @@ export const TickButton: React.FC<TickButtonProps> = ({ currentClimb, angle, boa
count={badgeCount > 0 ? badgeCount : 0}
overflowCount={100}
showZero={false}
color={hasSuccessfulAscent ? 'cyan' : 'red'}
color={themeTokens.neutral[400]}
>
<Button id="button-tick" type={buttonType} icon={<CheckOutlined />} onClick={showDrawer} />
</Badge>
Expand Down
4 changes: 2 additions & 2 deletions packages/web/app/components/queue-control/queue-list-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const AscentStatus = ({ climbUuid, fontSize }: { climbUuid: ClimbUuid; fo
</div>
) : null}
{!hasSuccessfulMirroredAscent && !hasSuccessfulAscent ? (
<CloseOutlined className={styles.ascentIconRegular} style={{ color: themeTokens.colors.error, fontSize }} />
<CloseOutlined className={styles.ascentIconRegular} style={{ color: themeTokens.neutral[400], fontSize }} />
) : null}
</div>
);
Expand All @@ -78,7 +78,7 @@ export const AscentStatus = ({ climbUuid, fontSize }: { climbUuid: ClimbUuid; fo
return hasSuccessfulAscent ? (
<CheckOutlined style={{ color: themeTokens.neutral[400], fontSize }} />
) : (
<CloseOutlined style={{ color: themeTokens.colors.error, fontSize }} />
<CloseOutlined style={{ color: themeTokens.neutral[400], fontSize }} />
);
};

Expand Down
Loading