diff options
-rw-r--r-- | app/builder/views.py | 2 | ||||
-rw-r--r-- | bak/unused_apps/budget/0007_luxpurchase_cat.py (renamed from app/budget/0007_luxpurchase_cat.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/admin.py (renamed from app/budget/admin.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/migrations/0001_initial.py (renamed from app/budget/migrations/0001_initial.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/migrations/0002_alter_luxpurchase_amount.py (renamed from app/budget/migrations/0002_alter_luxpurchase_amount.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/migrations/0003_alter_luxpurchase_category_alter_luxpurchase_source.py (renamed from app/budget/migrations/0003_alter_luxpurchase_category_alter_luxpurchase_source.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/migrations/0004_alter_luxpurchase_source.py (renamed from app/budget/migrations/0004_alter_luxpurchase_source.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/migrations/0005_luxspendingcategory_luxfixedmonthly.py (renamed from app/budget/migrations/0005_luxspendingcategory_luxfixedmonthly.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/migrations/0006_remove_luxfixedmonthly_cat_and_more.py (renamed from app/budget/migrations/0006_remove_luxfixedmonthly_cat_and_more.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/migrations/0007_luxpurchase_cat.py (renamed from app/budget/migrations/0007_luxpurchase_cat.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/migrations/0008_remove_luxpurchase_category.py (renamed from app/budget/migrations/0008_remove_luxpurchase_category.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/migrations/0009_rename_cat_luxpurchase_category.py (renamed from app/budget/migrations/0009_rename_cat_luxpurchase_category.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/migrations/0010_luxfixedmonthly_amount.py (renamed from app/budget/migrations/0010_luxfixedmonthly_amount.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/migrations/0011_luxpaymentmethod_alter_luxfixedmonthly_amount_and_more.py (renamed from app/budget/migrations/0011_luxpaymentmethod_alter_luxfixedmonthly_amount_and_more.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/migrations/__init__.py (renamed from app/budget/migrations/__init__.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/models.py (renamed from app/budget/models.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/templates/budget/base.html (renamed from app/budget/templates/budget/base.html) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/templates/budget/create_cat_form.html (renamed from app/budget/templates/budget/create_cat_form.html) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/templates/budget/create_form.html (renamed from app/budget/templates/budget/create_form.html) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/templates/budget/luxpurchase_list.html (renamed from app/budget/templates/budget/luxpurchase_list.html) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/templates/budget/update_form.html (renamed from app/budget/templates/budget/update_form.html) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/urls.py (renamed from app/budget/urls.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/budget/views.py (renamed from app/budget/views.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/admin.py (renamed from app/resume/admin.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/build.py (renamed from app/resume/build.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/migrations/0001_initial.py (renamed from app/resume/migrations/0001_initial.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/migrations/0002_auto_20151207_2105.py (renamed from app/resume/migrations/0002_auto_20151207_2105.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/migrations/0003_auto_20151211_1925.py (renamed from app/resume/migrations/0003_auto_20151211_1925.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/migrations/0004_job_resume.py (renamed from app/resume/migrations/0004_job_resume.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/migrations/0005_job_slug.py (renamed from app/resume/migrations/0005_job_slug.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/migrations/0006_auto_20190112_1257.py (renamed from app/resume/migrations/0006_auto_20190112_1257.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/migrations/0007_auto_20190113_1128.py (renamed from app/resume/migrations/0007_auto_20190113_1128.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/migrations/0008_auto_20190113_1139.py (renamed from app/resume/migrations/0008_auto_20190113_1139.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/migrations/0009_job_body_html.py (renamed from app/resume/migrations/0009_job_body_html.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/migrations/0010_auto_20190113_1147.py (renamed from app/resume/migrations/0010_auto_20190113_1147.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/migrations/0011_auto_20190114_0227.py (renamed from app/resume/migrations/0011_auto_20190114_0227.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/migrations/__init__.py (renamed from app/resume/migrations/__init__.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/models.py (renamed from app/resume/models.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/urls.py (renamed from app/resume/urls.py) | 0 | ||||
-rw-r--r-- | bak/unused_apps/resume/views.py (renamed from app/resume/views.py) | 0 | ||||
-rw-r--r-- | config/base_urls.py | 35 |
41 files changed, 19 insertions, 18 deletions
diff --git a/app/builder/views.py b/app/builder/views.py index 211b585..6621bc2 100644 --- a/app/builder/views.py +++ b/app/builder/views.py @@ -2,7 +2,7 @@ from django.shortcuts import render from django.template import RequestContext #from builder.base import BuildWriting, BuildWritingFeed, BuildMap, BuildPhotos, BuildProjects, BuildSitemap #from jrnl.build import archive_builder, detail_builder, home_builder, rss_builder, map_builder -from resume.build import pub_builder, resume_builder +#from resume.build import pub_builder, resume_builder from books.build import builder as book_builder from sightings.build import builder as sightings_builder from pages.build import BuildPages, BuildHome diff --git a/app/budget/0007_luxpurchase_cat.py b/bak/unused_apps/budget/0007_luxpurchase_cat.py index b7bb553..b7bb553 100644 --- a/app/budget/0007_luxpurchase_cat.py +++ b/bak/unused_apps/budget/0007_luxpurchase_cat.py diff --git a/app/budget/admin.py b/bak/unused_apps/budget/admin.py index 0f578fb..0f578fb 100644 --- a/app/budget/admin.py +++ b/bak/unused_apps/budget/admin.py diff --git a/app/budget/migrations/0001_initial.py b/bak/unused_apps/budget/migrations/0001_initial.py index 30bd5a1..30bd5a1 100644 --- a/app/budget/migrations/0001_initial.py +++ b/bak/unused_apps/budget/migrations/0001_initial.py diff --git a/app/budget/migrations/0002_alter_luxpurchase_amount.py b/bak/unused_apps/budget/migrations/0002_alter_luxpurchase_amount.py index 06400dd..06400dd 100644 --- a/app/budget/migrations/0002_alter_luxpurchase_amount.py +++ b/bak/unused_apps/budget/migrations/0002_alter_luxpurchase_amount.py diff --git a/app/budget/migrations/0003_alter_luxpurchase_category_alter_luxpurchase_source.py b/bak/unused_apps/budget/migrations/0003_alter_luxpurchase_category_alter_luxpurchase_source.py index a880acf..a880acf 100644 --- a/app/budget/migrations/0003_alter_luxpurchase_category_alter_luxpurchase_source.py +++ b/bak/unused_apps/budget/migrations/0003_alter_luxpurchase_category_alter_luxpurchase_source.py diff --git a/app/budget/migrations/0004_alter_luxpurchase_source.py b/bak/unused_apps/budget/migrations/0004_alter_luxpurchase_source.py index 0eab270..0eab270 100644 --- a/app/budget/migrations/0004_alter_luxpurchase_source.py +++ b/bak/unused_apps/budget/migrations/0004_alter_luxpurchase_source.py diff --git a/app/budget/migrations/0005_luxspendingcategory_luxfixedmonthly.py b/bak/unused_apps/budget/migrations/0005_luxspendingcategory_luxfixedmonthly.py index 66af470..66af470 100644 --- a/app/budget/migrations/0005_luxspendingcategory_luxfixedmonthly.py +++ b/bak/unused_apps/budget/migrations/0005_luxspendingcategory_luxfixedmonthly.py diff --git a/app/budget/migrations/0006_remove_luxfixedmonthly_cat_and_more.py b/bak/unused_apps/budget/migrations/0006_remove_luxfixedmonthly_cat_and_more.py index 3631cc3..3631cc3 100644 --- a/app/budget/migrations/0006_remove_luxfixedmonthly_cat_and_more.py +++ b/bak/unused_apps/budget/migrations/0006_remove_luxfixedmonthly_cat_and_more.py diff --git a/app/budget/migrations/0007_luxpurchase_cat.py b/bak/unused_apps/budget/migrations/0007_luxpurchase_cat.py index 7a8e548..7a8e548 100644 --- a/app/budget/migrations/0007_luxpurchase_cat.py +++ b/bak/unused_apps/budget/migrations/0007_luxpurchase_cat.py diff --git a/app/budget/migrations/0008_remove_luxpurchase_category.py b/bak/unused_apps/budget/migrations/0008_remove_luxpurchase_category.py index 7e2a0b9..7e2a0b9 100644 --- a/app/budget/migrations/0008_remove_luxpurchase_category.py +++ b/bak/unused_apps/budget/migrations/0008_remove_luxpurchase_category.py diff --git a/app/budget/migrations/0009_rename_cat_luxpurchase_category.py b/bak/unused_apps/budget/migrations/0009_rename_cat_luxpurchase_category.py index c0efeff..c0efeff 100644 --- a/app/budget/migrations/0009_rename_cat_luxpurchase_category.py +++ b/bak/unused_apps/budget/migrations/0009_rename_cat_luxpurchase_category.py diff --git a/app/budget/migrations/0010_luxfixedmonthly_amount.py b/bak/unused_apps/budget/migrations/0010_luxfixedmonthly_amount.py index 15461d4..15461d4 100644 --- a/app/budget/migrations/0010_luxfixedmonthly_amount.py +++ b/bak/unused_apps/budget/migrations/0010_luxfixedmonthly_amount.py diff --git a/app/budget/migrations/0011_luxpaymentmethod_alter_luxfixedmonthly_amount_and_more.py b/bak/unused_apps/budget/migrations/0011_luxpaymentmethod_alter_luxfixedmonthly_amount_and_more.py index 4186c52..4186c52 100644 --- a/app/budget/migrations/0011_luxpaymentmethod_alter_luxfixedmonthly_amount_and_more.py +++ b/bak/unused_apps/budget/migrations/0011_luxpaymentmethod_alter_luxfixedmonthly_amount_and_more.py diff --git a/app/budget/migrations/__init__.py b/bak/unused_apps/budget/migrations/__init__.py index e69de29..e69de29 100644 --- a/app/budget/migrations/__init__.py +++ b/bak/unused_apps/budget/migrations/__init__.py diff --git a/app/budget/models.py b/bak/unused_apps/budget/models.py index 512b019..512b019 100644 --- a/app/budget/models.py +++ b/bak/unused_apps/budget/models.py diff --git a/app/budget/templates/budget/base.html b/bak/unused_apps/budget/templates/budget/base.html index 9d6bfd0..9d6bfd0 100644 --- a/app/budget/templates/budget/base.html +++ b/bak/unused_apps/budget/templates/budget/base.html diff --git a/app/budget/templates/budget/create_cat_form.html b/bak/unused_apps/budget/templates/budget/create_cat_form.html index 03e996a..03e996a 100644 --- a/app/budget/templates/budget/create_cat_form.html +++ b/bak/unused_apps/budget/templates/budget/create_cat_form.html diff --git a/app/budget/templates/budget/create_form.html b/bak/unused_apps/budget/templates/budget/create_form.html index 2d38acf..2d38acf 100644 --- a/app/budget/templates/budget/create_form.html +++ b/bak/unused_apps/budget/templates/budget/create_form.html diff --git a/app/budget/templates/budget/luxpurchase_list.html b/bak/unused_apps/budget/templates/budget/luxpurchase_list.html index c03f14d..c03f14d 100644 --- a/app/budget/templates/budget/luxpurchase_list.html +++ b/bak/unused_apps/budget/templates/budget/luxpurchase_list.html diff --git a/app/budget/templates/budget/update_form.html b/bak/unused_apps/budget/templates/budget/update_form.html index b19efaa..b19efaa 100644 --- a/app/budget/templates/budget/update_form.html +++ b/bak/unused_apps/budget/templates/budget/update_form.html diff --git a/app/budget/urls.py b/bak/unused_apps/budget/urls.py index ef7852f..ef7852f 100644 --- a/app/budget/urls.py +++ b/bak/unused_apps/budget/urls.py diff --git a/app/budget/views.py b/bak/unused_apps/budget/views.py index 6a34b1e..6a34b1e 100644 --- a/app/budget/views.py +++ b/bak/unused_apps/budget/views.py diff --git a/app/resume/admin.py b/bak/unused_apps/resume/admin.py index 8646cca..8646cca 100644 --- a/app/resume/admin.py +++ b/bak/unused_apps/resume/admin.py diff --git a/app/resume/build.py b/bak/unused_apps/resume/build.py index 4f051d5..4f051d5 100644 --- a/app/resume/build.py +++ b/bak/unused_apps/resume/build.py diff --git a/app/resume/migrations/0001_initial.py b/bak/unused_apps/resume/migrations/0001_initial.py index 14c9348..14c9348 100644 --- a/app/resume/migrations/0001_initial.py +++ b/bak/unused_apps/resume/migrations/0001_initial.py diff --git a/app/resume/migrations/0002_auto_20151207_2105.py b/bak/unused_apps/resume/migrations/0002_auto_20151207_2105.py index 7ac653f..7ac653f 100644 --- a/app/resume/migrations/0002_auto_20151207_2105.py +++ b/bak/unused_apps/resume/migrations/0002_auto_20151207_2105.py diff --git a/app/resume/migrations/0003_auto_20151211_1925.py b/bak/unused_apps/resume/migrations/0003_auto_20151211_1925.py index 77e3049..77e3049 100644 --- a/app/resume/migrations/0003_auto_20151211_1925.py +++ b/bak/unused_apps/resume/migrations/0003_auto_20151211_1925.py diff --git a/app/resume/migrations/0004_job_resume.py b/bak/unused_apps/resume/migrations/0004_job_resume.py index e056fec..e056fec 100644 --- a/app/resume/migrations/0004_job_resume.py +++ b/bak/unused_apps/resume/migrations/0004_job_resume.py diff --git a/app/resume/migrations/0005_job_slug.py b/bak/unused_apps/resume/migrations/0005_job_slug.py index d18baeb..d18baeb 100644 --- a/app/resume/migrations/0005_job_slug.py +++ b/bak/unused_apps/resume/migrations/0005_job_slug.py diff --git a/app/resume/migrations/0006_auto_20190112_1257.py b/bak/unused_apps/resume/migrations/0006_auto_20190112_1257.py index 9ee8f1b..9ee8f1b 100644 --- a/app/resume/migrations/0006_auto_20190112_1257.py +++ b/bak/unused_apps/resume/migrations/0006_auto_20190112_1257.py diff --git a/app/resume/migrations/0007_auto_20190113_1128.py b/bak/unused_apps/resume/migrations/0007_auto_20190113_1128.py index a635258..a635258 100644 --- a/app/resume/migrations/0007_auto_20190113_1128.py +++ b/bak/unused_apps/resume/migrations/0007_auto_20190113_1128.py diff --git a/app/resume/migrations/0008_auto_20190113_1139.py b/bak/unused_apps/resume/migrations/0008_auto_20190113_1139.py index 29d975d..29d975d 100644 --- a/app/resume/migrations/0008_auto_20190113_1139.py +++ b/bak/unused_apps/resume/migrations/0008_auto_20190113_1139.py diff --git a/app/resume/migrations/0009_job_body_html.py b/bak/unused_apps/resume/migrations/0009_job_body_html.py index fdeea15..fdeea15 100644 --- a/app/resume/migrations/0009_job_body_html.py +++ b/bak/unused_apps/resume/migrations/0009_job_body_html.py diff --git a/app/resume/migrations/0010_auto_20190113_1147.py b/bak/unused_apps/resume/migrations/0010_auto_20190113_1147.py index 879bd55..879bd55 100644 --- a/app/resume/migrations/0010_auto_20190113_1147.py +++ b/bak/unused_apps/resume/migrations/0010_auto_20190113_1147.py diff --git a/app/resume/migrations/0011_auto_20190114_0227.py b/bak/unused_apps/resume/migrations/0011_auto_20190114_0227.py index 7656c6e..7656c6e 100644 --- a/app/resume/migrations/0011_auto_20190114_0227.py +++ b/bak/unused_apps/resume/migrations/0011_auto_20190114_0227.py diff --git a/app/resume/migrations/__init__.py b/bak/unused_apps/resume/migrations/__init__.py index e69de29..e69de29 100644 --- a/app/resume/migrations/__init__.py +++ b/bak/unused_apps/resume/migrations/__init__.py diff --git a/app/resume/models.py b/bak/unused_apps/resume/models.py index bac3115..bac3115 100644 --- a/app/resume/models.py +++ b/bak/unused_apps/resume/models.py diff --git a/app/resume/urls.py b/bak/unused_apps/resume/urls.py index de95866..de95866 100644 --- a/app/resume/urls.py +++ b/bak/unused_apps/resume/urls.py diff --git a/app/resume/views.py b/bak/unused_apps/resume/views.py index 3d0cd8d..3d0cd8d 100644 --- a/app/resume/views.py +++ b/bak/unused_apps/resume/views.py diff --git a/config/base_urls.py b/config/base_urls.py index 0677a15..2b7d43d 100644 --- a/config/base_urls.py +++ b/config/base_urls.py @@ -27,37 +27,44 @@ sitemaps = { } urlpatterns = [ - re_path(r'^admin/build/.*', builder.views.do_build), - path(r'admin/data/', include('utils.urls')), + # old unused urls #path(r'admin/income/invoice/monthlyview/<str:slug>/invoice/', DownloadMonthlyInvoiceView.as_view(), name="download-invoice"), #path(r'admin/income/invoice/monthlyview/<str:slug>/', MonthlyInvoiceView.as_view(), name="monthly-invoice"), + #path(r'spending/', include('budget.urls')), + #path(r'projects/', include('projects.urls')), + #path(r'expenses/', include('expenses.urls', namespace='expenses')), + #path(r'film/', include('posts.urls.film_urls')), + #re_path(r'^film/$', RedirectView.as_view(url='/films/')), + #path(r'films/', include('posts.urls.film_urls', namespace='films')), + #path(r'review/', include('posts.urls.review_urls')), + #re_path(r'^review/$', RedirectView.as_view(url='/reviews/')), + #path(r'reviews/', include('posts.urls.review_urls', namespace='review-list')), + #path(r'how-to/', include('posts.urls.craft_urls')), + #re_path(r'^how-to/$', RedirectView.as_view(url='/how-to/')), + #path(r'how-tos/', include('posts.urls.craft_urls', namespace='craft')), + #path(r'people/', include('people.urls')), + #path(r'work/', include('resume.urls', namespace='resume')), + #path(r'<path>/<slug>/', PageDetailView.as_view()), + re_path(r'^admin/build/.*', builder.views.do_build), + path(r'admin/data/', include('utils.urls')), path(r'admin/', admin.site.urls), path(r'trading/', include('trading.urls')), path(r'gtd/', include('gtd.urls')), - path(r'spending/', include('budget.urls')), path(r'planner/', include('planner.urls')), path(r'luximages/insert/', utils.views.insert_image), path(r'feed.xml', JrnlRSSFeedView(),name="feed"), path(r'sitemap.xml', sitemap, {'sitemaps': sitemaps}), path(r'links/', include('links.urls')), path(r'jrnl/', include('posts.urls.jrnl_urls', namespace='jrnl')), - #path(r'projects/', include('projects.urls')), path(r'walk/', include('locations.walk_urls')), path(r'walks/', include('locations.walk_urls')), path(r'locations/', include('locations.urls')), - #path(r'expenses/', include('expenses.urls', namespace='expenses')), path(r'newsletter/', include('lttr.urls')), path(r'photos/', include('media.urls')), path(r'images/', include('posts.urls.photo_essay_urls', namespace='photo-essay-list')), - #path(r'film/', include('posts.urls.film_urls')), - #re_path(r'^film/$', RedirectView.as_view(url='/films/')), - #path(r'films/', include('posts.urls.film_urls', namespace='films')), re_path(r'^trip/$', RedirectView.as_view(url='/trips/')), path(r'trip/', include('posts.urls.trip_urls')), path(r'trips/', include('posts.urls.trip_urls', namespace='trips')), - #path(r'review/', include('posts.urls.review_urls')), - #re_path(r'^review/$', RedirectView.as_view(url='/reviews/')), - #path(r'reviews/', include('posts.urls.review_urls', namespace='review-list')), re_path(r'^guide/$', RedirectView.as_view(url='/guides/')), path(r'guides/', include('posts.urls.guide_urls', namespace='guides')), path(r'guide/', include('posts.urls.guide_urls')), @@ -66,22 +73,16 @@ urlpatterns = [ path(r'essays/', include('posts.urls.essay_urls', namespace='essay-list')), path(r'range/', include('posts.urls.range_urls', namespace='range')), path(r'friends/', include('posts.urls.friends_urls', namespace='friends')), - #path(r'how-to/', include('posts.urls.craft_urls')), - #re_path(r'^how-to/$', RedirectView.as_view(url='/how-to/')), - #path(r'how-tos/', include('posts.urls.craft_urls', namespace='craft')), path(r'book-notes/', include('books.urls')), - #path(r'people/', include('people.urls')), path(r'dialogues/', include('sightings.urls', namespace='sightings')), path(r'field-notes/', include('posts.urls.field_note_urls', namespace='fieldnote')), path(r'src/', include('posts.urls.src_urls', namespace='src')), - path(r'work/', include('resume.urls', namespace='resume')), path(r'map', include('locations.urls', namespace='map')), path(r'map/', include('locations.urls', namespace='map')), path(r'', HomePageList.as_view(), {'pk':1,}, name="homepage"), path(r'comments/', include('django_comments.urls')), path(r'<slug>.txt', PageDetailTXTView.as_view()), path(r'<slug>', include('pages.urls', namespace='pages')), - #path(r'<path>/<slug>/', PageDetailView.as_view()), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) |