[odrs-web/UBI8: 2/6] Flatten file structure




commit dca354426e2d3cc5d1610b08c512be260d521a3c
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Mon Apr 25 10:19:24 2022 +0200

    Flatten file structure

 .gitignore                                                  |   7 +++----
 Dockerfile                                                  |   2 +-
 app_data/MAINTAINERS => MAINTAINERS                         |   0
 app_data/Makefile => Makefile                               |   0
 app_data/README.md => README.md                             |   0
 app_data/.gitignore                                         |   3 ---
 {app_data/contrib => contrib}/pylintrc                      |   0
 app_data/cron.py => cron.py                                 |   0
 app_data/flaskapp.py => flaskapp.py                         |   0
 {app_data/httpd-cfg => httpd-cfg}/odrs.gnome.org.conf       |   0
 {app_data/httpd-pre-init => httpd-pre-init}/entrypoint.sh   |   0
 {app_data/migrations => migrations}/alembic.ini             |   0
 {app_data/migrations => migrations}/env.py                  |   0
 {app_data/migrations => migrations}/script.py.mako          |   0
 .../migrations => migrations}/versions/036f0cd034e5_.py     |   0
 .../migrations => migrations}/versions/19526c284b29_.py     |   0
 .../migrations => migrations}/versions/1b966aab67a1_.py     |   0
 .../migrations => migrations}/versions/64751cf97429_.py     |   0
 .../migrations => migrations}/versions/6f54fde07d02_.py     |   0
 .../migrations => migrations}/versions/7c3432c40267_.py     |   0
 .../migrations => migrations}/versions/84deb10331db_.py     |   0
 {app_data/migrations => migrations}/versions/README.md      |   0
 .../migrations => migrations}/versions/a22c286d8094_.py     |   0
 .../migrations => migrations}/versions/b2d75ba212ed_.py     |   0
 .../migrations => migrations}/versions/b63a028c3346_.py     |   0
 .../migrations => migrations}/versions/b8243269e9cf_.py     |   0
 .../migrations => migrations}/versions/bbbcd54c69ac_.py     |   0
 .../migrations => migrations}/versions/e37c745e3097_.py     |   0
 .../migrations => migrations}/versions/e6fa15874247_.py     |   0
 .../migrations => migrations}/versions/ef03b3a98056_.py     |   0
 .../migrations => migrations}/versions/f32bd8265c3b_.py     |   0
 {app_data/odrs => odrs}/__init__.py                         |   0
 {app_data/odrs => odrs}/dbutils.py                          |   0
 {app_data/odrs => odrs}/example.cfg                         |   0
 {app_data/odrs => odrs}/models.py                           |   0
 {app_data/odrs => odrs}/static/Chart.js                     |   0
 {app_data/odrs => odrs}/static/app-page.png                 | Bin
 {app_data/odrs => odrs}/static/gnome-logo.svg               |   0
 {app_data/odrs => odrs}/static/review-submit.png            | Bin
 {app_data/odrs => odrs}/static/robots.txt                   |   0
 {app_data/odrs => odrs}/static/style.css                    |   0
 {app_data/odrs => odrs}/templates/components.html           |   0
 {app_data/odrs => odrs}/templates/default.html              |   0
 {app_data/odrs => odrs}/templates/delete.html               |   0
 {app_data/odrs => odrs}/templates/error.html                |   0
 {app_data/odrs => odrs}/templates/graph-month.html          |   0
 {app_data/odrs => odrs}/templates/graph-year.html           |   0
 {app_data/odrs => odrs}/templates/index.html                |   0
 {app_data/odrs => odrs}/templates/login.html                |   0
 {app_data/odrs => odrs}/templates/modadmin.html             |   0
 {app_data/odrs => odrs}/templates/mods.html                 |   0
 {app_data/odrs => odrs}/templates/oars.html                 |   0
 {app_data/odrs => odrs}/templates/privacy.html              |   0
 {app_data/odrs => odrs}/templates/search.html               |   0
 {app_data/odrs => odrs}/templates/show-all.html             |   0
 {app_data/odrs => odrs}/templates/show.html                 |   0
 {app_data/odrs => odrs}/templates/stats.html                |   0
 {app_data/odrs => odrs}/templates/taboos.html               |   0
 {app_data/odrs => odrs}/tests/odrs_test.py                  |   0
 {app_data/odrs => odrs}/tests/util_test.py                  |   0
 {app_data/odrs => odrs}/util.py                             |   0
 {app_data/odrs => odrs}/views.py                            |   0
 {app_data/odrs => odrs}/views_admin.py                      |   0
 {app_data/odrs => odrs}/views_api.py                        |   0
 app_data/pylint_test.py => pylint_test.py                   |   0
 app_data/requirements.txt => requirements.txt               |   0
 app_data/wsgi.py => wsgi.py                                 |   0
 67 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 91cc539..76803bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-backup
