refactor project structure

prod
Dmitriy Shesterkin 9 years ago
parent 8656fc7903
commit d381e491de
  1. 2
      .bowerrc
  2. 206
      .gitignore
  3. 2
      bower.json
  4. 2
      src/customer/tasks.py
  5. 8
      src/dokumentor/settings/common.py
  6. 0
      static/PD.pdf
  7. 0
      static/ckeditor/plugins/filerimage/dialogs/filerImageDialog.js
  8. 0
      static/ckeditor/plugins/filerimage/icons/filerimage.png
  9. 0
      static/ckeditor/plugins/filerimage/plugin.js
  10. 0
      static/css/custom_admin.css
  11. 0
      static/css/style.css
  12. 0
      static/css/ui-lightness/images/animated-overlay.gif
  13. 0
      static/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
  14. 0
      static/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
  15. 0
      static/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
  16. 0
      static/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
  17. 0
      static/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
  18. 0
      static/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
  19. 0
      static/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
  20. 0
      static/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
  21. 0
      static/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
  22. 0
      static/css/ui-lightness/images/ui-icons_222222_256x240.png
  23. 0
      static/css/ui-lightness/images/ui-icons_228ef1_256x240.png
  24. 0
      static/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
  25. 0
      static/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
  26. 0
      static/css/ui-lightness/images/ui-icons_ffffff_256x240.png
  27. 0
      static/css/ui-lightness/jquery-ui-1.10.3.custom.css
  28. 0
      static/css/ui-lightness/jquery-ui-1.10.3.custom.min.css
  29. 0
      static/dogovor.pdf
  30. 0
      static/favicon.ico
  31. 0
      static/fonts/261413575-a_AvanteLt-DemiBold.eot
  32. 0
      static/fonts/261413575-a_AvanteLt-DemiBold.html
  33. 0
      static/fonts/261413575-a_AvanteLt-DemiBold.svg
  34. 0
      static/fonts/261413575-a_AvanteLt-DemiBold.ttf
  35. 0
      static/fonts/261413575-a_AvanteLt-DemiBold.woff
  36. 0
      static/fonts/332733155-a_AvanteLt-Light.eot
  37. 0
      static/fonts/332733155-a_AvanteLt-Light.html
  38. 0
      static/fonts/332733155-a_AvanteLt-Light.svg
  39. 0
      static/fonts/332733155-a_AvanteLt-Light.ttf
  40. 0
      static/fonts/332733155-a_AvanteLt-Light.woff
  41. 0
      static/fonts/MyriadPro-Light.eot
  42. 0
      static/fonts/MyriadPro-Light.otf
  43. 0
      static/fonts/MyriadPro-Light.svg
  44. 0
      static/fonts/MyriadPro-Light.ttf
  45. 0
      static/fonts/MyriadPro-Light.woff
  46. 0
      static/fonts/myriadpro-cond.eot
  47. 0
      static/fonts/myriadpro-cond.svg
  48. 0
      static/fonts/myriadpro-cond.ttf
  49. 0
      static/fonts/myriadpro-cond.woff
  50. 0
      static/fonts/myriadpro-regular.css
  51. 0
      static/fonts/myriadpro-regular.eot
  52. 0
      static/fonts/myriadpro-regular.svg
  53. 0
      static/fonts/myriadpro-regular.ttf
  54. 0
      static/fonts/myriadpro-regular.woff
  55. 0
      static/img/add-new.png
  56. 0
      static/img/ajax-loader.gif
  57. 0
      static/img/alfa.svg
  58. 0
      static/img/asc.png
  59. 0
      static/img/beel.svg
  60. 0
      static/img/bg.png
  61. 0
      static/img/black_arrow.png
  62. 0
      static/img/close.png
  63. 0
      static/img/comepay.svg
  64. 0
      static/img/darker-bg.png
  65. 0
      static/img/desc.png
  66. 0
      static/img/envelope.png
  67. 0
      static/img/euroset.svg
  68. 0
      static/img/footer-bg.jpg
  69. 0
      static/img/glavbuh_sign.png
  70. 0
      static/img/gotopay-hover.png
  71. 0
      static/img/gotopay.png
  72. 0
      static/img/icon-add.gif
  73. 0
      static/img/icon-add.png
  74. 0
      static/img/icon-alert.gif
  75. 0
      static/img/icon-calendar.gif
  76. 0
      static/img/icon-calendar.png
  77. 0
      static/img/icon-delete.gif
  78. 0
      static/img/icon-delete.png
  79. 0
      static/img/icon-directory.png
  80. 0
      static/img/icon-edit.gif
  81. 0
      static/img/icon-edit.png
  82. 0
      static/img/icon-email.gif
  83. 0
      static/img/icon-error.gif
  84. 0
      static/img/icon-excel.gif
  85. 0
      static/img/icon-pdf.gif
  86. 0
      static/img/icon-success.gif
  87. 0
      static/img/index-banner.png
  88. 0
      static/img/index-promo-1.png
  89. 0
      static/img/index-promo-2.png
  90. 0
      static/img/index-promo-3.png
  91. 0
      static/img/index-promo-bg.jpg
  92. 0
      static/img/index-yellow-bg.jpg
  93. 0
      static/img/lamp-off.png
  94. 0
      static/img/lamp.png
  95. 0
      static/img/left-arrow.gif
  96. 0
      static/img/left-arrow.png
  97. 0
      static/img/login-black.png
  98. 0
      static/img/login-yellow.png
  99. 0
      static/img/login.png
  100. 0
      static/img/logo.png
  101. Some files were not shown because too many files have changed in this diff Show More

