Start moving site in packages and prepare for netlify

containers/frontend/dist/browserconfig.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square70x70logo src="dist/mstile-70x70.png"/>
-            <square150x150logo src="dist/mstile-150x150.png"/>
-            <wide310x150logo src="dist/mstile-310x150.png"/>
-            <square310x310logo src="dist/mstile-310x310.png"/>
-            <TileColor>#555555</TileColor>
-
-        </tile>
-
-    </msapplication>
-
-</browserconfig>

containers/frontend/dist/manifest.json

@@ -1,59 +0,0 @@
-{
-  "name": "LessPass",
-  "short_name": "LessPass",
-  "description": "Next-Gen Open Source Password Manager",
-  "dir": "auto",
-  "lang": "en-US",
-  "display": "standalone",
-  "orientation": "portrait",
-  "start_url": "/?homescreen=1",
-  "background_color": "#555555",
-  "theme_color": "#fff",
-  "icons": [
-    {
-      "src": "dist/android-chrome-36x36.png",
-      "sizes": "36x36",
-      "type": "image/png"
-    },
-    {
-      "src": "dist/android-chrome-48x48.png",
-      "sizes": "48x48",
-      "type": "image/png"
-    },
-    {
-      "src": "dist/android-chrome-72x72.png",
-      "sizes": "72x72",
-      "type": "image/png"
-    },
-    {
-      "src": "dist/android-chrome-96x96.png",
-      "sizes": "96x96",
-      "type": "image/png"
-    },
-    {
-      "src": "dist/android-chrome-144x144.png",
-      "sizes": "144x144",
-      "type": "image/png"
-    },
-    {
-      "src": "dist/android-chrome-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png"
-    },
-    {
-      "src": "dist/android-chrome-256x256.png",
-      "sizes": "256x256",
-      "type": "image/png"
-    },
-    {
-      "src": "dist/android-chrome-384x384.png",
-      "sizes": "384x384",
-      "type": "image/png"
-    },
-    {
-      "src": "dist/android-chrome-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png"
-    }
-  ]
-}

containers/frontend/dist/manifest.webapp

@@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "name": "LessPass",
-  "description": "Next-Gen Open Source Password Manager",
-  "icons": {
-    "60": "dist/firefox_app_60x60.png",
-    "128": "dist/firefox_app_128x128.png",
-    "512": "dist/firefox_app_512x512.png"
-  },
-  "developer": {
-    "name": "Guillaume Vincent",
-    "url": null
-  }
-}

containers/frontend/dist/yandex-browser-manifest.json

@@ -1,9 +0,0 @@
-{
-  "version": 1,
-  "api_version": 1,
-  "layout": {
-    "logo": "dist/yandex-browser-50x50.png",
-    "color": "#555555",
-    "show_title": true
-  }
-}

containers/frontend/images/LessPass-icon-white.svg

