Static content changed because the site has no backend yet

This commit is contained in:
horhik 2020-05-27 04:16:28 +03:00
parent 1d5b7d3519
commit 24d8900a3a
8 changed files with 69 additions and 56 deletions

View file

@ -11,15 +11,13 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4b1db503-490b-4f06-812d-6b9b94d2764a" name="Default Changelist" comment=""> <list default="true" id="4b1db503-490b-4f06-812d-6b9b94d2764a" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/css/elements/blog-post-preview.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/svg/stopwatch.svg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/svg/watch.svg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/index.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/components/elements/homepage/recent-block.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/elements/homepage/recent-block.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/App.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/App.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/components/elements/homepage/recent-list.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/elements/homepage/recent-list.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/pages/blog.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/pages/blog.jsx" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/components/pages/blog.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/pages/blog.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/css/basic.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/css/basic.scss" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/components/pages/portfolio.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/pages/portfolio.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/img/░█░█░░░░█▀▄ ░█▀█░░░░█░█ ░▀░▀░▀░░▀▀░.png" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/src/css/elements/blog-post-preview.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/css/elements/blog-post-preview.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/css/elements/portfolio-project.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/css/elements/portfolio-project.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/reducers/site-content-reducer.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/reducers/site-content-reducer.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/reducers/site-content-reducer.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/reducers/site-content-reducer.js" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -84,7 +82,8 @@
<workItem from="1589583447607" duration="5148000" /> <workItem from="1589583447607" duration="5148000" />
<workItem from="1590125952856" duration="14140000" /> <workItem from="1590125952856" duration="14140000" />
<workItem from="1590359928462" duration="4688000" /> <workItem from="1590359928462" duration="4688000" />
<workItem from="1590372993882" duration="18882000" /> <workItem from="1590372993882" duration="19190000" />
<workItem from="1590539117687" duration="2719000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -143,10 +142,11 @@
<screen x="0" y="0" width="1920" height="1080" /> <screen x="0" y="0" width="1920" height="1080" />
</state> </state>
<state x="391" y="182" key="SettingsEditor/0.0.1920.1080/1920.0.1280.1024@0.0.1920.1080" timestamp="1590389869850" /> <state x="391" y="182" key="SettingsEditor/0.0.1920.1080/1920.0.1280.1024@0.0.1920.1080" timestamp="1590389869850" />
<state x="538" y="-170" width="774" height="774" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1590396787684"> <state x="534" y="-210" width="774" height="774" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1590540625923">
<screen x="0" y="0" width="1920" height="1080" /> <screen x="0" y="0" width="1920" height="1080" />
</state> </state>
<state x="538" y="-170" width="774" height="774" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1920.1080/1920.0.1280.1024@0.0.1920.1080" timestamp="1590396787684" /> <state x="538" y="-170" width="774" height="774" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1920.1080/1920.0.1280.1024@0.0.1920.1080" timestamp="1590396787684" />
<state x="534" y="-210" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1920.1080@0.0.1920.1080" timestamp="1590540625923" />
<state x="1710" y="11" width="99" height="1060" key="dock-window-1" timestamp="1590395037402"> <state x="1710" y="11" width="99" height="1060" key="dock-window-1" timestamp="1590395037402">
<screen x="0" y="0" width="1920" height="1080" /> <screen x="0" y="0" width="1920" height="1080" />
</state> </state>

View file

