Merge staging into master

app/components/advertisement-tool.js

@@ -21,110 +21,100 @@ export default Component.extend({
     {
       title: 'Qorting.nl',
       link: 'https://qorting.nl/',
-      image: 'advertisements/qorting.png',
+      image: 'advertisements/Qorting.png',
       full: true,
     },
     {
       title: 'Sponsorkliks',
       link: 'https://www.sponsorkliks.com/products/shops.php?club=4509',
-      image: 'advertisements/sponsorkliks.png',
+      image: 'advertisements/SponsorKliks.png',
       full: true,
     },
     {
-      title: 'StudentenWegwijzer',
-      link: 'https://www.studentenwegwijzer.nl/enschede/studentenverenigingen/alpha/',
-      image: 'advertisements/studenten-wegwijzer.png',
-      full: true,
-    },
-    {
-      title: 'InShared',
-      link: 'https://www.inshared.nl/',
-      image: 'advertisements/inshared.png',
+      title: 'BeBo Parket',
+      link: 'https://www.beboparket.nl/',
+      image: 'advertisements/BeBo.png',
     },
     {
-      title: 'Led24',
-      link: 'https://www.led24.nl/led-verlichting/led-tl-buis/',
-      image: 'advertisements/led24.png',
+      title: 'Boeketcadeau',
+      link: 'https://www.boeketcadeau.nl/',
+      image: 'advertisements/BoeketCadeau.png',
     },
     {
-      title: 'Noppies',
-      link: 'https://www.noppies.com/',
-      image: 'advertisements/noppies.png',
+      title: 'Baktotaal',
+      link: 'https://www.baktotaal.nl/',
+      image: 'advertisements/Baktotaal.png',
     },
     {
-      title: 'Rotimshop',
-      link: 'https://www.rotimshop.nl/',
-      image: 'advertisements/rotim.png',
+      title: 'Comfort Producten',
+      link: 'https://www.comfort-producten.nl/nl/',
+      image: 'advertisements/ComfortProducts.png',
     },
     {
-      title: 'Sans Online',
-      link: 'https://www.sans-online.nl/herenkleding/jassen/',
-      image: 'advertisements/sans.png',
+      title: 'Huurzone',
+      link: 'https://www.huurzone.nl/aanbod/nederland.html',
+      image: 'advertisements/Huurzone.png',
     },
     {
-      title: 'Sliponline',
-      link: 'https://www.sliponline.nl/kinderen/kinder-nachtkleding/kinder-pyjama/',
-      image: 'advertisements/sliponline.png',
+      title: 'Inshared',
+      link: 'https://www.inshared.nl/',
+      image: 'advertisements/Inshared.png',
     },
     {
-      title: 'Stellingstunt',
-      link: 'https://www.stellingstunt.nl/',
-      image: 'advertisements/stellingstunt.png',
+      title: 'Ledlampenkopen.nu',
+      link: 'https://www.ledlampenkopen.nu/',
+      image: 'advertisements/LedlampenKopen.png',
     },
     {
-      title: 'Baktotaal Bouwhuis',
-      link: 'https://www.bouwhuis.com/',
-      image: 'advertisements/bouwhuis.png',
+      title: 'Parcel Pro',
+      link: 'https://parcelpro.nl/',
+      image: 'advertisements/ParcelPro.png',
     },
     {
-      title: 'Shops United',
-      link: 'https://shops-united.nl/',
-      image: 'advertisements/shops-united.png',
+      title: 'Bierglazen bedrukken met logo',
+      alt: 'Bierglazen bedrukken met logo',
+      link: 'https://www.rikegroup.com/glazen-bedrukken/bierglazen-bedrukken',
+      image: 'advertisements/Rike_2022.png',
     },
     {
-      title: 'Urbansofa',
-      link: 'https://www.urbansofa.nl/',
-      image: 'advertisements/urbansofa.png',
+      title: 'Rotimshop',
+      link: 'https://www.rotimshop.nl/',
+      image: 'advertisements/RotimShop.png',
     },
     {
-      title: 'Prefixbroker',
-      link: 'https://www.prefixbroker.com/',
-      image: 'advertisements/prefixbroker.png',
+      title: 'Shops United',
+      link: 'https://shops-united.nl/',
+      image: 'advertisements/ShopsUnited.png',
     },
     {
-      title: 'Van Eyck Shutters',
-      link: 'https://www.vaneyckshutters.com/',
-      image: 'advertisements/van-eyck.png',
+      title: 'Sleiderink',
+      link: 'https://www.sleiderink.nl/',
+      image: 'advertisements/Sleiderink.png',
     },
     {
-      title: 'Verzekering.nl',
-      link: 'https://www.verzekering.nl/',
-      image: 'advertisements/verzekering.png',
+      title: 'Sliponline',
+      link: 'https://www.sliponline.nl/kinderen/kinder-nachtkleding/kinder-pyjama/',
+      image: 'advertisements/SlipOnline.png',
     },
     {
-      title: 'Zantman Kliniek',
-      link: 'https://www.zantmankliniek.nl/',
-      image: 'advertisements/zantman.png',
+      title: 'Stellingstunt',
+      link: 'https://www.stellingstunt.nl/',
+      image: 'advertisements/StellingStunt.png',
     },
     {
-      title: 'Bierglazen bedrukken met logo',
-      alt: 'Bierglazen bedrukken met logo',
-      link: 'https://www.rikegroup.com/glazen-bedrukken/bierglazen-bedrukken',
-      image: 'advertisements/rike.png',
+      title: 'Traffic Today',
+      link: 'https://www.traffictoday.nl/',
+      image: 'advertisements/TrafficToday.jpg',
     },
     {
-      links: [
-        {
-          link: 'https://www.huurzone.nl/aanbod/nederland.html',
-          title: 'huurwoningen',
-        },
-      ],
+      title: 'Verzekering',
+      link: 'https://www.verzekering.nl/',
+      image: 'advertisements/VerzekeringNL.png',
     },
     {
-      title: 'Top 5 Beste Kopen',
-      alt: 'Vergelijk de beste producten',
-      link: 'https://www.top5bestekopen.nl',
-      image: 'advertisements/trendiq.jpg',
+      title: 'Visser & Visser',
+      link: 'https://www.visserenvisser.nl/',
+      image: 'advertisements/Visser&Visser.png',
     },
   ],
 });

app/styles/components/advertisement-tool.scss

@@ -1,5 +1,5 @@
 // CSS3 code for animation of advertisements
-$amount-of-advertisements: 14;
+$amount-of-advertisements: 18;
 $single-advertisement-width: 175px;
 $advertisement-animation-duration: 16s;
 $advertisement-animation-holder-width: -$amount-of-advertisements *

tests/rendering/components/advertisement-tool-test.js

@@ -13,7 +13,7 @@ module('Integration | Component | advertisement tool', function (hooks) {
 
     assert.equal(
       this.element.querySelectorAll('.advertisement-item').length,
-      40 // Number of advertisements times two
+      38 // Number of advertisements times two
     );
   });
 });