Skip to content
This repository has been archived by the owner on Jun 13, 2022. It is now read-only.

Commit

Permalink
Add collaborators/members and update content
Browse files Browse the repository at this point in the history
  • Loading branch information
streamerd committed Feb 26, 2021
1 parent 41377c5 commit b1d88d6
Show file tree
Hide file tree
Showing 9 changed files with 16,532 additions and 41 deletions.
16,372 changes: 16,372 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"i18next-browser-languagedetector": "^6.0.1",
"i18next-xhr-backend": "^3.2.2",
"react": "^17.0.1",
"react-component-collaborators": "^1.0.1",
"react-cookie-consent": "^6.2.3",
"react-dom": "^17.0.1",
"react-i18next": "^11.8.5",
"react-reveal": "^1.2.2",
Expand Down
4 changes: 2 additions & 2 deletions public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
"theme_color": "#ffffff",
"background_color": "#FF73F5"
}
13 changes: 9 additions & 4 deletions src/components/Footer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,16 @@ const Footer = ({ t }) => {
src="twitter.svg"
/>

<SocialLink
href="https://futuremade.blackblogs.org/"
src="medium.svg"
/>
<div
className="license"
dangerouslySetInnerHTML={{
__html: `
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons Licence" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /> &nbsp &nbsp This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
`
}}
/>
</S.FooterContainer>

</Row>
</Container>
</S.Extra>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"title": "Diversified donation, a probable precondition",
"title": "Donations, diversified for local and global impact",
"text": "Consumers/audiences as in individuals/communities that declare those demands decide how and where impact will be delivered. There will be no price-tags; especially on people, as in market-place like platforms whatsoever, period.",
"section": [
{
Expand Down
6 changes: 3 additions & 3 deletions src/content/theories_for_change/ExpressionOfDemand.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"text": "We'd like to extend the Freedom of Expression with an effective Expression of Demand in our future projects and platforms. Basically, it is an activity, as in expressing the demand for a service/experience or resource/good, without waiting for it to be placed on a market place or announced. Aimed to re-establish trust and introduce resilliency through future-impact-driven capacity making activities.",
"section": [
{
"title": "An impact to be made, without financial or spatial-temporal limits of an individual or community.",
"title": "First area of implementation, arts and culture/events",
"content": "We'd like to reduce the stress on the artists and help them sustain their efforts via making their events more accessible to their audiences, as well as increasing their mobility with local support for the resources and skills they might need.",
"icon": "notes.svg"
},
{
"title": "What is next? A future, to be made by and for all..",
"content": "Applying demand-aware framework for crowdfunding and co-imagination and funding of of the ultimate transparency and verified knowledge. Hence, civid demands that made with desired topich & aspects along with debate themes and attendee requests to those content and talks.",
"title": "What is next? \"Financially and politically\" backed, independent journalism",
"content": "Applying demand-aware framework for crowdfunding and co-imagination and funding of the ultimate transparency and verified knowledge. Hence, civic demands that made with desired topich & aspects along with debate themes and attendee requests to those content and talks.",
"icon": "notes.svg"
}
]
Expand Down
18 changes: 17 additions & 1 deletion src/pages/Home/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { lazy } from "react";
import CookieConsent, { Cookies } from "react-cookie-consent";


import IntroContent from "../../content/IntroContent.json";
import MiddleBlockContent from "../../content/MiddleBlockContent.json";
import AboutContent from "../../content/AboutContent.json";
import MissionContent from "../../content/MissionContent.json";
import ContactContent from "../../content/ContactContent.json";
import Members from "../Members/index"

// Theories for Change
import ExpressionOfDemand from "../../content/theories_for_change/ExpressionOfDemand.json";
Expand Down Expand Up @@ -103,12 +106,25 @@ const Home = () => {
id="donation_as_precondition"
/>


<CookieConsent
location="bottom"
buttonText="roger that!"
cookieName="myAwesomeCookieName2"
style={{ background: "#2B373B" }}
buttonStyle={{ color: "#4e503b", fontSize: "13px" }}
expires={150}
>
Collaborators of this site use cookies to feed their appetites.{" "}
<span style={{ fontSize: "10px" }}>if you need more space, roger that.</span>
</CookieConsent>
{/* <ContactFrom
title={ContactContent.title}
content={ContactContent.text}
id="contact"
/> */}

<h3>Collaborators</h3>
<Members/>
</Container>
);
};
Expand Down
143 changes: 113 additions & 30 deletions src/pages/Members/index.js
Original file line number Diff line number Diff line change
@@ -1,38 +1,121 @@
import { lazy } from "react";
import React, { Component } from 'react'
import { CollaboratorsList } from 'react-component-collaborators'
import { CardComplete } from 'react-component-collaborators'
import { CardMinimal } from 'react-component-collaborators'

import IntroContent from "../../content/IntroContent.json";
import AboutContent from "../../content/AboutContent.json";
const Members = () => {

let listStyleObject = {
listWidth: '1200px',
listHeight: '600px',
direction: 'vertical',
listBackgroundColor: '#000'
}

const ContentBlock = lazy(() => import("../../components/ContentBlock"));
const Container = lazy(() => import("../../common/Container"));
const ScrollToTop = lazy(() => import("../../common/ScrollToTop"));
const borderImage = {
width: '4px',
style: 'solid',
color: '#800e34'
}
const borderCard = {
width: '4px',
style: 'solid',
color: '#800e34'
}

const Home = () => {
let cardStyleObject = {
cardWidth: '280px',
cardHeight: '140px',
cardBackgroundColor: '#e17e23',
textAlign: 'center',
imageFormat: 'circle',
borderImage: borderImage,
borderCard: borderCard,
titleColor: '#000',
descriptionColor: '#000',
imageWidth: '100px',
imageHeight: '100px',
fontSizeTitle: '100%',
paddingTitle: '0px 0px 20px 0px',
marginTitle: '0px 0px 0px 0px',
fontSizeDescription: '80%',
paddingDescription: '0px 0px 0px 0px',
marginDescription: '0px 0px 0px 0px'
}

let imagePosition = "left"
let collaboratorsArray = [
{
image:
'https://offsetmovement.org/FutureMade_files/collaborators/tolgay.jpg',
title: 'Abbas Tolgay Yilmaz',
description: 'Software Engineer, Visual Artist, Game Theorist'
},
{
image:
'https://offsetmovement.org/FutureMade_files/collaborators/zari.png',
title: 'Zari Harat',
description: 'Painter, traveler, healer, teacher, creative coach'
},
{
image:
'https://offsetmovement.org/FutureMade_files/collaborators/tanja.jpeg',
title: 'Tanja Taechanurug',
description: 'Designer, Illustrator'
}, {
image:
'https://offsetmovement.org/FutureMade_files/collaborators/mikey.jpg',
title: 'Mikey Goodfire',
description: 'Musician, Traveler'
},
{
image:
'https://offsetmovement.org/FutureMade_files/collaborators/tina.png',
title: 'Tina Marquardt',
description: 'blockchain & distributed governance researcher, entrepreneur'
},
{
image:
'https://offsetmovement.org/FutureMade_files/collaborators/vasilis.png',
title: 'Vasilis Spilka',
description: 'Software Architect'
},
{
image:
'https://i.imgur.com/PmFMNdc.png',
title: 'Sharon Lomanno',
description: 'Art Director, Scientist, Photographer, Videographer'
},
{
image:
'https://i.imgur.com/YSVq4C1.png',
title: 'Sabrina De Mitri',
description: 'Musician'
},
{
image:
'https://i.imgur.com/ZUwnvHZ.png',
title: 'Jannik Bessert',
description: 'Audio Engineer'
},
{
image:
'https://i.imgur.com/EgM5oOq.png',
title: 'Emin Araç',
description: 'Photographer, Traveler'
}
]
return (
<Container>
<ScrollToTop />
<ContentBlock
type="right"
first="true"
title={IntroContent.title}
content={IntroContent.text}
button={IntroContent.button}
icon="developer.svg"
id="intro"
/>

<ContentBlock
type="left"
title={AboutContent.title}
content={AboutContent.text}
section={AboutContent.section}
icon="graphs.svg"
id="collaborators"
/>

</Container>
<CollaboratorsList
collaboratorsArray={collaboratorsArray}
listStyleObject={listStyleObject}
>
<CardComplete
cardStyleObject={cardStyleObject}
imagePosition={imagePosition}
/>
</CollaboratorsList>
);
};

export default Home;
export default Members;
13 changes: 13 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6825,6 +6825,11 @@ jest@26.6.0:
import-local "^3.0.2"
jest-cli "^26.6.0"

js-cookie@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==

"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
Expand Down Expand Up @@ -9532,6 +9537,14 @@ react-app-polyfill@^2.0.0:
regenerator-runtime "^0.13.7"
whatwg-fetch "^3.4.1"

react-cookie-consent@^6.2.3:
version "6.2.3"
resolved "https://registry.yarnpkg.com/react-cookie-consent/-/react-cookie-consent-6.2.3.tgz#fdfbea5ea07ac484c46046418514865c33319015"
integrity sha512-PCagmezwHF0oEqORcY6jWlbwUeu1u1zFFi3gc9TL7H4bTk4qR2uLFBKKVVN5gfScTLwdoJtH8sMbgj/cOmUn0A==
dependencies:
js-cookie "^2.2.1"
prop-types "^15.7.2"

react-dev-utils@^11.0.2:
version "11.0.2"
resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-11.0.2.tgz#98aed16ef50f808ee17b32def75eb15f89655802"
Expand Down

0 comments on commit b1d88d6

Please sign in to comment.