@ -1,3 +1,3 @@
{ {
"directory": "src/dokumentor/static/vendor" "directory": "static/vendor"
} }

206
.gitignore vendored

@ -1,23 +1,6 @@
*.*~
*.pyc
.DS_Store
._*
pip-log.txt
ENV/
.idea/
Thumbs.db
distribute-*.tar.gz
*.bak
*.swp
_public_html/
celerybeat-schedule celerybeat-schedule
yandex_money.log
/tmp_emails/ /tmp_emails/
/media/
/static/
/src/dokumentor/media/
/tmp/ /tmp/
/data/
/db/ /db/
/public/ /public/
conf/env conf/env
@ -25,4 +8,191 @@ conf/env
!parts !parts
!.gitkeep !.gitkeep
!form.html !form.html
/src/dokumentor/static/vendor/ /static/vendor
######################All system################################################
# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so
# Packages #
############
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
# Logs and databases #
######################
*.log
*.sql
*.sqlite
*.sqlite3
*.fdb
*.gdb
# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db
################################################################################
####################JetBrains###################################################
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
*.iml
## Directory-based project format:
.idea/
# if you remove the above rule, at least ignore the following:
# User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/dictionaries
# Sensitive or high-churn files:
# .idea/dataSources.ids
# .idea/dataSources.xml
# .idea/sqlDataSources.xml
# .idea/dynamic.xml
# .idea/uiDesigner.xml
# Gradle:
# .idea/gradle.xml
# .idea/libraries
# Mongo Explorer plugin:
# .idea/mongoSettings.xml
## File-based project format:
*.ipr
*.iws
## Plugin-specific files:
# IntelliJ
/out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
################################################################################
################## OSX.gitignore ###############################################
.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
################################################################################
#######################Python.gitignore#########################################
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class
# C extensions
*.so
# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
#lib
lib64/
parts/
sdist/
*.egg-info/
.installed.cfg
*.egg
# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec
# Installer logs
pip-log.txt
pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover
# Translations
*.mo
*.pot
# Sphinx documentation
docs/_build/
# PyBuilder
target/
################################################################################
##############################Sass.gitignore####################################
.sass-cache/
*.css.map
################################################################################

@ -11,7 +11,7 @@
"**/.*", "**/.*",
"node_modules", "node_modules",
"bower_components", "bower_components",
"src/dokumentor/static/vendor", "static/vendor",
"test", "test",
"tests" "tests"
], ],

@ -38,8 +38,6 @@ def check_license():
message=f'Profile id={profile.pk}.\n\n{traceback.format_exc(e)}' message=f'Profile id={profile.pk}.\n\n{traceback.format_exc(e)}'
) )
return None
@shared_task @shared_task
def delete_not_activated_users(): def delete_not_activated_users():

