From 5d0dbbe89520c63a23294d8d113975ba6b4dccb0 Mon Sep 17 00:00:00 2001 From: Pierre Dittgen Date: Mon, 8 Oct 2018 11:30:01 +0200 Subject: [PATCH] validata_ui_next -> validata_ui --- .gitignore | 2 +- README.md | 2 +- serve.sh | 2 +- setup.py | 4 ++-- {validata_ui_next => validata_ui}/__init__.py | 4 ++-- {validata_ui_next => validata_ui}/error_messages.py | 0 .../static/css/bootstrap-grid.css | 0 .../static/css/bootstrap-grid.css.map | 0 .../static/css/bootstrap-grid.min.css | 0 .../static/css/bootstrap-grid.min.css.map | 0 .../static/css/bootstrap-reboot.css | 0 .../static/css/bootstrap-reboot.css.map | 0 .../static/css/bootstrap-reboot.min.css | 0 .../static/css/bootstrap-reboot.min.css.map | 0 .../static/css/bootstrap.css | 0 .../static/css/bootstrap.css.map | 0 .../static/css/bootstrap.min.css | 0 .../static/css/bootstrap.min.css.map | 0 .../static/css/sticky-footer-navbar.css | 0 .../static/img/favicon.ico | Bin .../static/img/logo-horizontal.png | Bin .../static/img/logo-only.png | Bin .../static/js/bootstrap-filestyle.min.js | 0 .../static/js/bootstrap.bundle.js | 0 .../static/js/bootstrap.bundle.js.map | 0 .../static/js/bootstrap.bundle.min.js | 0 .../static/js/bootstrap.bundle.min.js.map | 0 .../static/js/bootstrap.js | 0 .../static/js/bootstrap.js.map | 0 .../static/js/bootstrap.min.js | 0 .../static/js/bootstrap.min.js.map | 0 .../static/js/jquery-3.3.1.min.js | 0 .../static/js/popper.min.js | 0 .../templates/base_template.html | 0 .../templates/home.html | 0 .../templates/table_macros.html | 0 .../templates/validation_form.html | 0 .../templates/validation_report.html | 0 {validata_ui_next => validata_ui}/util.py | 0 .../validate_helper.py | 0 {validata_ui_next => validata_ui}/views.py | 8 ++++---- 41 files changed, 11 insertions(+), 11 deletions(-) rename {validata_ui_next => validata_ui}/__init__.py (98%) rename {validata_ui_next => validata_ui}/error_messages.py (100%) rename {validata_ui_next => validata_ui}/static/css/bootstrap-grid.css (100%) rename {validata_ui_next => validata_ui}/static/css/bootstrap-grid.css.map (100%) rename {validata_ui_next => validata_ui}/static/css/bootstrap-grid.min.css (100%) rename {validata_ui_next => validata_ui}/static/css/bootstrap-grid.min.css.map (100%) rename {validata_ui_next => validata_ui}/static/css/bootstrap-reboot.css (100%) rename {validata_ui_next => validata_ui}/static/css/bootstrap-reboot.css.map (100%) rename {validata_ui_next => validata_ui}/static/css/bootstrap-reboot.min.css (100%) rename {validata_ui_next => validata_ui}/static/css/bootstrap-reboot.min.css.map (100%) rename {validata_ui_next => validata_ui}/static/css/bootstrap.css (100%) rename {validata_ui_next => validata_ui}/static/css/bootstrap.css.map (100%) rename {validata_ui_next => validata_ui}/static/css/bootstrap.min.css (100%) rename {validata_ui_next => validata_ui}/static/css/bootstrap.min.css.map (100%) rename {validata_ui_next => validata_ui}/static/css/sticky-footer-navbar.css (100%) rename {validata_ui_next => validata_ui}/static/img/favicon.ico (100%) rename {validata_ui_next => validata_ui}/static/img/logo-horizontal.png (100%) rename {validata_ui_next => validata_ui}/static/img/logo-only.png (100%) rename {validata_ui_next => validata_ui}/static/js/bootstrap-filestyle.min.js (100%) rename {validata_ui_next => validata_ui}/static/js/bootstrap.bundle.js (100%) rename {validata_ui_next => validata_ui}/static/js/bootstrap.bundle.js.map (100%) rename {validata_ui_next => validata_ui}/static/js/bootstrap.bundle.min.js (100%) rename {validata_ui_next => validata_ui}/static/js/bootstrap.bundle.min.js.map (100%) rename {validata_ui_next => validata_ui}/static/js/bootstrap.js (100%) rename {validata_ui_next => validata_ui}/static/js/bootstrap.js.map (100%) rename {validata_ui_next => validata_ui}/static/js/bootstrap.min.js (100%) rename {validata_ui_next => validata_ui}/static/js/bootstrap.min.js.map (100%) rename {validata_ui_next => validata_ui}/static/js/jquery-3.3.1.min.js (100%) rename {validata_ui_next => validata_ui}/static/js/popper.min.js (100%) rename {validata_ui_next => validata_ui}/templates/base_template.html (100%) rename {validata_ui_next => validata_ui}/templates/home.html (100%) rename {validata_ui_next => validata_ui}/templates/table_macros.html (100%) rename {validata_ui_next => validata_ui}/templates/validation_form.html (100%) rename {validata_ui_next => validata_ui}/templates/validation_report.html (100%) rename {validata_ui_next => validata_ui}/util.py (100%) rename {validata_ui_next => validata_ui}/validate_helper.py (100%) rename {validata_ui_next => validata_ui}/views.py (97%) diff --git a/.gitignore b/.gitignore index 4e49591..bb421e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ __pycache__/ -validata_ui_next.egg-info/ +validata_ui.egg-info/ diff --git a/README.md b/README.md index 4170d40..70efccb 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ pip install -e . Start the web server: ```bash -export FLASK_APP=validata_ui_next +export FLASK_APP=validata_ui export FLASK_ENV=development flask run * Running on http://127.0.0.1:5000/ diff --git a/serve.sh b/serve.sh index 12ccf2a..04875eb 100755 --- a/serve.sh +++ b/serve.sh @@ -1,5 +1,5 @@ #! /bin/sh -export FLASK_APP=validata_ui_next +export FLASK_APP=validata_ui export FLASK_ENV=development flask run --with-threads diff --git a/setup.py b/setup.py index 787403a..698a15a 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ License :: OSI Approved :: GNU Affero General Public License v3 setup( - name='validata_ui_next', + name='validata_ui', version='0.0.1', author='Pierre Dittgen', @@ -21,7 +21,7 @@ setup( classifiers=[classifier for classifier in classifiers.split('\n') if classifier], description=__doc__, - packages=['validata_ui_next'], + packages=['validata_ui'], include_package_data=True, install_requires=[ 'flask', diff --git a/validata_ui_next/__init__.py b/validata_ui/__init__.py similarity index 98% rename from validata_ui_next/__init__.py rename to validata_ui/__init__.py index 8c6cf15..ab51f6a 100644 --- a/validata_ui_next/__init__.py +++ b/validata_ui/__init__.py @@ -3,7 +3,7 @@ from pathlib import Path from flask import Flask -from validata_ui_next.validate_helper import ValidatorHelper +from validata_ui.validate_helper import ValidatorHelper # Schemas settings schemas_config = { @@ -110,4 +110,4 @@ ValidatorHelper.init(schemas_config, Path('/tmp')) app = Flask(__name__) app.secret_key = 'MyPr3ci0u5$€cr€t' -import validata_ui_next.views +import validata_ui.views diff --git a/validata_ui_next/error_messages.py b/validata_ui/error_messages.py similarity index 100% rename from validata_ui_next/error_messages.py rename to validata_ui/error_messages.py diff --git a/validata_ui_next/static/css/bootstrap-grid.css b/validata_ui/static/css/bootstrap-grid.css similarity index 100% rename from validata_ui_next/static/css/bootstrap-grid.css rename to validata_ui/static/css/bootstrap-grid.css diff --git a/validata_ui_next/static/css/bootstrap-grid.css.map b/validata_ui/static/css/bootstrap-grid.css.map similarity index 100% rename from validata_ui_next/static/css/bootstrap-grid.css.map rename to validata_ui/static/css/bootstrap-grid.css.map diff --git a/validata_ui_next/static/css/bootstrap-grid.min.css b/validata_ui/static/css/bootstrap-grid.min.css similarity index 100% rename from validata_ui_next/static/css/bootstrap-grid.min.css rename to validata_ui/static/css/bootstrap-grid.min.css diff --git a/validata_ui_next/static/css/bootstrap-grid.min.css.map b/validata_ui/static/css/bootstrap-grid.min.css.map similarity index 100% rename from validata_ui_next/static/css/bootstrap-grid.min.css.map rename to validata_ui/static/css/bootstrap-grid.min.css.map diff --git a/validata_ui_next/static/css/bootstrap-reboot.css b/validata_ui/static/css/bootstrap-reboot.css similarity index 100% rename from validata_ui_next/static/css/bootstrap-reboot.css rename to validata_ui/static/css/bootstrap-reboot.css diff --git a/validata_ui_next/static/css/bootstrap-reboot.css.map b/validata_ui/static/css/bootstrap-reboot.css.map similarity index 100% rename from validata_ui_next/static/css/bootstrap-reboot.css.map rename to validata_ui/static/css/bootstrap-reboot.css.map diff --git a/validata_ui_next/static/css/bootstrap-reboot.min.css b/validata_ui/static/css/bootstrap-reboot.min.css similarity index 100% rename from validata_ui_next/static/css/bootstrap-reboot.min.css rename to validata_ui/static/css/bootstrap-reboot.min.css diff --git a/validata_ui_next/static/css/bootstrap-reboot.min.css.map b/validata_ui/static/css/bootstrap-reboot.min.css.map similarity index 100% rename from validata_ui_next/static/css/bootstrap-reboot.min.css.map rename to validata_ui/static/css/bootstrap-reboot.min.css.map diff --git a/validata_ui_next/static/css/bootstrap.css b/validata_ui/static/css/bootstrap.css similarity index 100% rename from validata_ui_next/static/css/bootstrap.css rename to validata_ui/static/css/bootstrap.css diff --git a/validata_ui_next/static/css/bootstrap.css.map b/validata_ui/static/css/bootstrap.css.map similarity index 100% rename from validata_ui_next/static/css/bootstrap.css.map rename to validata_ui/static/css/bootstrap.css.map diff --git a/validata_ui_next/static/css/bootstrap.min.css b/validata_ui/static/css/bootstrap.min.css similarity index 100% rename from validata_ui_next/static/css/bootstrap.min.css rename to validata_ui/static/css/bootstrap.min.css diff --git a/validata_ui_next/static/css/bootstrap.min.css.map b/validata_ui/static/css/bootstrap.min.css.map similarity index 100% rename from validata_ui_next/static/css/bootstrap.min.css.map rename to validata_ui/static/css/bootstrap.min.css.map diff --git a/validata_ui_next/static/css/sticky-footer-navbar.css b/validata_ui/static/css/sticky-footer-navbar.css similarity index 100% rename from validata_ui_next/static/css/sticky-footer-navbar.css rename to validata_ui/static/css/sticky-footer-navbar.css diff --git a/validata_ui_next/static/img/favicon.ico b/validata_ui/static/img/favicon.ico similarity index 100% rename from validata_ui_next/static/img/favicon.ico rename to validata_ui/static/img/favicon.ico diff --git a/validata_ui_next/static/img/logo-horizontal.png b/validata_ui/static/img/logo-horizontal.png similarity index 100% rename from validata_ui_next/static/img/logo-horizontal.png rename to validata_ui/static/img/logo-horizontal.png diff --git a/validata_ui_next/static/img/logo-only.png b/validata_ui/static/img/logo-only.png similarity index 100% rename from validata_ui_next/static/img/logo-only.png rename to validata_ui/static/img/logo-only.png diff --git a/validata_ui_next/static/js/bootstrap-filestyle.min.js b/validata_ui/static/js/bootstrap-filestyle.min.js similarity index 100% rename from validata_ui_next/static/js/bootstrap-filestyle.min.js rename to validata_ui/static/js/bootstrap-filestyle.min.js diff --git a/validata_ui_next/static/js/bootstrap.bundle.js b/validata_ui/static/js/bootstrap.bundle.js similarity index 100% rename from validata_ui_next/static/js/bootstrap.bundle.js rename to validata_ui/static/js/bootstrap.bundle.js diff --git a/validata_ui_next/static/js/bootstrap.bundle.js.map b/validata_ui/static/js/bootstrap.bundle.js.map similarity index 100% rename from validata_ui_next/static/js/bootstrap.bundle.js.map rename to validata_ui/static/js/bootstrap.bundle.js.map diff --git a/validata_ui_next/static/js/bootstrap.bundle.min.js b/validata_ui/static/js/bootstrap.bundle.min.js similarity index 100% rename from validata_ui_next/static/js/bootstrap.bundle.min.js rename to validata_ui/static/js/bootstrap.bundle.min.js diff --git a/validata_ui_next/static/js/bootstrap.bundle.min.js.map b/validata_ui/static/js/bootstrap.bundle.min.js.map similarity index 100% rename from validata_ui_next/static/js/bootstrap.bundle.min.js.map rename to validata_ui/static/js/bootstrap.bundle.min.js.map diff --git a/validata_ui_next/static/js/bootstrap.js b/validata_ui/static/js/bootstrap.js similarity index 100% rename from validata_ui_next/static/js/bootstrap.js rename to validata_ui/static/js/bootstrap.js diff --git a/validata_ui_next/static/js/bootstrap.js.map b/validata_ui/static/js/bootstrap.js.map similarity index 100% rename from validata_ui_next/static/js/bootstrap.js.map rename to validata_ui/static/js/bootstrap.js.map diff --git a/validata_ui_next/static/js/bootstrap.min.js b/validata_ui/static/js/bootstrap.min.js similarity index 100% rename from validata_ui_next/static/js/bootstrap.min.js rename to validata_ui/static/js/bootstrap.min.js diff --git a/validata_ui_next/static/js/bootstrap.min.js.map b/validata_ui/static/js/bootstrap.min.js.map similarity index 100% rename from validata_ui_next/static/js/bootstrap.min.js.map rename to validata_ui/static/js/bootstrap.min.js.map diff --git a/validata_ui_next/static/js/jquery-3.3.1.min.js b/validata_ui/static/js/jquery-3.3.1.min.js similarity index 100% rename from validata_ui_next/static/js/jquery-3.3.1.min.js rename to validata_ui/static/js/jquery-3.3.1.min.js diff --git a/validata_ui_next/static/js/popper.min.js b/validata_ui/static/js/popper.min.js similarity index 100% rename from validata_ui_next/static/js/popper.min.js rename to validata_ui/static/js/popper.min.js diff --git a/validata_ui_next/templates/base_template.html b/validata_ui/templates/base_template.html similarity index 100% rename from validata_ui_next/templates/base_template.html rename to validata_ui/templates/base_template.html diff --git a/validata_ui_next/templates/home.html b/validata_ui/templates/home.html similarity index 100% rename from validata_ui_next/templates/home.html rename to validata_ui/templates/home.html diff --git a/validata_ui_next/templates/table_macros.html b/validata_ui/templates/table_macros.html similarity index 100% rename from validata_ui_next/templates/table_macros.html rename to validata_ui/templates/table_macros.html diff --git a/validata_ui_next/templates/validation_form.html b/validata_ui/templates/validation_form.html similarity index 100% rename from validata_ui_next/templates/validation_form.html rename to validata_ui/templates/validation_form.html diff --git a/validata_ui_next/templates/validation_report.html b/validata_ui/templates/validation_report.html similarity index 100% rename from validata_ui_next/templates/validation_report.html rename to validata_ui/templates/validation_report.html diff --git a/validata_ui_next/util.py b/validata_ui/util.py similarity index 100% rename from validata_ui_next/util.py rename to validata_ui/util.py diff --git a/validata_ui_next/validate_helper.py b/validata_ui/validate_helper.py similarity index 100% rename from validata_ui_next/validate_helper.py rename to validata_ui/validate_helper.py diff --git a/validata_ui_next/views.py b/validata_ui/views.py similarity index 97% rename from validata_ui_next/views.py rename to validata_ui/views.py index 10f8b84..b2accb4 100644 --- a/validata_ui_next/views.py +++ b/validata_ui/views.py @@ -10,10 +10,10 @@ from pathlib import Path from validata_validate import csv_helpers from validata_validate.loaders import custom_loaders -from validata_ui_next import app -from validata_ui_next.util import flash_error, flash_info, flash_success, flash_warning, ValidataSource -from validata_ui_next.validate_helper import ValidatorHelper -from validata_ui_next import error_messages +from validata_ui import app +from validata_ui.util import flash_error, flash_info, flash_success, flash_warning, ValidataSource +from validata_ui.validate_helper import ValidatorHelper +from validata_ui import error_messages from flask import Flask, jsonify, redirect, render_template, request, url_for import tabulator -- 2.26.2