Merge pull request #12 from noten-app/v1.0.0

V1.0.1 bugfix
noten-app · Nov 20, 2022 · faeec0f · faeec0f
2 parents ed7dc81 + 69a0a76
commit faeec0f
Show file tree

Hide file tree

Showing 53 changed files with 19,844 additions and 23 deletions.
diff --git a/app/account/index.php b/app/account/index.php
@@ -55,6 +55,6 @@
             </div>
         </div>
         <script src="script.js"></script>
-        <script src="https://cdn.jsdelivr.net/gh/cuzimbisonratte/[email protected]/statusbox.js"></script>
+        <script src="../../src/js/statusbox/statusbox.js"></script>
     </body>
 </html>
diff --git a/app/account/style.css b/app/account/style.css
@@ -1,7 +1,33 @@
-/* Import the font "Dosis" that's used */
+/* Import the fonts "Dosis" and "Ubuntu" that's used */
+
+@font-face {
+    font-family: 'Dosis';
+    font-style: normal;
+    font-weight: 800;
+    src: url('../../src/fonts/dosis-v27-latin-800.eot');
+    /* IE9 Compat Modes */
+    src: local(''), url('../../src/fonts/dosis-v27-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../../src/fonts/dosis-v27-latin-800.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../../src/fonts/dosis-v27-latin-800.woff') format('woff'), /* Modern Browsers */
+    url('../../src/fonts/dosis-v27-latin-800.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../../src/fonts/dosis-v27-latin-800.svg#Dosis') format('svg');
+    /* Legacy iOS */
+}
+
+@font-face {
+    font-family: 'Ubuntu';
+    font-style: normal;
+    font-weight: 500;
+    src: url('../../src/fonts/ubuntu-v20-latin-500.eot');
+    /* IE9 Compat Modes */
+    src: local(''), url('../../src/fonts/ubuntu-v20-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../../src/fonts/ubuntu-v20-latin-500.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../../src/fonts/ubuntu-v20-latin-500.woff') format('woff'), /* Modern Browsers */
+    url('../../src/fonts/ubuntu-v20-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../../src/fonts/ubuntu-v20-latin-500.svg#Ubuntu') format('svg');
+    /* Legacy iOS */
+}
 
-@import url('https://fonts.googleapis.com/css2?family=Dosis:wght@800&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Ubuntu:wght@500&display=swap');
 
 /* Theme switch */
 

diff --git a/app/app.css b/app/app.css
@@ -1,6 +1,19 @@
 /* Import the font "Dosis" that's used */
 
-@import url('https://fonts.googleapis.com/css2?family=Dosis:wght@800&display=swap');
+@font-face {
+    font-family: 'Dosis';
+    font-style: normal;
+    font-weight: 800;
+    src: url('../src/fonts/dosis-v27-latin-800.eot');
+    /* IE9 Compat Modes */
+    src: local(''), url('../src/fonts/dosis-v27-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../src/fonts/dosis-v27-latin-800.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../src/fonts/dosis-v27-latin-800.woff') format('woff'), /* Modern Browsers */
+    url('../src/fonts/dosis-v27-latin-800.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../src/fonts/dosis-v27-latin-800.svg#Dosis') format('svg');
+    /* Legacy iOS */
+}
+
 
 /* Theme switch */
 

diff --git a/app/app.php b/app/app.php
@@ -28,7 +28,8 @@
     <link rel="stylesheet" href="app.css">
     <link rel="icon" type="image/x-icon" href="../src/img/favicon.ico" />
     <link rel="apple-touch-icon" href="../src/img/favicon.ico" />
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v6.2.0/css/all.css">
+    <link rel="stylesheet" href="../src/fontawesome/css/fontawesome.min.css">
+    <link rel="stylesheet" href="../src/fontawesome/css/solid.min.css">
     <link rel="manifest" href="../manifest.json">
 </head>
 
@@ -42,7 +43,7 @@
         <div class="fachliste" id="fachliste">
         </div>
     </div>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="../src/js/jquery/jquery-3.6.1.min.js"></script>
     <script src="./script.js"></script>
 </body>
 

diff --git a/app/fach/app.css b/app/fach/app.css
@@ -1,6 +1,19 @@
 /* Import the font "Dosis" that's used */
 
-@import url('https://fonts.googleapis.com/css2?family=Dosis:wght@800&display=swap');
+@font-face {
+    font-family: 'Dosis';
+    font-style: normal;
+    font-weight: 800;
+    src: url('../../src/fonts/dosis-v27-latin-800.eot');
+    /* IE9 Compat Modes */
+    src: local(''), url('../../src/fonts/dosis-v27-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../../src/fonts/dosis-v27-latin-800.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../../src/fonts/dosis-v27-latin-800.woff') format('woff'), /* Modern Browsers */
+    url('../../src/fonts/dosis-v27-latin-800.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../../src/fonts/dosis-v27-latin-800.svg#Dosis') format('svg');
+    /* Legacy iOS */
+}
+
 
 /* Theme switch */
 