@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3039"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   width="180"
-   height="180"
-   sodipodi:docname="LessPass-icon-white.svg">
-  <metadata
-     id="metadata3045">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3043">
-    <filter
-       id="filter5169"
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow">
-      <feFlood
-         id="feFlood5171"
-         flood-opacity="0.4"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite5173"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur5175"
-         stdDeviation="2"
-         result="blur" />
-      <feOffset
-         id="feOffset5177"
-         dx="4"
-         dy="4"
-         result="offset" />
-      <feComposite
-         id="feComposite5179"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter3013"
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow">
-      <feFlood
-         id="feFlood3015"
-         flood-opacity="0.4"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite3017"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur3019"
-         stdDeviation="1"
-         result="blur" />
-      <feOffset
-         id="feOffset3021"
-         dx="4"
-         dy="4"
-         result="offset" />
-      <feComposite
-         id="feComposite3023"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter3097"
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Drop Shadow">
-      <feFlood
-         id="feFlood3099"
-         flood-opacity="0.4"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite3101"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur3103"
-         stdDeviation="2"
-         result="blur" />
-      <feOffset
-         id="feOffset3105"
-         dx="4"
-         dy="4"
-         result="offset" />
-      <feComposite
-         id="feComposite3107"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#b1b1b1"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1871"
-     inkscape:window-height="1056"
-     id="namedview3041"
-     showgrid="false"
-     inkscape:zoom="2.814285"
-     inkscape:cx="83.115942"
-     inkscape:cy="134.0767"
-     inkscape:window-x="49"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3039"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:showpageshadow="false" />
-  <path
-     style="opacity:0.9;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter3097)"
-     d="m 88.85937,15.01627 c -5.751278,0.27568 -11.432799,2.6203 -15.843752,7.031248 L 22.046868,73.01626 c -9.410033,9.41003 -9.410033,24.55872 0,33.96875 l 50.96875,50.96875 c 9.410033,9.41003 24.558722,9.41003 33.968752,0 l 50.96875,-50.96875 c 9.41003,-9.41003 9.41003,-24.55872 0,-33.96875 L 106.98437,22.047518 C 101.98529,17.04844 95.37748,14.70383 88.85937,15.01627 Z m 0,30 c 0.38173,-0.0196 0.76987,0 1.15625,0 12.364,0 22.46875,10.13598 22.46875,22.49999 0,10.2795 -7.00683,18.97639 -16.46875,21.625 l 0,20.625 6.21875,0 c 0.126,0 0.21875,0.0928 0.21875,0.21875 l 0,10.25 c 0,0.1259 -0.0928,0.21875 -0.21875,0.21875 l -6.21875,0 0,3.875 6.21875,0 c 0.12098,-0.035 0.21875,0.0928 0.21875,0.21875 l 0,10.21875 c 0,0.1259 -0.0928,0.25 -0.21875,0.25 l -6.21875,0 -7.8125,0 -4.218752,0 0,-45.875 c -9.46194,-2.64861 -16.46875,-11.34551 -16.46875,-21.625 0,-11.97763 9.510121,-21.89377 21.343752,-22.49999 z m 1.15625,8.8125 c -7.596242,0 -13.656252,6.09122 -13.656252,13.68749 0,7.59632 6.06001,13.625 13.656252,13.625 7.59627,0 13.625,-6.02868 13.625,-13.625 0,-7.59627 -6.02873,-13.68749 -13.625,-13.68749 z"
-     id="rect3044"
-     inkscape:connector-curvature="0" />
-</svg>

containers/frontend/images/cover.original.txt

@@ -1 +0,0 @@
-https://www.pexels.com/photo/grey-and-white-snow-covered-mountains-and-white-cloud-bank-65125/

containers/frontend/server.js

@@ -1,17 +0,0 @@
-var express = require('express');
-var app = express();
-
-app.get('/robots.txt', function(req, res) {
-  res.type('text/plain');
-  res.send("User-agent: *\nAllow: /");
-});
-
-app.use('/dist', express.static(__dirname + '/dist'));
-
-app.get('/', function(req, res) {
-  res.sendFile(__dirname + '/index.html');
-});
-
-app.listen(8080, function() {
-  console.log('frontend listening on port 8080');
-});

netlify.toml

@@ -0,0 +1,2 @@
+[build]
+  base = "packages/lesspass-site"

packages/lesspass-site/.gitignore

@@ -0,0 +1 @@
+build

containers/frontend/gulpfile.js → packages/lesspass-site/gulpfile.js

@@ -2,11 +2,11 @@ const { src, dest, parallel } = require("gulp");
 const favicons = require("gulp-favicons");
 
 function js() {
-  return src(["node_modules/lesspass-pure/dist/**/*"]).pipe(dest("dist/"));
+  return src(["node_modules/lesspass-pure/dist/**/*"]).pipe(dest("build/"));
 }
 
 function images() {
-  return src(["images/**/*"]).pipe(dest("dist/"));
+  return src(["images/**/*"]).pipe(dest("build/"));
 }
 
 function favicon() {
@@ -17,7 +17,7 @@ function favicon() {
         appDescription: "Next-Gen Open Source Password Manager",
         developerName: "Guillaume Vincent",
         background: "#555555",
-        path: "dist/",
+        path: "/",
         url: "https://lesspass.com/",
         display: "standalone",
         orientation: "portrait",
@@ -30,7 +30,7 @@ function favicon() {
         replace: true
       })
     )
-    .pipe(dest("dist/"));
+    .pipe(dest("build/"));
 }
 
 exports.js = js;

containers/frontend/index.html → packages/lesspass-site/index.html

@@ -8,56 +8,56 @@
       name="viewport"
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
     />
-    <link rel="stylesheet" href="dist/lesspass.min.css" />
-    <link rel="manifest" href="dist/manifest.json" />
-    <link rel="manifest" href="dist/manifest.json" />
+    <link rel="stylesheet" href="lesspass.min.css" />
+    <link rel="manifest" href="manifest.json" />
+    <link rel="manifest" href="manifest.json" />
     <meta name="mobile-web-app-capable" content="yes" />
     <meta name="theme-color" content="#555555" />
     <meta name="application-name" content="LessPass" />
     <link
       rel="apple-touch-icon"
       sizes="57x57"
