Merge pull request #2 from buildit/gravity-next

Gravity next
buildit · Mar 26, 2020 · 7055763 · 7055763
2 parents 70845a2 + 9707c15
commit 7055763
Show file tree

Hide file tree

Showing 33 changed files with 7,646 additions and 3,939 deletions.
diff --git a/.browserlistrc b/.browserlistrc
@@ -0,0 +1 @@
+last 2 versions
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-lts/*
+lts/dubnium
diff --git a/config/envs.json b/config/envs.json
@@ -3,6 +3,7 @@
     "url": "http://localhost:8080",
     "excludeRobots": true,
     "optimise": false,
+    "debugCss": true,
     "gtm": {
       "containerId": "GTM-5HD3WXB",
       "authId": "UZwrBZ2wxRUy5NTsN5397A",
@@ -13,6 +14,7 @@
     "url": "http://localhost:8080",
     "excludeRobots": true,
     "optimise": true,
+    "debugCss": true,
     "gtm": {
       "containerId": "",
       "authId": "",
@@ -23,6 +25,7 @@
     "url": "https://staging",
     "excludeRobots": true,
     "optimise": true,
+    "debugCss": false,
     "gtm": {
       "containerId": "",
       "authId": "",
@@ -33,6 +36,7 @@
     "url": "https://production",
     "excludeRobots": false,
     "optimise": true,
+    "debugCss": false,
     "gtm": {
       "containerId": "",
       "authId": "",

diff --git a/content/article1.md b/content/article1.md
@@ -1,9 +1,9 @@
-# My First Article
-
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. Praesent mauris. Fusce nec tellus sed augue semper porta. Mauris massa. Vestibulum lacinia arcu eget nulla. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur sodales ligula in libero. Sed dignissim lacinia nunc.
 
 Curabitur tortor. Pellentesque nibh. Aenean quam. In scelerisque sem at dolor. Maecenas mattis. Sed convallis tristique sem. Proin ut ligula vel nunc egestas porttitor. Morbi lectus risus, iaculis vel, suscipit quis, luctus non, massa. Fusce ac turpis quis ligula lacinia aliquet. Mauris ipsum. Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque volutpat condimentum velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam nec ante.
 
+> Integer lacinia sollicitudin massa. Cras metus. Sed aliquet risus a tortor. Integer id quam. Morbi mi.
+
 Sed lacinia, urna non tincidunt mattis, tortor neque adipiscing diam, a cursus ipsum ante quis turpis. Nulla facilisi. Ut fringilla. Suspendisse potenti. Nunc feugiat mi a tellus consequat imperdiet. Vestibulum sapien. Proin quam. Etiam ultrices. Suspendisse in justo eu magna luctus suscipit. Sed lectus. Integer euismod lacus luctus magna.
 
 ![A placeholder image with a 2:1 aspect ratio.](https://placeimg.com/640/320/tech)

diff --git a/content/article2.md b/content/article2.md
@@ -1,15 +1,10 @@
-# The Second Article
-
 Sed lacinia, urna non tincidunt mattis, tortor neque adipiscing diam, a cursus ipsum ante quis turpis. Nulla facilisi. Ut fringilla. Suspendisse potenti. Nunc feugiat mi a tellus consequat imperdiet. Vestibulum sapien. Proin quam. Etiam ultrices. Suspendisse in justo eu magna luctus suscipit. Sed lectus. Integer euismod lacus luctus magna.
 
 Quisque cursus, metus vitae pharetra auctor, sem massa mattis sem, at interdum magna augue eget diam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Morbi lacinia molestie dui. Praesent blandit dolor. Sed non quam. In vel mi sit amet augue congue elementum. Morbi in ipsum sit amet pede facilisis laoreet. Donec lacus nunc, viverra nec, blandit vel, egestas et, augue. Vestibulum tincidunt malesuada tellus. Ut ultrices ultrices enim. Curabitur sit amet mauris. Morbi in dui quis est pulvinar ullamcorper. Nulla facilisi.
 
 Integer lacinia sollicitudin massa. Cras metus. Sed aliquet risus a tortor. Integer id quam. Morbi mi. Quisque nisl felis, venenatis tristique, dignissim in, ultrices sit amet, augue. Proin sodales libero eget ante. Nulla quam. Aenean laoreet. Vestibulum nisi lectus, commodo ac, facilisis ac, ultricies eu, pede. Ut orci risus, accumsan porttitor, cursus quis, aliquet eget, justo. Sed pretium blandit orci. Ut eu diam at pede suscipit sodales.
 
-## Images!
-
-![A placeholder image with a 1:2 aspect ratio.](https://placeimg.com/160/320/animals)
-![A placeholder image with a 1:1 aspect ratio.](https://placeimg.com/320/320/nature/grayscale)
-![A placeholder image with a 1:2 aspect ratio.](https://placeimg.com/160/320/nature/sepia)
-![A placeholder image with a 3:4 aspect ratio.](https://placeimg.com/240/320/animals)
-![A placeholder image with a 1:1 aspect ratio.](https://placeimg.com/320/320/nature)
+#### Images!
+![A placeholder image with a 16:9 aspect ratio.](https://placeimg.com/1920/1080/animals)
+![A placeholder image with a 16:10 aspect ratio.](https://placeimg.com/1920/1200/nature/grayscale)
+![A placeholder image with a 16:9 aspect ratio.](https://placeimg.com/1920/1080/nature/sepia)
diff --git a/content/home.md b/content/home.md
diff --git a/gulp/browsersync.js b/gulp/browsersync.js
@@ -49,7 +49,18 @@ function initTask(done) {
         "color: white",
         "text-align: center"
       ]
-    }
+    },
+    snippetOptions: {
+      // Make BrowerSync JS snippet get appended
+      // to <head> instead of <body>, so that it doesn't
+      // interfere with our * + * CSS rules.
+      rule: {
+        fn(snippet, match) {
+          return snippet + match;
+        },
+        match: /<\/head>/i,
+      },
+    },
   });
   done();
 }

diff --git a/gulp/get-build-info.js b/gulp/get-build-info.js
@@ -8,7 +8,12 @@ let commitInfo = null;
 
 async function getCommitInfo() {
   if (commitInfo === null) {
-    commitInfo = await promisify(git.getLastCommit)();
+    try {
+      commitInfo = await promisify(git.getLastCommit)();
+    } catch (e) {
+      // no previous commit
+      commitInfo = {};
+    }
   }
   return commitInfo;
 }
@@ -35,11 +40,15 @@ module.exports = async function() {
   }
 
   const commitInfo = await getCommitInfo();
-  bldInfo.commitHash = commitInfo.hash;
-  bldInfo.commitShortHash = commitInfo.shortHash;
-  bldInfo.commitGithubUrl = `https://github.com/buildit/gravity-metalsmith-seed/commit/${
-    commitInfo.hash
-  }`;
+  bldInfo.commitHash = commitInfo.hash || "n/a";
+  bldInfo.commitShortHash = commitInfo.shortHash || "n/a";
+  if (commitInfo.hash) {
+    bldInfo.commitGithubUrl = `https://github.com/buildit/gravity-metalsmith-seed/commit/${
+      commitInfo.hash
+    }`;
+  } else {
+    bldInfo.commitGithubUrl = "n/a";
+  }
 
   return bldInfo;
 };
diff --git a/gulpfile.js b/gulpfile.js
@@ -24,6 +24,7 @@ const eyeglass = require("eyeglass");
 const chalk = require("chalk");
 
 // config
+const gravityBldApi = require("@buildit/gravity-ui-web/build-api");
 const gulpConfig = require("./config/gulp.json");
 const paths = gulpConfig.paths;
 const envs = require("./gulp/envs.js");
@@ -70,12 +71,7 @@ function styles(done) {
     gulp
       .src(paths.styles.src)
       .pipe(sass(eyeglass(sassOptions)).on("error", sass.logError))
-      .pipe(
-        autoprefixer({
-          browsers: ["last 2 versions"],
-          cascade: false
-        })
-      )
+      .pipe(autoprefixer())
       .pipe(
         csso({
           restructure: optimise,
@@ -90,6 +86,18 @@ function styles(done) {
   });
 }
 
+// Copy Gravity's debug.css to output, if required by environment config
+function copyDebugCss() {
+  if (envs.getCurrentEnvInfo().debugCss) {
+    return gulp
+      .src(gravityBldApi.distPath(gravityBldApi.distCssDebugFilename))
+      .pipe(gulp.dest(paths.styles.dest));
+  }
+  // Need to return a resolving promise so that this Gulp
+  // task completes cleanly.
+  return Promise.resolve();
+}
+
 // Grab static assets (fonts, etc.) and move them to the build folder
 // No file mangling should be done in this directory
 function assets() {
@@ -136,12 +144,17 @@ function watch(done) {
   gulp.watch(paths.images.src, gulp.series(imageOptim, browserSync.reload));
   gulp.watch(paths.assets.src, gulp.series(assets, browserSync.reload));
   gulp.watch(
-    [paths.pages.src, paths.layouts.src, paths.configs.src, paths.content.src, "metalsmith.js"],
+    [
+      paths.pages.src,
+      paths.layouts.src,
+      paths.configs.src,
+      paths.content.src,
+      "metalsmith.js"
+    ],
     gulp.series(
       "clean",
       metalsmithBuild,
-      gulp.parallel(assets, imageOptim, styles, scripts.bundle),
-      criticalCss,
+      gulp.parallel(assets, imageOptim, styles, scripts.bundle, copyDebugCss),
       browserSync.reload
     )
   );
@@ -178,7 +191,7 @@ gulp.task(
     "clean",
     printBuildInfo,
     metalsmithBuild,
-    gulp.parallel(assets, imageOptim, styles, scripts.bundle),
+    gulp.parallel(assets, imageOptim, styles, scripts.bundle, copyDebugCss),
     criticalCss
   )
 );

diff --git a/layouts/basic-page.njk b/layouts/basic-page.njk
@@ -11,10 +11,10 @@
 <head>
   {% include "partials/head.njk" %}
 </head>
-<body>
-{% include "partials/blocks/header.njk" %}
-{% include "partials/blocks/main.njk" %}
-{% include "partials/blocks/footer.njk" %}
+<body class="grav-o-full-bleed">
+{% include "partials/wrappers/header.njk" %}
+{% include "partials/wrappers/main.njk" %}
+{% include "partials/wrappers/footer.njk" %}
 {% include "partials/scripts-below-footer.njk" %}
 {% include "partials/gravity-svg-symbols.njk" %}
 <!-- Build: {{build.description or 'undefined'}} -->

diff --git a/layouts/content/articles-hero.njk b/layouts/content/articles-hero.njk
diff --git a/layouts/content/articles-list.njk b/layouts/content/articles-list.njk
diff --git a/layouts/default/footer.njk b/layouts/default/footer.njk
@@ -1,47 +1,30 @@
-<p>made with ❤️ <br>
-  <a href="https://buildit.wiprodigital.com/">
-    <svg role="img" class="grav-c-logo" aria-label="Buildit @ Wipro Digital" width="300" height="33">
-      <title>Buildit Logo</title>
-      <use xlink:href="#buildit-logotype"></use>
-    </svg>
-  </a>
-</p>
-<ul class="grav-c-list-horizontal">
-  <li>
-    <a href="https://www.instagram.com/buildit_tech">
-      <svg role="img" class="grav-c-icon" aria-label="Instagram" width="32" height="32">
-        <title>Instagram Logo</title>
-        <use xlink:href="#icon-instagram"></use>
-      </svg>
-    </a>
-  </li>
-  <li>
-    <a href="https://twitter.com/buildit_tech">
-      <svg role="img" class="grav-c-icon" aria-label="Twitter" width="32" height="32">
-        <title>Twitter Logo</title>
-        <use xlink:href="#icon-twitter"></use>
-      </svg>
-    </a>
-  </li>
-  <li>
-    <a href="https://www.linkedin.com/company/buildit.">
-      <svg role="img" class="grav-c-icon" aria-label="LinkedIn" width="32" height="32">
-        <title>LinkedIn Logo</title>
-        <use xlink:href="#icon-linkedin"></use>
-      </svg>
-    </a>
-  </li>
-  <li>
-    <a href="https://github.com/buildit">
-      <svg role="img" class="grav-c-icon" aria-label="Github" width="32" height="32">
-        <title>Github Logo</title>
-        <use xlink:href="#icon-github"></use>
-      </svg>
-    </a>
-  </li>
-</ul>
-<p>
-  <a href="https://wiprodigital.com/privacy-policy">
-    Privacy policy
-  </a>
-</p>
+<div>
+  <svg role="img" class="grav-c-logotype" aria-labelledby="logo-buildit-logotype__title" width="299" height="34">
+    <use xlink:href="#logo-buildit-logotype"></use>
+  </svg>
+
+  <div class="grav-c-page-footer__lists">
+    <ul>
+      {% for navItem in colMainNav %}
+        <li>
+          <a
+            {% if navItem.schema %}typeof="schema:{{ navItem.schema }}"{% endif %}
+            href="/{{ navItem.path }}"
+          >
+            {{ navItem.title }}
+          </a>
+        </li>
+      {% endfor %}
+    </ul>
+
+    <ul>
+      <li><a href="#">Terms</a></li>
+      <li><a href="#">Accessibility</a></li>
+      <li><a href="https://wiprodigital.com/privacy-policy">Privacy &amp; Cookie Policy</a></li>
+    </ul>
+  </div>
+
+  <p>
+    © 2019 <strong>Buildit</strong>. All rights reserved.
+  </p>
+</div>
diff --git a/layouts/default/header.njk b/layouts/default/header.njk
@@ -5,9 +5,9 @@
     {% else %}
       <h1>
     {% endif %}
-        <svg role="img" class="grav-c-logo" aria-label="Buildit @ Wipro Digital" width="300" height="33">
-          <title>buildit @ wipro digital</title>
-          <use xlink:href="#buildit-logotype"></use>
+        <svg role="img" class="grav-c-logotype" width="299" height="34">
+          <title>Buildit | Wipro Digital</title>
+          <use xlink:href="#logo-buildit-logotype"></use>
         </svg>
     {% if path %}
       </a>
@@ -21,9 +21,15 @@
   <nav class="grav-c-nav-menu">
     <ul>
       {% for navItem in colMainNav %}
-      <li>
-        <a class="grav-c-nav-link" href="/{{ navItem.path }}">{{ navItem.title }}</a>
-      </li>
+        <li>
+          <a
+            class="grav-c-nav-link"
+            {% if navItem.schema %}typeof="schema:{{ navItem.schema }}"{% endif %}
+            href="/{{ navItem.path }}"
+          >
+            {{ navItem.title }}
+          </a>
+        </li>
       {% endfor %}
     </ul>
   </nav>

diff --git a/layouts/default/main.njk b/layouts/default/main.njk
@@ -0,0 +1,3 @@
+<section>
+  {{ contents | safe }}
+</section>
diff --git a/layouts/partials/articles/main.njk b/layouts/partials/articles/main.njk
@@ -0,0 +1,12 @@
+<article class="grav-c-article">
+  <header class="grav-c-page-intro">
+    <h1>{{ title }}</h1>
+    <p>{{ description }}</p>
+    {% if image %}
+      <img src="{{ image.src }}" alt="{{ image.alt }}" />
+    {% endif %}
+  </header>
+  <div class="grav-c-ostentatious-copy">
+    {{ blocks.content | safe }}
+  </div>
+</article>
diff --git a/layouts/partials/blocks/footer.njk b/layouts/partials/blocks/footer.njk
@@ -1,9 +1,5 @@
 {% if blocks.footer %}
-  <footer>
-    {{ blocks.footer | safe }}
-  </footer>
+  {{ blocks.footer | safe }}
 {% else %}
-  <footer>
-    {% include "default/footer.njk" %}
-  </footer>
+  {% include "default/footer.njk" %}
 {% endif %}
diff --git a/layouts/partials/blocks/header.njk b/layouts/partials/blocks/header.njk
@@ -1,9 +1,5 @@
 {% if blocks.header %}
-    <header>
-        {{ blocks.header | safe }}
-    </header>
+  {{ blocks.header | safe }}
 {% else %}
-  <header>
-    {% include "default/header.njk" %}
-  </header>
+  {% include "default/header.njk" %}
 {% endif %}