Merge pull request 'edit' (#51) from development into master

Reviewed-on: #51

.github/workflows/tf_update_dev.yml

@@ -0,0 +1,24 @@
+name: www2.ourworld.tf
+on:
+  push:
+    branches: [ development ]
+
+jobs:
+  job_one:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: pushing latest change on www2.ourworld.tf
+      uses: appleboy/ssh-action@master
+      with:
+        host: www2.ourworld.tf
+        username: webuser
+        key: ${{ secrets.TF_SECRET }}
+        port: 34022
+        script: |
+          cd websites/www2/www_ourworld_tf/
+          git log -1
+          git fetch
+          git reset --hard origin/development
+          sed -i "s/https:\/\/www.ourworld.tf/https:\/\/www2.ourworld.tf/g" config.toml
+          ./build.sh

.github/workflows/tf_update_prod.yml

@@ -0,0 +1,24 @@
+name: ourworld.tf
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  job_one:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: pushing latest change on ourworld.tf
+      uses: appleboy/ssh-action@master
+      with:
+        host: ourworld.tf
+        username: webuser
+        key: ${{ secrets.TF_SECRET }}
+        port: 34022
+        script: |
+          cd websites/www_ourworld_tf/
+          git log -1
+          git fetch
+          git reset --hard origin/master
+          sed -i "s/https:\/\/www2.ourworld.tf/https:\/\/ourworld.tf/g" config.toml
+          ./build.sh

config.toml

@@ -1,5 +1,5 @@
 # The URL the site will be built for
-base_url = "https://www2.ourworld.tf"
+base_url = "https://www.ourworld.tf"
 # Change this to your own URL! Please note this variable **must** be uncommented.
 
 title = "OURWORLD"

tailwind.config.js

@@ -1,43 +1,18 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  content: [
+  content: ['./templates/**/*.html', './content/**/*.md'],
-    './templates/**/*.html', 
-    './content/**/*.md',
-    './static/**/*.js'
-  ],
   safelist: [
-    'grid',
-    'items-start',
     {
         pattern: /(-|)(ml|mr)-(4|8|12|16|20|24|28)/,
-        variants: ['sm', 'md', 'lg', 'xl', '2xl', 'first', 'first:sm', 'first:md', 'first:lg', 'last', 'last:sm', 'last:md', 'last:lg'],
+        variants: ['sm', 'md', 'lg', 'first', 'first:sm', 'first:md', 'first:lg', 'last', 'last:sm', 'last:md', 'last:lg'],
     },
     {
         pattern: /(pt|pb)-(0)/,
-        variants: ['!', 'sm', 'md', 'lg', 'xl', '2xl', 'first', 'first:sm', 'first:md', 'first:lg', 'last', 'last:sm', 'last:md', 'last:lg'],
+        variants: ['!', 'lg', 'first', 'first:sm', 'first:md', 'first:lg', 'last', 'last:sm', 'last:md', 'last:lg'],
-    },
-    {
-        pattern: /(col-span)-(1|2|3|4|5|6)/,
-        variants: ['sm', 'md', 'lg', 'xl', '2xl'],
-    },
-    {
-        pattern: /(grid-cols)-(1|2|3|4|5|6)/,
-        variants: ['sm', 'md', 'lg', 'xl', '2xl'],
-    },
-    {
-        pattern: /(gap)-(x|y)?-(4|8|12|16|20|24)/,
-        variants: ['sm', 'md', 'lg', 'xl', '2xl'],
     }
   ],
   theme: {
-    extend: {
+    extend: {},
-      fontFamily: {
-        'cerco': ['CercoDEMO', 'sans-serif'],
-      },
-      colors: {
-        'semi-white': 'rgba(255, 255, 255, 0.75)',
-      },
-    },
   },
   plugins: [],
 }

templates/partials/portfolio2.html

@@ -13,7 +13,7 @@
     <dl class="mx-auto mt-16 grid max-w-2xl grid-cols-1 gap-x-6 lg:gap-y-10 sm:grid-cols-2 gap-y-16 lg:max-w-none lg:grid-cols-3 lg:gap-x-8">
       <div class="border-t border-gray-200 pt-4">
         <div class="flex items-center">
-          <a href="/ventures/" target="_blank" class="flex items-center hover:text-indigo-700">
+          <a href="/ventures/threefold" target="_blank" class="flex items-center hover:text-indigo-700">
           <img 
             src="/images/tf.png" 
             alt="ThreeFold Logo" 
@@ -28,7 +28,7 @@
       </div>
       <div class="border-t border-gray-200 pt-4">
         <div class="flex items-center">