-      href="dist/apple-touch-icon-57x57.png"
+      href="apple-touch-icon-57x57.png"
     />
     <link
       rel="apple-touch-icon"
       sizes="60x60"
-      href="dist/apple-touch-icon-60x60.png"
+      href="apple-touch-icon-60x60.png"
     />
     <link
       rel="apple-touch-icon"
       sizes="72x72"
-      href="dist/apple-touch-icon-72x72.png"
+      href="apple-touch-icon-72x72.png"
     />
     <link
       rel="apple-touch-icon"
       sizes="76x76"
-      href="dist/apple-touch-icon-76x76.png"
+      href="apple-touch-icon-76x76.png"
     />
     <link
       rel="apple-touch-icon"
       sizes="114x114"
-      href="dist/apple-touch-icon-114x114.png"
+      href="apple-touch-icon-114x114.png"
     />
     <link
       rel="apple-touch-icon"
       sizes="120x120"
-      href="dist/apple-touch-icon-120x120.png"
+      href="apple-touch-icon-120x120.png"
     />
     <link
       rel="apple-touch-icon"
       sizes="144x144"
-      href="dist/apple-touch-icon-144x144.png"
+      href="apple-touch-icon-144x144.png"
     />
     <link
       rel="apple-touch-icon"
       sizes="152x152"
-      href="dist/apple-touch-icon-152x152.png"
+      href="apple-touch-icon-152x152.png"
     />
     <link
       rel="apple-touch-icon"
       sizes="180x180"
-      href="dist/apple-touch-icon-180x180.png"
+      href="apple-touch-icon-180x180.png"
     />
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta
@@ -69,83 +69,70 @@
       rel="icon"
       type="image/png"
       sizes="228x228"
-      href="dist/coast-228x228.png"
-    />
-    <link
-      rel="yandex-tableau-widget"
-      href="dist/yandex-browser-manifest.json"
+      href="coast-228x228.png"
     />
+    <link rel="yandex-tableau-widget" href="yandex-browser-manifest.json" />
     <meta name="msapplication-TileColor" content="#555555" />
-    <meta name="msapplication-TileImage" content="dist/mstile-144x144.png" />
-    <meta name="msapplication-config" content="dist/browserconfig.xml" />
-    <link
-      rel="icon"
-      type="image/png"
-      sizes="32x32"
-      href="dist/favicon-32x32.png"
-    />
+    <meta name="msapplication-TileImage" content="mstile-144x144.png" />
+    <meta name="msapplication-config" content="browserconfig.xml" />
+    <link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png" />
     <link
       rel="icon"
       type="image/png"
       sizes="192x192"
-      href="dist/android-chrome-192x192.png"
+      href="android-chrome-192x192.png"
     />
-    <link
-      rel="icon"
-      type="image/png"
-      sizes="16x16"
-      href="dist/favicon-16x16.png"
-    />
-    <link rel="shortcut icon" href="dist/favicon.ico" />
+    <link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png" />
+    <link rel="shortcut icon" href="favicon.ico" />
     <link
       rel="apple-touch-startup-image"
       media="(device-width: 320px) and (device-height: 480px) and (-webkit-device-pixel-ratio: 1)"
-      href="dist/apple-touch-startup-image-320x460.png"
+      href="apple-touch-startup-image-320x460.png"
     />
     <link
       rel="apple-touch-startup-image"
       media="(device-width: 320px) and (device-height: 480px) and (-webkit-device-pixel-ratio: 2)"
-      href="dist/apple-touch-startup-image-640x920.png"
+      href="apple-touch-startup-image-640x920.png"
     />
     <link
       rel="apple-touch-startup-image"
       media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)"
-      href="dist/apple-touch-startup-image-640x1096.png"
+      href="apple-touch-startup-image-640x1096.png"
     />
     <link
       rel="apple-touch-startup-image"
       media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2)"
-      href="dist/apple-touch-startup-image-750x1294.png"
+      href="apple-touch-startup-image-750x1294.png"
     />
     <link
       rel="apple-touch-startup-image"
       media="(device-width: 414px) and (device-height: 736px) and (orientation: landscape) and (-webkit-device-pixel-ratio: 3)"
-      href="dist/apple-touch-startup-image-1182x2208.png"
+      href="apple-touch-startup-image-1182x2208.png"
     />
     <link
       rel="apple-touch-startup-image"
       media="(device-width: 414px) and (device-height: 736px) and (orientation: portrait) and (-webkit-device-pixel-ratio: 3)"
