Updated hugo-theme and webpack; Added Calypso and CTS as new adopters (#165)

* Added Calypso Networks Association as new adopter

* Added CTS as new adopter

* Updated hugo-theme and webpack config

* Fixed test adopters issue

config/adopters.json

@@ -197,6 +197,15 @@
 				"ecd.openvsx"
 			]
 		},
+		{
+			"name": "Calypso Networks Association",
+			"homepage_url": "https://calypsonet.org/keyple-resources/",
+			"logo": "logo-calypsonet.png",
+			"logo_white": "",
+			"projects": [
+				"iot.keyple"
+			]
+		},
 		{
 			"name": "Cassens",
 			"homepage_url": "https://www.cassens.com/",
@@ -254,6 +263,15 @@
 				"ecd.emfcloud"
 			]
 		},
+		{
+			"name": "CTS",
+			"homepage_url": "https://cts-strasbourg.eu/en/",
+			"logo": "logo-cts.png",
+			"logo_white": "",
+			"projects": [
+				"iot.keyple"
+			]
+		},
 		{
 			"name": "Digital Lights",
 			"homepage_url": "https://lights.digital",

js/adopters_test.js

@@ -55,6 +55,10 @@ function createProjectHeader(project) {
 function createAdopters(project, adopter, baseURL) {
 	var element = document.getElementById(project + "-ul");
 
+	// Skip creating the logo if it is empty string or undefined or null
+	if (!adopter['logo']) {
+		return;
+	}
 	// Get the home page url of this adopter
 	var url = '';
 	if (typeof adopter['homepage_url'] !== 'undefined') {

js/main.js

+/*!
+ * Copyright (c) 2021 Eclipse Foundation, Inc.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * Contributors:
+ *   Christopher Guindon <chris.guindon@eclipse-foundation.org>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import 'eclipsefdn-solstice-assets'

package.json

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "chai": "^4.2.0",
-    "eclipsefdn-hugo-solstice-theme": "0.0.114",
+    "eclipsefdn-hugo-solstice-theme": "0.0.139",
     "js-yaml": "^3.13.1",
     "json-minify": "^1.0.0",
     "jsonlint": "^1.6.3",

static/assets/mix-manifest.json

 {
-    "/css/styles.css": "/css/styles.css",
     "/js/scripts.min.js": "/js/scripts.min.js",
-    "/js/eclipsefdn.adopters.js": "/js/eclipsefdn.adopters.js",
+    "/css/styles.css": "/css/styles.css",
     "/js/adopters_test.js": "/js/adopters_test.js"
 }

webpack.mix.js

 /*!
  * Copyright (c) 2018, 2020 Eclipse Foundation, Inc.
- * 
+ *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
- * 
+ *
  * Contributors:
  *   Christopher Guindon <chris.guindon@eclipse-foundation.org>
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
-*/
+ */
 
+require('./node_modules/eclipsefdn-solstice-assets/webpack-solstice-assets.mix.js');
 let mix = require('laravel-mix');
+mix.EclipseFdnSolsticeAssets();
+
 mix.setPublicPath('static/assets');
 mix.setResourceRoot('../');
 
 // CSS
 mix.less('./less/styles.less', './static/assets/css/styles.css');
 
-// JavaScript
-mix.scripts([
-    './node_modules/jquery/dist/jquery.min.js',
-    './node_modules/bootstrap/dist/js/bootstrap.min.js',
-    './node_modules/jquery-match-height/dist/jquery.matchHeight-min.js',
-    './node_modules/jquery-eclipsefdn-api/dist/jquery.eclipsefdn-api.min.js',
-    './node_modules/feather-icons/dist/feather.min.js',
-    './node_modules/cookieconsent/src/cookieconsent.js',
-    './node_modules/eclipsefdn-solstice-assets/js/solstice.cookieconsent.js',
-    './node_modules/eclipsefdn-solstice-assets/js/eclipsefdn.videos.js',
-    './node_modules/eclipsefdn-solstice-assets/js/solstice.cookies.js',
-    './node_modules/eclipsefdn-solstice-assets/js/solstice.js'
-], './static/assets/js/scripts.min.js');
-mix.babel([
-    './node_modules/eclipsefdn-solstice-assets/js/eclipsefdn.adopters.js',
-], './static/assets/js/eclipsefdn.adopters.js');
-
-//For IE compatible with fetch
-mix.scripts([
-    './node_modules/promise-polyfill/dist/polyfill.min.js',
-    './node_modules/unfetch/polyfill/index.js',
-    './js/adopters_test.js',
-], './static/assets/js/adopters_test.js');
\ No newline at end of file
+mix.scripts('js/adopters_test.js', './static/assets/js/adopters_test.js');
+mix.js('js/main.js', './static/assets/js/scripts.min.js');