-*.pyc
-ratings.json
-secret.txt
+.coverage
+env
+htmlcov
diff --git a/Dockerfile b/Dockerfile
index c01fe33..3c2f2ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM registry.access.redhat.com/ubi8/python-38
 
 USER 0
-ADD app_data /tmp/src
+ADD . /tmp/src/
 RUN /usr/bin/fix-permissions /tmp/src
 
 USER 1001
diff --git a/app_data/MAINTAINERS b/MAINTAINERS
similarity index 100%
rename from app_data/MAINTAINERS
rename to MAINTAINERS
diff --git a/app_data/Makefile b/Makefile
similarity index 100%
rename from app_data/Makefile
rename to Makefile
diff --git a/app_data/README.md b/README.md
similarity index 100%
rename from app_data/README.md
rename to README.md
diff --git a/app_data/contrib/pylintrc b/contrib/pylintrc
similarity index 100%
rename from app_data/contrib/pylintrc
rename to contrib/pylintrc
diff --git a/app_data/cron.py b/cron.py
similarity index 100%
rename from app_data/cron.py
rename to cron.py
diff --git a/app_data/flaskapp.py b/flaskapp.py
similarity index 100%
rename from app_data/flaskapp.py
rename to flaskapp.py
diff --git a/app_data/httpd-cfg/odrs.gnome.org.conf b/httpd-cfg/odrs.gnome.org.conf
similarity index 100%
rename from app_data/httpd-cfg/odrs.gnome.org.conf
rename to httpd-cfg/odrs.gnome.org.conf
diff --git a/app_data/httpd-pre-init/entrypoint.sh b/httpd-pre-init/entrypoint.sh
similarity index 100%
rename from app_data/httpd-pre-init/entrypoint.sh
rename to httpd-pre-init/entrypoint.sh
diff --git a/app_data/migrations/alembic.ini b/migrations/alembic.ini
similarity index 100%
rename from app_data/migrations/alembic.ini
rename to migrations/alembic.ini
diff --git a/app_data/migrations/env.py b/migrations/env.py
similarity index 100%
rename from app_data/migrations/env.py
rename to migrations/env.py
diff --git a/app_data/migrations/script.py.mako b/migrations/script.py.mako
similarity index 100%
rename from app_data/migrations/script.py.mako
rename to migrations/script.py.mako
diff --git a/app_data/migrations/versions/036f0cd034e5_.py b/migrations/versions/036f0cd034e5_.py
similarity index 100%
rename from app_data/migrations/versions/036f0cd034e5_.py
rename to migrations/versions/036f0cd034e5_.py
diff --git a/app_data/migrations/versions/19526c284b29_.py b/migrations/versions/19526c284b29_.py
similarity index 100%
rename from app_data/migrations/versions/19526c284b29_.py
rename to migrations/versions/19526c284b29_.py
diff --git a/app_data/migrations/versions/1b966aab67a1_.py b/migrations/versions/1b966aab67a1_.py
similarity index 100%
rename from app_data/migrations/versions/1b966aab67a1_.py
rename to migrations/versions/1b966aab67a1_.py
diff --git a/app_data/migrations/versions/64751cf97429_.py b/migrations/versions/64751cf97429_.py
similarity index 100%
rename from app_data/migrations/versions/64751cf97429_.py
rename to migrations/versions/64751cf97429_.py
diff --git a/app_data/migrations/versions/6f54fde07d02_.py b/migrations/versions/6f54fde07d02_.py
similarity index 100%
rename from app_data/migrations/versions/6f54fde07d02_.py
rename to migrations/versions/6f54fde07d02_.py
diff --git a/app_data/migrations/versions/7c3432c40267_.py b/migrations/versions/7c3432c40267_.py
similarity index 100%
rename from app_data/migrations/versions/7c3432c40267_.py
rename to migrations/versions/7c3432c40267_.py
diff --git a/app_data/migrations/versions/84deb10331db_.py b/migrations/versions/84deb10331db_.py
similarity index 100%
rename from app_data/migrations/versions/84deb10331db_.py
rename to migrations/versions/84deb10331db_.py
diff --git a/app_data/migrations/versions/README.md b/migrations/versions/README.md
similarity index 100%
rename from app_data/migrations/versions/README.md
rename to migrations/versions/README.md
diff --git a/app_data/migrations/versions/a22c286d8094_.py b/migrations/versions/a22c286d8094_.py
similarity index 100%
rename from app_data/migrations/versions/a22c286d8094_.py
rename to migrations/versions/a22c286d8094_.py
diff --git a/app_data/migrations/versions/b2d75ba212ed_.py b/migrations/versions/b2d75ba212ed_.py
similarity index 100%
rename from app_data/migrations/versions/b2d75ba212ed_.py
rename to migrations/versions/b2d75ba212ed_.py
diff --git a/app_data/migrations/versions/b63a028c3346_.py b/migrations/versions/b63a028c3346_.py
similarity index 100%
rename from app_data/migrations/versions/b63a028c3346_.py
rename to migrations/versions/b63a028c3346_.py
diff --git a/app_data/migrations/versions/b8243269e9cf_.py b/migrations/versions/b8243269e9cf_.py
similarity index 100%
rename from app_data/migrations/versions/b8243269e9cf_.py
rename to migrations/versions/b8243269e9cf_.py
diff --git a/app_data/migrations/versions/bbbcd54c69ac_.py b/migrations/versions/bbbcd54c69ac_.py
similarity index 100%
rename from app_data/migrations/versions/bbbcd54c69ac_.py
rename to migrations/versions/bbbcd54c69ac_.py
diff --git a/app_data/migrations/versions/e37c745e3097_.py b/migrations/versions/e37c745e3097_.py
similarity index 100%
rename from app_data/migrations/versions/e37c745e3097_.py
rename to migrations/versions/e37c745e3097_.py
diff --git a/app_data/migrations/versions/e6fa15874247_.py b/migrations/versions/e6fa15874247_.py
similarity index 100%
rename from app_data/migrations/versions/e6fa15874247_.py
rename to migrations/versions/e6fa15874247_.py
diff --git a/app_data/migrations/versions/ef03b3a98056_.py b/migrations/versions/ef03b3a98056_.py
similarity index 100%
rename from app_data/migrations/versions/ef03b3a98056_.py
rename to migrations/versions/ef03b3a98056_.py
diff --git a/app_data/migrations/versions/f32bd8265c3b_.py b/migrations/versions/f32bd8265c3b_.py
similarity index 100%
rename from app_data/migrations/versions/f32bd8265c3b_.py
rename to migrations/versions/f32bd8265c3b_.py
diff --git a/app_data/odrs/__init__.py b/odrs/__init__.py
similarity index 100%
rename from app_data/odrs/__init__.py
rename to odrs/__init__.py
diff --git a/app_data/odrs/dbutils.py b/odrs/dbutils.py
similarity index 100%
rename from app_data/odrs/dbutils.py
rename to odrs/dbutils.py
diff --git a/app_data/odrs/example.cfg b/odrs/example.cfg
similarity index 100%
rename from app_data/odrs/example.cfg
rename to odrs/example.cfg
diff --git a/app_data/odrs/models.py b/odrs/models.py
similarity index 100%
rename from app_data/odrs/models.py
rename to odrs/models.py
diff --git a/app_data/odrs/static/Chart.js b/odrs/static/Chart.js
similarity index 100%
rename from app_data/odrs/static/Chart.js
rename to odrs/static/Chart.js
diff --git a/app_data/odrs/static/app-page.png b/odrs/static/app-page.png
similarity index 100%
rename from app_data/odrs/static/app-page.png
rename to odrs/static/app-page.png
diff --git a/app_data/odrs/static/gnome-logo.svg b/odrs/static/gnome-logo.svg
similarity index 100%
rename from app_data/odrs/static/gnome-logo.svg
rename to odrs/static/gnome-logo.svg
diff --git a/app_data/odrs/static/review-submit.png b/odrs/static/review-submit.png
similarity index 100%
rename from app_data/odrs/static/review-submit.png
rename to odrs/static/review-submit.png
diff --git a/app_data/odrs/static/robots.txt b/odrs/static/robots.txt
similarity index 100%
rename from app_data/odrs/static/robots.txt
rename to odrs/static/robots.txt
diff --git a/app_data/odrs/static/style.css b/odrs/static/style.css
similarity index 100%
rename from app_data/odrs/static/style.css
rename to odrs/static/style.css
diff --git a/app_data/odrs/templates/components.html b/odrs/templates/components.html
similarity index 100%
rename from app_data/odrs/templates/components.html
rename to odrs/templates/components.html
diff --git a/app_data/odrs/templates/default.html b/odrs/templates/default.html
similarity index 100%
rename from app_data/odrs/templates/default.html
rename to odrs/templates/default.html
diff --git a/app_data/odrs/templates/delete.html b/odrs/templates/delete.html
similarity index 100%
rename from app_data/odrs/templates/delete.html
rename to odrs/templates/delete.html
diff --git a/app_data/odrs/templates/error.html b/odrs/templates/error.html
similarity index 100%
rename from app_data/odrs/templates/error.html
rename to odrs/templates/error.html
diff --git a/app_data/odrs/templates/graph-month.html b/odrs/templates/graph-month.html
similarity index 100%
rename from app_data/odrs/templates/graph-month.html
rename to odrs/templates/graph-month.html
diff --git a/app_data/odrs/templates/graph-year.html b/odrs/templates/graph-year.html
similarity index 100%
rename from app_data/odrs/templates/graph-year.html
rename to odrs/templates/graph-year.html
diff --git a/app_data/odrs/templates/index.html b/odrs/templates/index.html
similarity index 100%
rename from app_data/odrs/templates/index.html
rename to odrs/templates/index.html
diff --git a/app_data/odrs/templates/login.html b/odrs/templates/login.html
similarity index 100%
rename from app_data/odrs/templates/login.html
rename to odrs/templates/login.html
diff --git a/app_data/odrs/templates/modadmin.html b/odrs/templates/modadmin.html
similarity index 100%
rename from app_data/odrs/templates/modadmin.html
rename to odrs/templates/modadmin.html
diff --git a/app_data/odrs/templates/mods.html b/odrs/templates/mods.html
similarity index 100%
rename from app_data/odrs/templates/mods.html
rename to odrs/templates/mods.html
diff --git a/app_data/odrs/templates/oars.html b/odrs/templates/oars.html
similarity index 100%
rename from app_data/odrs/templates/oars.html
rename to odrs/templates/oars.html
diff --git a/app_data/odrs/templates/privacy.html b/odrs/templates/privacy.html
similarity index 100%
rename from app_data/odrs/templates/privacy.html
rename to odrs/templates/privacy.html
diff --git a/app_data/odrs/templates/search.html b/odrs/templates/search.html
similarity index 100%
rename from app_data/odrs/templates/search.html
rename to odrs/templates/search.html
diff --git a/app_data/odrs/templates/show-all.html b/odrs/templates/show-all.html
similarity index 100%
rename from app_data/odrs/templates/show-all.html
rename to odrs/templates/show-all.html
diff --git a/app_data/odrs/templates/show.html b/odrs/templates/show.html
similarity index 100%
rename from app_data/odrs/templates/show.html
rename to odrs/templates/show.html
diff --git a/app_data/odrs/templates/stats.html b/odrs/templates/stats.html
similarity index 100%
rename from app_data/odrs/templates/stats.html
rename to odrs/templates/stats.html
diff --git a/app_data/odrs/templates/taboos.html b/odrs/templates/taboos.html
similarity index 100%
rename from app_data/odrs/templates/taboos.html
rename to odrs/templates/taboos.html
diff --git a/app_data/odrs/tests/odrs_test.py b/odrs/tests/odrs_test.py
similarity index 100%
rename from app_data/odrs/tests/odrs_test.py
rename to odrs/tests/odrs_test.py
diff --git a/app_data/odrs/tests/util_test.py b/odrs/tests/util_test.py
similarity index 100%
rename from app_data/odrs/tests/util_test.py
rename to odrs/tests/util_test.py
diff --git a/app_data/odrs/util.py b/odrs/util.py
similarity index 100%
rename from app_data/odrs/util.py
rename to odrs/util.py
diff --git a/app_data/odrs/views.py b/odrs/views.py
similarity index 100%
rename from app_data/odrs/views.py
rename to odrs/views.py
diff --git a/app_data/odrs/views_admin.py b/odrs/views_admin.py
similarity index 100%
rename from app_data/odrs/views_admin.py
rename to odrs/views_admin.py
diff --git a/app_data/odrs/views_api.py b/odrs/views_api.py
similarity index 100%
rename from app_data/odrs/views_api.py
rename to odrs/views_api.py
diff --git a/app_data/pylint_test.py b/pylint_test.py
similarity index 100%
rename from app_data/pylint_test.py
rename to pylint_test.py
diff --git a/app_data/requirements.txt b/requirements.txt
similarity index 100%
rename from app_data/requirements.txt
rename to requirements.txt
diff --git a/app_data/wsgi.py b/wsgi.py
similarity index 100%
rename from app_data/wsgi.py
rename to wsgi.py


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]