Several changes

ras/frontend/src/Functions.js

@@ -1,3 +1,5 @@
+import DataTable from 'datatables.net-dt';
+
 export const readCookie = (name) => {
     var nameEQ = name + "=";
     var ca = document.cookie.split(';');

ras/frontend/src/components/Data.js

@@ -79,6 +79,7 @@ export const getChallenge = (year) => {
     return fetch('/api/books/challenge', {
         "method": "GET",
         "headers": {
+            "Authorization": "Bearer " + localStorage.getItem("token"),
             "year": year,
             "userid": localStorage.getItem('id')
         }

ras/frontend/src/views/login.js

@@ -32,11 +32,10 @@ const Login = (props) => {
         formData.append('username', username);
         formData.append('password', password);
 
-        return authFetch(`http://localhost:8000/api/auth/login?username=${username}&password=${password}`, {
+        return authFetch(`/api/auth/login?username=${username}&password=${password}`, {
             method: 'POST',
             body: formData
         }).then(res => {
-            console.log(res.user);
             if(res.user){
                 localStorage.setItem('id', res.user.id);
                 localStorage.setItem('name', res.user.name);

ras/frontend/static/css/style.css

@@ -1,4 +1,5 @@
 @import url('https://fonts.googleapis.com/css2?family=Poppins:wght@100;200;300;400;500;600;700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@200;300;400;600;700&display=swap');
 
 html, body{
     background:#f8f8fa;

ras/frontend/static/js/src_Functions_js.js

@@ -1,2 +1,2 @@
 /*! For license information please see src_Functions_js.js.LICENSE.txt */
-"use strict";(self.webpackChunkfrontend=self.webpackChunkfrontend||[]).push([["src_Functions_js"],{"./src/Functions.js":(__unused_webpack_module,__webpack_exports__,__webpack_require__)=>{eval('__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */   "initDataTable": () => (/* binding */ initDataTable),\n/* harmony export */   "readCookie": () => (/* binding */ readCookie)\n/* harmony export */ });\nconst readCookie = name => {\n  var nameEQ = name + "=";\n  var ca = document.cookie.split(\';\');\n  for (var i = 0; i < ca.length; i++) {\n    var c = ca[i];\n    while (c.charAt(0) == \' \') c = c.substring(1, c.length);\n    if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length);\n  }\n  return null;\n};\nconst initDataTable = () => {\n  let table = new DataTable(\'#DataTable\');\n  table.destroy();\n  setTimeout(() => {\n    table = new DataTable(\'#DataTable\', {\n      language: {\n        url: \'https://cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/Dutch.json\',\n        search: "",\n        searchPlaceholder: "Zoeken"\n      },\n      dom: \'rt<"bottom"pl><"clear">\',\n      order: []\n    });\n  }, 300);\n};\n\n//# sourceURL=webpack://frontend/./src/Functions.js?')}}]);
+"use strict";(self.webpackChunkfrontend=self.webpackChunkfrontend||[]).push([["src_Functions_js"],{"./src/Functions.js":(__unused_webpack_module,__webpack_exports__,__webpack_require__)=>{eval('__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */   "initDataTable": () => (/* binding */ initDataTable),\n/* harmony export */   "readCookie": () => (/* binding */ readCookie)\n/* harmony export */ });\n/* harmony import */ var datatables_net_dt__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! datatables.net-dt */ "./node_modules/datatables.net-dt/js/dataTables.dataTables.mjs");\n\nconst readCookie = name => {\n  var nameEQ = name + "=";\n  var ca = document.cookie.split(\';\');\n  for (var i = 0; i < ca.length; i++) {\n    var c = ca[i];\n    while (c.charAt(0) == \' \') c = c.substring(1, c.length);\n    if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length);\n  }\n  return null;\n};\nconst initDataTable = () => {\n  let table = new datatables_net_dt__WEBPACK_IMPORTED_MODULE_0__["default"](\'#DataTable\');\n  table.destroy();\n  setTimeout(() => {\n    table = new datatables_net_dt__WEBPACK_IMPORTED_MODULE_0__["default"](\'#DataTable\', {\n      language: {\n        url: \'https://cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/Dutch.json\',\n        search: "",\n        searchPlaceholder: "Zoeken"\n      },\n      dom: \'rt<"bottom"pl><"clear">\',\n      order: []\n    });\n  }, 300);\n};\n\n//# sourceURL=webpack://frontend/./src/Functions.js?')}}]);

ras/frontend/static/js/vendors-node_modules_datatables_net-dt_js_dataTables_dataTables_mjs.js.LICENSE.txt

@@ -0,0 +1,11 @@
+/*!********************************************!*\
+  !*** ./node_modules/jquery/dist/jquery.js ***!
+  \********************************************/
+
+/*!**************************************************************!*\
+  !*** ./node_modules/datatables.net/js/jquery.dataTables.mjs ***!
+  \**************************************************************/
+
+/*!*********************************************************************!*\
+  !*** ./node_modules/datatables.net-dt/js/dataTables.dataTables.mjs ***!
+  \*********************************************************************/

ras/frontend/templates/index.html

@@ -3,34 +3,11 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>Reading Analytics System</title>
+    <title>NovelMetrix</title>
     {% load static %}
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+    <link rel="icon" type="image/x-icon" href="{% static "images/favicon.ico" %}">
-    <link
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous">
-      rel="stylesheet"
-      href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"/>
-
-    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
-   integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
-   crossorigin=""/>
-
-   <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous">
-
-   <script src="https://kit.fontawesome.com/c4a0df9f18.js" crossorigin="anonymous"></script>
-
-   <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.12.1/css/jquery.dataTables.css">
-
-   <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@200;300;400;600;700&display=swap" rel="stylesheet"> 
-
     <link rel="stylesheet" type="text/css" href="{% static "css/style.css" %}" />
-
-
-   <!-- Make sure you put this AFTER Leaflet's CSS -->
- <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"
-   integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
-   crossorigin=""></script>
   </head>
   
   <body>
@@ -38,11 +15,10 @@
     <div id="main">
       <div id="app"></div>
     </div>
-
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+    <script src="https://kit.fontawesome.com/c4a0df9f18.js" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-u1OknCvxWvY5kfmNBILK2hRnQC3Pr17a+RTT6rIHI7NnikvbZlHgTPOOmMi466C8" crossorigin="anonymous"></script>
-    <script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/1.12.1/js/jquery.dataTables.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/masonry-layout@4.2.2/dist/masonry.pkgd.min.js" integrity="sha384-GNFwBvfVxBkLMJpYMOABq3c+d3KnQxudP/mGPkzpZSTYykLBNsZEnG2D9G/X/+7D" crossorigin="anonymous" async></script>
     <script src="{% static "js/main.js" %}"></script>
   </body>
 </html>

ras/ras/settings.py

@@ -57,7 +57,7 @@ MIDDLEWARE = [
 
 CORS_ORIGIN_ALLOW_ALL = False
 CORS_ORIGIN_WHITELIST = (
-    'http://localhost:8000',
+    'http://localhost:8000', 'https://novelmetrix.nl', 'http://novelmetrix.nl'
 )
 
 ROOT_URLCONF = 'ras.urls'