-          <a href="/ventures/" target="_blank" class="flex items-center hover:text-indigo-700">
+          <a href="/ventures/geomind" target="_blank" class="flex items-center hover:text-indigo-700">
           <img 
             src="/images/geo_ico.png" 
             alt="TF9LOGO Logo" 

templates/partials/ventures/geomind.html

@@ -7,7 +7,7 @@
     <div class="mx-auto max-w-7xl px-6 py-16 lg:pt-24 lg:pb-12">
       <div class="grid grid-cols-1 lg:grid-cols-5 lg:gap-x-16 items-start">
         <!-- Left Column -->
-        <div class="lg:col-span-3">
+        <div class="col-span-3">
           <div class="inline-flex items-center">
             <a href="/ventures" class="block">
               <h2 class="text-base font-semibold leading-8 text-indigo-600 hover:text-indigo-700 transition-colors duration-200 underline">
@@ -27,7 +27,7 @@
           </div>
 
         <!-- Right Column -->
-        <div class="p-6 rounded-lg border border-gray-300 lg:col-span-2">
+        <div class="p-6 rounded-lg border border-gray-300 col-span-2">
           <div class="mb-4">
             <h3 class="text-base font-medium leading-8 text-indigo-600">Platform</h3>
             <p class="text-base font-light text-black">Revolutionizing Cloud Infrastructure</p>

templates/partials/ventures/threefold.html

@@ -4,9 +4,9 @@
       <div class="relative left-[calc(50%-11rem)] aspect-[1155/678] w-[36.125rem] -translate-x-1/2 rotate-[30deg] bg-gradient-to-tr from-[#ff80b5] to-[#9089fc] opacity-20 sm:left-[calc(50%-30rem)] sm:w-[72.1875rem]" style="clip-path: polygon(74.1% 44.1%, 100% 61.6%, 97.5% 26.9%, 85.5% 0.1%, 80.7% 2%, 72.5% 32.5%, 60.2% 62.4%, 52.4% 68.1%, 47.5% 58.3%, 45.2% 34.5%, 27.5% 76.7%, 0.1% 64.9%, 17.9% 100%, 27.6% 76.8%, 76.1% 97.7%, 74.1% 44.1%)"></div>
     </div>
     <div class="mx-auto max-w-7xl px-6 py-16 lg:pt-24 lg:pb-12">
-      <div class="grid grid-cols-1 lg:grid-cols-2 lg:gap-x-16 items-start">
+      <div class="grid grid-cols-1 lg:grid-cols-5 lg:gap-x-16 items-start">
         <!-- Left Column -->
-        <div class="col-span-1">
+        <div class="col-span-3">
           <div class="inline-flex items-center">
             <a href="/ventures" class="block">
               <h2 class="text-base font-semibold leading-8 text-indigo-600 hover:text-indigo-700 transition-colors duration-200 underline">
@@ -31,7 +31,7 @@
         </div>
 
         <!-- Right Column -->
-        <div class="p-6 rounded-lg border border-gray-300 mt-8 lg:mt-0 col-span-1">
+        <div class="p-6 rounded-lg border border-gray-300 col-span-2">
           <div class="mb-4">
             <h3 class="text-base font-medium leading-8 text-indigo-600">Sector</h3>
             <p class="text-base font-light text-black">Technology, Information and Internet</p>
@@ -66,7 +66,7 @@
       </div>
     </div>
 
-    <dl class="mt-6 grid grid-cols-1 gap-8 lg:grid-cols-4">
+    <dl class="mt-6 grid grid-cols-1 gap-8 lg:grid-cols-2">
       <div class="flex flex-col-reverse px-6 py-2">
         <dt class="text-base leading-7 text-gray-700">Ultra-secure, private, and efficient storage at global scale.</dt>
         <dd class="text-xl font-semibold leading-9 tracking-tight flex items-center gap-4">
@@ -119,7 +119,7 @@
     </div>
     <div class="mt-10 flex items-center justify-center gap-x-6">
       <a href="/contact" class="rounded-md bg-black px-3.5 py-2.5 text-sm font-semibold text-white shadow-sm hover:bg-gray-800 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-black">Support Venture</a>
-      <a href="https://threefold.io" target="_blank" rel="noopener" class="text-sm font-semibold leading-6 text-black">Visit Website <span aria-hidden="true">→</span></a>
+      <a href="https://threefold.io" target="_blank" class="text-sm font-semibold leading-6 text-black">Visit Website <span aria-hidden="true">→</span></a>
     </div>
   </div>
 </div>