Squashed commit of the following:

commit f349915 Merge: f44e7ea d680271 Author: Sivan <[email protected]> Date: Sun Apr 7 19:37:26 2024 +0800 Merge pull request #1170 from pycontw/resolve-cve-babel-traverse deps: resolve CVE-2023-45133 commit d680271 Author: Matt Wang <[email protected]> Date: Sat Apr 6 01:50:00 2024 +0800 chore: use babel7 in the compressor command commit 1af235f Author: Matt Wang <[email protected]> Date: Sat Apr 6 01:44:34 2024 +0800 deps: upgrade babel and presets `babel-upgrade` is utlized to replace the presets with multiple packages. https://github.com/babel/babel-upgrade commit 228ec3e Author: Matt Wang <[email protected]> Date: Sat Apr 6 01:43:14 2024 +0800 chore(docker): update for better cache utilizing when rebuild commit f44e7ea Merge: d956956 7726ba7 Author: Sivan <[email protected]> Date: Sat Feb 24 15:41:51 2024 +0800 Merge pull request #1166 from pycontw/feat-delete-cfp-preferred-date remove prefer_time for cfp commit 7726ba7 Author: svyeh <[email protected]> Date: Sat Feb 24 15:41:13 2024 +0800 remove prefer_time in messages commit dfabd13 Author: svyeh <[email protected]> Date: Sat Feb 24 15:13:55 2024 +0800 remove prefer_time in tests commit 28e454a Author: svyeh <[email protected]> Date: Sat Feb 24 10:27:32 2024 +0800 remove prefer_time remove prefer_time from src/core/choices.py and src/core/models.py then executed the following: $ python manage.py makemigrations $python manage.py makemessages -l en_US -l zh_Hant commit d956956 Merge: a3fa21b 9961b6f Author: svyeh <[email protected]> Date: Thu Feb 22 18:47:57 2024 +0800 Merge branch 'adjust_conference_date_to_2024' commit a3fa21b Merge: 4a2c1db 5203935 Author: Sivan <[email protected]> Date: Thu Feb 22 18:15:36 2024 +0800 Merge pull request #1164 from pycontw/check_master fix-2024-migrate-error commit 5203935 Author: svyeh <[email protected]> Date: Thu Feb 22 17:30:57 2024 +0800 switch back .python-version to 3.6.8 commit 4a2c1db Merge: 8331a9b fddc160 Author: Sivan <[email protected]> Date: Thu Feb 22 17:19:51 2024 +0800 Merge pull request #1165 from rockleona/feat/coc-update feat: add procedure image in CoC commit fddc160 Author: rockleona <[email protected]> Date: Thu Feb 22 14:17:23 2024 +0800 feat: add procedure image in CoC commit 8331a9b Merge: d9b684b 091501a Author: Sivan <[email protected]> Date: Thu Feb 22 13:58:44 2024 +0800 Merge pull request #1160 from pycontw/ben/fix-svg-no-show fix(Dockerfile): Add mime-support apt package at dockerfile to resolve svg not showing commit 9961b6f Author: svyeh <[email protected]> Date: Wed Feb 21 15:16:02 2024 +0800 apply makemigrations and makemessages auto result after two cmd: $python manage.py makemigrations $python manage.py makemessages -l en_US -l zh_Hant commit 091501a Merge: 5fca928 d9b684b Author: Josix <[email protected]> Date: Wed Feb 21 14:36:48 2024 +0800 Merge branch 'master' into ben/fix-svg-no-show commit b285d42 Author: svyeh <[email protected]> Date: Wed Feb 21 13:54:43 2024 +0800 adjust allowed_host commit d09ca24 Author: svyeh <[email protected]> Date: Wed Feb 21 12:29:28 2024 +0800 fix typo commit a280a4f Author: svyeh <[email protected]> Date: Wed Feb 21 00:14:09 2024 +0800 Update django.po commit 6b90e35 Author: svyeh <[email protected]> Date: Tue Feb 20 22:17:21 2024 +0800 adjustment_from_staging_2024-migrate commit 5fca928 Merge: 8da7a3a d6e616b Author: Sivan <[email protected]> Date: Sun Feb 18 09:16:14 2024 +0800 Merge pull request #1155 from pycontw/2024-migrate feat: update PyConTW 2023 to 2024(BackEnd) commit d9b684b Merge: d3d5005 267c525 Author: Sivan <[email protected]> Date: Mon Feb 19 21:12:33 2024 +0800 Merge pull request #1161 from rockleona/feat/coc-update feat: update code-of-conduct 2024 version commit 267c525 Author: RockLeon <[email protected]> Date: Mon Feb 19 21:08:57 2024 +0800 Apply suggestions from code review Co-authored-by: Sivan <[email protected]> commit 5b265fa Author: Sivan <[email protected]> Date: Mon Feb 19 20:27:55 2024 +0800 update en-coc effective date 2023->2024/02/20 commit a1766ad Author: Sivan <[email protected]> Date: Mon Feb 19 20:07:18 2024 +0800 Update code-of-conduct.html Differences compare to the provided doc commit b674918 Author: svyeh <[email protected]> Date: Mon Feb 19 13:23:45 2024 +0800 adjust_conference_date_to_2024 update date in 2023 to 2024 commit b920937 Author: rockleona <[email protected]> Date: Sun Feb 18 21:31:40 2024 +0800 feat: update code-of-conduct 2024 version commit d3d5005 Merge: 8da7a3a d6e616b Author: Sivan <[email protected]> Date: Sun Feb 18 09:16:14 2024 +0800 Merge pull request #1155 from pycontw/2024-migrate feat: update PyConTW 2023 to 2024(BackEnd) commit d6e616b Merge: 3deb4db 8da7a3a Author: Sivan <[email protected]> Date: Sat Feb 17 23:53:49 2024 +0800 Merge branch 'master' into 2024-migrate commit 8da7a3a Merge: c520012 913fef7 Author: Josix <[email protected]> Date: Sun Jan 28 09:38:16 2024 +0800 Merge pull request #1157 from pycontw/fix_node_not_found commit 913fef7 Author: iknowright <[email protected]> Date: Sat Jan 27 18:28:03 2024 +0800 fix: dockerfile fix node_modules path for production dockerfile commit 3deb4db Author: Matt Wang <[email protected]> Date: Sat Jan 27 14:33:47 2024 +0800 fix(docker): update uwsgi mount path commit 731cb60 Author: Matt Wang <[email protected]> Date: Sat Jan 27 12:40:38 2024 +0800 fix(assest): fix logo path commit 26d97c3 Author: Wei-Hsiang (Matt) Wang <[email protected]> Date: Sat Jan 27 03:08:37 2024 +0000 fix(migration): add migration scripts commit 9189009 Author: Sivan <[email protected]> Date: Mon Jan 22 22:28:22 2024 +0800 Update src/templates/pycontw-2024/contents/_base.html Co-authored-by: Wei-Hsiang (Matt) Wang <[email protected]> commit 0fa8f3b Author: Sivan <[email protected]> Date: Mon Jan 22 21:50:46 2024 +0800 Update base.html from 2023 to 2024 Co-authored-by: Wei-Hsiang (Matt) Wang <[email protected]> commit 9a0e16f Author: svyeh <[email protected]> Date: Mon Jan 22 17:30:44 2024 +0800 feat: update PyConTW 2023 to 2024(BackEnd) feat: update PyConTW 2023 to 2024(BackEnd)
pycontw · Apr 7, 2024 · 3b450dc · 3b450dc
1 parent 4bdb64d
commit 3b450dc
Show file tree

