From 24d8900a3af46426343997e1c0d8abfd20fac8b8 Mon Sep 17 00:00:00 2001 From: horhik Date: Wed, 27 May 2020 04:16:28 +0300 Subject: [PATCH] Static content changed because the site has no backend yet --- .idea/workspace.xml | 18 +++++----- .../elements/homepage/recent-block.jsx | 2 +- .../elements/homepage/recent-list.jsx | 31 +++++------------ src/components/pages/blog.jsx | 28 ++++++++------- src/components/pages/portfolio.jsx | 3 ++ src/css/elements/blog-post-preview.scss | 4 +++ src/css/elements/portfolio-project.scss | 5 +++ src/reducers/site-content-reducer.js | 34 +++++++++++++------ 8 files changed, 69 insertions(+), 56 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9a5a204..7e2362d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,15 +11,13 @@ - - - - - + + - - + + + @@ -143,10 +142,11 @@ - + + diff --git a/src/components/elements/homepage/recent-block.jsx b/src/components/elements/homepage/recent-block.jsx index 5f89bf4..38a6b44 100644 --- a/src/components/elements/homepage/recent-block.jsx +++ b/src/components/elements/homepage/recent-block.jsx @@ -13,7 +13,7 @@ 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 a8f2d11..690e2a9 100644 --- a/src/components/elements/homepage/recent-list.jsx +++ b/src/components/elements/homepage/recent-list.jsx @@ -9,33 +9,18 @@ const Recent = (props) => {

Recent

  • - + +
    • + +
  • +
  • -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • -
diff --git a/src/components/pages/blog.jsx b/src/components/pages/blog.jsx index 95c2bd2..d92a424 100644 --- a/src/components/pages/blog.jsx +++ b/src/components/pages/blog.jsx @@ -22,19 +22,21 @@ const BlogArticlePreview = (props) => { const BlogPage = (props) => { return (
-
    - {props.posts.map((post, index) => { - const pos = index % 2 === 0 ? "left" : "right"; - return ( -
  • - -
    • - ); - })} -
+

There's nothing here yet

+ + {/*
    */} + {/* {props.posts.map((post, index) => {*/} + {/* const pos = index % 2 === 0 ? "left" : "right";*/} + {/* return (*/} + {/* */} + {/* */} + {/* */} + {/* );*/} + {/* })}*/} + {/*
*/}
); diff --git a/src/components/pages/portfolio.jsx b/src/components/pages/portfolio.jsx index 5347f09..37442d3 100644 --- a/src/components/pages/portfolio.jsx +++ b/src/components/pages/portfolio.jsx @@ -1,6 +1,7 @@ import React from "react"; import { connect } from "react-redux"; import Contacts from "../elements/contacts"; +import {APP} from "../../constants/link-types"; const PortfolioItem = (props) => { const name = props.project.name; @@ -23,6 +24,8 @@ const PortfolioItem = (props) => { key={link.src} className={`project-link project-link--${link.type}`} > + {link.type === APP && link.logo ? TaSquare logo: ''} + {link.name} diff --git a/src/css/elements/blog-post-preview.scss b/src/css/elements/blog-post-preview.scss index 1455967..1a07513 100644 --- a/src/css/elements/blog-post-preview.scss +++ b/src/css/elements/blog-post-preview.scss @@ -24,6 +24,10 @@ } } +.nothing{ + text-align: center; +} + .blog-post__header{ color: $header-color; & a{ diff --git a/src/css/elements/portfolio-project.scss b/src/css/elements/portfolio-project.scss index fd70a20..70aa4b3 100644 --- a/src/css/elements/portfolio-project.scss +++ b/src/css/elements/portfolio-project.scss @@ -76,4 +76,9 @@ content: url("../../svg/app-page.svg"); } } +} + +.project-link__logo{ + margin-right: 10px; + width: 30px; } \ No newline at end of file diff --git a/src/reducers/site-content-reducer.js b/src/reducers/site-content-reducer.js index e9f4990..0a984f9 100644 --- a/src/reducers/site-content-reducer.js +++ b/src/reducers/site-content-reducer.js @@ -1,50 +1,64 @@ -import {APP_PAGE, GITHUB} from "../constants/link-types"; +import {APP, APP_PAGE, GITHUB} from "../constants/link-types"; const initialState = { recentNews: ["nope"], portfolioItems: [ { name: 'AnkiLan', - description: 'The app created for pushing cards with english words and their definitions to AnkiLan', + description: 'The app created for pushing cards with english words and their definitions to Anki', gallery: [], pageLink: '', links: [ { name: 'GitHub', type: GITHUB, - src: 'https://github.com' + src: 'https://github.com/horhik/ankilan' }, - { + /*{ name: 'App page', type: APP_PAGE, src: 'https://github.com' }, + */ ] }, { - name: 'Time garden', - description: 'The Forest like app for desktop and mobile', + name: 'Snake Game', + description: 'Just the "Snake" game with smooth graphics', gallery: [], pageLink: '', links: [ { name: 'GitHub', type: GITHUB, - src: 'https://github.com' + src: 'https://github.com/horhik/snake' + }, + + { + name: 'Game', + type: APP, + src: 'https://smoothsnake.netlify.app', + // logo: 'https://raw.githubusercontent.com/Horhik/tasquare/master/src/svg/logo.svg' } ] }, { - name: 'Time garden', - description: 'The Forest like app for desktop and mobile', + name: 'TaSquare', + description: 'TODO app for mobile', gallery: [], pageLink: '', links: [ { name: 'GitHub', type: GITHUB, - src: 'https://github.com' + src: 'https://github.com/horhik/tasquare' + }, + { + name: 'App', + type: APP, + src: 'https://tasquare.netlify.app', + logo: 'https://raw.githubusercontent.com/Horhik/tasquare/master/src/svg/logo.svg' } ]