@ -6,9 +6,11 @@ from datetime import timedelta
import envvars as e import envvars as e
# PATH
PROJECT_DIR = os.path.normpath(os.path.join(os.path.dirname(__file__), '..')) PROJECT_DIR = os.path.normpath(os.path.join(os.path.dirname(__file__), '..'))
MANAGE_DIR = os.path.normpath(os.path.join(PROJECT_DIR, '..')) MANAGE_DIR = os.path.normpath(os.path.join(PROJECT_DIR, '..'))
ROOT_DIR = os.path.normpath(os.path.join(MANAGE_DIR, '..')) ROOT_DIR = os.path.normpath(os.path.join(MANAGE_DIR, '..'))
TEMPLATE_PATH = os.path.join(ROOT_DIR, 'templates')
sys.path.append(PROJECT_DIR) sys.path.append(PROJECT_DIR)
sys.path.append(MANAGE_DIR) sys.path.append(MANAGE_DIR)
@ -70,7 +72,7 @@ STATIC_URL = '/static/'
# Additional locations of static files # Additional locations of static files
STATICFILES_DIRS = ( STATICFILES_DIRS = (
os.path.join(PROJECT_DIR, 'static'), os.path.join(ROOT_DIR, 'static'),
) )
MIDDLEWARE_CLASSES = [ MIDDLEWARE_CLASSES = [
@ -92,9 +94,7 @@ MIDDLEWARE_CLASSES = [
TEMPLATES = [ TEMPLATES = [
{ {
'BACKEND': 'django.template.backends.django.DjangoTemplates', 'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [ 'DIRS': [TEMPLATE_PATH],
os.path.join(PROJECT_DIR, 'templates'),
],
'OPTIONS': { 'OPTIONS': {
'context_processors': [ 'context_processors': [
'django.contrib.auth.context_processors.auth', 'django.contrib.auth.context_processors.auth',

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 340 KiB

After

Width:  |  Height:  |  Size: 340 KiB

Before

Width:  |  Height:  |  Size: 596 KiB

After

Width:  |  Height:  |  Size: 596 KiB

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Before

Width:  |  Height:  |  Size: 150 B

After

Width:  |  Height:  |  Size: 150 B

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 82 KiB

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 570 B

After

Width:  |  Height:  |  Size: 570 B

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before

Width:  |  Height:  |  Size: 479 KiB

After

Width:  |  Height:  |  Size: 479 KiB

Before

Width:  |  Height:  |  Size: 148 B

After

Width:  |  Height:  |  Size: 148 B

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before

Width:  |  Height:  |  Size: 416 B

After

Width:  |  Height:  |  Size: 416 B

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 374 B

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Before

Width:  |  Height:  |  Size: 145 B

After

Width:  |  Height:  |  Size: 145 B

Before

Width:  |  Height:  |  Size: 413 B

After

Width:  |  Height:  |  Size: 413 B

Before

Width:  |  Height:  |  Size: 730 B

After

Width:  |  Height:  |  Size: 730 B

Before

Width:  |  Height:  |  Size: 420 B

After

Width:  |  Height:  |  Size: 420 B

Before

Width:  |  Height:  |  Size: 523 B

After

Width:  |  Height:  |  Size: 523 B

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Before

Width:  |  Height:  |  Size: 397 B

After

Width:  |  Height:  |  Size: 397 B

Before

Width:  |  Height:  |  Size: 772 B

After

Width:  |  Height:  |  Size: 772 B

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 395 B

Before

Width:  |  Height:  |  Size: 319 B

After

Width:  |  Height:  |  Size: 319 B

Before

Width:  |  Height:  |  Size: 433 B

After

Width:  |  Height:  |  Size: 433 B

Before

Width:  |  Height:  |  Size: 422 B

After

Width:  |  Height:  |  Size: 422 B

Before

Width:  |  Height:  |  Size: 341 B

After

Width:  |  Height:  |  Size: 341 B

Before

Width:  |  Height:  |  Size: 891 KiB

After

Width:  |  Height:  |  Size: 891 KiB

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 272 B

Before

Width:  |  Height:  |  Size: 289 B

After

Width:  |  Height:  |  Size: 289 B

Before

Width:  |  Height:  |  Size: 952 B

After

Width:  |  Height:  |  Size: 952 B

Before

Width:  |  Height:  |  Size: 906 B

After

Width:  |  Height:  |  Size: 906 B

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Before

Width:  |  Height:  |  Size: 625 B

After

Width:  |  Height:  |  Size: 625 B

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save