Squashed commit of the following:

commit 3016396 Author: Garrett Coakley <[email protected]> Date: Sat Sep 4 15:34:41 2021 +0100 Jobboard signup copy commit 9eb66dc Author: Garrett Coakley <[email protected]> Date: Sat Sep 4 15:34:13 2021 +0100 Fix title block in allauth templates commit 4175ec0 Author: Garrett Coakley <[email protected]> Date: Sat Sep 4 15:33:41 2021 +0100 Add anymail and Mailjet config commit 571eecd Author: Garrett Coakley <[email protected]> Date: Fri Sep 3 16:27:27 2021 +0100 Email copy update and messages fix commit 5ef891f Author: Garrett Coakley <[email protected]> Date: Fri Sep 3 16:13:21 2021 +0100 Flash messages and post-confirmation redirect commit ac6f002 Author: Garrett Coakley <[email protected]> Date: Fri Sep 3 14:59:54 2021 +0100 Improved notification emails commit 97bb7e8 Author: Garrett Coakley <[email protected]> Date: Fri Sep 3 11:32:47 2021 +0100 Add conditional around contact details commit cff7a84 Author: Garrett Coakley <[email protected]> Date: Fri Sep 3 09:32:24 2021 +0100 Added missed migration commit 6464bed Author: Garrett Coakley <[email protected]> Date: Thu Sep 2 16:55:08 2021 +0100 Job model tweaks commit e72bb48 Author: Garrett Coakley <[email protected]> Date: Thu Sep 2 16:54:51 2021 +0100 Unpublish signal borked when first signing up, disabled for now commit 7d5fea0 Author: Garrett Coakley <[email protected]> Date: Thu Sep 2 16:24:43 2021 +0100 Ensure wheel is installed, fix env example commit afa9a2f Author: Garrett Coakley <[email protected]> Date: Thu Sep 2 16:14:10 2021 +0100 Job styling commit a7c4c37 Author: Garrett Coakley <[email protected]> Date: Thu Sep 2 16:13:44 2021 +0100 Add short description to admin job list commit bb0402c Author: Garrett Coakley <[email protected]> Date: Thu Sep 2 16:13:22 2021 +0100 Reduce the max length of short description commit 9d23715 Author: Garrett Coakley <[email protected]> Date: Thu Sep 2 12:12:22 2021 +0100 Initial job styling commit fbcc04a Author: Garrett Coakley <[email protected]> Date: Thu Sep 2 12:11:52 2021 +0100 Add short description and make fields required commit bfdcf48 Author: Garrett Coakley <[email protected]> Date: Wed Sep 1 17:43:49 2021 +0100 Add signal for unpublishing recruitment page when user set to inactive commit 67b4617 Author: Garrett Coakley <[email protected]> Date: Wed Sep 1 17:36:22 2021 +0100 Import signals, and logic for user notification commit d23d805 Author: Garrett Coakley <[email protected]> Date: Tue Aug 31 17:32:25 2021 +0100 Refactor signals out to their own file and set up end user notification commit aee3fc6 Author: Garrett Coakley <[email protected]> Date: Thu Aug 26 11:20:08 2021 +0100 Add salary field commit 57b820f Author: Garrett Coakley <[email protected]> Date: Thu Aug 26 10:22:39 2021 +0100 Restrict admin job listing to own jobs (y'know, for privacy) commit 9c7daf0 Author: Garrett Coakley <[email protected]> Date: Thu Aug 26 10:21:55 2021 +0100 Send admin a message when recruiter signs up commit 5d4434b Author: Garrett Coakley <[email protected]> Date: Wed Aug 25 16:58:56 2021 +0100 Add first and last name to signup form commit 2b2a22e Author: Garrett Coakley <[email protected]> Date: Wed Aug 25 16:56:43 2021 +0100 Layout and copy tweaks commit 28d3bc1 Author: Garrett Coakley <[email protected]> Date: Wed Aug 25 16:56:01 2021 +0100 Removed username from allauth configuration commit db89658 Author: Garrett Coakley <[email protected]> Date: Wed Aug 25 15:17:55 2021 +0100 Smaller login link commit a260713 Author: Garrett Coakley <[email protected]> Date: Wed Aug 25 15:00:23 2021 +0100 Reorder menus, use first name in authenticated link commit 3431227 Author: Garrett Coakley <[email protected]> Date: Wed Aug 25 14:38:11 2021 +0100 Hide reports and explorer from recruiters, hide recruiter profile from admin commit fb37e68 Author: Garrett Coakley <[email protected]> Date: Wed Aug 25 11:31:42 2021 +0100 Tweak logo size commit c2df703 Author: Garrett Coakley <[email protected]> Date: Fri Aug 20 15:39:19 2021 +0100 Tidied up requirements and settings commit 1ca3c95 Author: Garrett Coakley <[email protected]> Date: Wed Aug 18 16:49:58 2021 +0100 Sign in links commit 86927c5 Author: Garrett Coakley <[email protected]> Date: Wed Aug 18 16:03:08 2021 +0100 Use constants for job type choices commit 39fd4cb Author: Garrett Coakley <[email protected]> Date: Wed Aug 18 10:58:22 2021 +0100 Wide screen refactor commit c968314 Author: Garrett Coakley <[email protected]> Date: Wed Aug 18 10:30:04 2021 +0100 Refactor layout and markup commit df880a6 Author: Garrett Coakley <[email protected]> Date: Tue Aug 17 17:31:11 2021 +0100 Admin menus for recruiter commit a71f564 Author: Garrett Coakley <[email protected]> Date: Tue Aug 17 16:47:28 2021 +0100 Move jobs templates to main app commit 35aabad Author: Garrett Coakley <[email protected]> Date: Tue Aug 17 15:59:41 2021 +0100 Move to python-dotenv commit df2bf6c Author: Garrett Coakley <[email protected]> Date: Tue Aug 17 15:58:06 2021 +0100 Tidy up requirements and installation guide commit 8598f3a Author: Garrett Coakley <[email protected]> Date: Tue Aug 10 17:22:01 2021 +0100 Added job type commit 45f9112 Author: Garrett Coakley <[email protected]> Date: Tue Aug 10 17:17:07 2021 +0100 Added job type commit 38cccad Author: Garrett Coakley <[email protected]> Date: Tue Aug 10 16:50:51 2021 +0100 Fixed sign up and confirmation flow. commit 16d9b82 Author: Garrett Coakley <[email protected]> Date: Tue Aug 10 16:49:19 2021 +0100 Exclude everything in the log directory commit 11e32e7 Author: Garrett Coakley <[email protected]> Date: Tue Aug 10 12:35:27 2021 +0100 Replace registration-redux with allauth due to registration-redux deprecation commit e9711a3 Author: Garrett Coakley <[email protected]> Date: Mon Aug 9 16:31:51 2021 +0100 User registration custom fields (WIP) commit d139592 Author: Garrett Coakley <[email protected]> Date: Thu Aug 5 15:46:28 2021 +0100 Add custom field to registration (WIP), code tidy ups commit 2baaf11 Author: Garrett Coakley <[email protected]> Date: Thu Aug 5 12:11:09 2021 +0100 Added configuration options for taggit commit e0e4ef0 Author: Garrett Coakley <[email protected]> Date: Thu Aug 5 12:10:29 2021 +0100 Fix bug with revisions needing a user object, slightly refactored recruiter fields commit 77a4e17 Author: Garrett Coakley <[email protected]> Date: Wed Aug 4 17:22:51 2021 +0100 Refactores requirements files, added flake8 and isort, added job filter listing for closing date commit 33c7bbe Author: Garrett Coakley <[email protected]> Date: Tue Aug 3 12:53:05 2021 +0100 Added psycopg and bumped wagtail version commit 48f0eca Author: Garrett Coakley <[email protected]> Date: Mon Aug 2 16:10:09 2021 +0100 Tidy up templates commit eff477e Author: Garrett Coakley <[email protected]> Date: Mon Aug 2 16:09:35 2021 +0100 Add job type field. Set recruiter page to unpubliched when account created commit 6d7351d Author: Garrett Coakley <[email protected]> Date: Mon Aug 2 16:08:35 2021 +0100 Update account activation templates commit 764843c Author: Garrett Coakley <[email protected]> Date: Mon Jul 26 16:01:39 2021 +0100 Fix copy in verification template commit 6d7fca4 Author: Garrett Coakley <[email protected]> Date: Mon Jul 26 15:56:15 2021 +0100 Tidy up templates for recuriter and jobs. Form styling commit f7ef428 Author: Garrett Coakley <[email protected]> Date: Mon Jul 26 14:14:34 2021 +0100 Fixed user form bug commit 8d30c49 Author: Garrett Coakley <[email protected]> Date: Fri Jul 23 16:01:22 2021 +0100 Move custom fields to RecruiterPage, broke user editing 🤷‍♂️ commit 4cfaa2c Author: Garrett Coakley <[email protected]> Date: Fri Jul 23 12:26:42 2021 +0100 Add account profile page, tidy up migrations commit 95982f6 Author: Garrett Coakley <[email protected]> Date: Thu Jul 15 16:46:40 2021 +0100 Enable black and djhtml formatting commit 862ecfa Author: Garrett Coakley <[email protected]> Date: Mon Jul 5 17:33:40 2021 +0100 Add fields to admin areas commit 1274f8d Author: Garrett Coakley <[email protected]> Date: Mon Jul 5 15:59:44 2021 +0100 Move fields from RecruiterPage to User model commit bad3dd5 Author: Garrett Coakley <[email protected]> Date: Fri Jul 2 11:06:15 2021 +0100 Installed django-registration-redux and templates commit 9ee31fa Author: Garrett Coakley <[email protected]> Date: Tue Jun 29 16:38:10 2021 +0100 Remove allauth commit 71cff26 Author: Garrett Coakley <[email protected]> Date: Mon Jun 28 15:35:46 2021 +0100 Basic signup workflow and profile page creation commit 992e0db Merge: 77de510 02f5fe6 Author: Garrett Coakley <[email protected]> Date: Mon Jun 28 08:40:34 2021 +0100 Merge branch 'feature/jobs' of https://github.com/digitaloxford/do-wagtail into feature/jobs # Conflicts: # digitaloxford/settings/base.py # jobs/models.py commit 02f5fe6 Author: Garrett Coakley <[email protected]> Date: Sun Jun 27 17:06:51 2021 +0100 Remove custom code for a cleaner approach commit 972e3d8 Author: Garrett Coakley <[email protected]> Date: Fri Jun 25 15:20:44 2021 +0100 WIP: User account settings commit 9c9b1ed Author: Garrett Coakley <[email protected]> Date: Thu Jun 24 16:20:50 2021 +0100 Stubbed out logic and views for recruiter accounts commit 48efa4e Author: Garrett Coakley <[email protected]> Date: Sun Jun 27 16:55:12 2021 +0100 Add allauth and betterforms commit 3daaf39 Author: Garrett Coakley <[email protected]> Date: Wed Jun 23 10:26:35 2021 +0100 Don’t allow job pages under the index page (they should be under a recruiter) commit cef3b3d Author: Garrett Coakley <[email protected]> Date: Tue Jun 22 10:49:17 2021 +0100 Make jobs a cild of recruiter commit e033164 Author: Garrett Coakley <[email protected]> Date: Mon Jun 21 21:35:46 2021 +0100 Basic content types, relations, and templates commit 3d2fa79 Author: Garrett Coakley <[email protected]> Date: Thu Jun 3 15:18:09 2021 +0100 Migration from rebase on main commit 5345a49 Author: Garrett Coakley <[email protected]> Date: Sat Mar 6 14:50:00 2021 +0000 Stub out job and job index commit 77de510 Author: Garrett Coakley <[email protected]> Date: Fri Jun 25 15:20:44 2021 +0100 WIP: User account settings commit a5ccafb Author: Garrett Coakley <[email protected]> Date: Thu Jun 24 16:20:50 2021 +0100 Stubbed out logic and views for recruiter accounts commit 0363c1a Author: Garrett Coakley <[email protected]> Date: Wed Jun 23 17:51:59 2021 +0100 Add allauth and betterforms commit c6ed9d9 Author: Garrett Coakley <[email protected]> Date: Wed Jun 23 10:26:35 2021 +0100 Don’t allow job pages under the index page (they should be under a recruiter) commit dd93f02 Author: Garrett Coakley <[email protected]> Date: Tue Jun 22 10:49:17 2021 +0100 Make jobs a cild of recruiter commit 695b9d9 Author: Garrett Coakley <[email protected]> Date: Mon Jun 21 21:35:46 2021 +0100 Basic content types, relations, and templates commit ad7772f Merge: 18531c5 823efa5 Author: Garrett Coakley <[email protected]> Date: Mon Jun 21 20:06:09 2021 +0100 Merge branch 'feature/jobs' of github.com:digitaloxford/do-wagtail into feature/jobs commit 823efa5 Author: Garrett Coakley <[email protected]> Date: Thu Jun 3 15:18:09 2021 +0100 Migration from rebase on main commit 42c6bef Author: Garrett Coakley <[email protected]> Date: Sat Mar 6 14:50:00 2021 +0000 Stub out job and job index commit 18531c5 Author: Garrett Coakley <[email protected]> Date: Sat Mar 6 14:50:00 2021 +0000 Stub out job and job index
digitaloxford · Sep 4, 2021 · 928c0b5 · 928c0b5
1 parent e361266
commit 928c0b5
Show file tree

Hide file tree

Showing 125 changed files with 2,842 additions and 890 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,31 @@
+[run]
+source = .
+omit =
+    ./env/*
+    *tests*
+    *apps.py
+    *manage.py
+    *__init__.py
+    *migrations*
+    *asgi*
+    *wsgi*
+    *admin.py
+    *urls.py
+    test_helpers.py
+    test_settings.py
+
+[report]
+omit =
+    ./env/*
+    *tests*
+    *apps.py
+    *manage.py
+    *__init__.py
+    *migrations*
+    *asgi*
+    *wsgi*
+    *admin.py
+    *urls.py
+
+[html]
+directory = htmlcov/
diff --git a/.flake8 b/.flake8
@@ -0,0 +1,15 @@
+[flake8]
+exclude =
+    .env
+    build
+    dist
+    env
+    logs
+    manage.py
+    media
+    migrations
+    static
+ignore = BLK100, E203, E266, E501, W503, F403, F401, F405, F811
+max-line-length = 89
+max-complexity = 18
+select = B,C,E,F,W,T4,B9
diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,7 @@ pip-delete-this-directory.txt
 /wagtail.egg-info/
 npm-debug.log*
 __pycache__
-/logs/*.txt
+/logs/*
 
 # Distribution / packaging
 .eggs/

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,17 +2,32 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v4.0.1
     hooks:
     -   id: check-added-large-files
     -   id: check-merge-conflict
     -   id: debug-statements
     # -   id: detect-aws-credentials
     -   id: detect-private-key
-    # -   id: end-of-file-fixer
+    -   id: end-of-file-fixer
     -   id: mixed-line-ending
     -   id: trailing-whitespace
-# -   repo: https://github.com/psf/black
-#     rev: 21.5b0
-#     hooks:
-#     -   id: black
+-   repo: https://github.com/pycqa/isort
+    rev: 5.9.3
+    hooks:
+    -   id: isort
+        args: [--profile, black, --skip, env, --skip-glob, "*/migrations/*", --filter-files]
+-   repo: https://gitlab.com/pycqa/flake8.git
+    rev: 3.9.2
+    hooks:
+    -   id: flake8
+        additional_dependencies:
+        - flake8-black>=0.1.1
+-   repo: https://github.com/psf/black
+    rev: 21.7b0
+    hooks:
+    -   id: black
+-   repo: https://github.com/rtts/djhtml
+    rev: v1.4.9
+    hooks:
+    - id: djhtml
diff --git a/Dockerfile b/Dockerfile
diff --git a/README.md b/README.md
@@ -7,8 +7,6 @@ The repository for the [Wagtail](https://docs.wagtail.io/en/stable/index.html) p
 
 - Requires Python 3.*
 - This project uses [django-sass-processor](https://github.com/jrief/django-sass-processor) to manage scss files. Refer to that repository's README for instructions on how to manage the files.
-- Code formatting is controlled by [Black](https://black.readthedocs.io/en/stable/index.html). At some point that will probably become automated.
-
 
 ## Local setup
 
@@ -28,15 +26,27 @@ $ source ./env/bin/activate
 Install requirements:
 
 ```
-$ pip install -r requirements.txt
+$ pip install -r requirements/requirements-dev.txt
 ```
 
-Create a local secrets file at `<install-directory>/digitaloxford/settings/local.py` with the following format:
+(NOTE: `requirements-dev.txt` includes `requirements.txt` automatically)
+
+### Pre-commit hooks
+
+This repository uses the [pre-commit](https://pre-commit.com/) framework to perform certain sanity checks during development. These include code formatting with [Black](https://black.readthedocs.io/en/stable/index.html) and [DjHTML](https://github.com/rtts/djhtml), import sorting with [isort](https://pycqa.github.io/isort/index.html), and detecting any private keys you may have accidentally added to the repository. For a full list see the file `<install-directory>/.pre-commit-config.yaml`.
+
+Run pre-commit install to set up the git hook scripts
 
 ```
-SECRET_KEY = 'some random hash'
+$ pre-commit install
 ```
 
+Now pre-commit will run automatically on git commit.
+
+### Configuration
+
+Create a local environment file by copying `<install-directory>/home/.env_example` to `<install-directory>/home/.env` and filling out the details.
+
 Run the migrations and create the superuser:
 
 ```
@@ -45,8 +55,8 @@ $ ./manage.py migrate
 $ ./manage.py createsuperuser
 ```
 
-Finally, start the server:
+Finally, start the development server:
 
 ```
-$ ./manage.py runserver
+$ ./manage.py runserver_plus
 ```
diff --git a/digitaloxford/.env_example b/digitaloxford/.env_example
@@ -0,0 +1,9 @@
+HOSTING_ENV="dev|production"
+SECRET_KEY="django_secret_key"
+DB_NAME="database_name"
+DB_USER="database_user"
+DB_PASSWORD="database_password"
+DB_HOST="database_host"
+DB_PORT="database_port"
+EMAIL_USER = "email_user"
+EMAIL_PASSWORD = "email_password"