Merge pull request #10 from NotAProton/main

src/adminHandlers.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
 	"net/http"
 	"strconv"
 	"strings"
@@ -152,14 +153,19 @@ func returnReported(w http.ResponseWriter, r *http.Request) {
 	}
 
 	jsonData, err := dbQueryReported(p)
+	if errors.Is(err, errnoEnt) {
+		w.WriteHeader(http.StatusNoContent)
+		return
+	}
+
 	if err != nil {
 		logger.Println(getRequestId(r) + err.Error())
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(http.StatusOK)
-	w.Header().Set("Content-Type", "application/json")
 	w.Write(jsonData)
 }
 

src/main.go

@@ -34,7 +34,7 @@ const (
 )
 
 var (
-	version    string = "1.1.0"
+	version    string = "1.2.2"
 	reg        *regexp.Regexp
 	regForHTTP *regexp.Regexp
 )

src/sql.go

@@ -19,12 +19,14 @@ package main
 import (
 	"database/sql"
 	"encoding/json"
+	"errors"
 	"fmt"
 
 	_ "github.com/go-sql-driver/mysql"
 )
 
 var db *sql.DB
+var errnoEnt error = errors.New("no entries")
 
 func connectDb() {
 	var err error
@@ -262,7 +264,7 @@ func dbQueryReported(page int) ([]byte, error) {
 		Voted_by         string `json:"voted_by"`
 	}
 
-	var users []Entry
+	var entries []Entry
 
 	for rows.Next() {
 		var id, times_reported, tempVotedfordeletion int
@@ -276,10 +278,12 @@ func dbQueryReported(page int) ([]byte, error) {
 		} else {
 			votedfordeletion = true
 		}
-		users = append(users, Entry{id, domain, path, destination, times_reported, hashed_IP, votedfordeletion, voted_by})
+		entries = append(entries, Entry{id, domain, path, destination, times_reported, hashed_IP, votedfordeletion, voted_by})
 	}
-
-	entryBytes, _ := json.MarshalIndent(&users, "", "  ")
+	if len(entries) == 0 {
+		return nil, errnoEnt
+	}
+	entryBytes, _ := json.MarshalIndent(&entries, "", "  ")
 
 	return entryBytes, nil
 }

src/static/admin/index.html

@@ -5,7 +5,6 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Admin Panel</title>
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/water.css@2/out/water.css">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridjs/dist/themermaid.min.css">
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/gridjs/dist/gridjs.umd.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>

src/static/admin/login/script.js

@@ -5,7 +5,7 @@ $('#login').attr('disabled',true);
 let u = $('#username').val()
 let p = $('#password').val()
 fetch(domain+'admin/api/newreftoken', {
-method: "post",
+method: "POST",
 headers: {
   'Accept': 'application/json',
   'Content-Type': 'application/json'

src/static/admin/script.js

@@ -15,7 +15,7 @@ function regenTokens() {
     }
     let r = localStorage.getItem('reftoken');
     fetch(domain+'admin/api/newacctoken', {
-    method: "post",
+    method: "POST",
     headers: {
       'Accept': 'application/json',
       'Content-Type': 'application/json'
@@ -49,26 +49,26 @@ function getReported() {
     let bearer = 'Bearer ' + sessionStorage.getItem('acctoken')
     let page='1'
     fetch(domain + 'admin/api/getreported?page=' + page, {
-        method: 'post',
+        method: 'POST',
         headers: {
             'Authorization': bearer,
             'Content-Type': 'application/x-www-form-url-encoded' 
         }
     })
-    .then (res => {
-        console.log(res.text)
-        if (res.headers.get('content-type') == 'text/plain; charset=utf-8') {
-            $('#table').text('No reported links so far')
-        }
-    })
-    .then(res => res.json())
+    .then(res => {
+      if (res.status == 204) {
+        $('#table').text('No reported links so far')
+    } else {
+    res.json()
     .then(data => {
-        data.forEach(function(obj) { 
-            obj.link = obj.domain + "/" + obj.path
-            delete obj.domain
-            delete obj.path
-        makeTable(data)
+      data.forEach(function(obj) { 
+          obj.link = obj.domain + "/" + obj.path
+          delete obj.domain
+          delete obj.path
+      })
+      makeTable(data)
      })
+    }
     })
     .catch(error => ({
         message: 'Something bad happened ' + error
@@ -115,7 +115,7 @@ function refreshTable() {
     let bearer = 'Bearer ' + sessionStorage.getItem('acctoken')
     let page='1'
     fetch(domain + 'admin/api/getreported?page=' + page, {
-        method: 'post',
+        method: 'POST',
         headers: {
             'Authorization': bearer,
             'Content-Type': 'application/x-www-form-url-encoded' 
@@ -142,18 +142,18 @@ function renderTable(data) {
 }
 
 function voteDelete(link) {
-domain=link.substr(0,link.indexOf('/')); 
+linkdomain=link.substr(0,link.indexOf('/')); 
 path=link.substr(link.indexOf('/')+1);
 let bearer = 'Bearer ' + sessionStorage.getItem('acctoken')
 fetch(domain + 'admin/api/votedelete', {
-method: "post",
+method: "POST",
 headers: {
     'Authorization': bearer,
     'Accept': 'application/json',
     'Content-Type': 'application/json'
 },
 body: JSON.stringify({
-  domain: domain,
+  domain: linkdomain,
   path: path
   })
 })