Fixed local merge conflict

redbrickboard/accounts/views.py

@@ -10,7 +10,7 @@ from .forms import CustomUserCreationForm, CustomUserAuthenticationForm
 
 from django.contrib.auth.models import auth
 from django.contrib.auth import authenticate, login, logout
-
+from django import forms
 
 from . import models
 
@@ -75,16 +75,17 @@ def auth_receiver(request):
     password = user_data['sub']+'google'+user_data['name']
 
     logInUser = authenticate(request, email = email, password = password)
-
+    if "@ateneo.edu" not in email and "@student.ateneo.edu" not in email and "@alumni.ateneo.edu" not in email:   
+        return HttpResponse("Your login must be an ateneo email address. Try again <a href='./login'>here</a>", status=403)
     if logInUser is not None:
-        pass
+        auth.login(request, logInUser)
     else:
         first_name = user_data['given_name']
         last_name = user_data['family_name']
         role = "STUDENT"
         user = models.CustomUser.objects.create_user(email=email, password=password, first_name=first_name, last_name=last_name, role=role)
-
-    auth.login(request, logInUser)
+        auth.login(request, logInUser)
+    
     print("Login Successful")
     return redirect("index")
     
\ No newline at end of file

redbrickboard/event_management/models.py

 from django.db import models
+from django.utils import timezone
+from django.urls import reverse
+from datetime import timedelta
+from accounts import models as accounts
 
-# Create your models here.
+class Event(models.Model):
+    event_name = models.CharField(default='', max_length=150)
+    event_datetime_start = models.DateTimeField(default=timezone.now, null=False)
+    event_datetime_end = models.DateTimeField()
+    event_organizer = models.ForeignKey(accounts.CustomUser, on_delete=models.CASCADE, related_name='events_organized')
+    # finalize arguments
+    event_header = models.ImageField(upload_to='headers/', height_field=None, width_field=None, max_length=100, blank=True)
+    # research how exactly to do this
+    event_promos = models.FileField(upload_to='promos/', blank=True, null=True)
+    # decide whether to have a separate model for the comments
+    comments = models.TextField()
+    last_time_bumped = models.DateTimeField()
+
+    def __str__(self):
+        return '{}'.format(self.event_name)
+    
+    def get_absolute_url(self):
+        return reverse('event_management:event_details', kwargs={'pk': self.pk})
+
+    def save(self, *args, **kwargs):
+        if self.event_datetime_end is None:
+            self.event_datetime_end = self.event_datetime_start + timedelta(hours=1)
+        if self.last_time_bumped is None:
+            self.last_time_bumped = self.event_datetime_start
+        super(Event, self).save(*args, **kwargs)
\ No newline at end of file

redbrickboard/event_management/templates/event_management/create_event.html

 {% extends 'base.html' %}
 {% load static %}
-{% block title %}Widget's Forum{% endblock %}
+{% block title %}Event Management{% endblock %}
 {% block content %}
 <div class="container justify-content-md-center align-items-center" id="trial">
      <div class="row">

redbrickboard/eventcatalog/templates/eventcatalog/index.html

@@ -11,6 +11,7 @@ Hi {{ user.first_name }} {{ user.last_name }}!
 {% else %}
 <p>You are not logged in</p>
 <a href="{% url 'accounts:login' %}">Log In</a>
+<a href="{% url 'accounts:register' %}">Register</a>
 {% endif %}
 
 {% endblock %}
\ No newline at end of file

redbrickboard/static/css/custom.css

@@ -11,7 +11,7 @@
 body {
      font-family: "Inter";
      background-color: var(--theme-dutch-white);
-     background-image: url("/static/images/Continuous Background.png");
+     /* background-image: url("/static/images/Continuous Background.png"); */
      background-position: left top;
      background-repeat: repeat-y; 
      background-size: 80%;

redbrickboard/templates/base.html

@@ -32,6 +32,9 @@
                               <button class="btn" type="button">Log Out</button>
                          </form>
                     </div>
+                    {% comment %} <form class="container-fluid justify-content-start">
+                         <button class="btn" type="button" >Log Out</button>
+                    </form> {% endcomment %}
                </div>
           </div>
      </nav>