upgrade packages, fix vue3-bootstrap-icons and correct db migrations

pietheinstrengholt · Jul 1, 2024 · 258cd6e · 258cd6e
1 parent 15b061b
commit 258cd6e
Show file tree

Hide file tree

Showing 15 changed files with 1,876 additions and 1,439 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![Azure Web App](https://github.com/pietheinstrengholt/rssmonster/actions/workflows/azure-web-app-server.yml/badge.svg)](https://github.com/pietheinstrengholt/rssmonster/actions/workflows/azure-web-app-server.yml)
 [![Docker](https://img.shields.io/docker/pulls/pietheinstrengholt/rssmonster.svg)](https://hub.docker.com/r/pietheinstrengholt/rssmonster/builds)
 
-Copyright (c) 2023 Piethein Strengholt, [email protected]
+Copyright (c) 2024 Piethein Strengholt, [email protected]
 
 ### Background
 RSSMonster is an easy to use web-based RSS aggregator, created as an alternative for Google Reader. RSSMonster features a lightweight fluid responsive design. It is written in JavaScript: Vue.js 3 for the frontend and Express for the backend. It uses Bootstrap for making the design responsive. 

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -13,24 +13,24 @@
     "node": "18.x"
   },
   "dependencies": {
-    "@dvuckovic/vue3-bootstrap-icons": "^1.0.6",
-    "axios": "^1.6.7",
-    "bootstrap": "^5.3.2",
-    "bootswatch": "^5.3.2",
+    "@dvuckovic/vue3-bootstrap-icons": "^2.0.0",
+    "axios": "^1.7.2",
+    "bootstrap": "^5.3.3",
+    "bootswatch": "^5.3.3",
     "idb-keyval": "^6.2.1",
     "moment": "^2.30.1",
     "register-service-worker": "^1.7.2",
-    "vue": "^3.4.15",
+    "vue": "^3.4.31",
     "vue-infinite-loading": "github:nvitius/vue-infinite-loading#next",
     "vuedraggable": "^4.1.0",
     "waypoints": "^4.0.1"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^5.0.3",
-    "@vue/compiler-sfc": "^3.4.15",
-    "sass": "^1.70.0",
-    "vite": "^5.0.12",
-    "vite-plugin-pwa": "^0.17.5"
+    "@vitejs/plugin-vue": "^5.0.5",
+    "@vue/compiler-sfc": "^3.4.31",
+    "sass": "^1.77.6",
+    "vite": "^5.3.2",
+    "vite-plugin-pwa": "^0.20.0"
   },
   "browserslist": [
     "> 1%",

diff --git a/client/src/main.js b/client/src/main.js
@@ -4,7 +4,12 @@ import App from './App.vue';
 //progressive web app
 import './registerServiceWorker'
 
-import BootstrapIcon from '@dvuckovic/vue3-bootstrap-icons';
+import { BootstrapIcon } from '@dvuckovic/vue3-bootstrap-icons'
+import { injectBootstrapIcons } from '@dvuckovic/vue3-bootstrap-icons/utils'
+import BootstrapIcons from 'bootstrap-icons/bootstrap-icons.svg?raw'
+import '@dvuckovic/vue3-bootstrap-icons/dist/style.css'
+
+injectBootstrapIcons(BootstrapIcons)
 
 // create an instance using the function
 const app = createApp(App)

diff --git a/server/migrations/20190119122951-create-categories.js b/server/migrations/20190119122951-create-categories.js
@@ -1,5 +1,6 @@
-export default {
-  up: async (queryInterface, Sequelize) => {
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
     return queryInterface.createTable('categories', {
       id: {
         type: Sequelize.INTEGER,

diff --git a/server/migrations/20190119123240-create-feeds.js b/server/migrations/20190119123240-create-feeds.js
@@ -1,5 +1,6 @@
-export default {
-  up: async (queryInterface, Sequelize) => {
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
     return queryInterface.createTable('feeds', {
       id: {
         type: Sequelize.INTEGER,

diff --git a/server/migrations/20190119123611-create-articles.js b/server/migrations/20190119123611-create-articles.js
@@ -1,5 +1,6 @@
-export default {
-  up: async (queryInterface, Sequelize) => {
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
     return queryInterface.createTable('articles', {
       id: {
         type: Sequelize.INTEGER,

diff --git a/server/migrations/20190126162000-create-settings.js b/server/migrations/20190126162000-create-settings.js
@@ -1,5 +1,6 @@
-export default {
-  up: async (queryInterface, Sequelize) => {
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
     return queryInterface.createTable(
       "settings",
       {

diff --git a/server/migrations/20210630122000-create-hotlinks.js b/server/migrations/20210630122000-create-hotlinks.js
@@ -1,5 +1,6 @@
-export default {
-  up: async (queryInterface, Sequelize) => {
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
     return queryInterface.createTable(
       "hotlinks",
       {

diff --git a/server/migrations/package.json b/server/migrations/package.json
@@ -0,0 +1,3 @@
+{
+    "type": "commonjs"
+}