fix templates for Boostrap 5.0.0-beta1.

4 files changed, 26 insertions, 26 deletions

diff --git a/newspipe/templates/home.html b/newspipe/templates/home.html
index 8b5c3a38..67034065 100644
--- a/newspipe/templates/home.html
+++ b/newspipe/templates/home.html
@@ -55,7 +55,7 @@
 
         <ul class="nav flex-column">
         <div class="bg-primary clearfix text-sm-left font-weight-bold">
-            <button class="btn btn-primary btn-sm pull-right" type="button" data-toggle="collapse" data-target="#collapse-noCategory" aria-expanded="true" aria-controls="collapse-noCategory">
+            <button class="btn btn-primary btn-sm pull-right" role="button" data-bs-toggle="collapse" data-target="#collapse-noCategory" aria-controls="collapse-noCategory">
                 <i class="fa fa-chevron-down" aria-hidden="true"></i>
             </button>
             <span class="align-middle">&nbsp;No category</<span>
diff --git a/newspipe/templates/layout.html b/newspipe/templates/layout.html
index f24ab854..7cd98316 100644
--- a/newspipe/templates/layout.html
+++ b/newspipe/templates/layout.html
@@ -13,7 +13,7 @@
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='npm_components/fork-awesome/css/fork-awesome.min.css') }}" />
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/custom.css') }}" />
     <!-- JavaScript -->
-    <script type="text/javascript" src="{{ url_for('static', filename='npm_components/popper.js/dist/umd/popper.min.js') }}"></script>
+    <script type="text/javascript" src="{{ url_for('static', filename='npm_components/@popperjs/core/dist/umd/popper.min.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='npm_components/bootstrap/dist/js/bootstrap.min.js') }}"></script>
     {% endblock %}
   </head>
@@ -53,8 +53,8 @@
                         </li>
                     {% endif %}
                     <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownRSS" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-rss" aria-hidden="true"></i>&nbsp;{{ _('Feeds') }}</a>
-                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownRSS" style="min-width: 300px;">
+                        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownRSS" role="button" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-rss" aria-hidden="true"></i>&nbsp;{{ _('Feeds') }}</a>
+                        <div class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdownRSS" style="min-width: 300px;">
                               <a class="dropdown-item" href="{{ url_for('feeds.feeds') }}">{{ _('Feeds') }}</a>
                               <a class="dropdown-item" href="{{ url_for('feeds.inactives') }}">{{ _('Inactive') }}</a>
                               <a class="dropdown-item" href="{{ url_for('popular') }}">{{ _('Popular') }}</a>
@@ -72,8 +72,8 @@
                     </li>
 
                     <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownCategory" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-tag" aria-hidden="true"></i>&nbsp;{{ _('Categories') }}</a>
-                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownCategory" style="min-width: 250px;">
+                        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownCategory" role="button" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-tag" aria-hidden="true"></i>&nbsp;{{ _('Categories') }}</a>
+                        <div class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdownCategory" style="min-width: 250px;">
                             <a class="dropdown-item" href="{{ url_for('categories.list_') }}">{{ _('Categories') }}</a>
                             <div class="dropdown-divider"></div>
                             <a class="dropdown-item" href="{{ url_for('category.form') }}">{{ _('Add a new category') }}</a>
@@ -88,16 +88,16 @@
                     </li>
 
                     <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownBookmark" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bookmark" aria-hidden="true"></i>&nbsp;{{ _('Bookmarks') }}</a>
-                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownBookmark">
-                            <a class="dropdown-item" href="{{ url_for('bookmarks.list_') }}">{{ _('Bookmarks') }}</a>
-                            <a class="dropdown-item" href="{{ url_for('bookmark.form') }}">{{ _('Add a new bookmark') }}</a>
-                        </div>
+                        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownBookmark" role="button" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-bookmark" aria-hidden="true"></i>&nbsp;{{ _('Bookmarks') }}</a>
+                        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdownBookmark">
+                            <li><a class="dropdown-item" href="{{ url_for('bookmarks.list_') }}">{{ _('Bookmarks') }}</a></li>
+                            <li><a class="dropdown-item" href="{{ url_for('bookmark.form') }}">{{ _('Add a new bookmark') }}</a></li>
+                        </ul>
                     </li>
 
                     <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownSearch" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-search" aria-hidden="true"></i></i>&nbsp;{{ _('Search') }}</a>
-                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownSearch" style="min-width: 300px;">
+                        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownSearch" role="button" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-search" aria-hidden="true"></i></i>&nbsp;{{ _('Search') }}</a>
+                        <div class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdownSearch">
                             <form class="px-4 py-3" action="{{ url_for('home') }}" method="GET">
                                 <div class="mb-3">
                                     <input class="form-control" name="query" type="text" placeholder="{{_('Query')}}" required="required"/>
@@ -116,8 +116,8 @@
                     </li>
 
                     <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownUser" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-user" aria-hidden="true"></i></a>
-                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownUser">
+                        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownUser" role="button" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-user" aria-hidden="true"></i></a>
+                        <div class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdownUser">
                             <a class="dropdown-item" href="{{ url_for('user.profile') }}">{{ _('Profile') }}</a>
                             <a class="dropdown-item" href="{{ url_for('user.management') }}">{{ _('Your data') }}</a>
                             {% if current_user.is_admin %}
diff --git a/package-lock.json b/package-lock.json
index c9c60421..ae6a540f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,10 +4,15 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@popperjs/core": {
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.5.4.tgz",
+      "integrity": "sha512-ZpKr+WTb8zsajqgDkvCEWgp6d5eJT6Q63Ng2neTbzBO76Lbe91vX/iVIW9dikq+Fs3yEo+ls4cxeXABD2LtcbQ=="
+    },
     "bootstrap": {
-      "version": "5.0.0-alpha2",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-alpha2.tgz",
-      "integrity": "sha512-ZhW32+m5ImJoEkDKn43QQk2KovpJFisV/7TAg/RCzDi+B8m7FUgLHWx1Auu0Jt3/DQXDYwp6iwsprP3ej4u3ng=="
+      "version": "5.0.0-beta1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-beta1.tgz",
+      "integrity": "sha512-UrHApw/WRmT7l2rlDdn5iXr7Jps/LlMZtJlLn9G41aGDfss48hyDeYyHtX1C6NHKVcmdUarGG+ve0LZB5iHyTQ=="
     },
     "fork-awesome": {
       "version": "1.1.7",
@@ -18,11 +23,6 @@
       "version": "2.29.1",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
       "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
-    },
-    "popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
     }
   }
 }
diff --git a/package.json b/package.json
index 45900193..4f0c8f9f 100644
--- a/package.json
+++ b/package.json
@@ -4,10 +4,10 @@
   "license": "AGPL-3.0",
   "private": true,
   "dependencies": {
-    "bootstrap": "^5.0.0-alpha2",
+    "@popperjs/core": "^2.5.4",
+    "bootstrap": "^5.0.0-beta1",
     "fork-awesome": "^1.1.7",
-    "moment": "^2.29.1",
-    "popper.js": "^1.16.1"
+    "moment": "^2.29.1"
   },
   "engines": {
     "yarn": ">= 1.0.0"