From d766f5af2b59ede34479dcce54b368c3bf816d2b Mon Sep 17 00:00:00 2001
From: rstular <rok@stular.eu>
Date: Tue, 2 Jun 2020 16:07:57 +0200
Subject: Preparing to merge

---
 assets/js/gradings.js | 18 +++++++++---------
 dist/js/app.js        |  6 +-----
 dist/js/gradings.js   |  2 +-
 dist/pages/about.html |  2 +-
 dist/sw.js            |  4 ++--
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/assets/js/gradings.js b/assets/js/gradings.js
index a852337..f884bf2 100644
--- a/assets/js/gradings.js
+++ b/assets/js/gradings.js
@@ -176,15 +176,15 @@ document.addEventListener("DOMContentLoaded", () => {
     calendar_obj.render();
 
     // Modal for adding gradings
-    setupPickers(); // todo (adding an event), to be stored in messages
-    // Setup modals
-	const modal_elems = document.querySelectorAll('.modal');
-	const modal_options = {
-		onOpenStart: () => { $("#fab-new").hide() },
-		onCloseEnd: () => { $("#fab-new").show() },
-		dismissible: false
-	};
-	M.Modal.init(modal_elems, modal_options);
+    // setupPickers(); // todo (adding an event), to be stored in messages
+    // // Setup modals
+	// const modal_elems = document.querySelectorAll('.modal');
+	// const modal_options = {
+	// 	onOpenStart: () => { $("#fab-new").hide() },
+	// 	onCloseEnd: () => { $("#fab-new").show() },
+	// 	dismissible: false
+	// };
+	// M.Modal.init(modal_elems, modal_options);
 
     loadGradings(true);
     // Setup refresh handler
diff --git a/dist/js/app.js b/dist/js/app.js
index 339215b..623d86d 100755
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -3,11 +3,7 @@
 
 
 const app_version = "1.0.14-beta";
-<<<<<<< HEAD
-const previous_commit = "aebac8bcd0e946f1e7283d8e280e301d52b8d64b";
-=======
-const previous_commit = "35b595f806f99ca18365d511ab820ab818da348d";
->>>>>>> f06c121... Github actions fix
+const previous_commit = "f06c1210549f0e6c81b72c6f51b811304e8cd7c4";
 
 if ("serviceWorker" in navigator) {
     navigator.serviceWorker.register("/sw.js")
diff --git a/dist/js/gradings.js b/dist/js/gradings.js
index 017e4e6..b9b3d5c 100644
--- a/dist/js/gradings.js
+++ b/dist/js/gradings.js
@@ -13,4 +13,4 @@ function displayData(){let transformed_gradings=[];gradings.forEach((element,ind
 function gradingClickHandler(eventClickInfo){let grading_id=parseInt(eventClickInfo.event.id);let grading_subject=gradings[grading_id]["subject"];let grading_date_obj=gradings[grading_id]["date"];let grading_date=dateString.longFormatted(grading_date_obj);let grading_description=gradings[grading_id]["description"];$("#grading-subject").text(grading_subject);$("#grading-date").text(grading_date);$("#grading-description").text(grading_description);const modal=document.querySelectorAll(".side-modal")[0];M.Sidenav.getInstance(modal).open();}
 function setupPickers(){var date_object=new Date();let elems=document.querySelectorAll('#datepicker-add');let options={autoClose:true,format:"dd.mm.yyyy",defaultDate:date_object,setDefaultDate:true,firstDay:1}
 instances=M.Datepicker.init(elems,options);}
-document.addEventListener("DOMContentLoaded",()=>{checkLogin();var calendarEl=document.getElementById("calendar");calendar_obj=new FullCalendar.Calendar(calendarEl,{firstDay:1,plugins:["dayGrid"],defaultDate:getDateString(),navLinks:false,editable:false,events:[],eventClick:gradingClickHandler,height:"parent"});calendar_obj.render();setupPickers();const modal_elems=document.querySelectorAll('.modal');const modal_options={onOpenStart:()=>{$("#fab-new").hide()},onCloseEnd:()=>{$("#fab-new").show()},dismissible:false};M.Modal.init(modal_elems,modal_options);loadGradings(true);$("#refresh-icon").click(()=>{loadGradings(true);});const menus=document.querySelectorAll(".side-menu");M.Sidenav.init(menus,{edge:"right",draggable:true});const modals=document.querySelectorAll('.side-modal');M.Sidenav.init(modals,{edge:'left',draggable:false});});
\ No newline at end of file
+document.addEventListener("DOMContentLoaded",()=>{checkLogin();var calendarEl=document.getElementById("calendar");calendar_obj=new FullCalendar.Calendar(calendarEl,{firstDay:1,plugins:["dayGrid"],defaultDate:getDateString(),navLinks:false,editable:false,events:[],eventClick:gradingClickHandler,height:"parent"});calendar_obj.render();loadGradings(true);$("#refresh-icon").click(()=>{loadGradings(true);});const menus=document.querySelectorAll(".side-menu");M.Sidenav.init(menus,{edge:"right",draggable:true});const modals=document.querySelectorAll('.side-modal');M.Sidenav.init(modals,{edge:'left',draggable:false});});
\ No newline at end of file
diff --git a/dist/pages/about.html b/dist/pages/about.html
index 6405a1d..f1785c7 100755
--- a/dist/pages/about.html
+++ b/dist/pages/about.html
@@ -142,7 +142,7 @@
 				<div class="row">
 					<p>
 						<small>
-							^HEAD 35b595f806f99ca18365d511ab820ab818da348d
+							^HEAD f06c1210549f0e6c81b72c6f51b811304e8cd7c4
                         </small>
 					</p>
 				</div>
diff --git a/dist/sw.js b/dist/sw.js
index 9c15e74..55c43c0 100755
--- a/dist/sw.js
+++ b/dist/sw.js
@@ -3,8 +3,8 @@
 
 
 // Change version to cause cache refresh
-const static_cache_name = "site-static-1.0.14-beta-35b595f";
-// commit before the latest is 35b595f806f99ca18365d511ab820ab818da348d
+const static_cache_name = "site-static-1.0.14-beta-f06c121";
+// commit before the latest is f06c1210549f0e6c81b72c6f51b811304e8cd7c4
 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js
 // sw.js NE SME BITI CACHAN, ker vsebuje verzijo!
 
-- 
cgit v1.2.3