Merge pull request #287 from hackupc/develop

DEVELOP TO MASTER

Author: AdriMM26

.circleci/config.yml

@@ -3,9 +3,7 @@ workflows:
   version: 2
   test:
     jobs:
-    - build-3.7
-    - build-3.8
-    - build-3.9
+    - build-3.10
 
 jobs:
   build-3.7: &test-template
@@ -54,3 +52,7 @@ jobs:
       <<: *test-template
       docker:
           -   image: circleci/python:3.9
+  build-3.10:
+      <<: *test-template
+      docker:
+          -   image: circleci/python:3.10

.dockerignore

@@ -0,0 +1,8 @@
+db.sqlite3
+staticfiles
+*.template
+.env
+env
+.github
+.circleci
+tmp

.env.template

@@ -0,0 +1,19 @@
+PROD_MODE="True"
+SECRET=""
+POSTGRES_DB="postgres"
+POSTGRES_USER="postgres"
+POSTGRES_PASSWORD="password"
+POSTGRES_HOST="db"
+SG_KEY=""
+TP_KEY=""
+DOMAIN=""
+IP_SERVER=""
+GOOGLE_RECAPTCHA_SECRET_KEY=""
+GOOGLE_RECAPTCHA_SITE_KEY=""
+CAS_SERVER=""
+OIDC_DISCOVERY_ENDPOINT=""
+POSTGRES_PORT="5432"
+MYHACKUPC_PORT="8000"
+GOOGLE_WALLET_ISSUER_ID=""
+GOOGLE_WALLET_CLASS_SUFFIX=""
+GOOGLE_WALLET_APPLICATION_CREDENTIALS="/path/to/credentials.json" # remember to allow read perms

.github/workflows/backendTest.yml

@@ -0,0 +1,23 @@
+name: Deploy on BackendTest
+
+on: 
+  push:
+    branches: 
+     - 'develop'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Git pull and rebuild docker
+      uses: appleboy/ssh-action@master  
+      with:
+        host: ${{ secrets.HOST }}
+        username: ${{ secrets.USERNAME }}
+        port: ${{ secrets.PORT }}
+        key: ${{ secrets.SSHKEY }}
+        script: ${{ secrets.SCRIPT }}

.gitignore

