diff --git a/assets/src/components/TermCard.js b/assets/src/components/TermCard.js
index a6ea5974..7bfe90d2 100644
--- a/assets/src/components/TermCard.js
+++ b/assets/src/components/TermCard.js
@@ -1,328 +1,291 @@
import React, {useContext} from "react"
-import { Card, Accordion } from 'react-bootstrap';
+import { Card } from 'react-bootstrap';
import { makeStyles } from '@material-ui/core/styles';
import Chip from '@material-ui/core/Chip';
import DoneIcon from '@material-ui/icons/Done';
import HighlightOffIcon from '@material-ui/icons/HighlightOff';
+import Accordion from '@material-ui/core/Accordion';
+import AccordionSummary from '@material-ui/core/AccordionSummary';
+import AccordionDetails from '@material-ui/core/AccordionDetails';
+import Typography from '@material-ui/core/Typography';
+import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+
import LockOutlinedIcon from '@material-ui/icons/LockOutlined';
import AttachMoneyIcon from '@material-ui/icons/AttachMoney';
import DateRangeIcon from '@material-ui/icons/DateRange';
import InfoIcon from '@material-ui/icons/Info';
import DescriptionIcon from '@material-ui/icons/Description';
import LockOpenIcon from '@material-ui/icons/LockOpen';
import Grid from '@material-ui/core/Grid';
import {Context} from "../Context"
+import "./termcard.css"
-const useStyles = makeStyles({
+const useStyles = makeStyles((theme) =>({
card: {
width: '100%',
marginTop: "1rem",
},
root: {
flexGrow: 1,
},
chip: {
margin: 0.5,
},
+
+ heading: {
+ fontSize: theme.typography.pxToRem(15),
+ fontWeight: theme.typography.fontWeightRegular,
+ },
-})
+}))
function TermCard({term}) {
console.log(term)
const classes = useStyles();
const { institName, journalName } = useContext(Context)
-
- // const termJournalName = term.journals.map(journal=>(
-
- // {journal.name}
-
- // ))
-
- // const publisherName = term.publishers.map(publisher=>(
-
- // {publisher.name}
- // ))
- // const publisherDetail = term.publishers.map(publisher=>(
- //
- //
Publisher Details
- // {publisher.name}
- // {publisher.city}
- //
- // Since: {publisher.starting_year}
- //
- // ))
-
- // const journalDetail = term.journals.map(i=>(
- //
- //
Journal Details
- // {i.name}
- //
- // {i.name_short_iso_4}
- //
- //
{i.website}
- //
Licence Details
{i.name}
{i.name_or_abbrev}
{i.website}
))
function licence (){
const lockstatus = term.licence.map(i=>(
i.name_or_abbrev
))
if (lockstatus[0] === "CC-BY") {
return (
}
label={lockstatus}
// clickable={handleClick}
// color="secondary"
// onDelete={handleDelete}
className={classes.chip}
style={{ background: "#FFFFFF"}}
/>
)
}
else {
return(
}
label={lockstatus}
// clickable={handleClick}
// color="secondary"
// onDelete={handleDelete}
className={classes.chip}
style={{ background: "#FFFFFF"}}
/>
)
}
}
function version() {
const vers = term.version.map(i => (
i.description
))
const id = term.version.map(i => (
i.id
))
// console.log(vers[0])
if (vers[0] === "Submitted") {
return (
}
label="Submitted Version"
// clickable={handleClick}
// color="secondary"
// onDelete={handleDelete}
className={classes.chip}
style={{ background: "#FFFFFF"}}
/>
)
}
else if (vers[0] === "Accepted") {
return (
}
label="Accepted Version"
// clickable={handleClick}
// color="secondary"
// onDelete={handleDelete}
className={classes.chip}
style={{ background: "#FFFFFF"}}
/>
)
}
else if (vers[0] === "Published") {
return (
}
label="Published Version"
// clickable={handleClick}
// color="secondary"
// onDelete={handleDelete}
className={classes.chip}
style={{ background: "#FFFFFF"}}
/>
)
}
}
function cost() {
const price = term.cost_factor.map(i => (
i.amount
))
const price_symbol = term.cost_factor.map(j => (
j.symbol
))
const cost_name = term.cost_factor.map(k => (
k.cost_factor_type[0].name
))
const id = term.cost_factor.map(k => (
k.cost_factor_type[0].id
))
return (
}
label={cost_name[0] + " : " + price[0] + " " + price_symbol}
// clickable={handleClick}
// color="secondary"
// onDelete={handleDelete}
className={classes.chip}
style={{ background: "#FFFFFF"}}
/>
)
}
const termArchive = term.ir_archiving ? (
}
label={"IR Archiving"}
// variant="outlined"
// clickable={handleClick}
// color="secondary"
// onDelete={handleDelete}
style={{ background: "#FFFFFF"}}
/>
): (
}
label="IR Archiving"
// clickable={handleClick}
// color="secondary"
// onDelete={handleDelete}
style={{ background: "#f50057"}}
/>
)
const embargo = term.ir_archiving ? (
}
label={"Embargo: " + term.embargo_months + " Month(s)"}
// variant="outlined"
// clickable={handleClick}
// color="secondary"
// onDelete={handleDelete}
style={{ background: "#FFFFFF"}}
/>
):
()
return (
-
-
-
-
-
-
+
+
+
+ }
+ aria-controls="panel1a-content"
+ id="panel1a-header"
+ >
+ {version()}
+
+
+
+
{institName ?
Agreement with {institName}
:
{journalName}
}
-
- {version()}
{cost()}
{licence()}
{termArchive}
{embargo}
-
-
-
-
-
-
-
-
- ID: {term.id}
-
- {/*
- your subtile here
- */}
-
-
-
-
-
- {licenceDetail}
-
-
-
-
-
-
+ {licenceDetail}
+
+
-
+