ourworld_web/www_threefold_io
23
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
samaradel
2021-03-14 07:41:29 +02:00
parent 843471039e 1e016076f9
commit 5701d14847
27 changed files with 271 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -18,3 +18,4 @@ install.sh
run.sh
build.sh
package-lock.json
dist

BIN
content/page/home/InTheNews/btc.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
content/page/home/InTheNews/cryptodaily.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
content/page/home/InTheNews/forbers.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
content/page/home/InTheNews/grit_daily.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
content/page/home/InTheNews/hackernoon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

27
content/page/home/InTheNews/inTheNews.md
View File

@@ -1,24 +1,23 @@
---
id: in_the_news
# Add logos in src/assets/images/
partners:
- path: /test
logo: https://tailwindui.com/img/logos/v1/transistor-logo.svg
- path: https://www.forbes.com/sites/johnkoetsier/2020/06/20/largest-distributed-peer-to-peer-grid-on-the-planet-laying-foundation-for-a-decentralized-internet/?fbclid=IwAR1WKCpqLcWPRWg5bPD6RCQE5JJjRPt6ey5vbEnu3db2FvJnp6-YKeVZNW8#79aa340e6798'
logo: ./logos/forbers.png
- path: /test
logo: https://tailwindui.com/img/logos/v1/mirage-logo.svg
- path: https://cointelegraph.com/news/peer-to-peer-internet-has-lofty-goal-to-bring-true-decentralization
logo: ./logos/thecointel.png
- path: /test
logo: https://tailwindui.com/img/logos/v1/tuple-logo.svg
- path: https://hackernoon.com/is-it-possible-to-create-a-decentralized-internet-this-startup-and-its-farmers-think-so-ey2e3ycf
logo: ./logos/hackernoon.png
- path: /test
logo: https://tailwindui.com/img/logos/v1/laravel-logo.svg
- path: https://cryptodaily.co.uk/2019/11/data-centers-are-under-pressure-to-meet-internet-demand
logo: ./logos/cryptodaily.png
- path: /test
logo: https://tailwindui.com/img/logos/v1/statickit-logo.svg
- path: https://gritdaily.com/belarus-governments-control-internet/
logo: ./logos/grit_daily.png
- path: /test
logo: https://tailwindui.com/img/logos/v1/statamic-logo.svg
- path: https://btcmanager.com/digibyte-dgb-threefold-decentralize-global-internet-architecture/?q=/digibyte-dgb-threefold-decentralize-global-internet-architecture/&q=/digibyte-dgb-threefold-decentralize-global-internet-architecture/
logo: ./logos/btc.png
---
Some text can go here
In the News

BIN
content/page/home/InTheNews/logos/btc.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
content/page/home/InTheNews/logos/cryptodaily.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
content/page/home/InTheNews/logos/forbers.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
content/page/home/InTheNews/logos/grit_daily.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
content/page/home/InTheNews/logos/hackernoon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
content/page/home/InTheNews/logos/thecointel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
content/page/home/InTheNews/thecointel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
content/page/home/comparison/section1/privacy.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 63 KiB

1
content/page/home/home.md
View File

@@ -14,6 +14,7 @@ link: https://farming.threefold.io/token #link for button
comparisonMain: comparison
comparisonSecs: [section1, section2, section3]
brandPanel: brand_panel
inTheNews: in_the_news
solution_image2: ./cta_image.png
cta: home_cta
---

BIN
content/page/home/home_header.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 990 KiB

After

Width:  |  Height:  |  Size: 2.2 MiB

BIN
content/page/home/home_header_old.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 990 KiB

BIN
content/page/home/token.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 161 KiB

After

Width:  |  Height:  |  Size: 796 KiB

BIN
content/page/home/token_old.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 161 KiB

BIN
src/assets/images/apple.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

432
src/assets/scss/main.scss
View File

