diff --git a/edivorce/settings/base.py b/edivorce/settings/base.py index 00cc7c6f..5439678c 100644 --- a/edivorce/settings/base.py +++ b/edivorce/settings/base.py @@ -47,6 +47,7 @@ INSTALLED_APPS = ( 'django.contrib.humanize', 'rest_framework', 'debug_toolbar', + 'corsheaders', 'edivorce.apps.core', 'compressor', 'crispy_forms', @@ -63,6 +64,7 @@ MIDDLEWARE = ( 'edivorce.apps.core.middleware.basicauth_middleware.BasicAuthMiddleware', 'debug_toolbar.middleware.DebugToolbarMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'corsheaders.middleware.CorsMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', diff --git a/edivorce/settings/local.py b/edivorce/settings/local.py index d413bc51..0f4ec828 100644 --- a/edivorce/settings/local.py +++ b/edivorce/settings/local.py @@ -26,6 +26,7 @@ PROXY_BASE_URL = '' SASS_PROCESSOR_ENABLED = True SASS_PROCESSOR_ROOT = PROJECT_ROOT + '/edivorce/apps/core/static' SASS_OUTPUT_STYLE = 'compressed' +CORS_ORIGIN_ALLOW_ALL = True LOGOUT_URL = '/accounts/logout/' diff --git a/requirements.txt b/requirements.txt index c0c4f8e7..addd26c3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,7 @@ clamd==1.0.2 Django==2.2.15 django-appconf==1.0.4 django-compressor==2.4 +django-cors-headers==3.5 django-crispy-forms==1.9.2 django-debug-toolbar==2.2 django-sass-processor==0.8 diff --git a/vue/public/final-filing.html b/vue/public/final-filing.html index 7bfd6777..26d90ae1 100644 --- a/vue/public/final-filing.html +++ b/vue/public/final-filing.html @@ -13,7 +13,8 @@ how-to-sign="Together" how-to-file="Online" sign-file-options-url="https://wwww.google.com" - print-form-url="https://wwww.facebook.com"> + print-form-url="https://wwww.facebook.com" + proxy-root-path="http://localhost:8000/"> diff --git a/vue/public/initial-filing.html b/vue/public/initial-filing.html index 94fb5c48..e7f9e9eb 100644 --- a/vue/public/initial-filing.html +++ b/vue/public/initial-filing.html @@ -9,7 +9,8 @@ + spouse-signing-location="In-person" + proxy-root-path="http://localhost:8000/"> diff --git a/vue/src/components/ItemTile.vue b/vue/src/components/ItemTile.vue index 414f0a8e..66132675 100644 --- a/vue/src/components/ItemTile.vue +++ b/vue/src/components/ItemTile.vue @@ -1,7 +1,7 @@ @@ -65,7 +75,7 @@ export default { margin-bottom: 5px; position: relative; - .image-wrap, .status-wrap { + .image-wrap { height: 160px; border: 1px solid black; border-top-left-radius: 6px; @@ -77,32 +87,6 @@ export default { overflow-y: hidden; } - .status-wrap { - border-bottom-left-radius: 6px; - border-bottom-right-radius: 6px; - display: flex; - flex-direction: column; - justify-content: center; - text-align: center; - } - - .progress { - width: calc(100% - 1.5px); - background-color: #F2F2F3; - height: 22px; - position: absolute; - bottom: -19.5px; - left: 1px; - border-radius: 0; - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; - - > div { - background-color: #365EBE; - height: 22px; - } - } - .item-text { text-align: center; min-height: 75px; @@ -125,10 +109,27 @@ export default { margin-bottom: 10px; } - img { + img.rotate-0 { width: 98%; } + img.rotate-90 { + transform: rotate(90deg); + height: 98%; + max-width: 98%; + } + + img.rotate-180 { + transform: rotate(180deg); + width: 98%; + } + + img.rotate-270 { + transform: rotate(270deg); + height: 98%; + max-width: 98%; + } + button { position: relative; z-index: 2; diff --git a/vue/src/components/ProgressBar.vue b/vue/src/components/ProgressBar.vue new file mode 100644 index 00000000..253e708a --- /dev/null +++ b/vue/src/components/ProgressBar.vue @@ -0,0 +1,60 @@ + + + + + \ No newline at end of file diff --git a/vue/src/components/Uploader.vue b/vue/src/components/Uploader.vue index 754b659c..8331492f 100644 --- a/vue/src/components/Uploader.vue +++ b/vue/src/components/Uploader.vue @@ -39,7 +39,9 @@ :file-count="files.length" @remove="remove(file)" @moveup="moveUp(index)" - @movedown="moveDown(index)"/> + @movedown="moveDown(index)" + @rotateleft="rotateLeft(index)" + @rotateright="rotateRight(index)"/>
@@ -130,6 +132,7 @@ export default { let URL = window.URL || window.webkitURL if (URL && URL.createObjectURL) { newFile.objectURL = URL.createObjectURL(newFile.file) + newFile.rotation = 0; } } }, @@ -146,6 +149,12 @@ export default { this.files.splice(old_index + 1, 0, this.files.splice(old_index, 1)[0]); } }, + rotateLeft(index) { + this.files[index].rotation -= 90; + }, + rotateRight(index) { + this.files[index].rotation += 90; + }, draggingOn() { this.dragging = true; },