From c75ed15b6ee005b7de1d005bbcb270d82a6ac56d Mon Sep 17 00:00:00 2001 From: Flejk Date: Thu, 1 Jul 2021 19:08:02 +0200 Subject: [PATCH] tiny CSS update and deployment url change --- README.md | 2 +- src/pages/404.js | 33 +++++++--- .../{MarkdownRemark.frontmatter__slug}.js | 19 +++++- src/resources/style.css | 8 +-- src/statComponents/BottomBar.js | 9 ++- src/statComponents/Layout.js | 63 +++++++------------ src/statComponents/SideContactBar.js | 1 + src/statComponents/TopNavBar.js | 9 ++- 8 files changed, 83 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index 2b957c1..dd21a86 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ ## Currently deployed at: -romantic-yonath-0742bf.netlify.app/ +sor-it.netlify.app/ ## TO DO: diff --git a/src/pages/404.js b/src/pages/404.js index 90a8caa..5e64f51 100644 --- a/src/pages/404.js +++ b/src/pages/404.js @@ -1,17 +1,32 @@ + +/* <--- Imports ---> */ import * as React from "react" -import Layout from '../statComponents/Layout'; import { Link } from "gatsby" +import { Helmet } from "react-helmet" +import Layout from '../statComponents/Layout' + +/* <--- Resources ---> */ +import favicon from '../resources/favicon.ico' +import logo192 from '../resources/logo192.png' + const NotFoundPage = () => { return ( - -

Ooops... Obsah nenalezen

-

Sorry{" "} - - 😔 - {" "} -

- Vrátit na domovskou stránku + + + + Ooops... - Studentská oborová rada IT PedF UK v Praze + + + + + +
+

Ooops... Obsah nenalezen

+

+ Vrátit na domovskou stránku +

+
) } diff --git a/src/pages/{MarkdownRemark.frontmatter__slug}.js b/src/pages/{MarkdownRemark.frontmatter__slug}.js index feb8abc..97ebb15 100644 --- a/src/pages/{MarkdownRemark.frontmatter__slug}.js +++ b/src/pages/{MarkdownRemark.frontmatter__slug}.js @@ -1,6 +1,13 @@ +/* <--- Imports ---> */ import React from "react" import { graphql } from "gatsby" -import Layout from '../statComponents/Layout'; +import { Helmet } from "react-helmet" +import Layout from '../statComponents/Layout' + + +/* <--- Resources ---> */ +import favicon from '../resources/favicon.ico' +import logo192 from '../resources/logo192.png' export default function Template({ data, // this prop will be injected by the GraphQL query below. @@ -8,7 +15,15 @@ export default function Template({ const { markdownRemark } = data // data.markdownRemark holds your post data const { frontmatter, html } = markdownRemark return ( - + + + + {frontmatter.pageTitle} - Studentská oborová rada IT PedF UK v Praze + + + + +
*/ import { Link } from 'gatsby'; import React from 'react'; + +/* <--- Resources ---> */ import logoSORIT from '../resources/logoSORIT.svg'; import znakUK from '../resources/UKZnakTransparent.png'; import znakUKHover from '../resources/UKZnakTransparentHover.png'; @@ -10,7 +13,7 @@ const BottomBar = () => {
    • - Logo Oborové rady IT + Logo Oborové rady IT
      • @@ -53,8 +56,8 @@ const BottomBar = () => {
      • - Znak Karlovy Univerzity - Znak Karlovy Univerzity + Znak Karlovy Univerzity + Znak Karlovy Univerzity
      diff --git a/src/statComponents/Layout.js b/src/statComponents/Layout.js index 57ae7a7..5ff85d3 100644 --- a/src/statComponents/Layout.js +++ b/src/statComponents/Layout.js @@ -1,48 +1,33 @@ /* <--- Imports ---> */ -import { Helmet } from "react-helmet" - -import React from 'react'; -import BottomBar from './BottomBar'; -import SideContactBar from './SideContactBar'; -import TopNavBar from './TopNavBar'; - +import React from 'react' +import BottomBar from './BottomBar' +import SideContactBar from './SideContactBar' +import TopNavBar from './TopNavBar' /* <--- Resources ---> */ - -import '../resources/style.css'; -import favicon from '../resources/favicon.ico' -import logo192 from '../resources/logo192.png' +import '../resources/style.css' - const Layout = ({ pageTitle, children }) => { - return ( -
      - - - {pageTitle} - Studentská oborová rada IT PedF UK v Praze - - - - - -
      - - {/* ---TO DO: Banner--- */} -
      +const Layout = ({ children }) => { + return ( +
      +
      + + {/* ---TO DO: Banner--- */} +
      -
      - - {children} +
      + {children} + +
      - -
      +
      +
      + +
      +
      + ) +} - -
      - ) - } - export default Layout +export default Layout diff --git a/src/statComponents/SideContactBar.js b/src/statComponents/SideContactBar.js index d3fe1fb..b8560e2 100644 --- a/src/statComponents/SideContactBar.js +++ b/src/statComponents/SideContactBar.js @@ -1,3 +1,4 @@ +/* <--- Imports ---> */ import React from 'react'; const SideContactBar = () => { diff --git a/src/statComponents/TopNavBar.js b/src/statComponents/TopNavBar.js index 2162a33..eaefe66 100644 --- a/src/statComponents/TopNavBar.js +++ b/src/statComponents/TopNavBar.js @@ -1,6 +1,9 @@ -import React from 'react'; -import { Link } from 'gatsby'; -import logoSORIT from '../resources/logoSORIT.svg'; +/* <--- Imports ---> */ +import React from 'react' +import { Link } from 'gatsby' + +/* <--- Resources ---> */ +import logoSORIT from '../resources/logoSORIT.svg' const TopNavBar = () => {