This commit is contained in:
Alexander Nozik 2021-03-29 18:50:37 +03:00
parent 1e537b74ab
commit 6b0e3eeacf
8 changed files with 17 additions and 22 deletions

View File

@ -10,7 +10,7 @@ const MagProgLayout = ({children}) => {
const intl = useIntl(); const intl = useIntl();
const lang = intl.locale; const lang = intl.locale;
return ( return (
<body> <>
<SEO lang={lang} title={intl.formatMessage({id: "title"})}/> <SEO lang={lang} title={intl.formatMessage({id: "title"})}/>
<Helmet> <Helmet>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
@ -34,7 +34,7 @@ const MagProgLayout = ({children}) => {
</div> </div>
</footer>*/} </footer>*/}
</body> </>
) )
} }

View File

@ -49,13 +49,14 @@ const NpmNavbar = () => {
<Nav.Link as="span" eventKey="partners"><FormattedMessage <Nav.Link as="span" eventKey="partners"><FormattedMessage
id="header.partners"/></Nav.Link> id="header.partners"/></Nav.Link>
</Link> </Link>
{/*
<Link to={`/${intl.locale}/magprog`} className="nav-item" activeClassName="active" <Link to={`/${intl.locale}/magprog`} className="nav-item" activeClassName="active"
partiallyActive={true}> partiallyActive={true}>
{/* magprog */}
<Nav.Link as="span" eventKey="magprog"> <Nav.Link as="span" eventKey="magprog">
<FormattedMessage id="header.magprog"/> <FormattedMessage id="header.magprog"/>
</Nav.Link> </Nav.Link>
</Link> </Link>
*/}
</Nav> </Nav>
<Nav.Link eventKey="language" className="nav-item language"> <Nav.Link eventKey="language" className="nav-item language">
<Language/> <Language/>

View File

@ -17,7 +17,7 @@ export default function Projects({projects, project_type}) {
const link = node.frontmatter.shortTitle; const link = node.frontmatter.shortTitle;
const id = node.frontmatter.id; const id = node.frontmatter.id;
return ( return (
<li><Link to={`/projects/${project_type}#${id}`}>{link}</Link></li> <li key={id}><Link to={`/projects/${project_type}#${id}`}>{link}</Link></li>
) )
})} })}
</ul> </ul>
@ -26,7 +26,7 @@ export default function Projects({projects, project_type}) {
const title = node.frontmatter.title; const title = node.frontmatter.title;
const id = node.frontmatter.id; const id = node.frontmatter.id;
return ( return (
<div className="row" id={id}> <div className="row" id={id} key={id}>
<div className="col-lg-12"> <div className="col-lg-12">
<hr/> <hr/>
<h2 id={id}>{title}</h2> <h2 id={id}>{title}</h2>

View File

@ -8,13 +8,5 @@ order: 2
published: true published: true
language: ru language: ru
--- ---
<table> <img src="/images/projects/math/gears_animated.gif" alt="Under construction...">
<tbody><tr><td> <h3>Этот раздел дорабатывается...</h3>
<div className="col-lg-9">
<img src="/images/projects/math/gears_animated.gif" alt="Under construction...">
</div>
</td>
<td>
<div className="col-lg-8" align="center"><h3>Этот раздел дорабатывается...</h3></div>
</td>
</tr></tbody></table>

View File

@ -1,7 +1,7 @@
--- ---
content_type: project content_type: project
project_type: software project_type: software
id: dataforge id: kmath
shortTitle: Kmath shortTitle: Kmath
title: "Экспериментальная математическая библиотека на kotlin" title: "Экспериментальная математическая библиотека на kotlin"
order: 2 order: 2

View File

@ -38,7 +38,7 @@ const AboutPage = ({data}) => {
const path = "../../images/members/" const path = "../../images/members/"
if (photo === null) if (photo === null)
return ( return (
<div> <div key={node.id}>
<hr/> <hr/>
<div className="row"> <div className="row">
<div className="col-lg-2"/> <div className="col-lg-2"/>
@ -51,7 +51,7 @@ const AboutPage = ({data}) => {
) )
else else
return ( return (
<div> <div key={node.id}>
<hr/> <hr/>
<div className="row"> <div className="row">
<div className="col-lg-2"> <div className="col-lg-2">
@ -77,6 +77,7 @@ export const query = graphql`
sort: {fields: frontmatter___order, order: ASC}) { sort: {fields: frontmatter___order, order: ASC}) {
edges{ edges{
node { node {
id
html html
frontmatter { frontmatter {
title title
@ -91,6 +92,7 @@ export const query = graphql`
sort: {fields: frontmatter___order, order: ASC}) { sort: {fields: frontmatter___order, order: ASC}) {
edges{ edges{
node { node {
id
html html
frontmatter { frontmatter {
title title

View File

@ -68,7 +68,7 @@ const IndexPage = ({data}) => {
const date = node.frontmatter.date; const date = node.frontmatter.date;
const html = node.html; const html = node.html;
return ( return (
<div className="card" <div className="card" key={node.id} id={node.id}
style={{marginBottom: `15px`, borderRadius: `0px`, boxShadow: `0 2px 2px #A2A2A2`}}> style={{marginBottom: `15px`, borderRadius: `0px`, boxShadow: `0 2px 2px #A2A2A2`}}>
<div className="card-body"> <div className="card-body">
<h2 className="title"> <h2 className="title">
@ -92,6 +92,7 @@ export const query = graphql`
{ {
edges{ edges{
node{ node{
id
html html
frontmatter { frontmatter {
date(formatString: "DD.MM.YYYY") date(formatString: "DD.MM.YYYY")
@ -107,6 +108,7 @@ export const query = graphql`
{ {
edges{ edges{
node{ node{
id
html html
frontmatter { frontmatter {
date(formatString: "DD.MM.YYYY") date(formatString: "DD.MM.YYYY")

View File

@ -49,9 +49,7 @@ function team(edges) {
<div className="content"> <div className="content">
<div className="inner"> <div className="inner">
<h2>{name}</h2> <h2>{name}</h2>
<p>
{Parser(edge.node.html)} {Parser(edge.node.html)}
</p>
{/* {/*
<ul className="actions"> <ul className="actions">
<li><a href="generic.html" className="button">Learn more</a></li> <li><a href="generic.html" className="button">Learn more</a></li>