Skip to content

Commit

Permalink
Merge pull request #169 from stephengtuggy/sgt_2024-06-30
Browse files Browse the repository at this point in the history
Manual, Non-Breaking Changes 2024-06-30
  • Loading branch information
stephengtuggy authored Jul 1, 2024
2 parents bfaba87 + 817fe4b commit 7d780a1
Show file tree
Hide file tree
Showing 9 changed files with 82 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
JOB_HISTORY_ALLOWED_HOSTS=0.0.0.0,my-desktop
JOB_HISTORY_ALLOWED_HOSTS=0.0.0.0
JOB_HISTORY_DB_HOST=job_history_db
JOB_HISTORY_DB_NAME=job_history
JOB_HISTORY_DB_PASSWORD=8KkMs8a2SdxUw25CAwmuyantK5dbK1xT
JOB_HISTORY_DB_PASSWORD=
JOB_HISTORY_DB_PORT=5432
JOB_HISTORY_DB_USERNAME=postgres
JOB_HISTORY_DEBUG=FALSE
JOB_HISTORY_SECRET_KEY=4VGVMQDKbpMsAostzHCtlfOUTHFAMx03zeXza96WGiPxt3qTtkQcTyr
JOB_HISTORY_SECRET_KEY=
JOB_HISTORY_STATIC_ROOT=/usr/src/app/static/
JOB_HISTORY_STATIC_URL=/app/static/
POSTGRES_DB=job_history
POSTGRES_PASSWORD=8KkMs8a2SdxUw25CAwmuyantK5dbK1xT
POSTGRES_PASSWORD=
POSTGRES_USER=postgres
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,5 @@ dmypy.json
.vscode/
**/public/
*.sql
/local-env.sh
/app/static/
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions .idea/job-history.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 9 additions & 7 deletions app/jobHistorySite/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
Generated by 'django-admin startproject' using Django 2.1.4.
For more information on this file, see
https://docs.djangoproject.com/en/2.2/topics/settings/
https://docs.djangoproject.com/en/3.2/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/2.2/ref/settings/
https://docs.djangoproject.com/en/3.2/ref/settings/
"""

import os
Expand All @@ -33,7 +33,7 @@


# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/

# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = env('JOB_HISTORY_SECRET_KEY')
Expand Down Expand Up @@ -93,7 +93,7 @@


# Database
# https://docs.djangoproject.com/en/2.2/ref/settings/#databases
# https://docs.djangoproject.com/en/3.2/ref/settings/#databases

DATABASES = {
'default': {
Expand All @@ -108,7 +108,7 @@


# Password validation
# https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators
# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators

AUTH_PASSWORD_VALIDATORS = [
{
Expand All @@ -127,7 +127,7 @@


# Internationalization
# https://docs.djangoproject.com/en/2.2/topics/i18n/
# https://docs.djangoproject.com/en/3.2/topics/i18n/

LANGUAGE_CODE = 'en-us'

Expand All @@ -141,11 +141,13 @@


# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/2.2/howto/static-files/
# https://docs.djangoproject.com/en/3.2/howto/static-files/
STATICFILES_STORAGE='whitenoise.storage.CompressedManifestStaticFilesStorage'

STATIC_URL = env('JOB_HISTORY_STATIC_URL')
STATIC_ROOT = env('JOB_HISTORY_STATIC_ROOT')

LOGIN_URL = reverse_lazy('login')
LOGIN_REDIRECT_URL = reverse_lazy('jobHistory:index')

DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

0 comments on commit 7d780a1

Please sign in to comment.