diff --git a/app/fach/index.php b/app/fach/index.php
@@ -79,7 +79,8 @@
     <link rel="stylesheet" href="app.css">
     <link rel="icon" type="image/x-icon" href="../../src/img/favicon.ico" />
     <link rel="apple-touch-icon" href="../../src/img/favicon.ico" />
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v6.2.0/css/all.css">
+    <link rel="stylesheet" href="../../src/fontawesome/css/fontawesome.min.css">
+    <link rel="stylesheet" href="../../src/fontawesome/css/solid.min.css">
     <link rel="manifest" href="../../manifest.json">
 </head>
 
@@ -153,6 +154,7 @@
                         // Get number of types AND Get averages
                         $num_type_t = 0;
                         $num_t_grades_sum = 0;
+                        $grade_t = 0;
                         foreach ($grades as $grade_entry) {
                             $grade_type_calc = $grade_entry["type"];
                             $grade = $grade_entry["grade"];
@@ -161,7 +163,7 @@
                                 $num_t_grades_sum += $grade;
                             }
                         }
-                        $grade_t = $num_t_grades_sum / $num_type_t;
+                        if(!($num_t_grades_sum == 0 || $num_type_t)) $grade_t = $num_t_grades_sum / $num_type_t;
                         $num_type_K = 0;
                         $num_type_M = 0;
                         $num_type_S = 0;
@@ -218,7 +220,7 @@
             </tbody>
         </table>
     </div>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="../../src/js/jquery/jquery-3.6.1.min.js"></script>
 </body>
 
 </html>
diff --git a/app/fach_bearbeiten/app.css b/app/fach_bearbeiten/app.css
@@ -1,6 +1,19 @@
 /* Import the font "Dosis" that's used */
 
-@import url('https://fonts.googleapis.com/css2?family=Dosis:wght@800&display=swap');
+@font-face {
+    font-family: 'Dosis';
+    font-style: normal;
+    font-weight: 800;
+    src: url('../../src/fonts/dosis-v27-latin-800.eot');
+    /* IE9 Compat Modes */
+    src: local(''), url('../../src/fonts/dosis-v27-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../../src/fonts/dosis-v27-latin-800.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../../src/fonts/dosis-v27-latin-800.woff') format('woff'), /* Modern Browsers */
+    url('../../src/fonts/dosis-v27-latin-800.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../../src/fonts/dosis-v27-latin-800.svg#Dosis') format('svg');
+    /* Legacy iOS */
+}
+
 
 /* Theme switch */
 

diff --git a/app/fach_bearbeiten/index.php b/app/fach_bearbeiten/index.php
@@ -57,7 +57,8 @@
     <link rel="stylesheet" href="app.css">
     <link rel="icon" type="image/x-icon" href="../../src/img/favicon.ico" />
     <link rel="apple-touch-icon" href="../../src/img/favicon.ico" />
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v6.2.0/css/all.css">
+    <link rel="stylesheet" href="../../src/fontawesome/css/fontawesome.min.css">
+    <link rel="stylesheet" href="../../src/fontawesome/css/solid.min.css">
     <link rel="manifest" href="../../manifest.json">
 </head>
 
@@ -101,7 +102,7 @@
             </div>
         </div>
     </div>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="../../src/js/jquery/jquery-3.6.1.min.js"></script>
     <script src="script.js"></script>
 </body>
 

diff --git a/app/fach_erstellen/app.css b/app/fach_erstellen/app.css
@@ -1,6 +1,19 @@
 /* Import the font "Dosis" that's used */
 
-@import url('https://fonts.googleapis.com/css2?family=Dosis:wght@800&display=swap');
+@font-face {
+    font-family: 'Dosis';
+    font-style: normal;
+    font-weight: 800;
+    src: url('../../src/fonts/dosis-v27-latin-800.eot');
+    /* IE9 Compat Modes */
+    src: local(''), url('../../src/fonts/dosis-v27-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../../src/fonts/dosis-v27-latin-800.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../../src/fonts/dosis-v27-latin-800.woff') format('woff'), /* Modern Browsers */
+    url('../../src/fonts/dosis-v27-latin-800.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../../src/fonts/dosis-v27-latin-800.svg#Dosis') format('svg');
+    /* Legacy iOS */
+}
+
 
 /* Theme switch */
 

