ServiceList setup

app.py

@@ -54,6 +54,15 @@ def service(service):
 
     return render_template("itemWebsite.html", service=service, url=url, UP=UP)
 
+@app.route("/serviceList")
+def serviceList():
+    dictService = []
+
+    for service in services:
+        dictService.append(dict(service=service, url=services[service]["url"], reportedStatus=dataReport.getLastReport(service), Status=services[service]["Last status"]))
+
+    return render_template("serviceList.html", serviceInfo=dictService)
+
 # To handle error reporting
 @app.route('/process', methods=['GET'])
 def process():

data/404-Test/log.csv

@@ -1,2 +1,4 @@
 date,UP
 2024-01-22T13:26:59,True
+2024-01-22T16:02:54,True
+2024-01-22T16:17:41,True

data/ADE/log.csv

@@ -2,3 +2,5 @@ date,UP
 2024-01-22T14:03:05,True
 2024-01-22T14:03:07,True
 2024-01-22T14:21:15,True
+2024-01-22T15:51:14,False
+2024-01-22T15:51:19,True

data/Gradescope/log.csv

@@ -1,3 +1,4 @@
 date,UP
 2024-01-22T14:02:32,True
 2024-01-22T14:21:28,True
+2024-01-22T16:59:51,True

data/Intranet/log.csv

@@ -4,3 +4,4 @@ date,UP
 2024-01-22T12:32:30,True
 2024-01-22T12:32:35,False
 2024-01-22T14:21:46,True
+2024-01-22T15:05:02,True

data/Pilou-Pilou/log.csv

@@ -1,2 +1,3 @@
 date,UP
 2024-01-22T14:15:34,False
+2024-01-22T15:11:51,False

data/UCLouvain/log.csv

@@ -1 +1,2 @@
 date,UP
+2024-01-22T17:00:28,True

dataReport.py

@@ -108,6 +108,17 @@ def dataExtraction():
     for service in serviceList:
         os.system(f'cmd /c "curl {url}/extract?get={service} -o data/{service}/log.csv"')
 
+def getLastReport(service):
+    with open("data/" + service + "/log.csv", "r") as file:
+        f = file.readlines()
+        lastValue = f[-1].split(",")[1].strip("\n") 
+
+
+        if lastValue == "False":
+            return False
+        if lastValue == "True":
+            return True
+        return None
 
 if __name__ == "__main__":
     dataExtraction()

services.json

