bug: error occured

junnie082 · Jan 27, 2024 · 6ccfbab · 6ccfbab
1 parent f6e158e
commit 6ccfbab
Show file tree

Hide file tree

Showing 443 changed files with 95,651 additions and 11 deletions.
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/scoopadive/board/__pycache__/__init__.cpython-310.pyc b/scoopadive/board/__pycache__/__init__.cpython-310.pyc
diff --git a/scoopadive/board/__pycache__/admin.cpython-310.pyc b/scoopadive/board/__pycache__/admin.cpython-310.pyc
diff --git a/scoopadive/board/__pycache__/apps.cpython-310.pyc b/scoopadive/board/__pycache__/apps.cpython-310.pyc
diff --git a/scoopadive/board/__pycache__/models.cpython-310.pyc b/scoopadive/board/__pycache__/models.cpython-310.pyc
diff --git a/scoopadive/board/__pycache__/urls.cpython-310.pyc b/scoopadive/board/__pycache__/urls.cpython-310.pyc
diff --git a/scoopadive/board/__pycache__/views.cpython-310.pyc b/scoopadive/board/__pycache__/views.cpython-310.pyc
diff --git a/scoopadive/common/__pycache__/__init__.cpython-310.pyc b/scoopadive/common/__pycache__/__init__.cpython-310.pyc
diff --git a/scoopadive/common/__pycache__/admin.cpython-310.pyc b/scoopadive/common/__pycache__/admin.cpython-310.pyc
diff --git a/scoopadive/common/__pycache__/apps.cpython-310.pyc b/scoopadive/common/__pycache__/apps.cpython-310.pyc
diff --git a/scoopadive/common/__pycache__/models.cpython-310.pyc b/scoopadive/common/__pycache__/models.cpython-310.pyc
diff --git a/scoopadive/common/__pycache__/urls.cpython-310.pyc b/scoopadive/common/__pycache__/urls.cpython-310.pyc
diff --git a/scoopadive/common/__pycache__/views.cpython-310.pyc b/scoopadive/common/__pycache__/views.cpython-310.pyc
diff --git a/scoopadive/db.sqlite3 b/scoopadive/db.sqlite3
diff --git a/scoopadive/divepedia/__pycache__/__init__.cpython-310.pyc b/scoopadive/divepedia/__pycache__/__init__.cpython-310.pyc
diff --git a/scoopadive/divepedia/__pycache__/admin.cpython-310.pyc b/scoopadive/divepedia/__pycache__/admin.cpython-310.pyc
diff --git a/scoopadive/divepedia/__pycache__/api.cpython-310.pyc b/scoopadive/divepedia/__pycache__/api.cpython-310.pyc
diff --git a/scoopadive/divepedia/__pycache__/apps.cpython-310.pyc b/scoopadive/divepedia/__pycache__/apps.cpython-310.pyc
diff --git a/scoopadive/divepedia/__pycache__/models.cpython-310.pyc b/scoopadive/divepedia/__pycache__/models.cpython-310.pyc
diff --git a/scoopadive/divepedia/__pycache__/urls.cpython-310.pyc b/scoopadive/divepedia/__pycache__/urls.cpython-310.pyc
diff --git a/scoopadive/divepedia/__pycache__/views.cpython-310.pyc b/scoopadive/divepedia/__pycache__/views.cpython-310.pyc
diff --git a/scoopadive/main/__pycache__/__init__.cpython-310.pyc b/scoopadive/main/__pycache__/__init__.cpython-310.pyc
diff --git a/scoopadive/main/__pycache__/admin.cpython-310.pyc b/scoopadive/main/__pycache__/admin.cpython-310.pyc
diff --git a/scoopadive/main/__pycache__/apps.cpython-310.pyc b/scoopadive/main/__pycache__/apps.cpython-310.pyc
diff --git a/scoopadive/main/__pycache__/models.cpython-310.pyc b/scoopadive/main/__pycache__/models.cpython-310.pyc
diff --git a/scoopadive/main/__pycache__/urls.cpython-310.pyc b/scoopadive/main/__pycache__/urls.cpython-310.pyc
diff --git a/scoopadive/main/__pycache__/views.cpython-310.pyc b/scoopadive/main/__pycache__/views.cpython-310.pyc
diff --git a/scoopadive/main/templatetags/__pycache__/main_filter.cpython-310.pyc b/scoopadive/main/templatetags/__pycache__/main_filter.cpython-310.pyc
diff --git a/scoopadive/scoopadive/__pycache__/__init__.cpython-310.pyc b/scoopadive/scoopadive/__pycache__/__init__.cpython-310.pyc
diff --git a/scoopadive/scoopadive/__pycache__/urls.cpython-310.pyc b/scoopadive/scoopadive/__pycache__/urls.cpython-310.pyc
diff --git a/scoopadive/scoopadive/__pycache__/wsgi.cpython-310.pyc b/scoopadive/scoopadive/__pycache__/wsgi.cpython-310.pyc
diff --git a/scoopadive/scoopadive/settings/__pycache__/__init__.cpython-310.pyc b/scoopadive/scoopadive/settings/__pycache__/__init__.cpython-310.pyc
diff --git a/scoopadive/scoopadive/settings/__pycache__/base.cpython-310.pyc b/scoopadive/scoopadive/settings/__pycache__/base.cpython-310.pyc
diff --git a/scoopadive/scoopadive/settings/__pycache__/prod.cpython-310.pyc b/scoopadive/scoopadive/settings/__pycache__/prod.cpython-310.pyc
diff --git a/scoopadive/scoopadive/settings/base.py b/scoopadive/scoopadive/settings/base.py
@@ -13,20 +13,22 @@
 from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent.parent.parent
