Merge branch 'knivets-feature/bootstrap-v5'

.eslintrc.js

@@ -0,0 +1,27 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "es6": true
+    },
+    "overrides": [
+        {
+            "env": {
+                "node": true
+            },
+            "files": [
+                ".eslintrc.{js,cjs}"
+            ],
+            "parserOptions": {
+                "sourceType": "script"
+            }
+        }
+    ],
+    "parserOptions": {
+        "ecmaVersion": "latest"
+    },
+    "plugins": [
+        "unicorn"
+    ],
+    "rules": {
+    }
+}

Makefile

@@ -18,7 +18,7 @@ ASSETS_DIR    := $(srcDir)/htdocs/static
 installDirs   ?= /usr/bin/install -d
 installFiles  ?= /usr/bin/install -p -m 644
 DOCKER        ?= docker
-ESCHECK       ?= es-check
+ESCHECK       ?= eslint
 NPM           ?= npm
 PIP           ?= pip
 PYTHON        ?= python
@@ -186,11 +186,10 @@ $(installTop)/.npm/$(APP_NAME)-packages: $(srcDir)/package.json
 	$(installFiles) $(libDir)/node_modules/jquery/dist/jquery.js $(ASSETS_DIR)/vendor
 	$(installFiles) $(libDir)/node_modules/moment/moment.js $(ASSETS_DIR)/vendor
 	$(installFiles) $(libDir)/node_modules/moment-timezone/builds/moment-timezone-with-data.js $(ASSETS_DIR)/vendor
-	$(installFiles) $(libDir)/node_modules/popper.js/dist/umd/popper.js $(ASSETS_DIR)/vendor
-	$(installFiles) $(libDir)/node_modules/popper.js/dist/umd/popper-utils.js $(ASSETS_DIR)/vendor
+	$(installFiles) $(libDir)/node_modules/@popperjs/core/dist/umd/popper.min.js* $(ASSETS_DIR)/vendor
 	$(installFiles) $(libDir)/node_modules/vue/dist/vue.js $(ASSETS_DIR)/vendor
 	$(installFiles) $(libDir)/node_modules/lodash/lodash.js $(ASSETS_DIR)/vendor
-	[ -f $(binDir)/es-check ] || (cd $(binDir) && ln -s ../lib/node_modules/.bin/es-check es-check)
+	[ -e $(binDir)/eslint ] || (cd $(binDir) && ln -s ../lib/node_modules/.bin/eslint eslint)
 	[ -f $(binDir)/sassc ] || (cd $(binDir) && ln -s ../lib/node_modules/.bin/sass sassc)
 	[ -f $(binDir)/swagger-cli ] || (cd $(binDir) && ln -s ../lib/node_modules/.bin/swagger-cli swagger-cli)
 	[ -f $(binDir)/webpack ] || (cd $(binDir) && ln -s ../lib/node_modules/.bin/webpack webpack)

README.md

@@ -57,7 +57,7 @@ Development
 You will want to toggle `DEBUG` on in the site.conf file.
 
 <pre><code>
-    $ diff -u <em>installTop</em>/etc/djaoapp/site.conf
+    $ diff -u <em>installTop</em>/etc/djaopsp/site.conf
     -DEBUG = False
     +DEBUG = True
 
@@ -72,6 +72,8 @@ You will want to toggle `DEBUG` on in the site.conf file.
     $ python manage.py runserver --nostatic
 </code></pre>
 
+The app will be accessible at http://localhost:8000/djaopsp
+
 
 Release Notes
 =============

djaopsp/static/scss/base/base.scss

@@ -1,4 +1,7 @@
 // Core variables and mixins
+
+// has to be imported first
+@import "variables.scss";
 @import "../vendor/bootstrap/bootstrap.scss";
 @import "../vendor/font-awesome.scss";
 @import "../vendor/matrix-chart.scss";

djaopsp/static/scss/base/custom.scss