diff --git a/app/fach_erstellen/index.php b/app/fach_erstellen/index.php
@@ -27,7 +27,8 @@
     <link rel="stylesheet" href="app.css">
     <link rel="icon" type="image/x-icon" href="../../src/img/favicon.ico" />
     <link rel="apple-touch-icon" href="../../src/img/favicon.ico" />
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v6.2.0/css/all.css">
+    <link rel="stylesheet" href="../../src/fontawesome/css/fontawesome.min.css">
+    <link rel="stylesheet" href="../../src/fontawesome/css/solid.min.css">
     <link rel="manifest" href="../../manifest.json">
 </head>
 
@@ -67,7 +68,7 @@
             </div>
         </div>
     </div>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="../../src/js/jquery/jquery-3.6.1.min.js"></script>
     <script src="script.js"></script>
 </body>
 

diff --git a/app/note_bearbeiten/app.css b/app/note_bearbeiten/app.css
@@ -1,6 +1,19 @@
 /* Import the font "Dosis" that's used */
 
-@import url('https://fonts.googleapis.com/css2?family=Dosis:wght@800&display=swap');
+@font-face {
+    font-family: 'Dosis';
+    font-style: normal;
+    font-weight: 800;
+    src: url('../../src/fonts/dosis-v27-latin-800.eot');
+    /* IE9 Compat Modes */
+    src: local(''), url('../../src/fonts/dosis-v27-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../../src/fonts/dosis-v27-latin-800.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../../src/fonts/dosis-v27-latin-800.woff') format('woff'), /* Modern Browsers */
+    url('../../src/fonts/dosis-v27-latin-800.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../../src/fonts/dosis-v27-latin-800.svg#Dosis') format('svg');
+    /* Legacy iOS */
+}
+
 
 /* Theme switch */
 

diff --git a/app/note_bearbeiten/index.php b/app/note_bearbeiten/index.php
@@ -57,12 +57,13 @@
     <link rel="stylesheet" href="app.css">
     <link rel="icon" type="image/x-icon" href="../../src/img/favicon.ico" />
     <link rel="apple-touch-icon" href="../../src/img/favicon.ico" />
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v6.2.0/css/all.css">
+    <link rel="stylesheet" href="../../src/fontawesome/css/fontawesome.min.css">
+    <link rel="stylesheet" href="../../src/fontawesome/css/solid.min.css">
     <link rel="manifest" href="../../manifest.json">
 </head>
 
 <body>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="../../src/js/jquery/jquery-3.6.1.min.js"></script>
     <script src="script.js"></script>
     <nav class="topleiste" id="topleiste">
         <div class="logo" id="top_leiste_icon-name" onclick="location.assign('../fach/?id=<?=$class_id?>')"><i class="fa-solid fa-circle-left"></i></div>

diff --git a/app/note_eintragen/app.css b/app/note_eintragen/app.css
@@ -1,6 +1,19 @@
 /* Import the font "Dosis" that's used */
 
-@import url('https://fonts.googleapis.com/css2?family=Dosis:wght@800&display=swap');
+@font-face {
+    font-family: 'Dosis';
+    font-style: normal;
+    font-weight: 800;
+    src: url('../../src/fonts/dosis-v27-latin-800.eot');
+    /* IE9 Compat Modes */
+    src: local(''), url('../../src/fonts/dosis-v27-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+    url('../../src/fonts/dosis-v27-latin-800.woff2') format('woff2'), /* Super Modern Browsers */
+    url('../../src/fonts/dosis-v27-latin-800.woff') format('woff'), /* Modern Browsers */
+    url('../../src/fonts/dosis-v27-latin-800.ttf') format('truetype'), /* Safari, Android, iOS */
+    url('../../src/fonts/dosis-v27-latin-800.svg#Dosis') format('svg');
+    /* Legacy iOS */
+}
+
 
 /* Theme switch */
 

diff --git a/app/note_eintragen/index.php b/app/note_eintragen/index.php
@@ -54,7 +54,8 @@
     <link rel="stylesheet" href="app.css">
     <link rel="icon" type="image/x-icon" href="../../src/img/favicon.ico" />
     <link rel="apple-touch-icon" href="../../src/img/favicon.ico" />
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v6.2.0/css/all.css">
+    <link rel="stylesheet" href="../../src/fontawesome/css/fontawesome.min.css">
+    <link rel="stylesheet" href="../../src/fontawesome/css/solid.min.css">
     <link rel="manifest" href="../../manifest.json">
 </head>
 
@@ -112,7 +113,7 @@
             </div>
         </div>
     </div>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="../../src/js/jquery/jquery-3.6.1.min.js"></script>
     <script src="script.js"></script>
 </body>