+BASE_DIR = Path(__file__).resolve().parent.parent.parent
+#BASE_DIR = /home/ubuntu/projects/mysite/scoopadive
+
 print('BASE_DIR: ' + str(BASE_DIR))
-# STATICFILES_DIRS = [
-#     str(BASE_DIR / 'main/static'),
-# ]
-# STATIC_ROOT = str(BASE_DIR / 'staticfiles')
+STATICFILES_DIRS = [
+     str(BASE_DIR / 'main/static'),
+]
+STATIC_ROOT = str(BASE_DIR / 'staticfiles')
 ALLOWED_HOSTS = ['3.36.81.50']
 
 STATIC_URL = '/static/'
 
 # Additional locations of static files
-STATICFILES_DIRS = [
-    BASE_DIR / 'static'
-]
+#STATICFILES_DIRS = [
+#    BASE_DIR / 'static'
+#]
 
 # Absolute filesystem path to the directory that will hold static files.
 # STATIC_ROOT = str(BASE_DIR / 'static')

diff --git a/scoopadive/scoopadive/settings/prod.py b/scoopadive/scoopadive/settings/prod.py
@@ -1,7 +1,8 @@
 from .base import *
 
 ALLOWED_HOSTS = ['3.36.81.50']
-STATIC_ROOT = BASE_DIR / 'static/'
+STATIC_ROOT = str(BASE_DIR / 'static/')
+
 print("STATIC_ROOT: " + STATIC_ROOT)
 STATICFILES_DIRS = []
-DEBUG = False
+DEBUG = False
diff --git a/scoopadive/scoopadive/wsgi.py b/scoopadive/scoopadive/wsgi.py
@@ -11,6 +11,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'scoopadive.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'scoopadive.settings.prod')
 
 application = get_wsgi_application()