@@ -56,7 +56,12 @@ $jumbotron-shadow-end-color-dark: $jumbotron-shadow-start-color;
 
 //.tick line {display: none;}
 header .nav-item {
-  border-left: 1px solid #fff;
+  border-left: 1px solid $white;
+  padding: 0 10px;
+}
+
+header .nav-item>.nav-link {
+  color: $white;
 }
 
 .navbar-top {
@@ -74,11 +79,16 @@ header .nav-item {
 }
 
 .table-assessment {
-  tbody:nth-of-type(#{$table-striped-order}) {
+  $table-accent-bg: rgba(0, 0, 0, 0.05);
+  tbody:nth-of-type(#{$table-striped-order}) td {
     background-color: $table-accent-bg;
   }
 }
 
+.tile-link {
+    text-decoration: none;
+}
+
 .practice-required {
   border-right: 1px solid #FF2020 !important;
 }
@@ -124,6 +134,7 @@ header .nav-item {
 
 .progressbar li a {
   color: white;
+  text-decoration: none;
 }
 
 .progressbar li a>.progressbar-step {
@@ -260,7 +271,7 @@ h2.icon-row-title {
 
 .improvement-planning .inner {
   background: #eafcd4;
-  border: 1px theme-color(primary) solid;
+  border: 1px map-get($theme-colors, "primary") solid;
 }
 
 .chart-title {
@@ -312,15 +323,11 @@ b, strong{
    sticking the footer to the bottom while introducing a "border" above it. */
 #main{
   /*overflow:auto;*/
+  min-height: 100%;
   padding-bottom: $footer-height;/* stick to bottom must be in pixel
                                     (see comment abolve) */
 }
 
-header {
-  background: #3ca65b;
-  color: white;
-}
-
 #scroll-page {
   position:relative;
   text-align: center;
@@ -1034,6 +1041,13 @@ a.text-grey{
    color:#54BAD8;
 }
 
+.bestpractice>a {
+  text-decoration: none;
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
 .bestpractice>a.title,
 .bestpractice-0>a.title,
 .bestpractice-1>a.title,
@@ -1123,14 +1137,14 @@ a.text-grey{
 }
 
 .navbar-light .navbar-nav  > .login > a:hover, .login > a:focus {
-  background-color:#79c84a; /* darken(@login-bg, 6.5%) */
+  background-color:#79c84a; /* shade-color(@login-bg, 6.5%) */
 }
 
 .navbar .divider-vertical {
   border-right: 1px solid #ffffff;
 }
 
-@include media-breakpoint-down(sm) {
+@include media-breakpoint-down(md) {
 .navbar-collapse .nav > .divider-vertical {
     display: none;
   }
@@ -1659,7 +1673,7 @@ thead{
 }
 
 .choice-selected {
-  background-color: $secondary;
+  background-color: $secondary !important;
 }
 
 .table tr > th.sticky-cell {
@@ -1713,7 +1727,7 @@ thead{
 }
 
 .report-measurements-link {
-  color: theme-color(primary);
+  color: map-get($theme-colors, "primary");
 }
 
 /****** Best practice detail ********/
@@ -2078,11 +2092,11 @@ color: #000;
 }
 
 .supplier-initiated {
-  background: theme-color(primary);
+  background: map-get($theme-colors, "primary");
 }
 
 .table-striped tbody tr:nth-of-type(odd).supplier-initiated {
-  background: darken(theme-color(primary), 5%);
+  background: shade-color(map-get($theme-colors, "primary"), 5%);
 }
 
 .supplier-initiated a,
@@ -2091,6 +2105,7 @@ color: #000;
   color: white;
 }
 
+
 .verifier-notes {
 //  background: rgb(123,233,255);
   background: #c4dbfa;
@@ -2278,3 +2293,32 @@ pre.code{
 @media print {
     .pagebreak { page-break-before: always; }
 }
+
+
+.breadcrumb-item > a {
+  &,
+  &:active,
+  &:hover,
+  &:visited {
+    color: $breadcrumb-divider-color;
+    text-decoration: none;
+  }
+}
+
+.btn-primary,
+.btn-secondary {
+  --#{$prefix}btn-color: var(--bs-white);
+  --#{$prefix}btn-hover-color: var(--bs-white);
+}
+
+.navbar-nav .nav-link {
+  --#{$prefix}nav-link-padding-x: 1.5rem;
+}
+
+.pages-card-link {
+  text-decoration: none;
+
+  &:hover {
+    text-decoration: underline;
+  }
+}

djaopsp/static/scss/base/pricing.scss

@@ -16,7 +16,7 @@ $plan-footer-height: 70px;
 
 .plan-short:hover {
   cursor: pointer;
-  background-color: lighten(theme-color(primary), 75%);
+  background-color: tint-color(map-get($theme-colors, "primary"), 75%);
 }
 
 .plan-wrap {
@@ -36,7 +36,7 @@ $plan-footer-height: 70px;
 
 
 .plan-pricing {
-  color: #111; //theme-color(secondary);
+  color: #111; //map-get($theme-colors, "secondary");
   font-weight: bold;
   text-align: center !important;
   margin-bottom: 2rem;
@@ -54,5 +54,5 @@ $plan-footer-height: 70px;
   font-family: 'FontAwesome';
   content: "\f058";
   margin: 0 18px 0 -15px;
-  color: theme-color(secondary);
+  color: map-get($theme-colors, "secondary");
 }

djaopsp/static/scss/base/variables.scss

@@ -0,0 +1,4 @@
+$primary: #f0ad4e;
+$secondary: #3ca65b;
+$link-color: $secondary;
+$breadcrumb-divider-color: white;

djaopsp/static/scss/email/email-theme.scss

@@ -98,7 +98,7 @@ ol li {
 
 .page-header {
   padding:10px;
-  border-bottom:2px solid theme-color(primary);
+  border-bottom:2px solid map-get($theme-colors, "primary");
 }
 
 .page-header > h3 {
@@ -110,7 +110,7 @@ ol li {
 .page-footer {
   text-align:center;
   padding-top:20px;
-  border-top: 2px solid theme-color(primary);
+  border-top: 2px solid map-get($theme-colors, "primary");
 }
 
 .poweredby-logo {