Skip to content

Commit

Permalink
Merge pull request #118 from norcalipa/norcalipa/fix-static-files
Browse files Browse the repository at this point in the history
moving static files to their own directory
  • Loading branch information
norcalipa authored Apr 16, 2024
2 parents 7f5ad09 + 42c79fd commit 378e6db
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ crank/__pycache__
media
.env
backup.json
dump
dump
13 changes: 5 additions & 8 deletions crank/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"""
import os
from pathlib import Path

from dotenv import load_dotenv
from opentelemetry.instrumentation.django import DjangoInstrumentor

Expand All @@ -21,6 +22,7 @@
BASE_DIR = Path(__file__).resolve().parent.parent.parent
CONTENT_DIR = os.path.join(str(BASE_DIR), "crank/content")
DEFAULT_ALGORITHM_ID = 5
DEBUG = False

LOGGING = {
'version': 1,
Expand Down Expand Up @@ -55,6 +57,7 @@
# Application definition

INSTALLED_APPS = [
'whitenoise.runserver_nostatic',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
Expand Down Expand Up @@ -183,21 +186,15 @@
# https://docs.djangoproject.com/en/4.2/topics/i18n/

LANGUAGE_CODE = 'en-us'

TIME_ZONE = 'UTC'

USE_I18N = True

USE_TZ = True

# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.2/howto/static-files/

STATIC_URL = 'static/'
#STATICFILES_DIRS = (
# "templates/static/",
#)
STATIC_ROOT = str(BASE_DIR) + '/templates/static'
STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, "static")
STORAGES = {
# ...
"staticfiles": {
Expand Down
File renamed without changes.
File renamed without changes

0 comments on commit 378e6db

Please sign in to comment.