-      href="dist/apple-touch-startup-image-1242x2148.png"
+      href="apple-touch-startup-image-1242x2148.png"
     />
     <link
       rel="apple-touch-startup-image"
       media="(device-width: 768px) and (device-height: 1024px) and (orientation: landscape) and (-webkit-device-pixel-ratio: 1)"
-      href="dist/apple-touch-startup-image-748x1024.png"
+      href="apple-touch-startup-image-748x1024.png"
     />
     <link
       rel="apple-touch-startup-image"
       media="(device-width: 768px) and (device-height: 1024px) and (orientation: portrait) and (-webkit-device-pixel-ratio: 1)"
-      href="dist/apple-touch-startup-image-768x1004.png"
+      href="apple-touch-startup-image-768x1004.png"
     />
     <link
       rel="apple-touch-startup-image"
       media="(device-width: 768px) and (device-height: 1024px) and (orientation: landscape) and (-webkit-device-pixel-ratio: 2)"
-      href="dist/apple-touch-startup-image-1496x2048.png"
+      href="apple-touch-startup-image-1496x2048.png"
     />
     <link
       rel="apple-touch-startup-image"
       media="(device-width: 768px) and (device-height: 1024px) and (orientation: portrait) and (-webkit-device-pixel-ratio: 2)"
-      href="dist/apple-touch-startup-image-1536x2008.png"
+      href="apple-touch-startup-image-1536x2008.png"
     />
     <style>
       * {
@@ -163,8 +150,7 @@
 
       #fold {
         background-size: cover;
-        background: #3398eb url(dist/double-blue-cover.png) no-repeat center
-          center;
+        background: #3398eb url(double-blue-cover.png) no-repeat center center;
         min-height: 100%;
       }
 
@@ -227,7 +213,7 @@
       <div class="container d-none d-md-block py-sm-3 text-center">
         <a class="navbar-brand" href="https://lesspass.com">
           <img
-            src="dist/LessPass-icon-white.svg"
+            src="LessPass-icon-white.svg"
             width="60"
             height="60"
             class="d-inline-block align-top"
@@ -280,11 +266,7 @@
             </p>
           </div>
           <div class="col-12 col-sm-6">
-            <img
-              src="dist/HowItWorks.png"
-              class="img-fluid"
-              alt="LessPass demo"
-            />
+            <img src="HowItWorks.png" class="img-fluid" alt="LessPass demo" />
           </div>
         </div>
         <div class="row air">
@@ -294,7 +276,7 @@
               length, etc...)
             </p>
             <img
-              src="dist/options.png"
+              src="options.png"
               class="img-fluid my-1"
               alt="LessPass options"
             />
@@ -305,7 +287,7 @@
               Increment the counter field in your options.
             </p>
             <img
-              src="dist/counter.png"
+              src="counter.png"
               class="img-fluid my-1"
               alt="LessPass counter"
             />
@@ -318,7 +300,7 @@
               "<i>I like to eat in this luxury liner</i>".
             </p>
             <img
-              src="dist/fingerprint.png"
+              src="fingerprint.png"
               class="img-fluid my-1"
               alt="LessPass fingerprint"
             />
@@ -336,7 +318,7 @@
           </div>
           <div class="col-12 col-sm-7">
             <img
-              src="dist/LessPassDatabase.png"
+              src="LessPassDatabase.png"
               class="img-fluid"
               alt="LessPass Database"
             />
@@ -467,6 +449,6 @@
         </div>
       </div>
     </div>
-    <script src="dist/lesspass.min.js"></script>
+    <script src="lesspass.min.js"></script>
   </body>
 </html>

containers/frontend/package.json → packages/lesspass-site/package.json

@@ -6,7 +6,7 @@
   "author": "Guillaume Vincent <guillaume@oslab.fr>",
   "repository": "lesspass/frontend",
   "scripts": {
-    "build": "rm -rf dist && gulp && rm dist/index.html",
+    "build": "rm -rf build && gulp && cp index.html build/index.html",
     "start": "NODE_ENV=production node server.js",
     "test": "echo 0"
   },

packages/lesspass-site/server.js

@@ -0,0 +1,14 @@
+var path = require("path");
+var express = require("express");
+
+var app = express();
+
+app.use(express.static(path.join(__dirname, "build")));
+
+app.get("/", function(req, res) {
+  res.sendFile(path.join(__dirname, "build", "index.html"));
+});
+
+app.listen(8080, function() {
+  console.log("frontend listening on port 8080");
+});