Merge branch 'fix-build' into 'master'

Fix release build

See merge request NCER-PD/scheduling-system!293

.gitlab-ci.yml

@@ -75,7 +75,6 @@ test_create_dummy_script:
          - python db_scripts/create_dummy_data.py
 
 build_debian:
-  image: node
   stage: build
   only:
     - tags
@@ -86,7 +85,10 @@ build_debian:
       - "*.deb"
   script:
     - apt-get update
-    - DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated libsasl2-dev libssl-dev locales locales-all python3 dh-make build-essential lintian devscripts xsltproc fakeroot xsltproc docbook-xsl
+    - DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated libsasl2-dev libssl-dev locales locales-all python3 dh-make build-essential lintian devscripts xsltproc fakeroot xsltproc docbook-xsl curl gnupg git gcc g++ make
+    - curl -sL https://deb.nodesource.com/setup_14.x | bash -
+    - DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
+
     - pip install --use-deprecated=legacy-resolver -r requirements.txt --default-timeout=180 -i https://pypi.lcsb.uni.lu/simple/
     - pip install --use-deprecated=legacy-resolver -r requirements-dev.txt --default-timeout=180 -i https://pypi.lcsb.uni.lu/simple/
 

CHANGELOG

@@ -21,7 +21,7 @@ smasch (1.0.0~beta.0-1) unstable; urgency=low
   * small improvement: redcap API token is not visible in configuration panel
     (#359)
   
- -- Piotr Gawron <piotr.gawron@uni.lu>  Tue, 10 Nov 2020 14:00:00 +0200
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Tue, 15 Dec 2020 11:00:00 +0200
 
 smasch (1.0.0~alpha.0-0) unstable; urgency=low
 

debian-template/copyright

@@ -25,6 +25,7 @@ License: Django
 Files: smash/node_modules/admin-lte/*
        smash/node_modules/awesomplete/*
        smash/node_modules/bootstrap/*
+       smash/node_modules/cookieconsent/*
        smash/node_modules/datatables.net-bs/*
        smash/node_modules/datatables.net-buttons-bs/*
        smash/node_modules/datatables.net-buttons/*

smash/package-lock.json

@@ -224,6 +224,11 @@
         "safe-buffer": "~5.1.1"
       }
     },
+    "cookieconsent": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/cookieconsent/-/cookieconsent-3.1.1.tgz",
+      "integrity": "sha512-v8JWLJcI7Zs9NWrs8hiVldVtm3EBF70TJI231vxn6YToBGj0c9dvdnYwltydkAnrbBMOM/qX1xLFrnTfm5wTag=="
+    },
     "core-js": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",

smash/package.json

@@ -13,6 +13,7 @@
     "awesomplete": "^1.1.5",
     "bootstrap": "^3.3.6",
     "bootstrap-datepicker": "^1.7.0",
+    "cookieconsent": "^3.1.1",
     "datatables.net-bs": "^1.10.22",
     "datatables.net-buttons": "^1.6.5",
     "datatables.net-buttons-bs": "^1.6.5",

smash/smash/settings.py

@@ -126,6 +126,7 @@ NPM_FILE_PATTERNS = {
     'awesomplete': ['awesomplete.css', 'awesomplete.css.map', 'awesomplete.min.js', 'awesomplete.min.js.map'],
     'bootstrap': ['dist/*'],
     'bootstrap-datepicker': ['dist/*'],
+    'cookieconsent': ['build/*'],
     'datatables.net': ['js/*'],
     'datatables.net-bs': ['css/*', 'js/*'],
     'datatables.net-buttons': ['js/*'],

smash/web/templates/_base.html

@@ -25,14 +25,7 @@
 
         <link rel="stylesheet" href="{% static 'npm/jquery-ui-dist/jquery-ui.min.css' %}">
 
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!--[if lt IE 9]>
-        <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-        <![endif]-->
-        <script src="https://cdn.jsdelivr.net/npm/cookieconsent@3/build/cookieconsent.min.js"></script>
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/cookieconsent@3/build/cookieconsent.min.css">
+        <link rel="stylesheet" href="{% static 'npm/cookieconsent/build/cookieconsent.min.css' %}">
     {% endblock styles %}
 </head>
 <!--
@@ -369,6 +362,7 @@ desired effect
     <script src="{% static 'js/smash.js' %}"></script>
     <script src="{% static 'npm/moment/min/moment.min.js' %}"></script>
     <script src="{% static 'npm/moment-range/dist/moment-range.js' %}"></script>
+    <script src="{% static 'npm/cookieconsent/build/cookieconsent.min.js' %}"></script>
     <script type="text/javascript">
         window['moment-range'].extendMoment(moment);
     </script>

smash/web/templates/errors/400.html

@@ -24,12 +24,6 @@
         <!-- iCheck -->
         <link rel="stylesheet" href="{% static 'npm/icheck/skins/square/blue.css' %}">
 
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!--[if lt IE 9]>
-	<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-	<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
-
         <style>
             .login-logo-h5 {
                 margin-top: -10px;

smash/web/templates/errors/403.html

@@ -24,12 +24,6 @@
         <!-- iCheck -->
         <link rel="stylesheet" href="{% static 'npm/icheck/skins/square/blue.css' %}">
 
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!--[if lt IE 9]>
-	<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-	<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
-
         <style>
             .login-logo-h5 {
                 margin-top: -10px;

smash/web/templates/errors/404.html

@@ -24,12 +24,6 @@
         <!-- iCheck -->
         <link rel="stylesheet" href="{% static 'npm/icheck/skins/square/blue.css' %}">
 
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!--[if lt IE 9]>
-	<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-	<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
-
         <style>
             .login-logo-h5 {
                 margin-top: -10px;

smash/web/templates/errors/500.html

@@ -24,12 +24,6 @@
         <!-- iCheck -->
         <link rel="stylesheet" href="{% static 'npm/icheck/skins/square/blue.css' %}">
 
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!--[if lt IE 9]>
-	<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-	<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
-
         <style>
             .login-logo-h5 {
                 margin-top: -10px;

smash/web/templates/login.html

@@ -27,12 +27,6 @@
         <!-- iCheck -->
         <link rel="stylesheet" href="{% static 'npm/icheck/skins/square/blue.css' %}">
 
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!--[if lt IE 9]>
-	<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-	<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
-
         <style>
             .login-logo-h5 {
                 margin-top: -10px;