Merge branch 'next' into razzia-overhaul

f-klubben · Dec 4, 2023 · 24b7976 · 24b7976
2 parents 4c57541 + 537c5e5
commit 24b7976
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/media/stregsystem/background.png b/media/stregsystem/background.png
diff --git a/requirements.txt b/requirements.txt
@@ -2,7 +2,6 @@ Django==2.2.28
 Pillow==8.3.2
 Coverage==4.4.1
 pytz==2021.3
-regex==2017.07.28
 freezegun==0.3.15
 Django-Select2==5.11.1
 django-debug-toolbar==1.11.1

diff --git a/stregsystem/parser.py b/stregsystem/parser.py
@@ -1,4 +1,4 @@
-import regex
+import re
 
 
 class QuickBuyError(Exception):
@@ -11,7 +11,7 @@ class QuickBuyParseError(Exception):
     pass
 
 
-_item_matcher = regex.compile(r'(?V1)(?P<productId>\d+)(?::(?P<count>\d+))?$')
+_item_matcher = re.compile(r'(?P<productId>\d+)(?::(?P<count>\d+))?$')
 
 
 def get_token_indexes(string, start_index):

diff --git a/stregsystem/static/stregsystem/snow.js b/stregsystem/static/stregsystem/snow.js
@@ -24,7 +24,7 @@ function SpawnSnowflake () {
 function SetBodyChristmasStyle() {
     const bodyStyle = document.body.style;
     bodyStyle.color = "white";
-    bodyStyle.backgroundImage = "url(\"" + media_url + "stregsystem/background.jpg\")";
+    bodyStyle.backgroundImage = "url(\"" + media_url + "stregsystem/background.png\")";
     bodyStyle.backgroundRepeat = "repeat-x";
     bodyStyle.backgroundSize = "auto 100%";
     bodyStyle.padding = "0";