Skip to content

chore: Simplify contribute and tagging pages #41

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

Merged
mannyakosah merged 3 commits into from
Feb 2, 2024
Merged

chore: Simplify contribute and tagging pages #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0389ad4
simplify contribute and tagging pages
mannyakosah Feb 2, 2024
be5fb42
remove unnecessary changes
mannyakosah Feb 2, 2024
c54c396
minor changes
mannyakosah Feb 2, 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
19 changes: 15 additions & 4 deletions packages/client/src/pages/contribute/ContributeLanding.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
import { Typography, Box, Stack, Button } from '@mui/material';
import { useNavigate } from 'react-router-dom';
import { useStudy } from '../../context/Study.context';
import { TagProvider, useTag } from '../../context/Tag.context';

export const ContributeLanding: React.FC = () => {
const ContributeLandingInternal: React.FC = () => {
const navigate = useNavigate();
const { study } = useStudy();
const { tag } = useTag();

const enterTagging = () => {
navigate('/contribute/tagging');
};

// TODO: Add in check for training completion

return (
<>
{study && (
Expand All @@ -22,13 +25,21 @@ export const ContributeLanding: React.FC = () => {
<Typography variant="body2">Study: {study.name}</Typography>
<Typography variant="body2">Description: {study.description}</Typography>
<Typography variant="body2">Instructions: {study.instructions}</Typography>
<Button variant="outlined" onClick={enterTagging}>
Enter tagging
</Button>
</Stack>
</Box>
<Button variant="outlined" onClick={enterTagging} disabled={tag == undefined}>
{tag ? 'Enter tagging' : 'No tagging left'}
</Button>
</Box>
)}
</>
);
};

export const ContributeLanding: React.FC = () => {
return (
<TagProvider>
<ContributeLandingInternal />
</TagProvider>
);
};
19 changes: 8 additions & 11 deletions packages/client/src/pages/contribute/TaggingInterface.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,21 @@ import { TagForm } from '../../components/contribute/TagForm.component';
import { useStudy } from '../../context/Study.context';
import { useEffect, useState } from 'react';
import { useCompleteTagMutation } from '../../graphql/tag/tag';
import { NoTagNotification } from '../../components/contribute/NoTagNotification.component';
import { Study } from '../../graphql/graphql';
import { TagProvider, useTag } from '../../context/Tag.context';
import { NoTagNotification } from '../../components/contribute/NoTagNotification.component';

export const TaggingInterface: React.FC = () => {
const { study } = useStudy();

// TODO: View for when there is no study vs when there is no tag
return (
<>
<TagProvider>
{study && (
<>
<MainView study={study} />
</>
)}
</TagProvider>
</>
<TagProvider>
{study && (
<>
<MainView study={study} />
</>
)}
</TagProvider>
);
};

Expand Down