cerc-io/snowballtools-base
16
0
Fork 2
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #143 from snowball-tools/template-card-redirect-bug

Browse Source 
Template card redirect bug
This commit is contained in:
Vivian Phung 2024-02-29 00:38:12 -07:00 committed by GitHub
commit ff9b08e91d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/frontend/src/assets/templates.ts
View File

@ -18,14 +18,14 @@ export default [
name: 'Kotlin',
icon: 'kotlin',
repoFullName: '',
isComingSoon: false,
isComingSoon: true,
},
{
id: '4',
name: 'React Native',
icon: 'react-native',
repoFullName: '',
isComingSoon: false,
isComingSoon: true,
},
{
id: '5',

16
packages/frontend/src/components/projects/create/TemplateCard/TemplateCard.tsx
View File

@ -1,3 +1,4 @@
import React, { ComponentPropsWithoutRef, useCallback } from 'react';
import { Button } from 'components/shared/Button';
import {
ArrowRightCircleIcon,
@ -6,8 +7,7 @@ import {
TemplateIconType,
} from 'components/shared/CustomIcon';
import { Tag } from 'components/shared/Tag';
import React, { ComponentPropsWithoutRef, useCallback } from 'react';
import { useNavigate } from 'react-router-dom';
import { useNavigate, useParams } from 'react-router-dom';
import { useToast } from 'components/shared/Toast';
import { cn } from 'utils/classnames';
@ -24,9 +24,13 @@ export interface TemplateCardProps extends ComponentPropsWithoutRef<'div'> {
isGitAuth: boolean;
}
export const TemplateCard = ({ template, isGitAuth }: TemplateCardProps) => {
export const TemplateCard: React.FC<TemplateCardProps> = ({
template,
isGitAuth,
}: TemplateCardProps) => {
const { toast, dismiss } = useToast();
const navigate = useNavigate();
const { orgSlug } = useParams();
const handleClick = useCallback(() => {
if (template?.isComingSoon) {
@ -38,7 +42,9 @@ export const TemplateCard = ({ template, isGitAuth }: TemplateCardProps) => {
});
}
if (isGitAuth) {
return navigate(`/template?templateId=${template.id}`);
return navigate(
`/${orgSlug}/projects/create/template?templateId=${template.id}`,
);
}
return toast({
id: 'connect-git-account',
@ -46,7 +52,7 @@ export const TemplateCard = ({ template, isGitAuth }: TemplateCardProps) => {
variant: 'error',
onDismiss: dismiss,
});
}, [isGitAuth, navigate, template, toast]);
}, [orgSlug, dismiss, isGitAuth, navigate, template, toast]);
return (
<button