diff --git a/.github/workflows/tf_update.yml b/.github/workflows/tf_update.yml index eb77cbd..b570489 100644 --- a/.github/workflows/tf_update.yml +++ b/.github/workflows/tf_update.yml @@ -1,23 +1,23 @@ - name: ourverse.tf - on: - push: - branch: [ development ] +name: ourverse.tf +on: + push: + branch: [development] - jobs: - job_one: - name: Deploy - runs-on: ubuntu-latest - steps: - - name: pushing latest change on www2.ourverse.tf - uses: appleboy/ssh-action@master - with: - host: www2.ourverse.tf - username: root - key: ${{ secrets.TF_SECRET }} - port: 22 - script: | - cd /opt/www_ourverse/ - git log -1 - git restore static/css/index.css - git pull - npm run build +jobs: + job_one: + name: Deploy + runs-on: ubuntu-latest + steps: + - name: pushing latest change on www2.ourverse.tf + uses: appleboy/ssh-action@master + with: + host: www2.ourverse.tf + username: root + key: ${{ secrets.TF_SECRET }} + port: 22 + script: | + cd /opt/www_ourverse/ + git log -1 + git restore static/css/index.css + git pull + npm run build diff --git a/.gitignore b/.gitignore index 31dfcfe..499540b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,3 @@ -examples/builder -examples/docker -examples/publisher -examples/texttools -examples/gittools -examples/tmux -examples/vredis2 *dSYM/ publisher/publish install_publisher @@ -20,7 +13,6 @@ src/.temp content/news content/person content/project -node_modules !.env.example .env .env.* @@ -32,4 +24,5 @@ dist run* install* public -static/css \ No newline at end of file +static/css +tailwindcss \ No newline at end of file diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 0000000..fae6947 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,7 @@ +# This configuration file was automatically generated by Gitpod. +# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file) +# and commit this file to your remote git repository to share the goodness with others. + +tasks: + - init: sh build + command: sh build diff --git a/content/_index.md b/content/_index.md index 88786f4..d21745e 100644 --- a/content/_index.md +++ b/content/_index.md @@ -6,184 +6,4 @@ updated: 2021-02-20T14:40:00-06:00 draft: false extra: author: - imgPath: blog/realizing_the_promise/ --- - - - -{% row(style="center lean-right") %} - -### EXPERIENCE - -## ABUNDANCE - -
- -A better world is one where we all have access to endless information and oppurtunities. OurVerse exists to achieve that dream. - - - -||| - -![Image](/images/OWAsset-15.png#large) - -{% end %} - -{{ space() }} - -{% row(style="center narrow") %} - -
- -![Image](/images/OWAsset-16.png) - -### THE END OF - -## SCARCITY. - -
- -Learn whatever your heart desires. Access any oppurtunity to earn. Enter any shop. Travel everywhere. In OurVerse, you are limited by only your own imagination. - -{% end %} - -{{ space() }} - -{% row(style="center moderate") %} - -
- -![Image](/images/OWAsset-17.png) - -
- -#### ENDLESS KNOWLEDGE AND EDUCATION - -
- -Learn whatever your heart desires. Access any oppurtunity to earn. Enter any shop. Travel everywhere. In OurVerse, you are limited by only your own imagination. - -||| - -
- -![Image](/images/OWAsset-18.png) - -
- -#### A BETTER EARNING MODEL - -
- -Learn whatever your heart desires. Access any oppurtunity to earn. Enter any shop. Travel everywhere. In OurVerse, you are limited by only your own imagination. - -{% end %} - -{% row(style="center moderate") %} - -
- -![Image](/images/OWAsset-19.png) - -
- -#### EVERY PRODUCT IS ACCESSIBLE - -
- -Learn whatever your heart desires. Access any oppurtunity to earn. Enter any shop. Travel everywhere. In OurVerse, you are limited by only your own imagination. - -||| - -
- -![Image](/images/OWAsset-20.png) - -
- -#### THE WORLD IS YOUR OYSTER - -
- -Learn whatever your heart desires. Access any oppurtunity to earn. Enter any shop. Travel everywhere. In OurVerse, you are limited by only your own imagination. - -{% end %} - -{{ space() }} - -{% row(style="center lean-left" bgColor="#c4ffeb") %} - -![Image](/images/OWAsset-21.png) - -||| - -# WORK. - -# PLAY. - -# **LIVE.** - -
- -**Anything** you can do in the real world you can do in OurVerse. Only your own imagination limits you. Explore or start building experiences and start earning now! - - - -{% end %} - -{% row(style="center narrow") %} - -
- -### EVERY IDENTITY IS - -## PROTECTED. - -
- -OurVerse users are protected through ThreeFold's digital twin. This allows everyone to communicate, network and collaborate without worrying about data breaches and identity theft. - -
- -![Image](/images/OWAsset-22.png) - -{% end %} - -{{ space() }} - -{% row(style="center lean-left" bgColor="#c6f8ff") %} - -![Image](/images/OWAsset-23.png) - -||| - -#### BUILT BY - -### TOGETHERNESS. - -
- -An OurVerse is created by utilizing the world's largest decentralized and peer-to-peer of storage and compute: The ThreeFold Grid. - -
-
- -This provides every OurVerse community with unparalleled security to each user and assures unprecedented sovereignty. - - - -{% end %} - -{% row(style="center narrow invert-color" bgColor="#4dc48f") %} - -## WANNA GET **INVOLVED?** - -
- -Interested in partnering up? Or just wanna say hi? - -Drop us a message! - - - -{% end %} diff --git a/content/home/index.md b/content/home/index.md new file mode 100644 index 0000000..7e4b25f --- /dev/null +++ b/content/home/index.md @@ -0,0 +1,189 @@ +--- +title: "OurVerse" +description: "The only truly decentralized metaverse on the planet awaits you." +date: 2018-09-14T21:00:00-05:00 +updated: 2021-02-20T14:40:00-06:00 +draft: false +extra: + author: + imgPath: blog/realizing_the_promise/ +--- + + + +{% row(style="center" margin="lean-right") %} + +### EXPERIENCE + +## ABUNDANCE + +
+ +A better world is one where we all have access to endless information and oppurtunities. OurVerse exists to achieve that dream. + + + +||| + +![Image](/images/OWAsset-15.png#large) + +{% end %} + +{{ space() }} + +{% row(style="center narrow") %} + +
+ +![Image](/images/OWAsset-16.png) + +### THE END OF + +## SCARCITY. + +
+ +Learn whatever your heart desires. Access any oppurtunity to earn. Enter any shop. Travel everywhere. In OurVerse, you are limited by only your own imagination. + +{% end %} + +{{ space() }} + +{% row(style="center" margin="moderate") %} + +
+ +![Image](/images/OWAsset-17.png) + +
+ +#### ENDLESS KNOWLEDGE AND EDUCATION + +
+ +Learn whatever your heart desires. Access any oppurtunity to earn. Enter any shop. Travel everywhere. In OurVerse, you are limited by only your own imagination. + +||| + +
+ +![Image](/images/OWAsset-18.png) + +
+ +#### A BETTER EARNING MODEL + +
+ +Learn whatever your heart desires. Access any oppurtunity to earn. Enter any shop. Travel everywhere. In OurVerse, you are limited by only your own imagination. + +{% end %} + +{% row(style="center moderate") %} + +
+ +![Image](/images/OWAsset-19.png) + +
+ +#### EVERY PRODUCT IS ACCESSIBLE + +
+ +Learn whatever your heart desires. Access any oppurtunity to earn. Enter any shop. Travel everywhere. In OurVerse, you are limited by only your own imagination. + +||| + +
+ +![Image](/images/OWAsset-20.png) + +
+ +#### THE WORLD IS YOUR OYSTER + +
+ +Learn whatever your heart desires. Access any oppurtunity to earn. Enter any shop. Travel everywhere. In OurVerse, you are limited by only your own imagination. + +{% end %} + +{{ space() }} + +{% row(style="center lean-left" bgColor="#c4ffeb") %} + +![Image](/images/OWAsset-21.png) + +||| + +# WORK. + +# PLAY. + +# **LIVE.** + +
+ +**Anything** you can do in the real world you can do in OurVerse. Only your own imagination limits you. Explore or start building experiences and start earning now! + + + +{% end %} + +{% row(style="center narrow") %} + +
+ +### EVERY IDENTITY IS + +## PROTECTED. + +
+ +OurVerse users are protected through ThreeFold's digital twin. This allows everyone to communicate, network and collaborate without worrying about data breaches and identity theft. + +
+ +![Image](/images/OWAsset-22.png) + +{% end %} + +{{ space() }} + +{% row(style="center lean-left" bgColor="#c6f8ff") %} + +![Image](/images/OWAsset-23.png) + +||| + +#### BUILT BY + +### TOGETHERNESS. + +
+ +An OurVerse is created by utilizing the world's largest decentralized and peer-to-peer of storage and compute: The ThreeFold Grid. + +
+
+ +This provides every OurVerse community with unparalleled security to each user and assures unprecedented sovereignty. + + + +{% end %} + +{% row(style="center invert-color" bgColor="#4dc48f" margin="narrow") %} + +## WANNA GET **INVOLVED?** + +
+ +Interested in partnering up? Or just wanna say hi? + +Drop us a message! + + + +{% end %} diff --git a/css/index.css b/css/index.css index eae41c6..3808d06 100644 --- a/css/index.css +++ b/css/index.css @@ -86,7 +86,7 @@ img[src*="#tft_img"] { @apply text-xl lg:text-3xl font-normal; } h6 { - @apply text-md not-italic font-normal my-1; + @apply text-base not-italic font-normal my-1; } p { @apply text-lg lg:text-2xl leading-tight; diff --git a/tailwind.config.js b/tailwind.config.js index 873168a..5b0de27 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,58 +1,8 @@ -const colors = require('tailwindcss/colors') - +/** @type {import('tailwindcss').Config} */ module.exports = { - content: [ - './templates/**/*.html' - ], - darkMode: false, + content: ['./templates/**/*.html'], theme: { - fontSize: { - 'xs': '.75rem', - 'sm': '.875rem', - 'tiny': '.875rem', - 'base': '1rem', - 'md': '1.05rem', - 'lg': '1.125rem', - 'xl': '1.25rem', - '2xl': '1.5rem', - '3xl': '1.875rem', - '4xl': '2.25rem', - '5xl': '3rem', - '6xl': '4rem', - '7xl': '5rem', - '8xl': '5.75rem', - '9xl': '8rem' - }, - colors: { - transparent: 'transparent', - white: '#ffffff', - black: '#000000', - gray: colors.gray, - slate: colors.slate, - stone: colors.stone, - zinc: colors.zinc, - yellow: colors.yellow, - orange: colors.orange, - sky: colors.sky, - blue: { - '100': '#bbeeff', - '200': '#00aaff', - '300': '#0088ff', - '400': '#0033ff', - '500': '#0000ff', - '600': '#0000bb', - '700': '#0000aa', - '800': '#000088', - '900': '#000066', - }, - - }, - extend: { - screens: { - '2xl': '1450px', - // => @media (min-width: 992px) { ... } - }, - }, + extend: {}, }, - plugins: [], // if we add forms, do it here + plugins: [], } diff --git a/tailwindcss b/tailwindcss index 0393f83..5adb722 100755 Binary files a/tailwindcss and b/tailwindcss differ diff --git a/templates/_default/base.html b/templates/_default/base.html index 7888bf9..9816847 100644 --- a/templates/_default/base.html +++ b/templates/_default/base.html @@ -1,14 +1,13 @@ - {% include "partials/head.html" %} - {% include "partials/header.html" %} - - - -
- {% block content %}{% endblock %} -
- - + {% include "partials/head.html" %} + + + {% include "partials/header.html" %} +
+ {% block content %}{% endblock %} +
+ {% include "partials/footer.html" %} + \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index 24ba5b7..1e6fc10 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,8 +1,9 @@ {% extends "_default/base.html" %} {% block content %} - -
- {{section.content | safe}} -
+ +
+ {% set page = get_page(path="home/index.md") %} + {{page.content | safe}} +
{% endblock content %} \ No newline at end of file diff --git a/templates/page.html b/templates/page.html index 5f9cac9..2ad741b 100644 --- a/templates/page.html +++ b/templates/page.html @@ -5,6 +5,12 @@
- {{page.content | safe}} +
+ {% if page %} + {{page.content | safe}} + {% else %} + {{section.content | safe}} + {% endif %} +
{% endblock content %} diff --git a/templates/partials/featuredBlog.html b/templates/partials/featuredBlog.html index 671a864..80d2320 100644 --- a/templates/partials/featuredBlog.html +++ b/templates/partials/featuredBlog.html @@ -4,10 +4,13 @@

FEATURED POST

-

+

{{ featured.title }}

+

+ {{featured.description}} +

{{ featured.date | date(format="%B %e, %Y", timezone="America/Chicago")}} - diff --git a/templates/partials/footer.html b/templates/partials/footer.html index fd2a0fc..4dcf806 100644 --- a/templates/partials/footer.html +++ b/templates/partials/footer.html @@ -3,31 +3,19 @@ Read the documentation to get started: https://tailwindui.com/documentation --> -{%- set section = get_section(path="footer/_index.md") %} -{%- set logoPath = section.extra.logoPath %} +{%- set section = get_section(path="_index.md") %} - - -
-

- - - - \ No newline at end of file + \ No newline at end of file diff --git a/templates/partials/head.html b/templates/partials/head.html index 3b46cb0..1515e14 100644 --- a/templates/partials/head.html +++ b/templates/partials/head.html @@ -17,7 +17,7 @@ {% endif %} {% endblock title %} - + diff --git a/templates/partials/header.html b/templates/partials/header.html index 4fcaa12..e8daba4 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -84,143 +84,142 @@ -{%- set section = get_section(path="header/_index.md") %} -{% set header_items = section.content | safe | split(pat="
  • ") %} -
    -
    -
    -
    -
    - - Ourworld Logo - -
    -
    - - -
    -
    • ") %} - {% set header_label = header_arr[0] %} - {% if ' - {{link_label}} - - {% else %} -
    - {% set button_id = header_label ~ "-menu-btn" | slugify %} - -
    - - {% endif %} -{% endif %} -{% endfor %} - - - - - - -{% for header_item in header_items %} -{% if not loop.first %} - {% set header_arr = header_item | split(pat="") %} - {% set header_label = header_arr[0] %} - {% set header_menu = header_arr[1] %} - {% set menu_id = header_label ~ "-menu" | slugify %} - - - - -{% endif %} -{% endfor %} - - - - {{ page.content | safe }} diff --git a/templates/shortcodes/row.html b/templates/shortcodes/row.html index a2239ce..67961bb 100644 --- a/templates/shortcodes/row.html +++ b/templates/shortcodes/row.html @@ -9,8 +9,33 @@ Parameters: - bgPath: if bgPath is passed, the row has a full width background --> -{% set columns = body | safe | markdown | split(pat="|||") %} -{% set row_class = "relative pt-12 flex flex-col sm:grid sm:grid-cols-2 sm:gap-10 md:flex md:flex-row md:py-4 lg:py-8"%} + + +{% if page %} + {% if "](" in body %} + {% set body_arr = body | split(pat="](") %} + {% set body = body_arr[0] %} + {% for i in body_arr %} + {% set prev_index = loop.index0 - 1 %} + {% if not loop.first %} + {% if "![" in body_arr[prev_index] %} + {% set_global body = body ~ '](' ~ page.permalink ~ i %} + {% else %} + {% if i is not starting_with("http") %} + {% set base_url = get_url(path="") %} + {% set_global body = body ~ '](' ~ base_url ~ i %} + {% else %} + {% set_global body = body ~ '](' ~ i %} + {% endif %} + {% endif %} + {% endif %} + {% endfor %} + {% endif %} +{% endif %} + +{% set columns = body | safe | markdown | split(pat="

    |||

    ") %} + +{% set row_class = "relative py-12 flex flex-col sm:grid sm:grid-cols-2 sm:gap-10 md:flex md:flex-row flex-wrap max-w-fit "%} {% if 2 < columns | length %} @@ -19,7 +44,36 @@ Parameters: {% set row_class = row_class ~ " lg:items-center" %} {% endif %} -{% set col_class = "flex-1 mb-20 lg:mb-0 " %} +{% set col_class = "flex-1 mb-4 md:mb-12 lg:mb-0 " %} +{% set col_class = col_class ~ " lg:mx-8 " %} + + + + +{% set margin_class = " mx-4 md:mx-16 lg:mx-24 " %} + +{% if margin %} + {% if "none" in margin %} + {% set margin_class = " mx-0 " %} + {% elif "wide" in margin %} + {% set margin_class = " mx-4 sm:mx-8 md:mx-12 lg:mx-16 xl:mx-20 " %} + {% elif "moderate" in margin %} + {% set margin_class = " mx-8 sm:mx-16 md:mx-24 lg:mx-28 " %} + {% elif "narrow" in margin %} + {% set margin_class = " mx-12 sm:mx-20 md:mx-28 lg:mx-32 " %} + {% elif "tight" in margin %} + {% set margin_class = " mx-20 sm:mx-32 md:mx-60 lg:mx-80 xl:mx-96 " %} + {% endif %} + {% if "lean-left" in margin %} + {% set col_class = col_class ~ " lg:last:px-20 lg:max-w-[50%] lg:mx-0 " %} + {% set row_class = row_class ~ " !ml-0 sm:gap-0 " %} + {% elif "lean-right" in margin %} + {% set col_class = col_class ~ " lg:first:px-20 lg:max-w-[50%] lg:mx-0 " %} + {% set row_class = row_class ~ " !mr-0 sm:gap-0 " %} + {% endif %} +{% endif %} + +{% set row_class = row_class ~ margin_class %} {% if style %} @@ -31,24 +85,24 @@ Parameters: {% if "lean" in style %} {% if "lean-left" in style %} - {% set col_class = col_class ~ "flex-1 lg:m-0 " %} - {% set row_class = row_class ~ " lg:mr-20 " %} + {% set col_class = col_class ~ " last:px-20 lg:max-w-[50%] " %} + {% set row_class = row_class ~ " sm:gap-0 " %} {% elif "lean-right" in style %} - {% set col_class = col_class ~ "flex-1 lg:m-0 " %} - {% set row_class = row_class ~ " lg:ml-20 " %} + {% set col_class = col_class ~ " first:px-20 lg:max-w-[50%] -mr-8 md:-mr-12 lg:-mr-16 xl:-mr-20 " %} + {% set row_class = row_class ~ " sm:gap-0 " %} {% else %} - {% set col_class = col_class ~ "flex-1 lg:m-0 " %} + {% set row_class = row_class ~ " md:py-0 " %} + {% set col_class = col_class ~ " lg:m-0" %} {% endif %} {% else %} - {% set row_class = row_class ~ " mx-8 " %} - {% set col_class = col_class ~ " lg:mx-8 " %} + {% set row_class = row_class ~ " w-screen " %} {% endif %} {% if "between" in style %} {% set row_class = row_class ~ " lg:max-w-6xl " %} {% elif "moderate" in style %} - {% set row_class = row_class ~ " lg:m-20 " %} + {% set row_class = row_class ~ " " %} {% endif %} @@ -57,15 +111,16 @@ Parameters: {% elif "tight" in style %} {% set row_class = row_class ~ " lg:max-w-sm " %} {% elif "moderate" in style %} - {% set row_class = row_class ~ " lg:m-20 " %} + {% set row_class = row_class ~ " mx-20 " %} {% endif %} {% if "invert-color" in style %} - {% set row_class = row_class ~ " text-white " %} - {% endif %} + {% set row_class = row_class ~ " text-white lg:text-white " %} + + {% endif %} {% else %} - {% set row_class = row_class ~ " mx-12 " %} + {% set row_class = row_class ~ " " %} {% endif %} {% set anchor_link = ""%} @@ -76,25 +131,51 @@ Parameters: {% set styles = "" %} +{% set div_class = " " %} {% if bgPath %} - {% set styles = "background: url('" ~ bgPath ~ "'); background-size: cover" %} + {% set background_url = page.permalink ~ bgPath %} + {% set styles = "background: url('" ~ background_url ~ "'); background-size: cover; background-position: center;" %} + {% if "#desktop" in bgPath %} + {% set bgStyle = false %} + {% set div_class = " !bg-[length:0px_0px] !bg-no-repeat lg:!bg-cover " %} + {% set row_class = row_class | replace(from='text-white', to='text-black') %} + {% if "invert-color" in style %} + {% if "#desktop" in bgPath %} + {% set row_class = row_class ~ " lg:text-white " %} + {% endif %} + {% endif %} + {% endif %} +{% endif %} +{% if bgStyle %} + {% if "full" in bgStyle %} + {% set styles = styles ~ "height: -webkit-fill-available; height: 100vh;" %} + {% elif "hero" in bgStyle %} + {% set div_class = div_class ~ " -mt-24 pt-24 " %} + {% endif %} {% endif %} {% if bgColor %} {% set styles = "background-color: " ~ bgColor ~ "; background-size: cover" %} + {% set row_class = row_class ~ " py-0 " %} {% endif %} -
    -
    + +{% set no_margins = " -mx-8 md:-mx-12 lg:-mx-16 xl:-mx-20" %} + + +
    +
    + {% for column in columns%} {% if column | as_str | length < 10 %} -