Merge pull request #364 from labhackercd/dev

v1.0.0

.eslintrc.json

@@ -4,20 +4,20 @@
     },
     "extends": "eslint:recommended",
     "parserOptions": {
-        "ecmaVersion": 5
+        "ecmaVersion": 6
     },
     "rules": {
         "indent": [
             "error",
-            4
+            2
         ],
         "linebreak-style": [
             "error",
             "unix"
         ],
         "quotes": [
             "error",
-            "double"
+            "single"
         ],
         "semi": [
             "error",

.flake8

@@ -1,7 +1,8 @@
 [flake8]
 exclude =
     .git,
-    node_modules/,
+    node_modules/*,
     __pycache__,
     src/manage.py,
-    migrations/,
+    */migrations/*,
+    src/public/*

.gitignore

@@ -1,7 +1,5 @@
 *.sqlite3
-*.ini
 package-lock.json
-*.lock
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -29,6 +27,7 @@ wheels/
 .installed.cfg
 *.egg
 MANIFEST
+ngrok
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -108,9 +107,18 @@ venv.bak/
 # mypy
 .mypy_cache/
 
+# Static files
 node_modules/
 src/public/static/
+src/public/media/
 
+# VSCode
+.vscode/
+
+# Others
 .DS_Store
 dump.rdb
 npm-debug.*
+
+### Django Decouple ###
+src/wikilegis/*.ini

.travis.yml

@@ -17,7 +17,7 @@ install:
 - npm install
 script:
 - coverage run src/manage.py test
-- flake8 wikilegis
+- flake8 src
 - npm run lint
 after_success:
 - coveralls

Dockerfile

@@ -1,22 +1,22 @@
 FROM labhackercd/alpine-python3-nodejs
 
-ENV BUILD_PACKAGES postgresql-dev postgresql-client gettext
+ENV BUILD_PACKAGES postgresql-dev postgresql-client gettext freetype-dev libpng-dev openblas-dev
 
 RUN apk add --update --no-cache $BUILD_PACKAGES
-RUN mkdir -p /var/labhacker/wikilegis
+RUN mkdir -p /var/labhacker/new-wikilegis
 
-ADD . /var/labhacker/wikilegis
-WORKDIR /var/labhacker/wikilegis
+ADD . /var/labhacker/new-wikilegis
+WORKDIR /var/labhacker/new-wikilegis
 
-RUN pip install 'pipenv==8.1.2' psycopg2 gunicorn && \
-    pipenv install --system && \
-    rm -r /root/.cache
+RUN pip3 install --upgrade pip
+RUN pip3 install -U pipenv psycopg2 gunicorn
 
-RUN npm install
+RUN pipenv install --system
 
-RUN python3 src/manage.py compress --force && \
-    python3 src/manage.py collectstatic --no-input && \
-    python3 src/manage.py compilemessages
+RUN npm install && \
+    npm rebuild node-sass --force
+
+RUN chmod 755 start.sh
 
 EXPOSE 8000
 CMD ["python3", "src/manage.py", "runserver", "0.0.0.0:8000"]

Pipfile

@@ -4,19 +4,45 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-Django = "*"
-python-decouple = "*"
-django_compressor = "*"
-django-npm = "*"
-"flake8" = "*"
-coverage = "*"
-python-coveralls = "*"
-django-libsass = "*"
-django-compressor-postcss = "*"
-django-extensions = "*"
+Django = "==2.2.19"
+python-decouple = "==3.4"
+django_compressor = "==2.4"
+django-npm = "==1.0.0"
+flake8 = "==3.9.0"
+coverage = "==5.5"
+python-coveralls = "==2.9.3"
+django-libsass = "==0.8"
+django-compressor-postcss = "==0.8.2"
+django-extensions = "==3.1.1"
+djangorestframework = "==3.12.2"
+django-filter = "==2.4.0"
+django-compressor-toolkit = "==0.6.0"
+django-js-reverse = "==0.9.1"
+django-colorful = "==1.3"
+django-constance = {version = "==2.8.0", extras = ["database"]}
+django-picklefield = "==3.0.1"
+requests = "==2.25.1"
+psycopg2-binary = "==2.8.6"
+gunicorn = "==20.1.0"
+whitenoise = "==5.2.0"
+roman = "==3.3"
+beautifulsoup4 = "==4.9.3"
+celery = {version = "==5.0.5", extras = ["redis"]}
+django_celery_results = "==2.0.1"
+django_celery_beat = "==2.2.0"
+kombu = "==5.0.2"
+redis = "==3.5.3"
+diff-match-patch = "==20200713"
+django-cors-headers = "==3.7.0"
+graphene-django = "==2.15.0"
+django-graphql-jwt = "==0.3.1"
+pytest-django = "==4.1.0"
+pytest-cov = "==2.11.1"
+mixer = "==6.3.0"
+drf-yasg = "==1.20.0"
 
 [dev-packages]
 ipdb = "*"
 
 [requires]
-python_version = "3.6"
+python_version = "3.6"