Merge pull request #256 from CSSAInformationDepartment/master

Deploy

src/CSSANet/settings/base.py

@@ -35,7 +35,7 @@
     'FlexForm',
     'PhotoCompetition',
     'PrizeAPI',
-    'mail_owl',
+    # 'mail_owl',
     'MobileAppAPI',
     'CommunityAPI',
 
@@ -265,8 +265,7 @@
         },
     }
 }
-ADMINS = [('Master Inbox', '[email protected]'),
-          ('Lead Engineer', '[email protected]')]
+ADMINS = [('Master Inbox', '[email protected]')]
 
 SWAGGER_SETTINGS = {
     'USE_SESSION_AUTH': False,

src/CSSANet/settings/prod.py

@@ -17,7 +17,7 @@
 
 SECRET_KEY = env_dist.get('DJANGOKEYPD')
 ALLOWED_HOSTS = ['cssanet', '.cssaunimelb.com',
-                 'cloud.digitalocean.com', '.digitalocean.com', '165.227.240.43', '139.59.222.235']
+                 'cloud.digitalocean.com', '.digitalocean.com', '165.227.240.43']
 CSRF_COOKIE_SECURE = True
 SESSION_COOKIE_SECURE = True  # <- Activate in HTTPS envrioment only
 SECURE_CONTENT_TYPE_NOSNIFF = True
@@ -83,8 +83,7 @@
 MAILOWL_PORT = 44300
 
 
-ADMINS = [('Master Inbox', '[email protected]'),
-          ('Lead Engineer', '[email protected]')]
+ADMINS = [('Master Inbox', '[email protected]')]
 
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_USE_TLS = True

src/EventAPI/migrations/0022_auto_20240903_0844.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.12 on 2024-09-03 08:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('EventAPI', '0021_auto_20211220_2116'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='event',
+            name='eventName',
+            field=models.CharField(max_length=40, unique=True, verbose_name='活动名称'),
+        ),
+    ]

src/PublicSite/templates/PublicSite/dept_Information.html

@@ -96,8 +96,8 @@ <h1>信息部</h1>
 <div class="bloc my-3">
     <div class="row">
         <div class="col-12">
-            <h3 class="mg-md text-center">2022/23届 管理团队成员</h3>
-            <h5 class="text-center">Meet the Management Team of 2022/23 Term</h5>
+            <h3 class="mg-md text-center">2024/25届 管理团队成员</h3>
+            <h5 class="text-center">Meet the Management Team of 2024/25 Term</h5>
         </div>
     </div>
     <div class="row text-center" style="min-height:5rem;">
@@ -121,8 +121,8 @@ <h4>{{ user.member.get_full_EN_name }}</h4>
 <div class="bloc my-3">
     <div class="row">
         <div class="col-12">
-            <h3 class="mg-md text-center">2022/23届 部门成员</h3>
-            <h5 class="text-center">Meet the Committee Members of 2022/23 Term</h5>
+            <h3 class="mg-md text-center">2024/25届 部门成员</h3>
+            <h5 class="text-center">Meet the Committee Members of 2024/25 Term</h5>
         </div>
     </div>
     <div class="row" style="min-height:20rem">

src/PublicSite/templates/PublicSite/dept_liaison.html

@@ -75,8 +75,8 @@ <h5 class="text-center">成员性别多样性</h5>
 <div class="bloc my-3">
     <div class="row">
         <div class="col-12">
-            <h3 class="mg-md text-center">2022/23届 管理团队成员</h3>
-            <h5 class="text-center">Meet the Management Team of 2022/23 Term</h5>
+            <h3 class="mg-md text-center">2024/25届 管理团队成员</h3>
+            <h5 class="text-center">Meet the Management Team of 2024/25 Term</h5>
         </div>
     </div>
     <div class="row text-center" style="min-height:5rem;">
@@ -99,8 +99,8 @@ <h4>{{ user.member.get_full_EN_name }}</h4>
 <div class="bloc my-3">
     <div class="row">
         <div class="col-12">
-            <h3 class="mg-md text-center">2022/23届 部门成员</h3>
-            <h5 class="text-center">Meet the Committee Members of 2022/23 Term</h5>
+            <h3 class="mg-md text-center">2024/25届 部门成员</h3>
+            <h5 class="text-center">Meet the Committee Members of 2024/25 Term</h5>
         </div>
     </div>
     <div class="row" style="min-height:20rem">

src/PublicSite/templates/PublicSite/dept_organisation.html

