From 6b0e3eeacf81fa1ed31dbe4e1123b7d844af725d Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Mon, 29 Mar 2021 18:50:37 +0300 Subject: [PATCH] Cleanup --- src/components/magprog/common/MagProgLayout.js | 4 ++-- src/components/navBar.js | 3 ++- src/components/templates/projectsTemplate.js | 4 ++-- src/content/ru/projects/math/significance.md | 12 ++---------- src/content/ru/projects/software/kmath.md | 2 +- src/pages/about.js | 6 ++++-- src/pages/index.js | 4 +++- src/pages/magprog/index.js | 4 +--- 8 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/components/magprog/common/MagProgLayout.js b/src/components/magprog/common/MagProgLayout.js index 93a03bb..ad36ea3 100644 --- a/src/components/magprog/common/MagProgLayout.js +++ b/src/components/magprog/common/MagProgLayout.js @@ -10,7 +10,7 @@ const MagProgLayout = ({children}) => { const intl = useIntl(); const lang = intl.locale; return ( - + <> @@ -34,7 +34,7 @@ const MagProgLayout = ({children}) => { */} - + ) } diff --git a/src/components/navBar.js b/src/components/navBar.js index f46ee1b..f9741a9 100644 --- a/src/components/navBar.js +++ b/src/components/navBar.js @@ -49,13 +49,14 @@ const NpmNavbar = () => { +{/* - {/* magprog */} +*/} diff --git a/src/components/templates/projectsTemplate.js b/src/components/templates/projectsTemplate.js index fff12ff..0fb83d6 100644 --- a/src/components/templates/projectsTemplate.js +++ b/src/components/templates/projectsTemplate.js @@ -17,7 +17,7 @@ export default function Projects({projects, project_type}) { const link = node.frontmatter.shortTitle; const id = node.frontmatter.id; return ( -
  • {link}
    • +
  • {link}
    • ) })} @@ -26,7 +26,7 @@ export default function Projects({projects, project_type}) { const title = node.frontmatter.title; const id = node.frontmatter.id; return ( -
    +

    {title}

    diff --git a/src/content/ru/projects/math/significance.md b/src/content/ru/projects/math/significance.md index bb132bc..50d4b0e 100644 --- a/src/content/ru/projects/math/significance.md +++ b/src/content/ru/projects/math/significance.md @@ -8,13 +8,5 @@ order: 2 published: true language: ru --- - - - -
    -
    - Under construction... -
    -     		-

    Этот раздел дорабатывается...

    -
    \ No newline at end of file +Under construction... +

    Этот раздел дорабатывается...

    \ No newline at end of file diff --git a/src/content/ru/projects/software/kmath.md b/src/content/ru/projects/software/kmath.md index f1fee7b..e48bf3a 100644 --- a/src/content/ru/projects/software/kmath.md +++ b/src/content/ru/projects/software/kmath.md @@ -1,7 +1,7 @@ --- content_type: project project_type: software -id: dataforge +id: kmath shortTitle: Kmath title: "Экспериментальная математическая библиотека на kotlin" order: 2 diff --git a/src/pages/about.js b/src/pages/about.js index 07e4346..bcb2605 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -38,7 +38,7 @@ const AboutPage = ({data}) => { const path = "../../images/members/" if (photo === null) return ( -
    +
    @@ -51,7 +51,7 @@ const AboutPage = ({data}) => { ) else return ( -
    +
    @@ -77,6 +77,7 @@ export const query = graphql` sort: {fields: frontmatter___order, order: ASC}) { edges{ node { + id html frontmatter { title @@ -91,6 +92,7 @@ export const query = graphql` sort: {fields: frontmatter___order, order: ASC}) { edges{ node { + id html frontmatter { title diff --git a/src/pages/index.js b/src/pages/index.js index e0d8302..4aa0571 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -68,7 +68,7 @@ const IndexPage = ({data}) => { const date = node.frontmatter.date; const html = node.html; return ( -

    @@ -92,6 +92,7 @@ export const query = graphql` { edges{ node{ + id html frontmatter { date(formatString: "DD.MM.YYYY") @@ -107,6 +108,7 @@ export const query = graphql` { edges{ node{ + id html frontmatter { date(formatString: "DD.MM.YYYY") diff --git a/src/pages/magprog/index.js b/src/pages/magprog/index.js index b0e079a..73fc007 100644 --- a/src/pages/magprog/index.js +++ b/src/pages/magprog/index.js @@ -49,9 +49,7 @@ function team(edges) {

    {name}

    -

    - {Parser(edge.node.html)} -

    + {Parser(edge.node.html)} {/*