summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--assets/css/styles.css2
-rw-r--r--assets/js/absences.js2
-rw-r--r--assets/js/grades.js2
-rw-r--r--assets/js/gradings.js2
-rw-r--r--assets/js/meals.js4
-rw-r--r--assets/js/teachers.js2
-rw-r--r--dist/css/styles.css2
-rw-r--r--dist/js/absences.js2
-rw-r--r--dist/js/grades.js2
-rw-r--r--dist/js/gradings.js2
-rw-r--r--dist/js/meals.js4
-rw-r--r--dist/js/teachers.js2
-rw-r--r--dist/pages/about.html4
-rw-r--r--dist/sw.js5
15 files changed, 25 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index fe1db7c..9a4c435 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
**/.commit
+dist/sw.js
+dist/pages/about.html
diff --git a/assets/css/styles.css b/assets/css/styles.css
index f1160f2..b372c5e 100644
--- a/assets/css/styles.css
+++ b/assets/css/styles.css
@@ -273,7 +273,7 @@ span {
color: var(--color-text);
}
-div {
+div:not(.fc-time, .fc-title) {
color: var(--color-text);
}
diff --git a/assets/js/absences.js b/assets/js/absences.js
index 2ed5fe8..5fbc622 100644
--- a/assets/js/absences.js
+++ b/assets/js/absences.js
@@ -49,7 +49,7 @@ async function loadAbsences(forceRefresh = false) {
];
await Promise.all(promisesToRun);
// If we don't have a list of absences, query it
- if (absences === null || absences === {} || forceRefresh) {
+ if (absences == null || absences == {} || forceRefresh) {
try {
let gsecInstance = new gsec();
await gsecInstance.login(username, password);
diff --git a/assets/js/grades.js b/assets/js/grades.js
index 4c52848..aff62e4 100644
--- a/assets/js/grades.js
+++ b/assets/js/grades.js
@@ -38,7 +38,7 @@ async function loadGrades(force_refresh = false) {
];
await Promise.all(promises_to_run);
// If we don't have a list of grades, fetch it
- if (grades === null || grades === [] || force_refresh) {
+ if (grades == null || grades == [] || force_refresh) {
try {
let gsecInstance = new gsec();
diff --git a/assets/js/gradings.js b/assets/js/gradings.js
index 33fda47..b5bf7b5 100644
--- a/assets/js/gradings.js
+++ b/assets/js/gradings.js
@@ -88,7 +88,7 @@ async function loadGradings(force_refresh = false) {
})
];
await Promise.all(promises_to_run);
- if (gradings === null || gradings === [] || gradings === -1 || force_refresh) {
+ if (gradings == null || gradings == [] || gradings == -1 || force_refresh) {
try {
let gsecInstance = new gsec();
await gsecInstance.login(username, password);
diff --git a/assets/js/meals.js b/assets/js/meals.js
index 0a5313a..e9b3af8 100644
--- a/assets/js/meals.js
+++ b/assets/js/meals.js
@@ -49,7 +49,7 @@ async function getToken(callback, callbackparams = []) {
type: "POST",
success: (dataauth) => {
- if(dataauth === null || dataauth.error == true) {
+ if(dataauth == null || dataauth.error == true) {
UIAlert(D("authenticationError"), "getToken(): response error or null");
localforage.setItem("logged_in_lopolis", false).then( function(){
checkLogin();
@@ -97,7 +97,7 @@ async function getMenus(dataauth, callback, callbackparams = []) {
type: "POST",
success: (meals) => {
- if(meals === null || meals.error == true) {
+ if(meals == null || meals.error == true) {
UIAlert( D("errorGettingMenus"), "getMenus(): response error or null");
setLoading(false);
localforage.setItem("logged_in_lopolis", false).then( () => {
diff --git a/assets/js/teachers.js b/assets/js/teachers.js
index da0a62d..da83c06 100644
--- a/assets/js/teachers.js
+++ b/assets/js/teachers.js
@@ -29,7 +29,7 @@ async function loadTeachers(force_refresh = false) {
];
await Promise.all(promises_to_run);
// If we don't have a list of teachers, query it
- if (teachers === null || teachers === [] || force_refresh) {
+ if (teachers == null || teachers == [] || force_refresh) {
try {
let gsecInstance = new gsec();
await gsecInstance.login(username, password);
diff --git a/dist/css/styles.css b/dist/css/styles.css
index f1160f2..b372c5e 100644
--- a/dist/css/styles.css
+++ b/dist/css/styles.css
@@ -273,7 +273,7 @@ span {
color: var(--color-text);
}
-div {
+div:not(.fc-time, .fc-title) {
color: var(--color-text);
}
diff --git a/dist/js/absences.js b/dist/js/absences.js
index 2ed5fe8..5fbc622 100644
--- a/dist/js/absences.js
+++ b/dist/js/absences.js
@@ -49,7 +49,7 @@ async function loadAbsences(forceRefresh = false) {
];
await Promise.all(promisesToRun);
// If we don't have a list of absences, query it
- if (absences === null || absences === {} || forceRefresh) {
+ if (absences == null || absences == {} || forceRefresh) {
try {
let gsecInstance = new gsec();
await gsecInstance.login(username, password);
diff --git a/dist/js/grades.js b/dist/js/grades.js
index 4c52848..aff62e4 100644
--- a/dist/js/grades.js
+++ b/dist/js/grades.js
@@ -38,7 +38,7 @@ async function loadGrades(force_refresh = false) {
];
await Promise.all(promises_to_run);
// If we don't have a list of grades, fetch it
- if (grades === null || grades === [] || force_refresh) {
+ if (grades == null || grades == [] || force_refresh) {
try {
let gsecInstance = new gsec();
diff --git a/dist/js/gradings.js b/dist/js/gradings.js
index 33fda47..b5bf7b5 100644
--- a/dist/js/gradings.js
+++ b/dist/js/gradings.js
@@ -88,7 +88,7 @@ async function loadGradings(force_refresh = false) {
})
];
await Promise.all(promises_to_run);
- if (gradings === null || gradings === [] || gradings === -1 || force_refresh) {
+ if (gradings == null || gradings == [] || gradings == -1 || force_refresh) {
try {
let gsecInstance = new gsec();
await gsecInstance.login(username, password);
diff --git a/dist/js/meals.js b/dist/js/meals.js
index 0a5313a..e9b3af8 100644
--- a/dist/js/meals.js
+++ b/dist/js/meals.js
@@ -49,7 +49,7 @@ async function getToken(callback, callbackparams = []) {
type: "POST",
success: (dataauth) => {
- if(dataauth === null || dataauth.error == true) {
+ if(dataauth == null || dataauth.error == true) {
UIAlert(D("authenticationError"), "getToken(): response error or null");
localforage.setItem("logged_in_lopolis", false).then( function(){
checkLogin();
@@ -97,7 +97,7 @@ async function getMenus(dataauth, callback, callbackparams = []) {
type: "POST",
success: (meals) => {
- if(meals === null || meals.error == true) {
+ if(meals == null || meals.error == true) {
UIAlert( D("errorGettingMenus"), "getMenus(): response error or null");
setLoading(false);
localforage.setItem("logged_in_lopolis", false).then( () => {
diff --git a/dist/js/teachers.js b/dist/js/teachers.js
index da0a62d..da83c06 100644
--- a/dist/js/teachers.js
+++ b/dist/js/teachers.js
@@ -29,7 +29,7 @@ async function loadTeachers(force_refresh = false) {
];
await Promise.all(promises_to_run);
// If we don't have a list of teachers, query it
- if (teachers === null || teachers === [] || force_refresh) {
+ if (teachers == null || teachers == [] || force_refresh) {
try {
let gsecInstance = new gsec();
await gsecInstance.login(username, password);
diff --git a/dist/pages/about.html b/dist/pages/about.html
index f04883f..40fb4da 100644
--- a/dist/pages/about.html
+++ b/dist/pages/about.html
@@ -142,7 +142,11 @@
<div class="row">
<p>
<small>
+<<<<<<< HEAD
^HEAD b63b2381a851e2cbc6087bf4d355be4265e6982a
+=======
+ ^HEAD 16d4d4b9f9b35edc7164cd5662ded7377b6960a9
+>>>>>>> 7b0e9737328c2dc5a0ff1bd063cd7818706256c3
</p>
</div>
</div>
diff --git a/dist/sw.js b/dist/sw.js
index 674df87..562b494 100644
--- a/dist/sw.js
+++ b/dist/sw.js
@@ -3,8 +3,13 @@
// Change version to cause cache refresh
+<<<<<<< HEAD
const static_cache_name = "site-static-1.0.13-beta-b63b238";
// latest commit is b63b2381a851e2cbc6087bf4d355be4265e6982a
+=======
+const static_cache_name = "site-static-1.0.13-beta-16d4d4b";
+// latest commit is 16d4d4b9f9b35edc7164cd5662ded7377b6960a9
+>>>>>>> 7b0e9737328c2dc5a0ff1bd063cd7818706256c3
// Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js
// sw.js NE SME BITI CACHAN, ker vsebuje verzijo!
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 06:10:11 +0100