Merge pull request #2 from invenhost/actions

Actions

.github/workflows/gh-pages.yml

@@ -0,0 +1,24 @@
+name: Build pages and publish
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/cache@v2
+      with:
+        path: vendor/bundle
+        key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }}
+        restore-keys: |
+          ${{ runner.os }}-gems-
+    - uses: helaili/jekyll-action@2.2.0
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        target_branch: 'gh-pages'
+        jekyll_src: 'home'

home/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 gem 'jekyll'
-gem 'jekyll-seo-tag'
+
+group :jekyll_plugins do
+    gem 'jekyll-postcss'
+    gem 'jekyll-seo-tag'
+end

home/Gemfile.lock

@@ -31,6 +31,7 @@ GEM
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
       terminal-table (~> 1.8)
+    jekyll-postcss (0.5.0)
     jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-seo-tag (2.7.1)
@@ -69,6 +70,7 @@ PLATFORMS
 
 DEPENDENCIES
   jekyll
+  jekyll-postcss
   jekyll-seo-tag
 
 BUNDLED WITH

home/_config.yml

@@ -15,6 +15,7 @@ url: "" # the base hostname & protocol for your site, e.g. http://example.com
 
 plugins:
   - jekyll-seo-tag
+  - jekyll-postcss
 
 exclude: [
   styles/index.css,

home/_data/general/end_cta.yml

@@ -1,4 +1,4 @@
 text: Ready for a glimpse into the future? <br>Together we make InvenTree better, faster and more helpfull each day.
 btn:
   - text: open the roadmap
-    link: https://a.bb/
+    link: https://inventree.readthedocs.io/en/latest/upcoming/

home/_data/general/function.yml

@@ -1,4 +1,4 @@
-title: We start with simple core functions
+title: InvenTree builds it vast functions on top of a few core workflows
 text:
 functions:
   - title: Organize Parts
@@ -8,8 +8,10 @@ functions:
     text: InvenTree allows you to easily create, modify or delete suppliers and supplier items linked to any part in your inventory.
     link: https://inventree.readthedocs.io/en/latest/companies/supplier/
   - title: Instant Stock Knowledge
-    text: Instantly view current stock for a certain part, in a particular location, or required for an individual build. Stock items are organized in cascading locations and sub-locations, allowing flexible inspection of stock under any location. Stock items can be serialized for tracking of individual items, and test results can be stored against a serialized stock item for the purpose of acceptance testing and commissioning.
+    text: Instantly view current stock for a certain part, in a particular location, or required for an individual build.
+    extend: Stock items are organized in cascading locations and sub-locations, allowing flexible inspection of stock under any location. Stock items can be serialized for tracking of individual items, and test results can be stored against a serialized stock item for the purpose of acceptance testing and commissioning.
     link: https://inventree.readthedocs.io/en/latest/stock/stock/
   - title: BOM Management
-    text: Intelligent BOM (Bill of Material) management provides a clear understanding of the sub-parts required to make a new part. InvenTree allows you to upload simple BOM files in multiple formats, and download a detailed BOM with all the information stored in its database.
+    text: Intelligent <strong>B</strong>ill <strong>o</strong>f <strong>M</strong>aterial management provides a clear understanding of the sub-parts required to make a new part.
+    extend: InvenTree allows you to upload simple BOM files in multiple formats, and download a detailed BOM with all the information stored in its database.
     link: https://inventree.readthedocs.io/en/latest/build/bom/

home/_includes/cta.html

@@ -1,6 +1,6 @@
 <section class="cm-gray-2 body-font">
   {% unless include.no_container %}
-    <div class="cm-container">
+    <div class="container px-5 py-24 mx-auto">
   {% endunless %}
       <div class="lg:w-2/3 flex flex-col sm:flex-row sm:items-center items-start mx-auto">
         <h1 class="flex-grow sm:pr-16 text-2xl font-medium title-font cm-gray-1">{{ include.cta.text|default:include.text }}</h1>

home/_includes/features.html

@@ -1,9 +1,14 @@
 <section class="cm-gray-2 body-font">
-    <div class="cm-container">
+    <div class="container px-5 py-24 mx-auto">
       <div class="flex flex-wrap w-full mb-4">
         <div class="lg:w-1/2 w-full mb-6 lg:mb-0">
           <a class="anchor" id="{{ include.data.header.ref }}"></a>
-          <h1 class="sm:text-3xl text-2xl font-medium title-font mb-2 cm-gray-1">{{ include.data.header.title }}</h1>
+          <div class="inline-flex items-center">
+            <h1 class="sm:text-3xl text-2xl font-medium title-font mb-2 cm-gray-1">{{ include.data.header.title }}</h1>
+            {% if include.link %}
+            <a href="{{ include.link }}">{% include learn_more.html %}</a>
+            {% endif %}
+          </div>
           <div class="h-1 w-20 bg-secondary rounded"></div>
         </div>
         <p class="lg:w-1/2 w-full leading-relaxed cm-gray-3">{{ include.data.header.text }}</p>
@@ -15,7 +20,9 @@
           <div class="bg-gray-100 p-6 rounded-lg">
             <h3 class="tracking-widest text-primary text-xs font-medium title-font">{{ item.subtitle }}</h3>
             <h2 class="text-lg cm-gray-1 font-medium title-font mb-4">{{ item.title }}</h2>
-            <p class="leading-relaxed text-base">{{ item.description }}</p>
+            <p class="leading-relaxed text-base">{{ item.description }}
+              {% if include.extend and item.extend %}<br><br>{{ item.extend }}{% endif %}
+            </p>
             <a class="text-secondary inline-flex items-center" href="{{ item.link }}">Learn More {% include learn_more.html %}</a>
           </div>
         </div>

home/_includes/functions.html

@@ -1,5 +1,5 @@
 <section class="cm-gray-2 body-font">
-  <div class="cm-container">
+  <div class="container px-5 py-24 mx-auto">
     <div class="flex flex-col text-center w-full mb-20">
       <h1 class="sm:text-3xl text-2xl font-medium title-font mb-4 cm-gray-1">{{ include.data.title }}</h1>
       <p class="lg:w-2/3 mx-auto leading-relaxed text-base">{{ include.data.text }}</p>
@@ -9,7 +9,10 @@
       {% for item in include.data.functions %}
       <div class="xl:w-1/{{ function_len }} lg:w-1/2 md:w-full px-8 py-6">
         <h2 class="text-lg sm:text-xl cm-gray-1 font-medium title-font mb-2">{{ item.title }}</h2>
-        <p class="leading-relaxed text-base mb-4">{{ item.text }}</p>
+        <p class="leading-relaxed text-base mb-4">
+          {{ item.text }}
+          {% if include.extend and item.extend %}<br><br>{{ item.extend }}{% endif %}
+        </p>
         {% if item.link %}
         <a class="text-secondary inline-flex items-center" href="{{ item.link }}">Learn More {% include learn_more.html %}</a>
         {% endif %}

home/_includes/head.html

@@ -2,7 +2,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 
-<link rel="stylesheet" href="{{ "/dist/index.css" | relative_url }}">
+<link rel="stylesheet" href="{{ "/assets/index.css" | relative_url }}">
 <link rel="shortcut icon" type="image/png" href={{ "/assets/favicon.ico" | relative_url }}>
 
 <title>{{ site.title }}{% if page.title %} - {{ page.title }}{% endif %}</title>

home/_includes/stats.html

@@ -1,5 +1,5 @@
 <section class="cm-gray-2 body-font">
-  <div class="cm-container">
+  <div class="container px-5 py-24 mx-auto">
     <div class="flex flex-wrap -m-4 text-center">
 
     {% assign stats = stats|default:site.data.general.stats.stats %}

home/_includes/team.html

@@ -1,5 +1,5 @@
 <section class="cm-gray-2 body-font">
-    <div class="cm-container">
+    <div class="container px-5 py-24 mx-auto">
       <div class="flex flex-col text-center w-full mb-20">
         <h1 class="text-2xl font-medium title-font mb-4 cm-gray-1 tracking-widest">OUR TEAM</h1>
         <p class="lg:w-2/3 mx-auto leading-relaxed text-base">Whatever cardigan tote bag tumblr hexagon brooklyn asymmetrical gentrify, subway tile poke farm-to-table. Franzen you probably haven't heard of them.</p>

home/_includes/testimonials.html

@@ -1,5 +1,5 @@
 <section class="cm-gray-2 body-font">
-    <div class="cm-container">
+    <div class="container px-5 py-24 mx-auto">
       <h1 class="text-3xl font-medium title-font cm-gray-1 mb-12 text-center">Testimonials</h1>
       <div class="flex flex-wrap -m-4">
         <div class="p-4 md:w-1/2 w-full">

home/_layouts/branche.html

@@ -8,7 +8,7 @@ layout: default
 {% include features.html data=data %}
 
 {% include cta.html cta=site.data.general.learn_cta %}
-{% include functions.html data=site.data.general.function %}
+{% include functions.html data=site.data.general.function extend=true %}
 {% include cta.html cta=site.data.general.end_cta %}
 
 ---

home/assets/index.css

@@ -1,6 +1,9 @@
-@tailwind base;
+---
-@tailwind components;
+---
-@tailwind utilities;
+
+@import "tailwindcss/base";
+@import "tailwindcss/components";
+@import "tailwindcss/utilities";
 
 
 @layer components {
@@ -32,10 +35,6 @@
         @apply text-gray-500
     }
 
-    .cm-container {
-        @apply container px-5 py-24 mx-auto
-    }
-
     a.anchor {
         display: block;
         position: relative;

home/index.md

@@ -8,11 +8,11 @@ main_page: True
 
 {% include functions.html data=site.data.general.function %}
 
-{% include features.html data=site.data.for_maker %}
+{% include features.html data=site.data.for_maker link='/maker' %}
 
-{% include features.html data=site.data.for_business %}
+{% include features.html data=site.data.for_business link='/business' %}
 
-{% include features.html data=site.data.for_edu %}
+{% include features.html data=site.data.for_edu link='/education' %}
 
 {% include stats.html data=site.data.general.stats %}
 

home/package.json

@@ -1,24 +1,11 @@
 {
-    "name": "home.invenhost.com",
+  "devDependencies": {
-    "version": "0.0.1",
+    "@tailwindcss/typography": "^0.4.1",
-    "description": "A UI test",
+    "autoprefixer": "^10.4.0",
-    "scripts": {
+    "cssnano": "^5.0.10",
-        "preinstall": "npx npm-force-resolutions",
+    "postcss": "^8.3.11",
-        "setup": "gem install bundler && bundle install && npm i",
+    "postcss-cli": "^9.0.2",
-        "start": "concurrently --kill-others \"npm run css:dev\" \"bundle exec jekyll serve\"",
+    "postcss-import": "^14.0.2",
-        "build": "npm run css:rel && jekyll build",
+    "tailwindcss": "^2.2.19"
-        "css:dev": "parcel watch styles/index.css --no-source-maps",
+  }
-        "css:rel": "parcel build styles/index.css --no-source-maps"
-    },
-    "devDependencies": {
-        "@fullhuman/postcss-purgecss": "^4.0.3",
-        "@tailwindcss/typography": "^0.4.1",
-        "autoprefixer": "^10.4.0",
-        "concurrently": "^6.3.0",
-        "parcel": "^2.0.0",
-        "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.17"
-    },
-    "resolutions": {
-        "node-forge": "0.10.0"
-    }
 }

home/postcss.config.js

@@ -1,3 +1,10 @@
 module.exports = {
-    plugins: [require("tailwindcss"), require("autoprefixer")],
+    plugins: [
+        require('postcss-import'),
+        require("tailwindcss"),
+        require("autoprefixer"),
+        require('cssnano')({
+            preset: 'default',
+        }),
+    ],
 }