@@ -26,4 +26,5 @@ files/*
 cache/
 *.sh
 
-.google-service.account.json
+.env
+.google-service.account.json

Dockerfile

@@ -0,0 +1,25 @@
+FROM python:3.10-alpine
+
+RUN apk update && apk add postgresql-dev gcc python3-dev musl-dev
+
+# set environment variables
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+
+# Upgrade pip before installing dependencies
+RUN pip install --upgrade pip
+COPY requirements.txt requirements.txt
+# Add bin to path to avoid wanring
+ENV PATH="/home/biene/.local/bin:${PATH}"
+# Disable cache because it won't be used because it will be installed only when creating image
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Mounts the application code to the image
+COPY . code
+WORKDIR /code
+
+# Generate static files in the container
+RUN python manage.py collectstatic --noinput
+
+# Add crons from crontab django module to system cron
+RUN python manage.py crontab add

README.md

@@ -30,33 +30,16 @@
 
 Needs: Python 3.X, virtualenv
 
-Stable at v. 3.8.10
+Stable at v. 3.10.X
 
 - `git clone https://github.com/hackupc/myhackupc && cd myhackupc`
-- `virtualenv env --python=python3`
+- `virtualenv env --python=python3.10`
 - `source ./env/bin/activate`
 - `pip install -r requirements.txt`
 - (Optional) If using Postgres, set up the necessary environment variables for its usage before this step
 - `python manage.py migrate`
 - `python manage.py createsuperuser` (creates super user to manage all the app)
 
-### FAQ
-**The library backports.zoneinfo fails to install**
-If you are experiencing an error similar to this one:
-
-``
-ERROR: Could not build wheels for backports.zoneinfo, which is required to install pyproject.toml-based projects
-``
-
-Plase make sure to use *Python **3.8.10***
-
-
-**The library Pillow fails to install**
-Ths did the trick (note the python and -m flag are placed in purpouse to make sure you install it using the correct virtualenv python version):
-```
-python -m pip install --upgrade Pillow
-```
-
 ### Dummy data
 
 _Coming soon_

app/hackathon_variables.py

@@ -10,7 +10,7 @@
 # Hackathon timezone
 TIME_ZONE = 'CET'
 # This description will be used on the html and sharing meta tags
-HACKATHON_DESCRIPTION = 'Join us for BarcelonaTech\'s hackathon. 36h. May 12 - 14.'
+HACKATHON_DESCRIPTION = 'Join us for BarcelonaTech\'s hackathon. 36h. May 3 - 5.'
 # Domain where application is deployed, can be set by env variable
 HACKATHON_DOMAIN = os.environ.get('DOMAIN', None)
 HEROKU_APP_NAME = os.environ.get('HEROKU_APP_NAME', None)
@@ -40,11 +40,11 @@
 HACKATHON_GITHUB_REPO = 'https://github.com/hackupc/myhackupc/'
 
 # (OPTIONAL) Applications deadline
-HACKATHON_APP_DEADLINE = timezone.datetime(2023, 5, 3, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE))
-VOLUNTEER_APP_DEADLINE = timezone.datetime(2023, 5, 9, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE))
-MENTOR_APP_DEADLINE = timezone.datetime(2023, 5, 1, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE))
+HACKATHON_APP_DEADLINE = timezone.datetime(2024, 5, 3, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE))
+VOLUNTEER_APP_DEADLINE = timezone.datetime(2024, 5, 9, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE))
+MENTOR_APP_DEADLINE = timezone.datetime(2024, 5, 1, 23, 59, tzinfo=timezone.pytz.timezone(TIME_ZONE))
 # (OPTIONAL) Online checkin activated
-ONLINE_CHECKIN = timezone.datetime(2022, 4, 29, 17, 00, tzinfo=timezone.pytz.timezone(TIME_ZONE))
+ONLINE_CHECKIN = timezone.datetime(2024, 4, 29, 17, 00, tzinfo=timezone.pytz.timezone(TIME_ZONE))
 # (OPTIONAL) When to arrive at the hackathon
 HACKATHON_ARRIVE = ''
 

app/middlewares.py

@@ -1,4 +1,4 @@
-from backports import zoneinfo
+import zoneinfo
 from django.utils import timezone
 
 

app/settings.py

@@ -30,6 +30,8 @@
 
 # Application definition
 INSTALLED_APPS = [
+    "whitenoise.runserver_nostatic",
+    'django_crontab',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -57,7 +59,7 @@
     'corsheaders',
 ]
 
-GOOGLE_WALLET_ENABLED=True #Set to false to disable google wallet
+GOOGLE_WALLET_ENABLED = False  # Set to false to disable google wallet
 
 if BAGGAGE_ENABLED:
     INSTALLED_APPS.append('baggage')
@@ -79,6 +81,7 @@
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     "corsheaders.middleware.CorsMiddleware",
+    "whitenoise.middleware.WhiteNoiseMiddleware",
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -126,14 +129,14 @@
         ssl_require=os.environ.get('DATABASE_SECURE', 'true').lower() != 'false',
     )
 
-if os.environ.get('PG_PWD', None):
+if os.environ.get('POSTGRES_PASSWORD', None):
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.postgresql_psycopg2',
-            'NAME': os.environ.get('PG_NAME', 'backend'),
-            'USER': os.environ.get('PG_USER', 'backenduser'),
-            'PASSWORD': os.environ.get('PG_PWD'),
-            'HOST': os.environ.get('PG_HOST', 'localhost'),
+            'NAME': os.environ.get('POSTGRES_DB', 'backend'),
+            'USER': os.environ.get('POSTGRES_USER', 'backenduser'),
+            'PASSWORD': os.environ.get('POSTGRES_PASSWORD'),
+            'HOST': os.environ.get('POSTGRES_HOST', 'localhost'),
             'PORT': '5432',
         }
     }
@@ -191,14 +194,14 @@
 STATICFILES_DIRS = [
     os.path.join(BASE_DIR, os.path.join('app', "static")),
 ]
-STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
+STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
 
 # Dev emails set up
 if os.environ.get('ADMIN_EMAIL', None):
     try:
         HACKATHON_DEV_EMAILS.append(os.environ['ADMIN_EMAIL'])
     except NameError:
-        HACKATHON_DEV_EMAILS = [os.environ['ADMIN_EMAIL'],]
+        HACKATHON_DEV_EMAILS = [os.environ['ADMIN_EMAIL'], ]
 
 #  File upload configuration
 MEDIA_ROOT = 'files'
@@ -292,9 +295,9 @@
 MAX_VOTES_TO_APP = 30
 
 APPLICATION_EXPIRATION_TYPES = {
-    'H': True,                  # Hacker allways expire, do not change this
-    'M': MENTOR_EXPIRES,        # Mentor can expire
-    'V': VOLUNTEER_EXPIRES,     # Volunteer can expire
+    'H': True,  # Hacker allways expire, do not change this
+    'M': MENTOR_EXPIRES,  # Mentor can expire
+    'V': VOLUNTEER_EXPIRES,  # Volunteer can expire
 }
 
 MEALS_TOKEN = os.environ.get('MEALS_TOKEN', None)
@@ -324,3 +327,9 @@
 # Security
 SESSION_COOKIE_SECURE = CSRF_COOKIE_SECURE = not DEBUG
 SECURE_REFERRER_POLICY = "strict-origin-when-cross-origin"
+
+# Cron configuration to expire invitations and reimbursements
+CRONJOBS = [
+    ('6 */2 * * *', 'django.core.management.call_command', ['expire_reimbursements']),
+    ('6 */2 * * *', 'django.core.management.call_command', ['expire_applications']),
+]