Merge branch 'master' into fix/participant_count

api/nvdagen/models.py

@@ -103,14 +103,15 @@ class Program(models.Model):
     paragraph = models.CharField(max_length=10000,blank=True, null=True)
     registration = models.BooleanField(default=False)
     maxRegistered = models.IntegerField( blank=True, null=True)
+    registered = models.IntegerField( blank=True, null=True)
     cancelEmail = models.CharField(max_length=250, blank=True, null=True)
     registrationStart = models.IntegerField(blank=True, null=True)
     registrationEnd = models.IntegerField(blank=True, null=True)
 
 
 class Participant(models.Model):
     id = models.AutoField(primary_key=True)
-    event = models.ForeignKey(Program, on_delete=models.CASCADE)
+    event = models.IntegerField()
     email = models.CharField(max_length=250)
     name = models.CharField(max_length=250)
     year = models.CharField(max_length=250)

frontend/src/components/anon/HomeScreen.vue

@@ -21,9 +21,9 @@
           <b-link :to="'/program'">
             <HomeScreenBox box-title="Stands" box-icon="store-alt-solid.svg" box-text="Glassgården fylles med stands! Kom i kontakt med mange spennende bedrifter."/>
           </b-link>
-          <b-link :to="'/program'">
+          <router-link :to="{name: 'Program', hash: '#bankett'}" @click.native="scrollToId('bankett')">
             <HomeScreenBox box-title="Bankett" box-icon="glass-cheers-solid.svg" box-text="Nyhet! Nettverksdagene arrangerer en bankett. Mer info kommer."/>
-          </b-link>
+          </router-link>
           <b-link :to="'/program'">
             <HomeScreenBox box-title="Bedpres" box-icon="utensils-solid.svg" box-text="Det blir holdt flere bedrifts- presentasjoner for de som vil bli bedre kjent med bedriftene."/>
           </b-link>
@@ -45,6 +45,11 @@ export default {
   components: {
     HeroText,
     HomeScreenBox
+  },
+  methods: {
+    scrollToId (id) {
+      document.getElementById(id).scrollIntoView()
+    }
   }
 }
 </script>

frontend/src/components/anon/HomeScreenBox.vue

@@ -32,6 +32,8 @@ export default{
   .home-box:hover .showme {
     @media(min-width: 1430px) {
       opacity: 1;
+      transition: opacity 400ms;
+      transition-delay: 150ms;
     }
   }
   .container {
@@ -76,7 +78,8 @@ export default{
     }
   }
   .showme {
-    transition: opacity 200ms;
+    transition: opacity 100ms;
+    transition-delay: 0ms;
     opacity: 0;
   }
 </style>

frontend/src/components/anon/Listing.vue

@@ -60,21 +60,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  /deep/ .list-group-item {
-    border-radius: 20px;
-    border-width: 2px;
-    margin-bottom: 15px;
-    border-color: var(--line-border-color);
-  }
-  /deep/ .info-container {
-    text-decoration: none;
-  }
-  /deep/ .listing-item {
-    border-radius: 20px;
-    border-width: 2px;
-    margin-bottom: 15px;
-    border-color: var(--line-border-color);
-  }
   .listing-item:hover {
     background: var(--line-border-color);
     transition:0.1s;

frontend/src/components/anon/Sponsor.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="sponsor col-3 col-xl-2">
+    <div class="sponsor col-4 col-md-3">
       <a :href="href" target="_blank" rel="noopener noreferrer">
         <b-img fluid :src="fileserverHost + '/thumb/512/' + logo_src"></b-img>
       </a>
@@ -25,6 +25,7 @@ export default {
     margin: auto;
     margin-bottom: 30px;
     transition: transform 300ms, filter 500ms;
+    transform: scale(0.7);
     // filter: brightness(0) invert(20%) sepia(12%) saturate(2012%) hue-rotate(125deg) brightness(94%) contrast(94%);
     // @media(min-width: 768px) {
     //   transform: scale(0.8);

frontend/src/router/index.js

@@ -159,12 +159,14 @@ export default new Router({
     }
   ],
   scrollBehavior (to, from, savedPosition) {
-    if (to.hash) {
-      return {
-        selector: to.hash,
-        behavior: 'smooth'
+    if (savedPosition) {
+      return savedPosition
+    } else {
+      const position = {}
+      if (to.hash) {
+        position.selector = to.hash
+        return false
       }
     }
-    return { x: 0, y: 0 }
   }
 })

frontend/src/views/anon/AnonBaseView.vue

@@ -35,6 +35,7 @@ export default {
     width: 95%;
     min-width: 320px;
     margin: 0 auto;
+    overflow-x: hidden;
     @media(min-width: 480px) {
       width: 95%;
     }

frontend/src/views/anon/ListingsView.vue

@@ -251,10 +251,13 @@ export default {
     border-color: var(--line-border-color);
     border-width: 2px;
     border-radius: 15px;
-    -webkit-position: sticky;
-    position: sticky;
-    top: 76px;
+    top: 0;
     text-align: center;
+    @media(min-width: 768px) {
+      -webkit-position: sticky;
+      position: sticky;
+      top: 76px;
+    }
   }
   .filter {
     margin-top: 12px;
@@ -276,4 +279,13 @@ export default {
     border-color: var(--primary-color);
     background-color: var(--primary-color);
   }
+  /deep/ .list-group-item {
+    border-radius: 20px;
+    border-width: 2px;
+    margin-bottom: 15px;
+    border-color: var(--line-border-color);
+  }
+  /deep/ .info-container {
+    text-decoration: none;
+  }
 </style>

frontend/src/views/anon/ProgramView.vue

@@ -26,6 +26,8 @@
             </div>
           </div>
         </div>
+        <div id="bankett">
+        </div>
       </div>
 
       <!-- Uncomment this to get the stand maps from 2020 at the bottom. Disabled for 2021 since it was held digitally.