Hide file tree

Showing 231 changed files with 17,887 additions and 1,126 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,6 +4,9 @@ FROM node:8.16.0-buster-slim as node_stage
 COPY ./yarn.lock yarn.lock
 COPY ./package.json package.json
 
+RUN apt-get update
+RUN apt-get install python-pip -y
+
 RUN npm install -g yarn
 RUN yarn install --dev --frozen-lockfile  \
  && rm -rf $HOME/.cache/yarn/*
@@ -12,15 +15,15 @@ RUN yarn install --dev --frozen-lockfile  \
 # [Python Stage for Django web server]
 FROM python:3.6-slim-buster as python_stage
 
-COPY --from=node_stage /node_modules /usr/local/lib/node_modules
-COPY --from=node_stage /usr/local/bin/node /usr/local/bin/node
-
 ENV PYTHONUNBUFFERED 1
 ENV BASE_DIR /usr/local
 ENV APP_DIR $BASE_DIR/app
 
+COPY --from=node_stage /node_modules $APP_DIR/node_modules
+COPY --from=node_stage /usr/local/bin/node /usr/local/bin/node
+
 # make nodejs accessible and executable globally
-ENV NODE_PATH /usr/local/lib/node_modules/
+ENV NODE_PATH $APP_DIR/node_modules/
 ENV PATH /usr/local/bin:$PATH
 
 # Add bin directory used by `pip install --user`
@@ -29,7 +32,7 @@ ENV PATH /home/docker/.local/bin:$PATH
 # Infrastructure tools
 # gettext is used for django to compile .po to .mo files.
 RUN apt-get update
-RUN apt-get install gettext libpq-dev gcc -y
+RUN apt-get install gettext libpq-dev gcc mime-support -y
 
 # APP directory setup
 RUN adduser --system --disabled-login docker \
@@ -53,5 +56,5 @@ EXPOSE 8000
 CMD ["uwsgi", "--http-socket", ":8000", "--master", \
      "--hook-master-start", "unix_signal:15 gracefully_kill_them_all", \
      "--static-map", "/static=assets", "--static-map", "/media=media", \
-     "--mount", "/2021=pycontw2016/wsgi.py", "--manage-script-name", \
+     "--mount", "/2024=pycontw2016/wsgi.py", "--manage-script-name", \
      "--offload-threads", "2"]
diff --git a/dev.Dockerfile b/dev.Dockerfile
@@ -15,11 +15,7 @@ FROM python:3.6-slim-buster as python_stage
 
 WORKDIR /app
 
-COPY --from=node_stage /node_modules ./node_modules
-COPY --from=node_stage /usr/local/bin/node /usr/local/bin/node
-
 ENV PYTHONUNBUFFERED 1
-ENV BASE_DIR /usr/local
 
 # Infrastructure tools
 # gettext is used for django to compile .po to .mo files.
@@ -36,6 +32,9 @@ RUN apt-get install -y \
 COPY ./requirements ./requirements
 RUN pip3 install -r ./requirements/dev.txt
 
+COPY --from=node_stage /node_modules ./node_modules
+COPY --from=node_stage /usr/local/bin/node /usr/local/bin/node
+
 # for entry point
 COPY ./docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,8 +2,8 @@ version: "3.5"
 services:
   web:
     build: .
-    container_name: pycontw-2023
-    hostname: pycontw-2023
+    container_name: pycontw-2024
+    hostname: pycontw-2024
     entrypoint: ""
     command:
       # Hacky script for quick demonstration purpose
@@ -26,7 +26,7 @@ services:
     restart: always
     environment:
       # Save us from having to type `--setting=pycontw2016.settings.production`
-      DJANGO_SETTINGS_MODULE: pycontw2016.settings.production.pycontw2023
+      DJANGO_SETTINGS_MODULE: pycontw2016.settings.production.pycontw2024
       SCRIPT_NAME: /prs
       SECRET_KEY: ${SECRET_KEY}
       DATABASE_URL: ${DATABASE_URL}
@@ -43,4 +43,4 @@ services:
 networks:
   network:
     external: true
-    name: network-2023
+    name: network-2024
diff --git a/package.json b/package.json
@@ -5,11 +5,15 @@
   "author": "PyCon Taiwan <[email protected]>",
   "private": true,
   "devDependencies": {
+    "@babel/core": "^7.23.2",
+    "@babel/plugin-proposal-function-sent": "^7.23.2",
+    "@babel/plugin-proposal-throw-expressions": "^7.23.2",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-syntax-import-meta": "^7.10.4",
+    "@babel/plugin-transform-class-properties": "^7.23.2",
+    "@babel/preset-env": "^7.23.2",
     "autoprefixer": "^8.0.0",
-    "babel-core": "^6.26.0",
-    "babel-preset-env": "^1.6.1",
-    "babel-preset-stage-2": "^6.24.1",
-    "babelify": "^8.0.0",
+    "babelify": "^10.0.0",
     "browserify": "^16.1.0",
     "node-sass": "^4.9.0",
     "postcss-cli": "^5.0.0"

diff --git a/src/core/choices.py b/src/core/choices.py
@@ -37,13 +37,6 @@
     ('EXPERIENCED', _('Experienced')),
 )
 
-PREFER_TIME_CHOICES = (
-    ('DAY_ONE_MORNING', _('Day 1, September 2nd, 2023 Morning')),
-    ('DAY_ONE_AFTERNOON', _('Day 1, September 2nd, 2023 Afternoon')),
-    ('DAY_TWO_MORNING', _('Day 2, September 3rd, 2023 Morning')),
-    ('DAY_TWO_AFTERNOON', _('Day 2, September 3rd, 2023 Afternoon')),
-)
-
 RECORDING_POLICY_CHOICES = (
     (True, _('Yes')),
     (False, _('No'))

diff --git a/src/core/models.py b/src/core/models.py
@@ -10,7 +10,6 @@
     CATEGORY_CHOICES,
     LANGUAGE_CHOICES,
     PYTHON_LVL_CHOICES,
-    PREFER_TIME_CHOICES,
     RECORDING_POLICY_CHOICES,
     LIVING_IN_TAIWAN_CHOICES,
     LIVE_STREAM_POLICY_CHOICES,
@@ -170,12 +169,6 @@ class EventInfo(models.Model):
         auto_now=True,
     )
 
-    prefer_time = models.CharField(
-        verbose_name=_('prefer event time'),
-        max_length=32,
-        choices=PREFER_TIME_CHOICES,
-    )
-
     living_in_taiwan = models.BooleanField(
         verbose_name=_('living in Taiwan'),
         default=False,

diff --git a/src/events/migrations/0050_auto_20240127_1104.py b/src/events/migrations/0050_auto_20240127_1104.py
@@ -0,0 +1,54 @@
+# Generated by Django 3.1.7 on 2024-01-27 03:04
+
+from django.db import migrations, models
+import events.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0049_rename_willing_to'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='customevent',
+            name='conference',
+            field=models.SlugField(choices=[('pycontw-2016', 'PyCon Taiwan 2016'), ('pycontw-2017', 'PyCon Taiwan 2017'), ('pycontw-2018', 'PyCon Taiwan 2018'), ('pycontw-2019', 'PyCon Taiwan 2019'), ('pycontw-2020', 'PyCon Taiwan 2020'), ('pycontw-2021', 'PyCon Taiwan 2021'), ('pycontw-2022', 'PyCon Taiwan 2022'), ('pycontw-2023', 'PyCon Taiwan 2023'), ('pycontw-2024', 'PyCon Taiwan 2024')], default='pycontw-2024', verbose_name='conference'),
+        ),
+        migrations.AlterField(
+            model_name='joblistingsevent',
+            name='conference',
+            field=models.SlugField(choices=[('pycontw-2016', 'PyCon Taiwan 2016'), ('pycontw-2017', 'PyCon Taiwan 2017'), ('pycontw-2018', 'PyCon Taiwan 2018'), ('pycontw-2019', 'PyCon Taiwan 2019'), ('pycontw-2020', 'PyCon Taiwan 2020'), ('pycontw-2021', 'PyCon Taiwan 2021'), ('pycontw-2022', 'PyCon Taiwan 2022'), ('pycontw-2023', 'PyCon Taiwan 2023'), ('pycontw-2024', 'PyCon Taiwan 2024')], default='pycontw-2024', verbose_name='conference'),
+        ),
+        migrations.AlterField(
+            model_name='keynoteevent',
+            name='conference',
+            field=models.SlugField(choices=[('pycontw-2016', 'PyCon Taiwan 2016'), ('pycontw-2017', 'PyCon Taiwan 2017'), ('pycontw-2018', 'PyCon Taiwan 2018'), ('pycontw-2019', 'PyCon Taiwan 2019'), ('pycontw-2020', 'PyCon Taiwan 2020'), ('pycontw-2021', 'PyCon Taiwan 2021'), ('pycontw-2022', 'PyCon Taiwan 2022'), ('pycontw-2023', 'PyCon Taiwan 2023'), ('pycontw-2024', 'PyCon Taiwan 2024')], default='pycontw-2024', verbose_name='conference'),
+        ),
+        migrations.AlterField(
+            model_name='keynoteevent',
+            name='speaker_photo',
+            field=models.ImageField(default='', help_text="Raster format of the speaker's photo, e.g. PNG, JPEG.", storage=events.models.select_storage, upload_to=events.models.photo_upload_to, verbose_name='speaker photo'),
+        ),
+        migrations.AlterField(
+            model_name='proposedtalkevent',
+            name='conference',
+            field=models.SlugField(choices=[('pycontw-2016', 'PyCon Taiwan 2016'), ('pycontw-2017', 'PyCon Taiwan 2017'), ('pycontw-2018', 'PyCon Taiwan 2018'), ('pycontw-2019', 'PyCon Taiwan 2019'), ('pycontw-2020', 'PyCon Taiwan 2020'), ('pycontw-2021', 'PyCon Taiwan 2021'), ('pycontw-2022', 'PyCon Taiwan 2022'), ('pycontw-2023', 'PyCon Taiwan 2023'), ('pycontw-2024', 'PyCon Taiwan 2024')], default='pycontw-2024', verbose_name='conference'),
+        ),
+        migrations.AlterField(
+            model_name='proposedtutorialevent',
+            name='conference',
+            field=models.SlugField(choices=[('pycontw-2016', 'PyCon Taiwan 2016'), ('pycontw-2017', 'PyCon Taiwan 2017'), ('pycontw-2018', 'PyCon Taiwan 2018'), ('pycontw-2019', 'PyCon Taiwan 2019'), ('pycontw-2020', 'PyCon Taiwan 2020'), ('pycontw-2021', 'PyCon Taiwan 2021'), ('pycontw-2022', 'PyCon Taiwan 2022'), ('pycontw-2023', 'PyCon Taiwan 2023'), ('pycontw-2024', 'PyCon Taiwan 2024')], default='pycontw-2024', verbose_name='conference'),
+        ),
+        migrations.AlterField(
+            model_name='schedule',
+            name='conference',
+            field=models.SlugField(choices=[('pycontw-2016', 'PyCon Taiwan 2016'), ('pycontw-2017', 'PyCon Taiwan 2017'), ('pycontw-2018', 'PyCon Taiwan 2018'), ('pycontw-2019', 'PyCon Taiwan 2019'), ('pycontw-2020', 'PyCon Taiwan 2020'), ('pycontw-2021', 'PyCon Taiwan 2021'), ('pycontw-2022', 'PyCon Taiwan 2022'), ('pycontw-2023', 'PyCon Taiwan 2023'), ('pycontw-2024', 'PyCon Taiwan 2024')], default='pycontw-2024', verbose_name='conference'),
+        ),
+        migrations.AlterField(
+            model_name='sponsoredevent',
+            name='conference',
+            field=models.SlugField(choices=[('pycontw-2016', 'PyCon Taiwan 2016'), ('pycontw-2017', 'PyCon Taiwan 2017'), ('pycontw-2018', 'PyCon Taiwan 2018'), ('pycontw-2019', 'PyCon Taiwan 2019'), ('pycontw-2020', 'PyCon Taiwan 2020'), ('pycontw-2021', 'PyCon Taiwan 2021'), ('pycontw-2022', 'PyCon Taiwan 2022'), ('pycontw-2023', 'PyCon Taiwan 2023'), ('pycontw-2024', 'PyCon Taiwan 2024')], default='pycontw-2024', verbose_name='conference'),
+        ),
+    ]
diff --git a/src/events/migrations/0051_auto_20240221_1514.py b/src/events/migrations/0051_auto_20240221_1514.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.7 on 2024-02-21 07:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0050_auto_20240127_1104'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sponsoredevent',
+            name='prefer_time',
+            field=models.CharField(choices=[('DAY_ONE_MORNING', 'Day 1, September 21st, 2024 Morning'), ('DAY_ONE_AFTERNOON', 'Day 1, September 21st, 2024 Afternoon'), ('DAY_TWO_MORNING', 'Day 2, September 22nd, 2024 Morning'), ('DAY_TWO_AFTERNOON', 'Day 2, September 22nd, 2024 Afternoon')], max_length=32, verbose_name='prefer event time'),
+        ),
+    ]
diff --git a/src/events/migrations/0052_remove_sponsoredevent_prefer_time.py b/src/events/migrations/0052_remove_sponsoredevent_prefer_time.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.1.7 on 2024-02-24 02:20
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0051_auto_20240221_1514'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='sponsoredevent',
+            name='prefer_time',
+        ),
+    ]