diff --git a/README.md b/README.md index 518a30635..e9a5c1574 100755 --- a/README.md +++ b/README.md @@ -46,14 +46,3 @@ prev: '/docs/wiki-publisher/' next: '/docs/digitalme/' --- ``` -## You want to go deeper ? - -![https://docc-theme.netlify.app](https://docc-theme.netlify.app) - - -to install a new version of this - -``` -gridsome create threefold-now https://github.com/mrcrmn/docc -``` - diff --git a/content/author/christine.md b/content/author/christine.md index 437a4925e..68f23e231 100644 --- a/content/author/christine.md +++ b/content/author/christine.md @@ -18,8 +18,3 @@ image: ./images/author1.png test ![](./images/author1.png) - - - - - diff --git a/content/blog/beliive/beliive.png b/content/blog/beliive.png similarity index 100% rename from content/blog/beliive/beliive.png rename to content/blog/beliive.png diff --git a/content/blog/blog1.md b/content/blog/blog1.md new file mode 100644 index 000000000..89d287cd1 --- /dev/null +++ b/content/blog/blog1.md @@ -0,0 +1,42 @@ +--- +id: word_first_time_token2 +title: Worlds First Time Token +tags: grid, solution +category: gridusecase +excerpt: World First Time Token enables 200.000+ users for exchanging value. +created: 2019-03-20 +image: ./beliive.png +image_caption: beliive +author: christine +--- + + +# Beliive + +## About + +*Beliive* is a community where people can exchange experiences and services using time as the only currency. With 200.000 members to date Beliive is the world's largest time bank. Our vision is to be a movement that rethinks and rebuilds the value of money, the value of time and the way we collaborate with each other. When the money economy is failing at giving us a way to exchange our value independently of the circumstances, Beliive decided to create a complimentary economy based on an abundant resource available to everyone equally. + +## Mission + +Our mission is to empower and inspire people to recognize abundance by living new experiences one hour at a time. + +## Impact + +We have created a platform where low-income and unemployed people can exchange their time (hours) of volunteering for knowledge and skills. To scale this and to allow for collaboration opportunities, Beliive has an open API and a web widget that can integrate our time banking technology with different platforms and systems. Soon our time credits will use blockchain technology. + +## Powered by ThreeFold + +Beliive and ThreeFold recognize the power of equality to include and connect people to their unlimited abundance. We are peer-to-peer systems that are here to support the awakening of humanity to its own potential. Beliive will connect users' wallets and identity with ThreeFold, using its technology to support time exchange transactions. Beliive will also connect time credits to TF Foundation partners and communities, providing a peer-to-peer platform for TF Foundation to spread the use of time credits for economic empowerment. + +## Join saving our planet! + +The world has 3 trillion idle hours per year and Beliive is using TIME as the common currency to promote reciprocal exchanges and financial inclusion. With Beliive you can offer for example one hour of Spanish Lessons receiving a time credit of one hour in return, then you can exchange this credit for any activity available in the community, like financial advice, dance lessons or someone to fix something for you. + + +## Support this project + +Beliive is included in ThreeFold’s [Token Distribution Event (TDE)](https://wiki.threefold.io/#/tdeoverview) for the impact it brings to our planet, humanity and the ThreeFold Grid. +The ThreeFold Token (TFT) represents a unit of capacity on the new Internet and is created only when new capacity is added to the ThreeFold Grid. +Each project on the TDE benefits from TFT fund allocations. You can buy TFT's and support Beliive, and the growth of a new Conscious Internet. + diff --git a/content/people/adnan_fatayerji/adnan_fatayerji.jpg b/content/person/adnan_fatayerji/adnan_fatayerji.jpg similarity index 100% rename from content/people/adnan_fatayerji/adnan_fatayerji.jpg rename to content/person/adnan_fatayerji/adnan_fatayerji.jpg diff --git a/content/people/adnan_fatayerji/adnan_fatayerji.md b/content/person/adnan_fatayerji/adnan_fatayerji.md similarity index 100% rename from content/people/adnan_fatayerji/adnan_fatayerji.md rename to content/person/adnan_fatayerji/adnan_fatayerji.md diff --git a/content/people/ahmed_thabet/ahmed_thabet.jpg b/content/person/ahmed_thabet/ahmed_thabet.jpg similarity index 100% rename from content/people/ahmed_thabet/ahmed_thabet.jpg rename to content/person/ahmed_thabet/ahmed_thabet.jpg diff --git a/content/people/ahmed_thabet/ahmed_thabet.md b/content/person/ahmed_thabet/ahmed_thabet.md similarity index 100% rename from content/people/ahmed_thabet/ahmed_thabet.md rename to content/person/ahmed_thabet/ahmed_thabet.md diff --git a/content/people/akram_alfawakheeri/akram_alfawakheeri.jpg b/content/person/akram_alfawakheeri/akram_alfawakheeri.jpg similarity index 100% rename from content/people/akram_alfawakheeri/akram_alfawakheeri.jpg rename to content/person/akram_alfawakheeri/akram_alfawakheeri.jpg diff --git a/content/people/akram_alfawakheeri/akram_alfawakheeri.md b/content/person/akram_alfawakheeri/akram_alfawakheeri.md similarity index 100% rename from content/people/akram_alfawakheeri/akram_alfawakheeri.md rename to content/person/akram_alfawakheeri/akram_alfawakheeri.md diff --git a/content/people/alan_laubsch/alan_laubsch.md b/content/person/alan_laubsch/alan_laubsch.md similarity index 100% rename from content/people/alan_laubsch/alan_laubsch.md rename to content/person/alan_laubsch/alan_laubsch.md diff --git a/content/people/alan_laubsch/alan_laubsch.png b/content/person/alan_laubsch/alan_laubsch.png similarity index 100% rename from content/people/alan_laubsch/alan_laubsch.png rename to content/person/alan_laubsch/alan_laubsch.png diff --git a/content/people/andreas_hartl/andreas_hartl.jpeg b/content/person/andreas_hartl/andreas_hartl.jpeg similarity index 100% rename from content/people/andreas_hartl/andreas_hartl.jpeg rename to content/person/andreas_hartl/andreas_hartl.jpeg diff --git a/content/people/andreas_hartl/andreas_hartl.md b/content/person/andreas_hartl/andreas_hartl.md similarity index 100% rename from content/people/andreas_hartl/andreas_hartl.md rename to content/person/andreas_hartl/andreas_hartl.md diff --git a/content/people/anna_allen/anna_allen.jpeg b/content/person/anna_allen/anna_allen.jpeg similarity index 100% rename from content/people/anna_allen/anna_allen.jpeg rename to content/person/anna_allen/anna_allen.jpeg diff --git a/content/people/anna_allen/anna_allen.md b/content/person/anna_allen/anna_allen.md similarity index 100% rename from content/people/anna_allen/anna_allen.md rename to content/person/anna_allen/anna_allen.md diff --git a/content/people/arie_ben_david/arie_ben_david.jpg b/content/person/arie_ben_david/arie_ben_david.jpg similarity index 100% rename from content/people/arie_ben_david/arie_ben_david.jpg rename to content/person/arie_ben_david/arie_ben_david.jpg diff --git a/content/people/arie_ben_david/arie_ben_david.md b/content/person/arie_ben_david/arie_ben_david.md similarity index 100% rename from content/people/arie_ben_david/arie_ben_david.md rename to content/person/arie_ben_david/arie_ben_david.md diff --git a/content/people/bert_van_decraen/bert_van_decraen.md b/content/person/bert_van_decraen/bert_van_decraen.md similarity index 100% rename from content/people/bert_van_decraen/bert_van_decraen.md rename to content/person/bert_van_decraen/bert_van_decraen.md diff --git a/content/people/bert_van_decraen/bert_van_decraen.png b/content/person/bert_van_decraen/bert_van_decraen.png similarity index 100% rename from content/people/bert_van_decraen/bert_van_decraen.png rename to content/person/bert_van_decraen/bert_van_decraen.png diff --git a/content/people/boris_fahrnberger/boris_fahrnberger.md b/content/person/boris_fahrnberger/boris_fahrnberger.md similarity index 100% rename from content/people/boris_fahrnberger/boris_fahrnberger.md rename to content/person/boris_fahrnberger/boris_fahrnberger.md diff --git a/content/people/boris_fahrnberger/boris_fahrnberger.png b/content/person/boris_fahrnberger/boris_fahrnberger.png similarity index 100% rename from content/people/boris_fahrnberger/boris_fahrnberger.png rename to content/person/boris_fahrnberger/boris_fahrnberger.png diff --git a/content/people/brian_j_cardiff/brian_j_cardiff.jpg b/content/person/brian_j_cardiff/brian_j_cardiff.jpg similarity index 100% rename from content/people/brian_j_cardiff/brian_j_cardiff.jpg rename to content/person/brian_j_cardiff/brian_j_cardiff.jpg diff --git a/content/people/brian_j_cardiff/brian_j_cardiff.md b/content/person/brian_j_cardiff/brian_j_cardiff.md similarity index 100% rename from content/people/brian_j_cardiff/brian_j_cardiff.md rename to content/person/brian_j_cardiff/brian_j_cardiff.md diff --git a/content/people/brooks_cole/brooks_cole.jpg b/content/person/brooks_cole/brooks_cole.jpg similarity index 100% rename from content/people/brooks_cole/brooks_cole.jpg rename to content/person/brooks_cole/brooks_cole.jpg diff --git a/content/people/brooks_cole/brooks_cole.md b/content/person/brooks_cole/brooks_cole.md similarity index 100% rename from content/people/brooks_cole/brooks_cole.md rename to content/person/brooks_cole/brooks_cole.md diff --git a/content/people/charles_blass/charles_blass.md b/content/person/charles_blass/charles_blass.md similarity index 100% rename from content/people/charles_blass/charles_blass.md rename to content/person/charles_blass/charles_blass.md diff --git a/content/people/charles_blass/charles_blass.png b/content/person/charles_blass/charles_blass.png similarity index 100% rename from content/people/charles_blass/charles_blass.png rename to content/person/charles_blass/charles_blass.png diff --git a/content/people/christophe_de_carvalho/christophe_de_carvalho.jpeg b/content/person/christophe_de_carvalho/christophe_de_carvalho.jpeg similarity index 100% rename from content/people/christophe_de_carvalho/christophe_de_carvalho.jpeg rename to content/person/christophe_de_carvalho/christophe_de_carvalho.jpeg diff --git a/content/people/christophe_de_carvalho/christophe_de_carvalho.md b/content/person/christophe_de_carvalho/christophe_de_carvalho.md similarity index 100% rename from content/people/christophe_de_carvalho/christophe_de_carvalho.md rename to content/person/christophe_de_carvalho/christophe_de_carvalho.md diff --git a/content/people/claus_rosenberg_gotthard/claus_rosenberg_gotthard.jpg b/content/person/claus_rosenberg_gotthard/claus_rosenberg_gotthard.jpg similarity index 100% rename from content/people/claus_rosenberg_gotthard/claus_rosenberg_gotthard.jpg rename to content/person/claus_rosenberg_gotthard/claus_rosenberg_gotthard.jpg diff --git a/content/people/claus_rosenberg_gotthard/claus_rosenberg_gotthard.md b/content/person/claus_rosenberg_gotthard/claus_rosenberg_gotthard.md similarity index 100% rename from content/people/claus_rosenberg_gotthard/claus_rosenberg_gotthard.md rename to content/person/claus_rosenberg_gotthard/claus_rosenberg_gotthard.md diff --git a/content/people/dave_de_belder/dave_de_belder.jpeg b/content/person/dave_de_belder/dave_de_belder.jpeg similarity index 100% rename from content/people/dave_de_belder/dave_de_belder.jpeg rename to content/person/dave_de_belder/dave_de_belder.jpeg diff --git a/content/people/dave_de_belder/dave_de_belder.md b/content/person/dave_de_belder/dave_de_belder.md similarity index 100% rename from content/people/dave_de_belder/dave_de_belder.md rename to content/person/dave_de_belder/dave_de_belder.md diff --git a/content/people/dimitrios_dermentzioglou/dimitrios_dermentzioglou.jpg b/content/person/dimitrios_dermentzioglou/dimitrios_dermentzioglou.jpg similarity index 100% rename from content/people/dimitrios_dermentzioglou/dimitrios_dermentzioglou.jpg rename to content/person/dimitrios_dermentzioglou/dimitrios_dermentzioglou.jpg diff --git a/content/people/dimitrios_dermentzioglou/dimitrios_dermentzioglou.md b/content/person/dimitrios_dermentzioglou/dimitrios_dermentzioglou.md similarity index 100% rename from content/people/dimitrios_dermentzioglou/dimitrios_dermentzioglou.md rename to content/person/dimitrios_dermentzioglou/dimitrios_dermentzioglou.md diff --git a/content/people/franz_josef_allmayer/franz_josef_allmayer.jpg b/content/person/franz_josef_allmayer/franz_josef_allmayer.jpg similarity index 100% rename from content/people/franz_josef_allmayer/franz_josef_allmayer.jpg rename to content/person/franz_josef_allmayer/franz_josef_allmayer.jpg diff --git a/content/people/franz_josef_allmayer/franz_josef_allmayer.md b/content/person/franz_josef_allmayer/franz_josef_allmayer.md similarity index 100% rename from content/people/franz_josef_allmayer/franz_josef_allmayer.md rename to content/person/franz_josef_allmayer/franz_josef_allmayer.md diff --git a/content/people/hans_koning/hans_koning.md b/content/person/hans_koning/hans_koning.md similarity index 100% rename from content/people/hans_koning/hans_koning.md rename to content/person/hans_koning/hans_koning.md diff --git a/content/people/hans_koning/hans_koning.png b/content/person/hans_koning/hans_koning.png similarity index 100% rename from content/people/hans_koning/hans_koning.png rename to content/person/hans_koning/hans_koning.png diff --git a/content/people/isabelle_peters/isabelle_peters.md b/content/person/isabelle_peters/isabelle_peters.md similarity index 100% rename from content/people/isabelle_peters/isabelle_peters.md rename to content/person/isabelle_peters/isabelle_peters.md diff --git a/content/people/isabelle_peters/isabelle_peters.png b/content/person/isabelle_peters/isabelle_peters.png similarity index 100% rename from content/people/isabelle_peters/isabelle_peters.png rename to content/person/isabelle_peters/isabelle_peters.png diff --git a/content/people/jan_de_landtsheer/jan_de_landtsheer.md b/content/person/jan_de_landtsheer/jan_de_landtsheer.md similarity index 100% rename from content/people/jan_de_landtsheer/jan_de_landtsheer.md rename to content/person/jan_de_landtsheer/jan_de_landtsheer.md diff --git a/content/people/jan_de_landtsheer/jan_de_landtsheer.png b/content/person/jan_de_landtsheer/jan_de_landtsheer.png similarity index 100% rename from content/people/jan_de_landtsheer/jan_de_landtsheer.png rename to content/person/jan_de_landtsheer/jan_de_landtsheer.png diff --git a/content/people/jennifer_long/jennifer_long.jpeg b/content/person/jennifer_long/jennifer_long.jpeg similarity index 100% rename from content/people/jennifer_long/jennifer_long.jpeg rename to content/person/jennifer_long/jennifer_long.jpeg diff --git a/content/people/jennifer_long/jennifer_long.md b/content/person/jennifer_long/jennifer_long.md similarity index 100% rename from content/people/jennifer_long/jennifer_long.md rename to content/person/jennifer_long/jennifer_long.md diff --git a/content/people/jeroen_douglas/jeroen_douglas.jpg b/content/person/jeroen_douglas/jeroen_douglas.jpg similarity index 100% rename from content/people/jeroen_douglas/jeroen_douglas.jpg rename to content/person/jeroen_douglas/jeroen_douglas.jpg diff --git a/content/people/jeroen_douglas/jeroen_douglas.md b/content/person/jeroen_douglas/jeroen_douglas.md similarity index 100% rename from content/people/jeroen_douglas/jeroen_douglas.md rename to content/person/jeroen_douglas/jeroen_douglas.md diff --git a/content/people/joe_foxton/joe_foxton.jpg b/content/person/joe_foxton/joe_foxton.jpg similarity index 100% rename from content/people/joe_foxton/joe_foxton.jpg rename to content/person/joe_foxton/joe_foxton.jpg diff --git a/content/people/joe_foxton/joe_foxton.md b/content/person/joe_foxton/joe_foxton.md similarity index 100% rename from content/people/joe_foxton/joe_foxton.md rename to content/person/joe_foxton/joe_foxton.md diff --git a/content/people/jonas_delrue/jonas_delrue.jpeg b/content/person/jonas_delrue/jonas_delrue.jpeg similarity index 100% rename from content/people/jonas_delrue/jonas_delrue.jpeg rename to content/person/jonas_delrue/jonas_delrue.jpeg diff --git a/content/people/jonas_delrue/jonas_delrue.md b/content/person/jonas_delrue/jonas_delrue.md similarity index 100% rename from content/people/jonas_delrue/jonas_delrue.md rename to content/person/jonas_delrue/jonas_delrue.md diff --git a/content/people/juan_wajnerman/juan_wajnerman.jpg b/content/person/juan_wajnerman/juan_wajnerman.jpg similarity index 100% rename from content/people/juan_wajnerman/juan_wajnerman.jpg rename to content/person/juan_wajnerman/juan_wajnerman.jpg diff --git a/content/people/juan_wajnerman/juan_wajnerman.md b/content/person/juan_wajnerman/juan_wajnerman.md similarity index 100% rename from content/people/juan_wajnerman/juan_wajnerman.md rename to content/person/juan_wajnerman/juan_wajnerman.md diff --git a/content/people/justin_snyder/justin_snyder.jpg b/content/person/justin_snyder/justin_snyder.jpg similarity index 100% rename from content/people/justin_snyder/justin_snyder.jpg rename to content/person/justin_snyder/justin_snyder.jpg diff --git a/content/people/justin_snyder/justin_snyder.md b/content/person/justin_snyder/justin_snyder.md similarity index 100% rename from content/people/justin_snyder/justin_snyder.md rename to content/person/justin_snyder/justin_snyder.md diff --git a/content/people/koen_timmers/koen_timmers.jpg b/content/person/koen_timmers/koen_timmers.jpg similarity index 100% rename from content/people/koen_timmers/koen_timmers.jpg rename to content/person/koen_timmers/koen_timmers.jpg diff --git a/content/people/koen_timmers/koen_timmers.md b/content/person/koen_timmers/koen_timmers.md similarity index 100% rename from content/people/koen_timmers/koen_timmers.md rename to content/person/koen_timmers/koen_timmers.md diff --git a/content/people/kristine_vilnite/kristine_vilnite.jpg b/content/person/kristine_vilnite/kristine_vilnite.jpg similarity index 100% rename from content/people/kristine_vilnite/kristine_vilnite.jpg rename to content/person/kristine_vilnite/kristine_vilnite.jpg diff --git a/content/people/kristine_vilnite/kristine_vilnite.md b/content/person/kristine_vilnite/kristine_vilnite.md similarity index 100% rename from content/people/kristine_vilnite/kristine_vilnite.md rename to content/person/kristine_vilnite/kristine_vilnite.md diff --git a/content/people/kristof_de_spiegeleer/kristof_de_spiegeleer.jpeg b/content/person/kristof_de_spiegeleer/kristof_de_spiegeleer.jpeg similarity index 100% rename from content/people/kristof_de_spiegeleer/kristof_de_spiegeleer.jpeg rename to content/person/kristof_de_spiegeleer/kristof_de_spiegeleer.jpeg diff --git a/content/people/kristof_de_spiegeleer/kristof_de_spiegeleer.md b/content/person/kristof_de_spiegeleer/kristof_de_spiegeleer.md similarity index 100% rename from content/people/kristof_de_spiegeleer/kristof_de_spiegeleer.md rename to content/person/kristof_de_spiegeleer/kristof_de_spiegeleer.md diff --git a/content/people/lauren_moore_nignon/lauren_moore_nignon.md b/content/person/lauren_moore_nignon/lauren_moore_nignon.md similarity index 100% rename from content/people/lauren_moore_nignon/lauren_moore_nignon.md rename to content/person/lauren_moore_nignon/lauren_moore_nignon.md diff --git a/content/people/lauren_moore_nignon/lauren_moore_nignon.png b/content/person/lauren_moore_nignon/lauren_moore_nignon.png similarity index 100% rename from content/people/lauren_moore_nignon/lauren_moore_nignon.png rename to content/person/lauren_moore_nignon/lauren_moore_nignon.png diff --git a/content/people/lawrence_bloom/lawrence_bloom.jpg b/content/person/lawrence_bloom/lawrence_bloom.jpg similarity index 100% rename from content/people/lawrence_bloom/lawrence_bloom.jpg rename to content/person/lawrence_bloom/lawrence_bloom.jpg diff --git a/content/people/lawrence_bloom/lawrence_bloom.md b/content/person/lawrence_bloom/lawrence_bloom.md similarity index 100% rename from content/people/lawrence_bloom/lawrence_bloom.md rename to content/person/lawrence_bloom/lawrence_bloom.md diff --git a/content/people/lee_smet/lee_smet.md b/content/person/lee_smet/lee_smet.md similarity index 100% rename from content/people/lee_smet/lee_smet.md rename to content/person/lee_smet/lee_smet.md diff --git a/content/people/lee_smet/lee_smet.png b/content/person/lee_smet/lee_smet.png similarity index 100% rename from content/people/lee_smet/lee_smet.png rename to content/person/lee_smet/lee_smet.png diff --git a/content/people/lorrana_scarpioni/lorrana_scarpioni.jpg b/content/person/lorrana_scarpioni/lorrana_scarpioni.jpg similarity index 100% rename from content/people/lorrana_scarpioni/lorrana_scarpioni.jpg rename to content/person/lorrana_scarpioni/lorrana_scarpioni.jpg diff --git a/content/people/lorrana_scarpioni/lorrana_scarpioni.md b/content/person/lorrana_scarpioni/lorrana_scarpioni.md similarity index 100% rename from content/people/lorrana_scarpioni/lorrana_scarpioni.md rename to content/person/lorrana_scarpioni/lorrana_scarpioni.md diff --git a/content/people/marcelo_bohrer/marcelo_bohrer.jpg b/content/person/marcelo_bohrer/marcelo_bohrer.jpg similarity index 100% rename from content/people/marcelo_bohrer/marcelo_bohrer.jpg rename to content/person/marcelo_bohrer/marcelo_bohrer.jpg diff --git a/content/people/marcelo_bohrer/marcelo_bohrer.md b/content/person/marcelo_bohrer/marcelo_bohrer.md similarity index 100% rename from content/people/marcelo_bohrer/marcelo_bohrer.md rename to content/person/marcelo_bohrer/marcelo_bohrer.md diff --git a/content/people/mariza_wellesley_wesley/mariza_wellesley_wesley.jpg b/content/person/mariza_wellesley_wesley/mariza_wellesley_wesley.jpg similarity index 100% rename from content/people/mariza_wellesley_wesley/mariza_wellesley_wesley.jpg rename to content/person/mariza_wellesley_wesley/mariza_wellesley_wesley.jpg diff --git a/content/people/mariza_wellesley_wesley/mariza_wellesley_wesley.md b/content/person/mariza_wellesley_wesley/mariza_wellesley_wesley.md similarity index 100% rename from content/people/mariza_wellesley_wesley/mariza_wellesley_wesley.md rename to content/person/mariza_wellesley_wesley/mariza_wellesley_wesley.md diff --git a/content/people/maxime_daniel/maxime_daniel.md b/content/person/maxime_daniel/maxime_daniel.md similarity index 100% rename from content/people/maxime_daniel/maxime_daniel.md rename to content/person/maxime_daniel/maxime_daniel.md diff --git a/content/people/maxime_daniel/maxime_daniel.png b/content/person/maxime_daniel/maxime_daniel.png similarity index 100% rename from content/people/maxime_daniel/maxime_daniel.png rename to content/person/maxime_daniel/maxime_daniel.png diff --git a/content/people/michael_healy/michael_healy.md b/content/person/michael_healy/michael_healy.md similarity index 100% rename from content/people/michael_healy/michael_healy.md rename to content/person/michael_healy/michael_healy.md diff --git a/content/people/michael_healy/michael_healy.png b/content/person/michael_healy/michael_healy.png similarity index 100% rename from content/people/michael_healy/michael_healy.png rename to content/person/michael_healy/michael_healy.png diff --git a/content/people/michael_wellesley_wesley/michael_wellesley_wesley.jpeg b/content/person/michael_wellesley_wesley/michael_wellesley_wesley.jpeg similarity index 100% rename from content/people/michael_wellesley_wesley/michael_wellesley_wesley.jpeg rename to content/person/michael_wellesley_wesley/michael_wellesley_wesley.jpeg diff --git a/content/people/michael_wellesley_wesley/michael_wellesley_wesley.md b/content/person/michael_wellesley_wesley/michael_wellesley_wesley.md similarity index 100% rename from content/people/michael_wellesley_wesley/michael_wellesley_wesley.md rename to content/person/michael_wellesley_wesley/michael_wellesley_wesley.md diff --git a/content/people/mickey_malul/mickey_malul.md b/content/person/mickey_malul/mickey_malul.md similarity index 100% rename from content/people/mickey_malul/mickey_malul.md rename to content/person/mickey_malul/mickey_malul.md diff --git a/content/people/mickey_malul/mickey_malul.png b/content/person/mickey_malul/mickey_malul.png similarity index 100% rename from content/people/mickey_malul/mickey_malul.png rename to content/person/mickey_malul/mickey_malul.png diff --git a/content/people/monique_morrow/monique_morrow.md b/content/person/monique_morrow/monique_morrow.md similarity index 100% rename from content/people/monique_morrow/monique_morrow.md rename to content/person/monique_morrow/monique_morrow.md diff --git a/content/people/monique_morrow/monique_morrow.png b/content/person/monique_morrow/monique_morrow.png similarity index 100% rename from content/people/monique_morrow/monique_morrow.png rename to content/person/monique_morrow/monique_morrow.png diff --git a/content/people/muhammed_azmy/muhamed_amzy.png b/content/person/muhammed_azmy/muhamed_amzy.png similarity index 100% rename from content/people/muhammed_azmy/muhamed_amzy.png rename to content/person/muhammed_azmy/muhamed_amzy.png diff --git a/content/people/muhammed_azmy/muhammed_azmy.md b/content/person/muhammed_azmy/muhammed_azmy.md similarity index 100% rename from content/people/muhammed_azmy/muhammed_azmy.md rename to content/person/muhammed_azmy/muhammed_azmy.md diff --git a/content/people/nikolaus_heger/nikolaus_heger.jpg b/content/person/nikolaus_heger/nikolaus_heger.jpg similarity index 100% rename from content/people/nikolaus_heger/nikolaus_heger.jpg rename to content/person/nikolaus_heger/nikolaus_heger.jpg diff --git a/content/people/nikolaus_heger/nikolaus_heger.md b/content/person/nikolaus_heger/nikolaus_heger.md similarity index 100% rename from content/people/nikolaus_heger/nikolaus_heger.md rename to content/person/nikolaus_heger/nikolaus_heger.md diff --git a/content/people/owen_kemp/owen_kemp.jpeg b/content/person/owen_kemp/owen_kemp.jpeg similarity index 100% rename from content/people/owen_kemp/owen_kemp.jpeg rename to content/person/owen_kemp/owen_kemp.jpeg diff --git a/content/people/owen_kemp/owen_kemp.md b/content/person/owen_kemp/owen_kemp.md similarity index 100% rename from content/people/owen_kemp/owen_kemp.md rename to content/person/owen_kemp/owen_kemp.md diff --git a/content/people/rieki_cordon/rieki_cordon.jpg b/content/person/rieki_cordon/rieki_cordon.jpg similarity index 100% rename from content/people/rieki_cordon/rieki_cordon.jpg rename to content/person/rieki_cordon/rieki_cordon.jpg diff --git a/content/people/rieki_cordon/rieki_cordon.md b/content/person/rieki_cordon/rieki_cordon.md similarity index 100% rename from content/people/rieki_cordon/rieki_cordon.md rename to content/person/rieki_cordon/rieki_cordon.md diff --git a/content/people/rishi_chidananda/rishi_chidananda.jpeg b/content/person/rishi_chidananda/rishi_chidananda.jpeg similarity index 100% rename from content/people/rishi_chidananda/rishi_chidananda.jpeg rename to content/person/rishi_chidananda/rishi_chidananda.jpeg diff --git a/content/people/rishi_chidananda/rishi_chidananda.md b/content/person/rishi_chidananda/rishi_chidananda.md similarity index 100% rename from content/people/rishi_chidananda/rishi_chidananda.md rename to content/person/rishi_chidananda/rishi_chidananda.md diff --git a/content/people/rob_van_mieghem/rob_van_mieghem.md b/content/person/rob_van_mieghem/rob_van_mieghem.md similarity index 100% rename from content/people/rob_van_mieghem/rob_van_mieghem.md rename to content/person/rob_van_mieghem/rob_van_mieghem.md diff --git a/content/people/rob_van_mieghem/rob_van_mieghem.png b/content/person/rob_van_mieghem/rob_van_mieghem.png similarity index 100% rename from content/people/rob_van_mieghem/rob_van_mieghem.png rename to content/person/rob_van_mieghem/rob_van_mieghem.png diff --git a/content/people/roel_van_sabben/roel_van_sabben.jpg b/content/person/roel_van_sabben/roel_van_sabben.jpg similarity index 100% rename from content/people/roel_van_sabben/roel_van_sabben.jpg rename to content/person/roel_van_sabben/roel_van_sabben.jpg diff --git a/content/people/roel_van_sabben/roel_van_sabben.md b/content/person/roel_van_sabben/roel_van_sabben.md similarity index 100% rename from content/people/roel_van_sabben/roel_van_sabben.md rename to content/person/roel_van_sabben/roel_van_sabben.md diff --git a/content/people/roel_wofert/roel_wofert.md b/content/person/roel_wofert/roel_wofert.md similarity index 100% rename from content/people/roel_wofert/roel_wofert.md rename to content/person/roel_wofert/roel_wofert.md diff --git a/content/people/roel_wofert/roel_wofert.png b/content/person/roel_wofert/roel_wofert.png similarity index 100% rename from content/people/roel_wofert/roel_wofert.png rename to content/person/roel_wofert/roel_wofert.png diff --git a/content/people/sacha_obeegadoo/sacha_obeegadoo.jpg b/content/person/sacha_obeegadoo/sacha_obeegadoo.jpg similarity index 100% rename from content/people/sacha_obeegadoo/sacha_obeegadoo.jpg rename to content/person/sacha_obeegadoo/sacha_obeegadoo.jpg diff --git a/content/people/sacha_obeegadoo/sacha_obeegadoo.md b/content/person/sacha_obeegadoo/sacha_obeegadoo.md similarity index 100% rename from content/people/sacha_obeegadoo/sacha_obeegadoo.md rename to content/person/sacha_obeegadoo/sacha_obeegadoo.md diff --git a/content/people/sam_taggart/sam_taggart.jpeg b/content/person/sam_taggart/sam_taggart.jpeg similarity index 100% rename from content/people/sam_taggart/sam_taggart.jpeg rename to content/person/sam_taggart/sam_taggart.jpeg diff --git a/content/people/sam_taggart/sam_taggart.md b/content/person/sam_taggart/sam_taggart.md similarity index 100% rename from content/people/sam_taggart/sam_taggart.md rename to content/person/sam_taggart/sam_taggart.md diff --git a/content/people/sasha_astiadi/sasha_astiadi.md b/content/person/sasha_astiadi/sasha_astiadi.md similarity index 100% rename from content/people/sasha_astiadi/sasha_astiadi.md rename to content/person/sasha_astiadi/sasha_astiadi.md diff --git a/content/people/sasha_astiadi/sasha_astiadi.png b/content/person/sasha_astiadi/sasha_astiadi.png similarity index 100% rename from content/people/sasha_astiadi/sasha_astiadi.png rename to content/person/sasha_astiadi/sasha_astiadi.png diff --git a/content/people/sergey_ivliev/sergey_ivliev.md b/content/person/sergey_ivliev/sergey_ivliev.md similarity index 100% rename from content/people/sergey_ivliev/sergey_ivliev.md rename to content/person/sergey_ivliev/sergey_ivliev.md diff --git a/content/people/sergey_ivliev/sergey_ivliev.png b/content/person/sergey_ivliev/sergey_ivliev.png similarity index 100% rename from content/people/sergey_ivliev/sergey_ivliev.png rename to content/person/sergey_ivliev/sergey_ivliev.png diff --git a/content/people/sophie_monpeyssen/sophie_monpeyssen.jpeg b/content/person/sophie_monpeyssen/sophie_monpeyssen.jpeg similarity index 100% rename from content/people/sophie_monpeyssen/sophie_monpeyssen.jpeg rename to content/person/sophie_monpeyssen/sophie_monpeyssen.jpeg diff --git a/content/people/sophie_monpeyssen/sophie_monpeyssen.md b/content/person/sophie_monpeyssen/sophie_monpeyssen.md similarity index 100% rename from content/people/sophie_monpeyssen/sophie_monpeyssen.md rename to content/person/sophie_monpeyssen/sophie_monpeyssen.md diff --git a/content/people/sukhveer_sanghera/sukhveer_sanghera.md b/content/person/sukhveer_sanghera/sukhveer_sanghera.md similarity index 100% rename from content/people/sukhveer_sanghera/sukhveer_sanghera.md rename to content/person/sukhveer_sanghera/sukhveer_sanghera.md diff --git a/content/people/sukhveer_sanghera/sukhveer_sanghera.png b/content/person/sukhveer_sanghera/sukhveer_sanghera.png similarity index 100% rename from content/people/sukhveer_sanghera/sukhveer_sanghera.png rename to content/person/sukhveer_sanghera/sukhveer_sanghera.png diff --git a/content/people/vasily_gnuchev/vasily_gnuchev.jpg b/content/person/vasily_gnuchev/vasily_gnuchev.jpg similarity index 100% rename from content/people/vasily_gnuchev/vasily_gnuchev.jpg rename to content/person/vasily_gnuchev/vasily_gnuchev.jpg diff --git a/content/people/vasily_gnuchev/vasily_gnuchev.md b/content/person/vasily_gnuchev/vasily_gnuchev.md similarity index 100% rename from content/people/vasily_gnuchev/vasily_gnuchev.md rename to content/person/vasily_gnuchev/vasily_gnuchev.md diff --git a/content/people/weynand_kuijpers/weynand_kuijpers.jpeg b/content/person/weynand_kuijpers/weynand_kuijpers.jpeg similarity index 100% rename from content/people/weynand_kuijpers/weynand_kuijpers.jpeg rename to content/person/weynand_kuijpers/weynand_kuijpers.jpeg diff --git a/content/people/weynand_kuijpers/weynand_kuijpers.md b/content/person/weynand_kuijpers/weynand_kuijpers.md similarity index 100% rename from content/people/weynand_kuijpers/weynand_kuijpers.md rename to content/person/weynand_kuijpers/weynand_kuijpers.md diff --git a/content/blog/artheon/artheon.jpg b/content/project/artheon/artheon.jpg similarity index 100% rename from content/blog/artheon/artheon.jpg rename to content/project/artheon/artheon.jpg diff --git a/content/blog/artheon/artheon.md b/content/project/artheon/artheon.md similarity index 100% rename from content/blog/artheon/artheon.md rename to content/project/artheon/artheon.md diff --git a/content/blog/artheon/logo.png b/content/project/artheon/logo.png similarity index 100% rename from content/blog/artheon/logo.png rename to content/project/artheon/logo.png diff --git a/content/blog/beliive/beliive.md b/content/project/beliive/beliive.md similarity index 100% rename from content/blog/beliive/beliive.md rename to content/project/beliive/beliive.md diff --git a/content/project/beliive/beliive.png b/content/project/beliive/beliive.png new file mode 100644 index 000000000..8a6ab1ff7 Binary files /dev/null and b/content/project/beliive/beliive.png differ diff --git a/content/blog/beliive/logo.png b/content/project/beliive/logo.png similarity index 100% rename from content/blog/beliive/logo.png rename to content/project/beliive/logo.png diff --git a/content/blog/cicolab/cicolab.md b/content/project/cicolab/cicolab.md similarity index 100% rename from content/blog/cicolab/cicolab.md rename to content/project/cicolab/cicolab.md diff --git a/content/blog/cicolab/cicolab.png b/content/project/cicolab/cicolab.png similarity index 100% rename from content/blog/cicolab/cicolab.png rename to content/project/cicolab/cicolab.png diff --git a/content/blog/cicolab/logo.png b/content/project/cicolab/logo.png similarity index 100% rename from content/blog/cicolab/logo.png rename to content/project/cicolab/logo.png diff --git a/content/blog/covidfighters/covid_fighters.md b/content/project/covidfighters/covid_fighters.md similarity index 100% rename from content/blog/covidfighters/covid_fighters.md rename to content/project/covidfighters/covid_fighters.md diff --git a/content/blog/covidfighters/covid_fighters.png b/content/project/covidfighters/covid_fighters.png similarity index 100% rename from content/blog/covidfighters/covid_fighters.png rename to content/project/covidfighters/covid_fighters.png diff --git a/content/blog/covidfighters/logo.png b/content/project/covidfighters/logo.png similarity index 100% rename from content/blog/covidfighters/logo.png rename to content/project/covidfighters/logo.png diff --git a/content/blog/crystal_home/crystal_home.jpg b/content/project/crystal_home/crystal_home.jpg similarity index 100% rename from content/blog/crystal_home/crystal_home.jpg rename to content/project/crystal_home/crystal_home.jpg diff --git a/content/blog/crystal_home/crystal_home.md b/content/project/crystal_home/crystal_home.md similarity index 100% rename from content/blog/crystal_home/crystal_home.md rename to content/project/crystal_home/crystal_home.md diff --git a/content/blog/crystal_home/logo.png b/content/project/crystal_home/logo.png similarity index 100% rename from content/blog/crystal_home/logo.png rename to content/project/crystal_home/logo.png diff --git a/content/blog/crystal_language/crystal_language.md b/content/project/crystal_language/crystal_language.md similarity index 100% rename from content/blog/crystal_language/crystal_language.md rename to content/project/crystal_language/crystal_language.md diff --git a/content/blog/crystal_language/crystal_language.png b/content/project/crystal_language/crystal_language.png similarity index 100% rename from content/blog/crystal_language/crystal_language.png rename to content/project/crystal_language/crystal_language.png diff --git a/content/blog/crystal_language/logo.png b/content/project/crystal_language/logo.png similarity index 100% rename from content/blog/crystal_language/logo.png rename to content/project/crystal_language/logo.png diff --git a/content/blog/crystal_twin/crystal_twin.md b/content/project/crystal_twin/crystal_twin.md similarity index 100% rename from content/blog/crystal_twin/crystal_twin.md rename to content/project/crystal_twin/crystal_twin.md diff --git a/content/blog/crystal_twin/crystal_twin.png b/content/project/crystal_twin/crystal_twin.png similarity index 100% rename from content/blog/crystal_twin/crystal_twin.png rename to content/project/crystal_twin/crystal_twin.png diff --git a/content/blog/crystal_twin/logo.png b/content/project/crystal_twin/logo.png similarity index 100% rename from content/blog/crystal_twin/logo.png rename to content/project/crystal_twin/logo.png diff --git a/content/blog/digibyte/digibyte.md b/content/project/digibyte/digibyte.md similarity index 100% rename from content/blog/digibyte/digibyte.md rename to content/project/digibyte/digibyte.md diff --git a/content/blog/digibyte/digibyte.png b/content/project/digibyte/digibyte.png similarity index 100% rename from content/blog/digibyte/digibyte.png rename to content/project/digibyte/digibyte.png diff --git a/content/blog/digibyte/logo.png b/content/project/digibyte/logo.png similarity index 100% rename from content/blog/digibyte/logo.png rename to content/project/digibyte/logo.png diff --git a/content/blog/earthproject/earthproject.md b/content/project/earthproject/earthproject.md similarity index 100% rename from content/blog/earthproject/earthproject.md rename to content/project/earthproject/earthproject.md diff --git a/content/blog/earthproject/earthproject.png b/content/project/earthproject/earthproject.png similarity index 100% rename from content/blog/earthproject/earthproject.png rename to content/project/earthproject/earthproject.png diff --git a/content/blog/earthproject/logo.png b/content/project/earthproject/logo.png similarity index 100% rename from content/blog/earthproject/logo.png rename to content/project/earthproject/logo.png diff --git a/content/blog/generation_blue/generation_blue.md b/content/project/generation_blue/generation_blue.md similarity index 100% rename from content/blog/generation_blue/generation_blue.md rename to content/project/generation_blue/generation_blue.md diff --git a/content/blog/generation_blue/generation_blue.png b/content/project/generation_blue/generation_blue.png similarity index 100% rename from content/blog/generation_blue/generation_blue.png rename to content/project/generation_blue/generation_blue.png diff --git a/content/blog/generation_blue/logo.png b/content/project/generation_blue/logo.png similarity index 100% rename from content/blog/generation_blue/logo.png rename to content/project/generation_blue/logo.png diff --git a/content/blog/green_edge/green_edge.md b/content/project/green_edge/green_edge.md similarity index 100% rename from content/blog/green_edge/green_edge.md rename to content/project/green_edge/green_edge.md diff --git a/content/blog/green_edge/green_edge.png b/content/project/green_edge/green_edge.png similarity index 100% rename from content/blog/green_edge/green_edge.png rename to content/project/green_edge/green_edge.png diff --git a/content/blog/green_edge/logo.png b/content/project/green_edge/logo.png similarity index 100% rename from content/blog/green_edge/logo.png rename to content/project/green_edge/logo.png diff --git a/content/blog/money_of_good/logo.png b/content/project/money_of_good/logo.png similarity index 100% rename from content/blog/money_of_good/logo.png rename to content/project/money_of_good/logo.png diff --git a/content/blog/money_of_good/money_of_good.jpg b/content/project/money_of_good/money_of_good.jpg similarity index 100% rename from content/blog/money_of_good/money_of_good.jpg rename to content/project/money_of_good/money_of_good.jpg diff --git a/content/blog/money_of_good/money_of_good.md b/content/project/money_of_good/money_of_good.md similarity index 100% rename from content/blog/money_of_good/money_of_good.md rename to content/project/money_of_good/money_of_good.md diff --git a/content/blog/seeds/logo.png b/content/project/seeds/logo.png similarity index 100% rename from content/blog/seeds/logo.png rename to content/project/seeds/logo.png diff --git a/content/blog/seeds/seeds.md b/content/project/seeds/seeds.md similarity index 100% rename from content/blog/seeds/seeds.md rename to content/project/seeds/seeds.md diff --git a/content/blog/seeds/seeds.png b/content/project/seeds/seeds.png similarity index 100% rename from content/blog/seeds/seeds.png rename to content/project/seeds/seeds.png diff --git a/content/blog/shareitt/logo.png b/content/project/shareitt/logo.png similarity index 100% rename from content/blog/shareitt/logo.png rename to content/project/shareitt/logo.png diff --git a/content/blog/shareitt/shareitt.md b/content/project/shareitt/shareitt.md similarity index 100% rename from content/blog/shareitt/shareitt.md rename to content/project/shareitt/shareitt.md diff --git a/content/blog/shareitt/shareitt.png b/content/project/shareitt/shareitt.png similarity index 100% rename from content/blog/shareitt/shareitt.png rename to content/project/shareitt/shareitt.png diff --git a/content/blog/the_humanized_internet/logo_the_humanized_internet.png b/content/project/the_humanized_internet/logo_the_humanized_internet.png similarity index 100% rename from content/blog/the_humanized_internet/logo_the_humanized_internet.png rename to content/project/the_humanized_internet/logo_the_humanized_internet.png diff --git a/content/blog/the_humanized_internet/the_humanized_internet.md b/content/project/the_humanized_internet/the_humanized_internet.md similarity index 100% rename from content/blog/the_humanized_internet/the_humanized_internet.md rename to content/project/the_humanized_internet/the_humanized_internet.md diff --git a/content/blog/the_humanized_internet/the_humanized_internet.png b/content/project/the_humanized_internet/the_humanized_internet.png similarity index 100% rename from content/blog/the_humanized_internet/the_humanized_internet.png rename to content/project/the_humanized_internet/the_humanized_internet.png diff --git a/content/blog/threefold_foundation/logo.png b/content/project/threefold_foundation/logo.png similarity index 100% rename from content/blog/threefold_foundation/logo.png rename to content/project/threefold_foundation/logo.png diff --git a/content/blog/threefold_foundation/threefold_foundation.md b/content/project/threefold_foundation/threefold_foundation.md similarity index 100% rename from content/blog/threefold_foundation/threefold_foundation.md rename to content/project/threefold_foundation/threefold_foundation.md diff --git a/content/blog/threefold_foundation/threefold_foundation.png b/content/project/threefold_foundation/threefold_foundation.png similarity index 100% rename from content/blog/threefold_foundation/threefold_foundation.png rename to content/project/threefold_foundation/threefold_foundation.png diff --git a/content/blog/unit/logo.png b/content/project/unit/logo.png similarity index 100% rename from content/blog/unit/logo.png rename to content/project/unit/logo.png diff --git a/content/blog/unit/unit.md b/content/project/unit/unit.md similarity index 100% rename from content/blog/unit/unit.md rename to content/project/unit/unit.md diff --git a/content/blog/unit/unit.png b/content/project/unit/unit.png similarity index 100% rename from content/blog/unit/unit.png rename to content/project/unit/unit.png diff --git a/content/blog/vlinder/logo_vlinder.png b/content/project/vlinder/logo_vlinder.png similarity index 100% rename from content/blog/vlinder/logo_vlinder.png rename to content/project/vlinder/logo_vlinder.png diff --git a/content/blog/vlinder/vlinder.md b/content/project/vlinder/vlinder.md similarity index 100% rename from content/blog/vlinder/vlinder.md rename to content/project/vlinder/vlinder.md diff --git a/content/blog/vlinder/vlinder.png b/content/project/vlinder/vlinder.png similarity index 100% rename from content/blog/vlinder/vlinder.png rename to content/project/vlinder/vlinder.png diff --git a/content/blog/zetako/logo.png b/content/project/zetako/logo.png similarity index 100% rename from content/blog/zetako/logo.png rename to content/project/zetako/logo.png diff --git a/content/blog/zetako/zetako.md b/content/project/zetako/zetako.md similarity index 100% rename from content/blog/zetako/zetako.md rename to content/project/zetako/zetako.md diff --git a/content/blog/zetako/zetako.png b/content/project/zetako/zetako.png similarity index 100% rename from content/blog/zetako/zetako.png rename to content/project/zetako/zetako.png diff --git a/content/readme.md b/manual/README.md similarity index 56% rename from content/readme.md rename to manual/README.md index 89320bd23..e99b1e38b 100644 --- a/content/readme.md +++ b/manual/README.md @@ -2,14 +2,13 @@ ## metadata per project page --- -name: seeds +id: seeds title: seeds tags: crystaltwin, planned, grid status: planned startdate: 2021-03-01 countries: cities: -team: rank: 1 category: crystaltwin excerpt: @@ -17,9 +16,10 @@ created: 2019-03-20 image: ./seeds.png image_caption: seeds author: christine, kristof +members: kristof --- -- name uniquely chosen name +- id: uniquely chosen name, which should not change over time - title which shows on overview - tags: generic to allow us to search & shows - status: planned, internal, test, public @@ -30,4 +30,25 @@ author: christine, kristof - category: crystaltwin, team, tfgrid (for listing in navigation) - excerpt: short content to show in overview (DONT MAKE IT TOO LONG) - created: when the project was registered -- author: 1 or more people behind project \ No newline at end of file +- author: 1 or more authors who created the content +- members: 1 or more people behind project (the member of the project) + + +## metadata per user/author page + +--- +id: christine +name: Christine +tags: crystaltwin, planned, grid +rank: 1 +bio: Primis vitae mauris turpis ornare libero odio torquent vehicula proin consequat curabitur mattis +facebook: https://www.facebook.com +twitter: https://www.twitter.com +linkedin: https://www.linkedin.com +image: ./images/author1.png +projects: seeds,threefold +countries: +cities: +--- + +- ... \ No newline at end of file diff --git a/src/templates/Author.vue b/src/templates/Author.vue index e72733bcc..6baa23f5a 100644 --- a/src/templates/Author.vue +++ b/src/templates/Author.vue @@ -50,7 +50,6 @@
-
diff --git a/src/templates/Category.vue b/src/templates/Category.vue index d92a9599c..5e07b2569 100644 --- a/src/templates/Category.vue +++ b/src/templates/Category.vue @@ -56,7 +56,7 @@ path timeToRead startDate : startdate(format:"MM YYYY") - humanTime : created(format:"DD MMM YYYY") + humanTime : created(format:"MM YYYY") datetime : created category { id diff --git a/src/templates/User.vue b/src/templates/User.vue new file mode 100644 index 000000000..443ce55e0 --- /dev/null +++ b/src/templates/User.vue @@ -0,0 +1,143 @@ + + + + query($id: ID!, $page:Int) { + user(id: $id) { + name + path + bio + image(width:150, height:150) + facebook + twitter + linkedin + content + belongsTo(perPage: 5, page: $page) @paginate { + totalCount + pageInfo { + totalPages + currentPage + } + edges { + node { + ... on Blog { + title + excerpt + image(width:800) + path + timeToRead + humanTime : created(format:"DD MMM YYYY") + datetime : created + category { + id + title + } + user { + id + name + image(width:64, height:64, fit:inside) + path + } + } + } + } + } + } + } + + +