@ -13,7 +13,7 @@ import { connect } from "react-redux";
const RecentBlock = (props) => { const RecentBlock = (props) => {
return ( return (
<a <a
href="#test" href={props.link}
className={`recent-block recent-block--${props.pos || "right"}`} className={`recent-block recent-block--${props.pos || "right"}`}
> >
{props.header || "no content loaded..."} {props.header || "no content loaded..."}

View file

@ -9,33 +9,18 @@ const Recent = (props) => {
<h1 className={"h1 recent-header"}>Recent</h1> <h1 className={"h1 recent-header"}>Recent</h1>
<ul className="recent-list"> <ul className="recent-list">
<li> <li>
<RecentBlock <RecentBlock link={"/portfolio"} header={'Added "TaSquare" project to portfolio '} pos={"right"} />
header={" My school report said I showed no interest"} </li>
pos="left"
/> <li>
<RecentBlock link={"/portfolio"} header={'Added Snake game to portfolio'} pos={"right"} />
</li> </li>
<li> <li>
<RecentBlock <RecentBlock
header={'"A disruptive influence" I felt sorry for them in a way'} link={"/portfolio"}
/> header={'Added "AnkiLan" project to portfolio'}
</li> pos="right"
<li>
<RecentBlock header={"When they finally expelled me"} pos={"left"} />
</li>
<li>
<RecentBlock header={"It didn't mean a thing"} pos={"left"} />
</li>
<li>
<RecentBlock
header={" Life is unfair, kill yourself or get over it"}
pos={"right"}
/>
</li>
<li>
<RecentBlock
header={" Life is unfair, kill yourself or get over it"}
pos={"left"}
/> />
</li> </li>
</ul> </ul>

View file

@ -22,19 +22,21 @@ const BlogArticlePreview = (props) => {
const BlogPage = (props) => { const BlogPage = (props) => {
return ( return (
<div> <div>
<ul className={"blog-posts"}> <h3 className={'nothing'} >There's nothing here yet</h3>
{props.posts.map((post, index) => {
const pos = index % 2 === 0 ? "left" : "right"; {/*<ul className={"blog-posts"}>*/}
return ( {/* {props.posts.map((post, index) => {*/}
<li {/* const pos = index % 2 === 0 ? "left" : "right";*/}
className={`recent-block recent-block--${pos} blog-posts__item `} {/* return (*/}
key={post.description} {/* <li*/}
> {/* className={`recent-block recent-block--${pos} blog-posts__item `}*/}
<BlogArticlePreview post={post} pos={pos}/> {/* key={post.description}*/}
</li> {/* >*/}
); {/* <BlogArticlePreview post={post} pos={pos}/>*/}
})} {/* </li>*/}
</ul> {/* );*/}
{/* })}*/}
{/*</ul>*/}
<Contacts /> <Contacts />
</div> </div>
); );

View file

@ -1,6 +1,7 @@
import React from "react"; import React from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import Contacts from "../elements/contacts"; import Contacts from "../elements/contacts";
import {APP} from "../../constants/link-types";
const PortfolioItem = (props) => { const PortfolioItem = (props) => {
const name = props.project.name; const name = props.project.name;
@ -23,6 +24,8 @@ const PortfolioItem = (props) => {
key={link.src} key={link.src}
className={`project-link project-link--${link.type}`} className={`project-link project-link--${link.type}`}
> >
{link.type === APP && link.logo ? <img className={'project-link__logo'} src={link.logo} alt="TaSquare logo"/>: ''}
<a className={"link"} href={link.src}> <a className={"link"} href={link.src}>
{link.name} {link.name}
</a> </a>

View file

@ -24,6 +24,10 @@
} }
} }
.nothing{
text-align: center;
}
.blog-post__header{ .blog-post__header{
color: $header-color; color: $header-color;
& a{ & a{

View file

@ -76,4 +76,9 @@
content: url("../../svg/app-page.svg"); content: url("../../svg/app-page.svg");
} }
} }
}
.project-link__logo{
margin-right: 10px;
width: 30px;
} }

View file

@ -1,50 +1,64 @@
import {APP_PAGE, GITHUB} from "../constants/link-types"; import {APP, APP_PAGE, GITHUB} from "../constants/link-types";
const initialState = { const initialState = {
recentNews: ["nope"], recentNews: ["nope"],
portfolioItems: [ portfolioItems: [
{ {
name: 'AnkiLan', 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: [], gallery: [],
pageLink: '', pageLink: '',
links: [ links: [
{ {
name: 'GitHub', name: 'GitHub',
type: GITHUB, type: GITHUB,
src: 'https://github.com' src: 'https://github.com/horhik/ankilan'
}, },
{ /*{
name: 'App page', name: 'App page',
type: APP_PAGE, type: APP_PAGE,
src: 'https://github.com' src: 'https://github.com'
}, },
*/
] ]
}, },
{ {
name: 'Time garden', name: 'Snake Game',
description: 'The Forest like app for desktop and mobile', description: 'Just the "Snake" game with smooth graphics',
gallery: [], gallery: [],
pageLink: '', pageLink: '',
links: [ links: [
{ {
name: 'GitHub', name: 'GitHub',
type: 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', name: 'TaSquare',
description: 'The Forest like app for desktop and mobile', description: 'TODO app for mobile',
gallery: [], gallery: [],
pageLink: '', pageLink: '',
links: [ links: [
{ {
name: 'GitHub', name: 'GitHub',
type: 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'
} }
] ]