diff --git a/scoopadive/static/admin/css/autocomplete.css b/scoopadive/static/admin/css/autocomplete.css
@@ -0,0 +1,275 @@
+select.admin-autocomplete {
+    width: 20em;
+}
+
+.select2-container--admin-autocomplete.select2-container {
+    min-height: 30px;
+}
+
+.select2-container--admin-autocomplete .select2-selection--single,
+.select2-container--admin-autocomplete .select2-selection--multiple {
+    min-height: 30px;
+    padding: 0;
+}
+
+.select2-container--admin-autocomplete.select2-container--focus .select2-selection,
+.select2-container--admin-autocomplete.select2-container--open .select2-selection {
+    border-color: var(--body-quiet-color);
+    min-height: 30px;
+}
+
+.select2-container--admin-autocomplete.select2-container--focus .select2-selection.select2-selection--single,
+.select2-container--admin-autocomplete.select2-container--open .select2-selection.select2-selection--single {
+    padding: 0;
+}
+
+.select2-container--admin-autocomplete.select2-container--focus .select2-selection.select2-selection--multiple,
+.select2-container--admin-autocomplete.select2-container--open .select2-selection.select2-selection--multiple {
+    padding: 0;
+}
+
+.select2-container--admin-autocomplete .select2-selection--single {
+    background-color: var(--body-bg);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+}
+
+.select2-container--admin-autocomplete .select2-selection--single .select2-selection__rendered {
+    color: var(--body-fg);
+    line-height: 30px;
+}
+
+.select2-container--admin-autocomplete .select2-selection--single .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold;
+}
+
+.select2-container--admin-autocomplete .select2-selection--single .select2-selection__placeholder {
+    color: var(--body-quiet-color);
+}
+
+.select2-container--admin-autocomplete .select2-selection--single .select2-selection__arrow {
+    height: 26px;
+    position: absolute;
+    top: 1px;
+    right: 1px;
+    width: 20px;
+}
+
+.select2-container--admin-autocomplete .select2-selection--single .select2-selection__arrow b {
+    border-color: #888 transparent transparent transparent;
+    border-style: solid;
+    border-width: 5px 4px 0 4px;
+    height: 0;
+    left: 50%;
+    margin-left: -4px;
+    margin-top: -2px;
+    position: absolute;
+    top: 50%;
+    width: 0;
+}
+
+.select2-container--admin-autocomplete[dir="rtl"] .select2-selection--single .select2-selection__clear {
+    float: left;
+}
+
+.select2-container--admin-autocomplete[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+    left: 1px;
+    right: auto;
+}
+
+.select2-container--admin-autocomplete.select2-container--disabled .select2-selection--single {
+    background-color: var(--darkened-bg);
+    cursor: default;
+}
+
+.select2-container--admin-autocomplete.select2-container--disabled .select2-selection--single .select2-selection__clear {
+    display: none;
+}
+
+.select2-container--admin-autocomplete.select2-container--open .select2-selection--single .select2-selection__arrow b {
+    border-color: transparent transparent #888 transparent;
+    border-width: 0 4px 5px 4px;
+}
+
+.select2-container--admin-autocomplete .select2-selection--multiple {
+    background-color: var(--body-bg);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+    cursor: text;
+}
+
+.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__rendered {
+    box-sizing: border-box;
+    list-style: none;
+    margin: 0;
+    padding: 0 10px 5px 5px;
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__rendered li {
+    list-style: none;
+}
+
+.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__placeholder {
+    color: var(--body-quiet-color);
+    margin-top: 5px;
+    float: left;
+}
+
+.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold;
+    margin: 5px;
+    position: absolute;
+    right: 0;
+}
+
+.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice {
+    background-color: var(--darkened-bg);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+    cursor: default;
+    float: left;
+    margin-right: 5px;
+    margin-top: 5px;
+    padding: 0 5px;
+}
+
+.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice__remove {
+    color: var(--body-quiet-color);
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 2px;
+}
+
+.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice__remove:hover {
+    color: var(--body-fg);
+}
+
+.select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+    float: right;
+}
+
+.select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+    margin-left: 5px;
+    margin-right: auto;
+}
+
+.select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+    margin-left: 2px;
+    margin-right: auto;
+}
+
+.select2-container--admin-autocomplete.select2-container--focus .select2-selection--multiple {
+    border: solid var(--body-quiet-color) 1px;
+    outline: 0;
+}
+
+.select2-container--admin-autocomplete.select2-container--disabled .select2-selection--multiple {
+    background-color: var(--darkened-bg);
+    cursor: default;
+}
+
+.select2-container--admin-autocomplete.select2-container--disabled .select2-selection__choice__remove {
+    display: none;
+}
+
+.select2-container--admin-autocomplete.select2-container--open.select2-container--above .select2-selection--single, .select2-container--admin-autocomplete.select2-container--open.select2-container--above .select2-selection--multiple {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+}
+
+.select2-container--admin-autocomplete.select2-container--open.select2-container--below .select2-selection--single, .select2-container--admin-autocomplete.select2-container--open.select2-container--below .select2-selection--multiple {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+.select2-container--admin-autocomplete .select2-search--dropdown {
+    background: var(--darkened-bg);
+}
+
+.select2-container--admin-autocomplete .select2-search--dropdown .select2-search__field {
+    background: var(--body-bg);
+    color: var(--body-fg);
+    border: 1px solid var(--border-color);
+    border-radius: 4px;
+}
+
+.select2-container--admin-autocomplete .select2-search--inline .select2-search__field {
+    background: transparent;
+    color: var(--body-fg);
+    border: none;
+    outline: 0;
+    box-shadow: none;
+    -webkit-appearance: textfield;
+}
+
+.select2-container--admin-autocomplete .select2-results > .select2-results__options {
+    max-height: 200px;
+    overflow-y: auto;
+    color: var(--body-fg);
+    background: var(--body-bg);
+}
+
+.select2-container--admin-autocomplete .select2-results__option[role=group] {
+    padding: 0;
+}
+
+.select2-container--admin-autocomplete .select2-results__option[aria-disabled=true] {
+    color: var(--body-quiet-color);
+}
+
+.select2-container--admin-autocomplete .select2-results__option[aria-selected=true] {
+    background-color: var(--selected-bg);
+    color: var(--body-fg);
+}
+
+.select2-container--admin-autocomplete .select2-results__option .select2-results__option {
+    padding-left: 1em;
+}
+
+.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__group {
+    padding-left: 0;
+}
+
+.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -1em;
+    padding-left: 2em;
+}
+
+.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -2em;
+    padding-left: 3em;
+}
+
+.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -3em;
+    padding-left: 4em;
+}
+
+.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -4em;
+    padding-left: 5em;
+}
+
+.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -5em;
+    padding-left: 6em;
+}
+
+.select2-container--admin-autocomplete .select2-results__option--highlighted[aria-selected] {
+    background-color: var(--primary);
+    color: var(--primary-fg);
+}
+
+.select2-container--admin-autocomplete .select2-results__group {
+    cursor: default;
+    display: block;
+    padding: 6px;
+}