diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1d2cc89..bdb9622 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,7 +11,25 @@ + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + @@ -77,6 +96,12 @@ + + + + + + @@ -131,15 +156,17 @@ - - + + - - + + + + @@ -288,9 +315,10 @@ - - + + + \ No newline at end of file diff --git a/public/index.html b/public/index.html index 6e30fc7..56d5dfe 100644 --- a/public/index.html +++ b/public/index.html @@ -10,9 +10,9 @@ content="O. George's portfolio and blog" /> - + - + Horhik.xyz diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 0000000..21b251a Binary files /dev/null and b/public/logo.png differ diff --git a/public/logo.svg b/public/logo.svg new file mode 100644 index 0000000..f7d7d80 --- /dev/null +++ b/public/logo.svg @@ -0,0 +1,116 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + ░█░█░░█▀█░░▀░▀░ + + + + diff --git a/public/logo192.png b/public/logo192_2.png similarity index 100% rename from public/logo192.png rename to public/logo192_2.png diff --git a/src/App.js b/src/App.js index f8ba9fa..268e505 100644 --- a/src/App.js +++ b/src/App.js @@ -1,9 +1,9 @@ import React from "react"; import "./css/basic.scss"; import HomePage from "./components/pages/homepage"; -import {connect} from 'react-redux' +import { connect } from "react-redux"; import NavHeader from "./components/navigation/nav-header"; -import {BrowserRouter, Route, Switch} from 'react-router-dom' +import { BrowserRouter, Route, Switch } from "react-router-dom"; import PageLinks from "./components/navigation/page-links"; import Logo from "./components/elements/logo"; import PortfolioPage from "./components/pages/portfolio"; @@ -12,28 +12,34 @@ import pages from "./constants/routes"; function App(props) { return (
- - - + + + - { - pages.map(page => { - return( - - ) - }) - } + + + - +
); } -export default connect( - state => ({ - currentPath: state.client.currentPath, - currentPage: state.client.currentPage, - currentPageName: state.client.currentPageName, - pageQuote: state.client.pageQuote - }) -)(App); +export default connect((state) => ({ + currentPath: state.client.currentPath, + currentPage: state.client.currentPage, + currentPageName: state.client.currentPageName, + pageQuote: state.client.pageQuote, +}))(App); diff --git a/src/components/elements/about.jsx b/src/components/elements/about.jsx index 677aeed..448498a 100644 --- a/src/components/elements/about.jsx +++ b/src/components/elements/about.jsx @@ -1,23 +1,20 @@ -import React from 'react' -import {connect} from 'react-redux' +import React from "react"; +import { connect } from "react-redux"; -const About = props => { +const About = (props) => { return (
-

- About me -

+

About me

Who I am?

-

What I can?

- ) -} + ); +}; -export default connect()(About) +export default connect()(About); diff --git a/src/components/elements/contacts.jsx b/src/components/elements/contacts.jsx index 2eb7b7f..02494d9 100644 --- a/src/components/elements/contacts.jsx +++ b/src/components/elements/contacts.jsx @@ -29,11 +29,11 @@ const Contacts = (props) => {
    {links.map((link) => (
  • - {link.mail ? - - : - - } + {link.mail ? ( + + ) : ( + + )}
  • ))}
diff --git a/src/components/elements/homepage/recent-block.jsx b/src/components/elements/homepage/recent-block.jsx index 38a6b44..0e0c4a9 100644 --- a/src/components/elements/homepage/recent-block.jsx +++ b/src/components/elements/homepage/recent-block.jsx @@ -1,5 +1,6 @@ import React from "react"; import { connect } from "react-redux"; +import { Link } from "react-router-dom/cjs/react-router-dom.min"; /* * props: { @@ -12,12 +13,13 @@ import { connect } from "react-redux"; const RecentBlock = (props) => { return ( - {props.header || "no content loaded..."} - + + ); }; diff --git a/src/components/elements/homepage/recent-list.jsx b/src/components/elements/homepage/recent-list.jsx index 690e2a9..a1dbbbd 100644 --- a/src/components/elements/homepage/recent-list.jsx +++ b/src/components/elements/homepage/recent-list.jsx @@ -3,29 +3,24 @@ import { connect } from "react-redux"; import RecentBlock from "./recent-block"; import Contacts from "../contacts"; -const Recent = (props) => { +const Recent = ({recent}) => { return (

Recent

    -
  • - -
  • - -
  • - -
  • - -
  • - -
  • -
+ {recent.map((page) => { + return ( +
  • + + +
  • + ); + })} +
    ); }; -export default connect()(Recent); +export default connect(state => ({ + recent: state.content.recentNews +}))(Recent); diff --git a/src/components/pages/blog.jsx b/src/components/pages/blog.jsx index 52bc00b..fd2ae58 100644 --- a/src/components/pages/blog.jsx +++ b/src/components/pages/blog.jsx @@ -4,7 +4,7 @@ import Contacts from "../elements/contacts"; const BlogArticlePreview = (props) => { return ( -
    + ); @@ -22,7 +26,7 @@ const BlogArticlePreview = (props) => { const BlogPage = (props) => { return (
    -

    There's nothing here yet

    +

    There's nothing here yet

    {/*