@@ -1,46 +1,46 @@
 {
     "404-Test": {
-        "Last access time": "2024-01-22T13:36:43",
+        "Last access time": "2024-01-22T17:55:49",
         "Last status": false,
         "url": "https://www.google.com/404"
     },
     "ADE": {
-        "Last access time": "2024-01-22T13:31:30",
+        "Last access time": "2024-01-22T17:56:09",
         "Last status": true,
         "url": "https://horaire.uclouvain.be/direct/"
     },
     "ADE-Scheduler": {
-        "Last access time": "2024-01-22T13:36:43",
+        "Last access time": "2024-01-22T17:55:49",
         "Last status": true,
         "url": "https://ade-scheduler.info.ucl.ac.be/calendar/"
     },
     "Comproved": {
-        "Last access time": "2024-01-22T13:36:43",
+        "Last access time": "2024-01-22T17:55:49",
         "Last status": true,
         "url": "https://app.comproved.com/universite-de-louvain"
     },
     "Gradescope": {
-        "Last access time": "2024-01-22T13:36:44",
+        "Last access time": "2024-01-22T17:55:50",
         "Last status": true,
         "url": "https://www.gradescope.com/"
     },
     "Intranet": {
-        "Last access time": "2024-01-22T13:36:44",
+        "Last access time": "2024-01-22T17:55:50",
         "Last status": true,
         "url": "https://intranet.uclouvain.be"
     },
     "Moodle": {
-        "Last access time": "2024-01-22T13:36:44",
+        "Last access time": "2024-01-22T17:55:50",
         "Last status": true,
         "url": "https://moodle.uclouvain.be/"
     },
     "Pilou-Pilou": {
-        "Last access time": "2024-01-22T13:36:44",
+        "Last access time": "2024-01-22T17:55:50",
         "Last status": false,
         "url": "https://perso.uclouvain.be/vincent.legat/zoulab/"
     },
     "UCLouvain": {
-        "Last access time": "2024-01-22T13:36:45",
+        "Last access time": "2024-01-22T17:55:51",
         "Last status": true,
         "url": "https://www.uclouvain.be/"
     }

static/main.css

@@ -14,7 +14,7 @@ body {
     background-color: rgb(0, 12, 51);
     text-align: left;
     margin: 0;
-    padding: 0;
+    padding: 10px;
 
     display: flex;
     align-items: center; /* Center vertically */

static/style.css

@@ -13,7 +13,7 @@ h1{
 iframe{
     overflow: hidden; /* So I don't have any scroll */
 
-    width: 420px;
+    width: 400px;
     height: 200px;
 
     margin: 10px;
@@ -32,6 +32,13 @@ iframe{
     justify-content: center; /* Center horizontally */
 }
 
+/*For mobile*/
+@media (max-width: 600px) {
+    iframe {
+        width: 320px;
+    }
+}
+
 /* Default link style */
 a {
     color: blue;

static/styleItem.css

@@ -34,8 +34,6 @@
 }
 
 
-
-
 .container {
     max-width: 100%; /* Set your desired maximum width */
     min-width: 100px; /* Set your desired minimum width */
@@ -83,6 +81,17 @@
     background-color: rgb(153, 103, 95);
 }
 
+/*For mobile*/
+@media (max-width: 600px) {
+    #down {
+        padding: 10px 100px 10px 100px;
+    }
+
+    #up {
+        padding: 10px 115px 10px 115px;
+    }
+}
+
 /* Define the CSS class */
 .big-gap {
     margin-top: 1000px; /* Adjust the value as needed to achieve the desired gap */

static/styleServiceList.css

@@ -0,0 +1,70 @@
+table{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    min-height: 100vh;
+
+    border-collapse: collapse;
+}
+
+/* Default link style */
+a {
+    color: blue;
+    text-decoration: none; /* Remove underline */
+}
+
+/* Visited link style */
+a:visited {
+    color: blue; /* Set the color for visited links */
+}
+
+h3{
+    font-style: italic;
+}
+
+h4{
+    color: rgb(50, 56, 61);
+}
+
+th, td{
+    text-align: center;
+    margin-top:12px;
+    border-bottom: 1px solid #adacac;
+    padding-left: 10px;
+}
+
+.report-up{
+    color: green;
+}
+
+.report-down{
+    color: red;
+}
+
+.report-none{
+    color: lightslategray;
+    align-items: center;
+}
+
+.thumb{
+    background-color: lightgray;
+    width: 70px;
+    font-size: 20px;
+
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    border-radius: 15px;
+    border-style:solid;
+    border-width: 2px;
+
+    margin: 0 auto;
+}
+
+.line-sep{
+    display: block;
+    border-bottom: 1px solid #dddddd; /* Add a bottom border for the divider */
+    margin-bottom: 4px; /* Adjust margin for better spacing */
+    background-color: red;
+}

templates/base.html

@@ -17,7 +17,7 @@
     <div id="header">
         <a href="/"><span class="header-button"> <b>Home</b> </span></a>
         <a href="https://github.com/Tfloow/UCLouvainDown"><span class="header-button"> <b>Github</b> </span></a>
-        <span class="header-button"> <b>ServiceList</b> </span>
+        <a href="/serviceList"><span class="header-button"> <b>ServiceList</b> </span></a>
     </div>
 
     {% block content %}

templates/itemWebsite.html

@@ -10,7 +10,7 @@
 {% endblock %}
 
 
-    {% block content %}
+{% block content %}
     <h2>Status for {{ service }} @ <a href={{ url }} id="urlTO"> {{ url }} </a> </h2>
 
     {% if UP %}

templates/serviceList.html

@@ -0,0 +1,42 @@
+{% extends "base.html" %}
+{% block head %}
+    <title>ServiceList</title>
+    <link rel="stylesheet" href="{{ url_for('static', filename='styleItem.css') }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename='styleServiceList.css') }}">
+    <link rel="icon" type="image/x-icon" href="/static/ico/icoDOWN.png">
+{% endblock %}
+
+
+{% block content %}
+    <table border="0">
+
+        <tr> 
+            <th> <h3>Service</h3> </th>
+            <th> <h3>URL</h3> </th>
+            <th> <h3>Reported Status by Users</h3> </th>
+            <th> <h3>Status</h3> </th>
+        </tr>
+        {% for serviceInfo in serviceInfo %}
+        <tr>
+
+
+            <th> <h4>{{ serviceInfo["service"] }}</h4> </th>
+            <th> <h5><a href={{ serviceInfo["url"] }}>{{ serviceInfo["url"] }}</a></h5> </th>
+            {% if serviceInfo["reportedStatus"]  %}
+                <th class="report-up"> <div class="thumb"> {{ serviceInfo["reportedStatus"] }} </div> </th>
+            {% elif serviceInfo["reportedStatus"] == False %}
+                <th class="report-down"> <div class="thumb"> {{ serviceInfo["reportedStatus"] }} </div> </th>
+            {% else %}
+                <th class="report-none"> <div class="thumb"> {{ serviceInfo["reportedStatus"] }} </div> </th>
+            {% endif %}
+
+            {% if serviceInfo["Status"] %}
+                <th id="up"> &nbsp;&nbsp;Up&nbsp;&nbsp; </th>
+            {% else %}
+                <th id="down"> Down</th>
+            {% endif %}
+        </tr>
+        {% endfor %}
+
+    </table>
+{% endblock %}