@@ -77,8 +77,8 @@ <h5 class="text-center">成员性别多样性</h5>
 <div class="bloc my-3">
     <div class="row">
         <div class="col-12">
-            <h3 class="mg-md text-center">2022/23届 管理团队成员</h3>
-            <h5 class="text-center">Meet the Management Team of 2022/23 Term</h5>
+            <h3 class="mg-md text-center">2024/25届 管理团队成员</h3>
+            <h5 class="text-center">Meet the Management Team of 2024/25 Term</h5>
         </div>
     </div>
     <div class="row text-center" style="min-height:5rem;">
@@ -101,8 +101,8 @@ <h4>{{ user.member.get_full_EN_name }}</h4>
 <div class="bloc my-3">
     <div class="row">
         <div class="col-12">
-            <h3 class="mg-md text-center">2022/23届 部门成员</h3>
-            <h5 class="text-center">Meet the Committee Members of 2022/23 Term</h5>
+            <h3 class="mg-md text-center">2024/25届 部门成员</h3>
+            <h5 class="text-center">Meet the Committee Members of 2024/25 Term</h5>
         </div>
     </div>
     <div class="row" style="min-height:20rem">

src/PublicSite/templates/PublicSite/dept_publicity.html

@@ -79,8 +79,8 @@ <h5 class="text-center">成员性别多样性</h5>
     <div class="bloc my-3">
         <div class="row">
             <div class="col-12">
-                <h3 class="mg-md text-center">2022/23届 管理团队成员</h3>
-                <h5 class="text-center">Meet the Management Team of 2022/23 Term</h5>
+                <h3 class="mg-md text-center">2024/25届 管理团队成员</h3>
+                <h5 class="text-center">Meet the Management Team of 2024/25 Term</h5>
             </div>
         </div>
         <div class="row text-center" style="min-height:5rem;">
@@ -103,8 +103,8 @@ <h4>{{ user.member.get_full_EN_name }}</h4>
     <div class="bloc my-3">
         <div class="row">
             <div class="col-12">
-                <h3 class="mg-md text-center">2022/23届 部门成员</h3>
-                <h5 class="text-center">Meet the Committee Members of 2022/23 Term</h5>
+                <h3 class="mg-md text-center">2024/25届 部门成员</h3>
+                <h5 class="text-center">Meet the Committee Members of 2024/25 Term</h5>
             </div>
         </div>
         <div class="row" style="min-height:20rem">

src/PublicSite/templates/PublicSite/dept_recruitment.html

@@ -92,8 +92,8 @@ <h3 class="mg-md text-center ">部门职责</h3>
     <div class="bloc my-3">
         <div class="row">
             <div class="col-12">
-                <h3 class="mg-md text-center">2022/23届 管理团队成员</h3>
-                <h5 class="text-center">Meet the Management Team of 2022/23 Term</h5>
+                <h3 class="mg-md text-center">2024/25届 管理团队成员</h3>
+                <h5 class="text-center">Meet the Management Team of 2024/25 Term</h5>
             </div>
         </div>
         <div class="row text-center" style="min-height:5rem;">
@@ -116,8 +116,8 @@ <h4>{{ user.member.get_full_EN_name }}</h4>
     <div class="bloc my-3">
         <div class="row">
             <div class="col-12">
-                <h3 class="mg-md text-center">2022/23届 部门成员</h3>
-                <h5 class="text-center">Meet the Committee Members of 2022/23 Term</h5>
+                <h3 class="mg-md text-center">2024/25届 部门成员</h3>
+                <h5 class="text-center">Meet the Committee Members of 2024/25 Term</h5>
             </div>
         </div>
         <div class="row" style="min-height:20rem">

src/PublicSite/views.py

@@ -18,7 +18,6 @@
 from django.utils import timezone
 from django.views import View
 from EventAPI import models as eventModels
-from mail_owl.utils import AutoMailSender
 from myCSSAhub import models as HubModels
 from RecruitAPI import models as JobModels
 from RecruitAPI.forms import ResumeSubmissionForm

src/RecruitAPI/views.py

@@ -7,7 +7,6 @@
 from django.views import View
 from django.views.generic import CreateView
 from django_datatables_view.base_datatable_view import BaseDatatableView
-from mail_owl.utils import AutoMailSender
 from myCSSAhub.apis import GetDocViewData
 from pytz import timezone
 from rest_framework import permissions, viewsets

src/celerybeat.pid

@@ -0,0 +1 @@
+9