Skip to content

Deploy #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kexincchen merged 8 commits into from
Nov 15, 2024
Merged

Deploy #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4aaffa0
Change admin email to cssa email only
doncd-p Oct 11, 2023
26fa3f3
fix: email sender changed
doncd-p Dec 25, 2023
27c82dd
fix: remove extra allowed host
doncd-p Dec 25, 2023
04ffe93
fix the environment
kexincchen Oct 1, 2024
72d0455
Merge branch 'master' into fix-env
kexincchen Oct 1, 2024
ce591f5
update year of dept info
kexincchen Oct 1, 2024
95585ef
rollback
kexincchen Oct 1, 2024
17b2d68
Merge pull request #255 from CSSAInformationDepartment/fix-env
BlodyH Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/CSSANet/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
'FlexForm',
'PhotoCompetition',
'PrizeAPI',
'mail_owl',
# 'mail_owl',
'MobileAppAPI',
'CommunityAPI',

Expand Down Expand Up @@ -265,8 +265,7 @@
},
}
}
ADMINS = [('Master Inbox', 'information@cssaunimelb.com'),
('Lead Engineer', 'joshlubox@gmail.com')]
ADMINS = [('Master Inbox', 'information@cssaunimelb.com')]

SWAGGER_SETTINGS = {
'USE_SESSION_AUTH': False,
Expand Down
5 changes: 2 additions & 3 deletions src/CSSANet/settings/prod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -83,8 +83,7 @@
MAILOWL_PORT = 44300


ADMINS = [('Master Inbox', 'information@cssaunimelb.com'),
('Lead Engineer', 'joshlubox@gmail.com')]
ADMINS = [('Master Inbox', 'information@cssaunimelb.com')]

EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_USE_TLS = True
Expand Down
18 changes: 18 additions & 0 deletions src/EventAPI/migrations/0022_auto_20240903_0844.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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='活动名称'),
),
]
8 changes: 4 additions & 4 deletions src/PublicSite/templates/PublicSite/dept_Information.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;">
Expand All @@ -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">
Expand Down
8 changes: 4 additions & 4 deletions src/PublicSite/templates/PublicSite/dept_liaison.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;">
Expand All @@ -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">
Expand Down
8 changes: 4 additions & 4 deletions src/PublicSite/templates/PublicSite/dept_organisation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;">
Expand All @@ -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">
Expand Down
8 changes: 4 additions & 4 deletions src/PublicSite/templates/PublicSite/dept_publicity.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;">
Expand All @@ -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">
Expand Down
8 changes: 4 additions & 4 deletions src/PublicSite/templates/PublicSite/dept_recruitment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;">
Expand All @@ -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">
Expand Down
1 change: 0 additions & 1 deletion src/PublicSite/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/RecruitAPI/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified src/celerybeat-schedule
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions src/celerybeat.pid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9
9 changes: 0 additions & 9 deletions src/mail_owl/README.md
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions src/mail_owl/__init__.py
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions src/mail_owl/admin.py
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/mail_owl/apps.py
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions src/mail_owl/celery.py
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions src/mail_owl/core.py
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions src/mail_owl/migrations/0001_initial.py
View file
Open in desktop

This file was deleted.

Empty file removed src/mail_owl/migrations/__init__.py
View file
Open in desktop
Empty file.
Loading
Loading