diff --git a/gatsby-config.js b/gatsby-config.js index 243731f..8178534 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -58,6 +58,6 @@ module.exports = { redirect: true, redirectComponent: require.resolve(`./src/components/redirect.js`), }, - } + }, ], } \ No newline at end of file diff --git a/gatsby-node.js b/gatsby-node.js index 8ea7d98..e9fc3c0 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -25,19 +25,6 @@ exports.createPages = async ({actions, graphql}) => { // language=GraphQL const result = await graphql(` { - courses: allMarkdownRemark( - filter: {frontmatter: {content_type: {eq: "page_education"}, published: {ne: false}}} - ){ - edges{ - node{ - html - frontmatter{ - title - path - } - } - } - } news: allMarkdownRemark( filter: {frontmatter: {content_type: {eq: "post"}, published: {ne: false}}}, @@ -54,14 +41,30 @@ exports.createPages = async ({actions, graphql}) => { } } } - }`) + + coursePages: allMarkdownRemark( + filter: {frontmatter: {content_type: {eq: "course"}, published: {ne: false}}} + ){ + edges{ + node{ + html + frontmatter{ + path + slug + } + } + } + } + } + `) if (result.errors) { throw result.errors; } + // Render courses const courseTemplate = path.resolve(`./src/components/templates/courseTemplate.js`); - const courses = result.data.courses.edges; + const courses = result.data.coursePages.edges; courses.forEach(({node}) => { createPage({ @@ -70,7 +73,7 @@ exports.createPages = async ({actions, graphql}) => { }) }); - /////////////////////////////////////////////////////////////////// + // Render news page const newsTemplate = path.resolve(`./src/components/templates/news.js`); const posts = result.data.news.edges; diff --git a/package.json b/package.json index d7b0203..d93177e 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,8 @@ "gatsby-source-graphql": "3.1.0", "gatsby-transformer-remark": "3.1.0", "gatsby-transformer-sharp": "3.1.0", + "node-sass": "^5.0.0", + "gatsby-plugin-sass": "4.1.0", "html-react-parser": "1.2.4", "imagemin-pngquant": "9.0.2", "jquery": "3.6.0", @@ -36,7 +38,9 @@ "react-intl": "^5.13.5", "redux": "4.0.5", "typescript": "^4.2.3", - "vertical-timeline-component-for-react": "1.0.7" + "vertical-timeline-component-for-react": "1.0.7", + "react-scrollspy": "^3.4.3", + "smoothscroll-polyfill": "^0.4.4" }, "devDependencies": { "autoprefixer": "10.2.5", diff --git a/src/components/footer.js b/src/components/footer.js index f8bc199..eba6a7e 100644 --- a/src/components/footer.js +++ b/src/components/footer.js @@ -1,11 +1,11 @@ import React from "react" import "../styles/footer.css" -const Footer = () => ( -