Merge pull request #31 from filips123/fix-lunch-updater

Author: filips123

API/gimvicurnik/updaters/eclassroom.py

@@ -413,7 +413,8 @@ def _store_lunch_schedule(self, name, url, span):
 
         # Daily lunch schedule format, used starting with March 2021
         # Example: delitevKosila-mar9-2021-TOR-objava-PDF-0.pdf
-        elif re.search(r"\/delitevKosila-[a-z0-9]+-[0-9]+-[A-Z]{3}-objava.*\.pdf$", url):
+        # Example: delitevKosila-1sept2021-SRE-objava-PDF.pdf
+        elif re.search(r"\/delitevKosila-[a-z0-9]+(?:-[0-9]+)?-[A-Z]{3}-objava.*\.pdf$", url):
             date = self._get_daily_lunch_schedule_date(name, url)
             self._parse_daily_lunch_schedule(date, tables)
 

website/vue.config.js

@@ -10,12 +10,11 @@ module.exports = {
 
   pwa: {
     name: process.env.VUE_APP_TITLE,
+    manifestPath: 'site.webmanifest',
 
     themeColor: '#007300',
     msTileColor: '#007300',
 
-    manifestPath: 'site.webmanifest',
-
     workboxOptions: {
       navigateFallback: '/index.html',
       navigateFallbackBlacklist: [/\./]
@@ -28,6 +27,12 @@ module.exports = {
       categories: process.env.VUE_APP_CATEGORIES.split(','),
       keywords: process.env.VUE_APP_KEYWORDS.split(','),
 
+      theme_color: '#007300',
+      background_color: '#ffffff',
+
+      scope: '/',
+      start_url: '/',
+
       shortcuts: [
         {
           name: 'Urnik',
@@ -56,10 +61,7 @@ module.exports = {
             sizes: '192x192'
           }]
         }
-      ],
-
-      theme_color: '#007300',
-      background_color: '#ffffff'
+      ]
     }
   },