Merge branch 'master' into robin/fix-various-breadcrumbs

.gitattributes

@@ -0,0 +1,2 @@
+# Force all files to use LF line endings
+* text=auto

backend/samfundet/migrations/0008_event_entrance_en_event_entrance_nb.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.1 on 2024-10-25 12:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('samfundet', '0007_alter_infobox_color_alter_infobox_image_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='entrance_en',
+            field=models.CharField(blank=True, max_length=140, null=True),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='entrance_nb',
+            field=models.CharField(blank=True, max_length=140, null=True),
+        ),
+    ]

backend/samfundet/models/event.py

@@ -161,11 +161,17 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
     description_long_en = models.TextField(blank=False, null=False)
     description_short_nb = models.TextField(blank=False, null=False)
     description_short_en = models.TextField(blank=False, null=False)
-    location = models.CharField(max_length=140, blank=False, null=False)
     image = models.ForeignKey(Image, on_delete=models.PROTECT, blank=False, null=False)
     host = models.CharField(max_length=140, blank=False, null=False)
     editors = models.ManyToManyField(Gang, blank=True)
 
+    # ======================== #
+    #       Venue/Entrance     #
+    # ======================== #
+    location = models.CharField(max_length=140, blank=False, null=False)  # AKA venue
+    entrance_nb = models.CharField(max_length=140, blank=True, null=True)
+    entrance_en = models.CharField(max_length=140, blank=True, null=True)
+
     age_restriction = models.CharField(max_length=30, choices=EventAgeRestriction.choices, blank=False, null=False, default=None)
     category = models.CharField(max_length=30, choices=EventCategory.choices, blank=False, null=False, default=EventCategory.OTHER)
 

biome.jsonc

@@ -33,8 +33,7 @@
   },
   "formatter": {
     "indentStyle": "space",
-    "lineWidth": 120,
-    "lineEnding": "lf"
+    "lineWidth": 120
   },
   "javascript": {
     "formatter": {

frontend/yarn.lock

@@ -11385,8 +11385,8 @@ __metadata:
   linkType: hard
 
 "http-proxy-middleware@npm:^2.0.3":
-  version: 2.0.6
-  resolution: "http-proxy-middleware@npm:2.0.6"
+  version: 2.0.7
+  resolution: "http-proxy-middleware@npm:2.0.7"
   dependencies:
     "@types/http-proxy": "npm:^1.17.8"
     http-proxy: "npm:^1.18.1"
@@ -11398,7 +11398,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/express":
       optional: true
-  checksum: 10c0/25a0e550dd1900ee5048a692e0e9b2b6339d06d487a705d90c47e359e9c6561d648cd7862d001d090e651c9efffa1b6e5160fcf1f299b5fa4935f76e9754eb11
+  checksum: 10c0/8d00a61eb215b83826460b07489d8bb095368ec16e02a9d63e228dcf7524e7c20d61561e5476de1391aecd4ec32ea093279cdc972115b311f8e0a95a24c9e47e
   languageName: node
   linkType: hard