Skip to content

Commit

Permalink
Merge pull request #4 from slacgismo/develop
Browse files Browse the repository at this point in the history
fixed small linking issue on homepage cards
  • Loading branch information
Thistleman authored Aug 19, 2024
2 parents 73165d5 + fc45687 commit 9afdc56
Show file tree
Hide file tree
Showing 7 changed files with 98 additions and 7 deletions.
7 changes: 4 additions & 3 deletions package-lock.json

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

8 changes: 5 additions & 3 deletions src/app/modules/carousels/cardBuilder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ export default function CarouselCard({
description,
link,
linkText,
titleLink,
}: {
id: number,
title: string,
image: string,
description: string,
link: string,
linkText: string
linkText: string,
titleLink: string
}): React.JSX.Element {
return (
<div
Expand Down Expand Up @@ -65,9 +67,9 @@ export default function CarouselCard({
className=''
/>
</div>
<div className='text-xl font-bold'>
<Link className='text-xl font-bold' href={titleLink}>
{title}
</div>
</Link>
<p>
{description}
</p>
Expand Down
4 changes: 3 additions & 1 deletion src/app/modules/carousels/carousel.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
{
"id": 1,
"title": "Analytical Tasks and Leaderboards",
"titleLink": "/analyses",
"description": "Test your algorithms against predefined tasks and compare how it performs with others in your field",
"image": "/static/assets/profilecovers/kittens.jpg",
"link": "/analyses",
"link": "/register",
"linkText": "Sign Up Now"
},
{
"id": 2,
"title": "Resources",
"titleLink": "/resources",
"description": "For information about how to contribute to the validation hub",
"image": "/static/assets/profilecovers/pupper.jpg",
"link": "/resources",
Expand Down
3 changes: 3 additions & 0 deletions src/app/modules/carousels/carouselBuilder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ type Slide = {
description: string,
link: string,
linkText: string,
titleLink: string,
}

type PropType = {
Expand Down Expand Up @@ -56,6 +57,7 @@ const EmblaCarousel: React.FC<PropType> = (props) => {
description,
link,
linkText,
titleLink,
} = slide;
return (
<div className="
Expand All @@ -70,6 +72,7 @@ const EmblaCarousel: React.FC<PropType> = (props) => {
description={description}
link={link}
linkText={linkText}
titleLink={titleLink}
/>
</div>
);
Expand Down
16 changes: 16 additions & 0 deletions src/app/modules/profile/actions.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
'use client';
// *********** START OF IMPORTS ***********
/* eslint-disable no-unused-vars */
import React, {useEffect, useState} from 'react';
import DialogAction from '@mui/material/DialogActions';
import {useRouter} from 'next/navigation';

// *********** MODULE IMPORTS ***********

import CookieService from '@/services/cookie_service';
import UserService from '@/services/user_service';
import Elink from '@/app/modules/elink/elink';

// *********** REDUX IMPORTS ***********

// *********** END OF IMPORTS ***********
51 changes: 51 additions & 0 deletions src/app/modules/profile/personal.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
'use client';
// *********** START OF IMPORTS ***********
/* eslint-disable no-unused-vars */
import React, {useEffect, useState} from 'react';
import {
Avatar,
Card,
CardContent,
CardMedia,
CircularProgress,
Grid, Typography,
TextField,
Button,
CardActions,
} from '@mui/material';
import {Box} from '@mui/system';
import {styled} from '@mui/material/styles';
import Dialog from '@mui/material/Dialog';
import DialogContent from '@mui/material/DialogContent';
import DialogAction from '@mui/material/DialogActions';

// *********** MODULE IMPORTS ***********

import CookieService from '@/services/cookie_service';
import UserService from '@/services/user_service';
import Elink from '@/app/modules/elink/elink';

// *********** REDUX IMPORTS ***********

// *********** END OF IMPORTS ***********

// *********** START OF TYPES ***********

type UserDetails = {
username: string;
email: string;
firstName: string;
lastName: string;
githubLink: string;
addtlLinks: string[];
}

// *********** END OF TYPES ***********

/**
*
* @return {JSX.Element}
*/
export default function PersonalDetails() {
return 'hi';
}
16 changes: 16 additions & 0 deletions src/app/modules/profile/tasks.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
'use client';
// *********** START OF IMPORTS ***********
/* eslint-disable no-unused-vars */
import React, {useEffect, useState} from 'react';
import DialogAction from '@mui/material/DialogActions';
import {useRouter} from 'next/navigation';

// *********** MODULE IMPORTS ***********

import CookieService from '@/services/cookie_service';
import UserService from '@/services/user_service';
import Elink from '@/app/modules/elink/elink';

// *********** REDUX IMPORTS ***********

// *********** END OF IMPORTS ***********

0 comments on commit 9afdc56

Please sign in to comment.