@@ -1,278 +1,279 @@
@tailwind base;
blockquote {
@apply border-l;
@apply border-l-4;
@apply border-l-blue-500;
@apply pl-4;
@apply italic;
@apply my-8;
p {
padding: 0 !important;
}
@apply border-l;
@apply border-l-4;
@apply border-l-blue-500;
@apply pl-4;
@apply italic;
@apply my-8;
p {
padding: 0 !important;
}
}
body h2{
font-family: 'Roboto', sans-serif;
body h2 {
font-family: 'Roboto', sans-serif;
}
body p{
font-family: 'Roboto', sans-serif;
body p {
font-family: 'Roboto', sans-serif;
}
.act-link {
@apply bg-gray-300;
@apply bg-gray-300;
}
pre {
@apply border-l;
@apply border-l-2;
@apply border-l-gray-500;
@apply pl-4;
@apply mt-4;
@apply text-base;
@apply break-words;
@apply overflow-x-auto;
@apply border-l;
@apply border-l-2;
@apply border-l-gray-500;
@apply pl-4;
@apply mt-4;
@apply text-base;
@apply break-words;
@apply overflow-x-auto;
}
ol {
@apply list-decimal;
@apply ml-5;
@apply list-decimal;
@apply ml-5;
}
ul {
@apply list-disc;
@apply ml-5;
@apply list-disc;
@apply ml-5;
}
:not(pre) > code {
@apply text-red-600;
@apply text-base;
:not(pre)>code {
@apply text-red-600;
@apply text-base;
}
@tailwind components;
@tailwind utilities;
@responsive {
.pxi-0 {
@apply px-0 #{!important};
}
.pyi-0 {
@apply py-0 #{!important};
}
.pi-0 {
@apply p-0 #{!important};
}
.pxi-0 {
@apply px-0 #{!important};
}
.pyi-0 {
@apply py-0 #{!important};
}
.pi-0 {
@apply p-0 #{!important};
}
}
.animated-link:after {
content: "";
width: 0px;
height: 1px;
display: block;
transition: 300ms;
@apply bg-gray-500;
content: "";
width: 0px;
height: 1px;
display: block;
transition: 300ms;
@apply bg-gray-500;
}
.footerlink {
margin-left: 0rem !important;
margin-left: 0rem !important;
}
// .animated-link:hover:after {
// width: 100%;
// }
.height-30px {
height: 30px;
height: 30px;
}
.brandpanel {
background-color: #1072ba;
background-color: #C2AEEC;
}
.no-border {
border-width: 0px !important;
border-width: 0px !important;
}
.flex-post {
@apply border-b;
@apply border-b-gray-300;
@apply flex-col;
@apply w-full;
.post-card-image {
@apply h-56;
@apply border-b;
@apply border-b-gray-300;
@apply flex-col;
@apply w-full;
@apply object-cover;
@apply rounded;
@apply relative;
}
.post-card-title {
@apply leading-none;
@apply text-2xl;
@apply font-medium;
}
.post-card-excerpt {
@apply font-serif;
}
.post-card-image {
@apply h-56;
@apply w-full;
@apply object-cover;
@apply rounded;
@apply relative;
}
.post-card-title {
@apply leading-none;
@apply text-2xl;
@apply font-medium;
}
.post-card-excerpt {
@apply font-serif;
}
}
.author-list-item:nth-child(n + 2) {
@apply -ml-3;
@apply -ml-3;
}
button:focus {
outline: none;
outline: none;
}
.telegram_icon{
font-size: 1.2rem;
.telegram_icon {
font-size: 1.2rem;
}
.text-8xl {
font-size: 5rem;
line-height: 1;
font-size: 5rem;
line-height: 1;
}
@media (min-width: 768px) {
.with-large > .flex-post:nth-child(5n),
.with-large > .flex-post:nth-child(5n-1) {
// @apply flex-100;
flex: 1 1 50%;
@apply flex-col;
.post-card-image-link {
@apply relative;
min-height: 400px;
.with-large>.flex-post:nth-child(5n),
.with-large>.flex-post:nth-child(5n-1) {
// @apply flex-100;
flex: 1 1 50%;
@apply flex-col;
.post-card-image-link {
@apply relative;
min-height: 400px;
}
.post-card-image {
@apply absolute;
@apply h-full;
@apply w-full;
@apply object-cover;
@apply rounded-lg;
}
.post-card-content {
// @apply flex-post-large-content;
flex: 0 1 auto;
@apply self-center;
}
.post-card-title {
@apply text-4xl;
}
.post-card-excerpt {
@apply text-xl;
}
}
.post-card-image {
@apply absolute;
@apply h-full;
@apply w-full;
@apply object-cover;
@apply rounded-lg;
.news>.flex-post:nth-child(5n),
.news>.flex-post:nth-child(5n-1) {
// @apply flex-100;
flex: 1 1 50%;
@apply flex-col;
.post-card-image-link {
@apply relative;
min-height: 300px;
}
.post-card-image {
@apply absolute;
@apply h-full;
@apply w-full;
@apply object-cover;
@apply rounded-lg;
}
.post-card-content {
// @apply flex-post-large-content;
flex: 0 1 auto;
@apply self-center;
}
.post-card-title {
@apply text-4xl;
}
.post-card-excerpt {
@apply text-xl;
}
}
.post-card-content {
// @apply flex-post-large-content;
flex: 0 1 auto;
@apply self-center;
}
.post-card-title {
@apply text-4xl;
}
.post-card-excerpt {
@apply text-xl;
}
}
.news > .flex-post:nth-child(5n),
.news > .flex-post:nth-child(5n-1) {
// @apply flex-100;
flex: 1 1 50%;
@apply flex-col;
.post-card-image-link {
@apply relative;
min-height: 300px;
}
.post-card-image {
@apply absolute;
@apply h-full;
@apply w-full;
@apply object-cover;
@apply rounded-lg;
}
.post-card-content {
// @apply flex-post-large-content;
flex: 0 1 auto;
@apply self-center;
}
.post-card-title {
@apply text-4xl;
}
.post-card-excerpt {
@apply text-xl;
}
}
// .news>.flex-post:nth-child(9n+1),
// .news>.flex-post:nth-child(9n+2) {
// // @apply flex-100;
// flex: 1 1 50%;
// @apply flex-col;
// .post-card-image-link {
// @apply relative;
// min-height: 300px;
// }
// .post-card-image {
// @apply absolute;
// @apply h-full;
// @apply w-full;
// @apply object-cover;
// @apply rounded-lg;
// }
// .post-card-content {
// // @apply flex-post-large-content;
// flex: 0 1 auto;
// @apply self-center;
// }
// .post-card-title {
// @apply text-4xl;
// }
// .post-card-excerpt {
// @apply text-xl;
// }
// }
// .news>.flex-post:nth-child(9n+3),
// .news>.flex-post:nth-child(9n+4),
// .news>.flex-post:nth-child(9n+5) {
// // @apply flex-100;
// flex: 1 1 300px;
// @apply flex-col;
// .post-card-image-link {
// @apply relative;
// min-height: 180px;
// }
// .post-card-image {
// @apply absolute;
// @apply h-full;
// @apply w-full;
// @apply object-cover;
// @apply rounded-lg;
// }
// .post-card-content {
// // @apply flex-post-large-content;
// flex: 0 1 auto;
// @apply self-center;
// }
// .post-card-title {
// @apply text-4xl;
// }
// .post-card-excerpt {
// @apply text-xl;
// }
// }
// .news>.flex-post:nth-child(9n+6),
// .news>.flex-post:nth-child(9n+7),
// .news>.flex-post:nth-child(9n+8),
// .news>.flex-post:nth-child(9n+9) {
// // @apply flex-100;
// flex: 1 1 250px;
// @apply flex-col;
// .post-card-image-link {
// @apply relative;
// min-height: 300px;
// }
// .post-card-image {
// @apply absolute;
// @apply h-full;
// @apply w-full;
// @apply object-cover;
// @apply rounded-lg;
// }
// .post-card-content {
// // @apply flex-post-large-content;
// flex: 0 1 auto;
// @apply self-center;
// }
// .post-card-title {
// @apply text-4xl;
// }
// .post-card-excerpt {
// @apply text-xl;
// }
// }
// .news>.flex-post:nth-child(9n+1),
// .news>.flex-post:nth-child(9n+2) {
// // @apply flex-100;
// flex: 1 1 50%;
// @apply flex-col;
// .post-card-image-link {
// @apply relative;
// min-height: 300px;
// }
// .post-card-image {
// @apply absolute;
// @apply h-full;
// @apply w-full;
// @apply object-cover;
// @apply rounded-lg;
// }
// .post-card-content {
// // @apply flex-post-large-content;
// flex: 0 1 auto;
// @apply self-center;
// }
// .post-card-title {
// @apply text-4xl;
// }
// .post-card-excerpt {
// @apply text-xl;
// }
// }
// .news>.flex-post:nth-child(9n+3),
// .news>.flex-post:nth-child(9n+4),
// .news>.flex-post:nth-child(9n+5) {
// // @apply flex-100;
// flex: 1 1 300px;
// @apply flex-col;
// .post-card-image-link {
// @apply relative;
// min-height: 180px;
// }
// .post-card-image {
// @apply absolute;
// @apply h-full;
// @apply w-full;
// @apply object-cover;
// @apply rounded-lg;
// }
// .post-card-content {
// // @apply flex-post-large-content;
// flex: 0 1 auto;
// @apply self-center;
// }
// .post-card-title {
// @apply text-4xl;
// }
// .post-card-excerpt {
// @apply text-xl;
// }
// }
// .news>.flex-post:nth-child(9n+6),
// .news>.flex-post:nth-child(9n+7),
// .news>.flex-post:nth-child(9n+8),
// .news>.flex-post:nth-child(9n+9) {
// // @apply flex-100;
// flex: 1 1 250px;
// @apply flex-col;
// .post-card-image-link {
// @apply relative;
// min-height: 300px;
// }
// .post-card-image {
// @apply absolute;
// @apply h-full;
// @apply w-full;
// @apply object-cover;
// @apply rounded-lg;
// }
// .post-card-content {
// // @apply flex-post-large-content;
// flex: 0 1 auto;
// @apply self-center;
// }
// .post-card-title {
// @apply text-4xl;
// }
// .post-card-excerpt {
// @apply text-xl;
// }
// }
}
// body[data-theme="dark"] {
@@ -307,7 +308,6 @@ button:focus {
// background-color: #191b1f;
// }
// .bg-white,
// .bg-gray-100,
// .bg-gray-200 {
// background-color: #191b1f;
@@ -343,4 +343,4 @@ button:focus {
// }
// }
// }
// }
// }

2
src/components/custom/Navbar/Navbar.vue
View File

@@ -141,7 +141,7 @@
v-else
class="block px-4 py-2 mt-2 text-sm font-semibold bg-transparent rounded-lg dark:bg-transparent dark:hover:bg-gray-600 dark-:focus:bg-gray-600 dark:focus:text-white dark:hover:text-white dark:text-gray-200 md:mt-0 hover:text-gray-900 focus:text-gray-900 hover:bg-gray-200 focus:bg-gray-200 focus:outline-none focus:shadow-outline"
@click="open = false"
:href="link.path"
:href="$url(link.path)"
>{{ link.title }}</a
>
</div>

2
src/components/custom/TagFilterHeader.vue
View File

@@ -65,7 +65,7 @@
v-for="tag in tags"
:key="tag.path"
class="cursor-pointer block px-4 py-2 mt-2 text-sm font-semibold bg-transparent rounded-lg dark:bg-transparent dark:hover:bg-gray-600 dark-:focus:bg-gray-600 dark:focus:text-white dark:hover:text-white dark:text-gray-200 md:mt-0 hover:text-gray-900 focus:text-gray-900 hover:bg-gray-200 focus:bg-gray-200 focus:outline-none focus:shadow-outline"
:href="tag.path"
:href="$url(tag.path)"
@click.self="open = false"
>{{ tag.title }}</a
>

2
src/components/marketing/sections/cta-sections/BrandPanel.vue
View File

@@ -22,7 +22,7 @@
></div>
<g-link
:to="brand.sourceUrl"
class="bg-teal-300 text-sm learn-button hover:bg-teal-400 text-gray-900 px-12 py-2 mr-3 rounded shadow rounded-full"
class="bg-teal-300 text-sm learn-button hover:bg-57EEF8-400 text-gray-900 px-12 py-2 mr-3 rounded shadow rounded-full"
>{{ brand.btnTxt }}</g-link
>
</div>

24
src/components/marketing/sections/logo-clouds/off_white_grid.vue
View File

@@ -1,11 +1,10 @@
<template>
<div class="bg-white">
<div class="max-w-screen-xl mx-auto py-12 px-4 sm:px-6 lg:py-16 lg:px-8">
<p
<div
v-html="news.content"
class="text-center text-base leading-6 font-semibold uppercase text-gray-600 tracking-wider"
>
{{ news.excerpt }}
</p>
></div>
<div class="mt-6 grid grid-cols-2 gap-0.5 md:grid-cols-3 lg:mt-8">
<g-link
v-for="partner in news.partners"
@@ -14,15 +13,7 @@
target="_blank"
class="col-span-1 flex justify-center py-8 px-8 m-1 bg-gray-100"
>
<!-- <img
class="max-h-12"
:src="require(`!!assets-loader!@images/${partner.logo}`)"
/> -->
<img
class="max-h-12"
:src="partner.logo"
/>
<img class="max-h-12" :src="img(partner.logo)" />
</g-link>
</div>
</div>
@@ -32,5 +23,12 @@
<script>
export default {
props: ["news"],
methods: {
img(image) {
if (!image) return "";
if (image.src) return image.src;
return image;
},
},
};
</script>

40
src/pages/Index.vue
View File

@@ -1,9 +1,11 @@
<template>
<Layout :hideHeader="true" :disableScroll="true">
<g-image
v-if="$page.markdownPage.solution_image"
:src="$page.markdownPage.solution_image.src"
/>
<div class="container-fluid sm:pxi-0 mx-auto overflow-x-hidden">
<g-image
v-if="$page.markdownPage.solution_image"
:src="$page.markdownPage.solution_image.src"
/>
</div>
<div class="container sm:pxi-0 mx-auto overflow-x-hidden py-5">
<SolutionsHeader
v-if="$page.markdownPage.header"
@@ -53,22 +55,27 @@
:card="card"
/> -->
<!-- <InTheNews
v-if="$page.markdownPage.inTheNews"
:news="$page.markdownPage.inTheNews"
/> -->
<InTheNews
v-if="$page.markdownPage.inTheNews"
:news="$page.markdownPage.inTheNews"
/>
<!-- <SignUp
v-if="$page.markdownPage.signup"
:signup="$page.markdownPage.signup"
/> -->
</div>
<g-image
v-if="$page.markdownPage.solution_image2"
:src="$page.markdownPage.solution_image2.src"
/>
<div class="container-fluid sm:pxi-0 mx-auto overflow-x-hidden">
<g-image
v-if="$page.markdownPage.solution_image2"
:src="$page.markdownPage.solution_image2.src"
/>
<CallToAction v-if="$page.markdownPage.cta" :cta="$page.markdownPage.cta" />
<CallToAction
v-if="$page.markdownPage.cta"
:cta="$page.markdownPage.cta"
/>
</div>
</Layout>
</template>
@@ -156,7 +163,7 @@
}
inTheNews {
id
excerpt
content
partners {
path
logo
@@ -207,3 +214,8 @@ export default {
},
};
</script>
<style scoped>
.container-fluid {
max-width: 100% !important;
}
</style>