Merge branch 'master' into tonkpils/package-updates

.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "bundler"
+    directory: "/backend"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "npm"
+    directory: "/frontend"
+    schedule:
+      interval: "weekly"

.github/workflows/backend.yml

@@ -17,7 +17,7 @@ jobs:
       backend: ${{ steps.filter.outputs.backend }}
       frontend: ${{ steps.filter.outputs.frontend }}
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v4
 
       - uses: dorny/paths-filter@v2
         id: filter
@@ -39,7 +39,7 @@ jobs:
         working-directory: backend
 
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v4
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
@@ -60,7 +60,7 @@ jobs:
         working-directory: backend
 
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v4
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
@@ -110,7 +110,7 @@ jobs:
           --health-retries 5
 
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v4
 
       - name: Install PostgreSQL client
         run: |
@@ -123,7 +123,7 @@ jobs:
           bundler-cache: true
 
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.4.0
+        uses: supercharge/mongodb-github-action@1.10.0
         with:
           mongodb-version: 4.4.9
 

frontend/app/styles/spinner.scss

@@ -1,5 +1,3 @@
-$spinkit-spinner-margin: 40px auto !default;
-$spinkit-size: 40px !default;
-$spinkit-spinner-color: $primary !default;
-
-@import 'spinners/7-three-bounce';
+:root {
+  --sk-color: #{$primary};
+}

frontend/app/templates/application-loading.hbs

@@ -1,5 +1,5 @@
-<div class="sk-three-bounce">
-  <div class="sk-child sk-bounce1"></div>
-  <div class="sk-child sk-bounce2"></div>
-  <div class="sk-child sk-bounce3"></div>
+<div class="sk-flow sk-center">
+  <div class="sk-flow-dot"></div>
+  <div class="sk-flow-dot"></div>
+  <div class="sk-flow-dot"></div>
 </div>

frontend/app/templates/application/three-bounce-spinner.hbs

@@ -1,5 +1,5 @@
-<div class="sk-three-bounce">
-  <div class="sk-child sk-bounce1"></div>
-  <div class="sk-child sk-bounce2"></div>
-  <div class="sk-child sk-bounce3"></div>
+<div class="sk-flow sk-center">
+  <div class="sk-flow-dot"></div>
+  <div class="sk-flow-dot"></div>
+  <div class="sk-flow-dot"></div>
 </div>

frontend/bower.json

@@ -1,7 +1,6 @@
 {
   "name": "flaredown",
   "dependencies": {
-    "spinkit": "~1.2",
     "bourbon": "4.2.3",
     "neat": "~1.7.2",
     "pace": "vectart/pace",

frontend/ember-cli-build.js

@@ -13,12 +13,6 @@ module.exports = function(defaults) {
       }
     },
 
-    sassOptions: {
-      includePaths: [
-        'bower_components/spinkit/scss'
-      ]
-    },
-
     fingerprint: {
       exclude: [
         'weather/clear-day',
@@ -61,6 +55,9 @@ module.exports = function(defaults) {
 
   vendorLib = map(vendorLib, (content) => `if (typeof FastBoot === 'undefined') { ${content} \n }`);
 
+  // Spinkit
+  app.import('node_modules/spinkit/spinkit.css')
+
   // d3
   app.import(app.bowerDirectory + '/d3/d3.min.js');
 

frontend/package.json

@@ -81,5 +81,8 @@
       "lib/full-story",
       "lib/heap-analytics"
     ]
+  },
+  "dependencies": {
+    "spinkit": "^2.0.1"
   }
 }