diff --git a/.env b/.env old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 9e23141..09e27fa --- a/README.md +++ b/README.md @@ -21,9 +21,9 @@ IMPORTANT Windows users must use: > docker-compose up 6. The application should become available on URL: -http://0.0.0.0:80\
+http://0.0.0.0:80 or http://127.0.0.1:80
Or if you are running docker-toolbox : -http://192.168.99.100:80\ +http://192.168.99.100:80 ### Build / Rebuild diff --git a/app_structure.png b/app_structure.png old mode 100644 new mode 100755 diff --git a/docker-compose.yml b/docker-compose.yml old mode 100644 new mode 100755 diff --git a/mysql/Dockerfile b/mysql/Dockerfile old mode 100644 new mode 100755 diff --git a/mysql/sql/init.sql b/mysql/sql/init.sql old mode 100644 new mode 100755 diff --git a/src/Dockerfile b/src/Dockerfile old mode 100644 new mode 100755 diff --git a/src/app/.gitignore b/src/app/.gitignore old mode 100644 new mode 100755 diff --git a/src/app/docs/Makefile b/src/app/docs/Makefile old mode 100644 new mode 100755 diff --git a/src/app/docs/build/doctrees/environment.pickle b/src/app/docs/build/doctrees/environment.pickle old mode 100644 new mode 100755 diff --git a/src/app/docs/build/doctrees/index.doctree b/src/app/docs/build/doctrees/index.doctree old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/.buildinfo b/src/app/docs/build/html/.buildinfo old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_sources/index.rst.txt b/src/app/docs/build/html/_sources/index.rst.txt old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/alabaster.css b/src/app/docs/build/html/_static/alabaster.css old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/basic.css b/src/app/docs/build/html/_static/basic.css old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/custom.css b/src/app/docs/build/html/_static/custom.css old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/doctools.js b/src/app/docs/build/html/_static/doctools.js old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/documentation_options.js b/src/app/docs/build/html/_static/documentation_options.js old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/file.png b/src/app/docs/build/html/_static/file.png old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/jquery-3.4.1.js b/src/app/docs/build/html/_static/jquery-3.4.1.js old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/jquery.js b/src/app/docs/build/html/_static/jquery.js old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/language_data.js b/src/app/docs/build/html/_static/language_data.js old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/minus.png b/src/app/docs/build/html/_static/minus.png old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/plus.png b/src/app/docs/build/html/_static/plus.png old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/pygments.css b/src/app/docs/build/html/_static/pygments.css old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/searchtools.js b/src/app/docs/build/html/_static/searchtools.js old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/underscore-1.3.1.js b/src/app/docs/build/html/_static/underscore-1.3.1.js old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/_static/underscore.js b/src/app/docs/build/html/_static/underscore.js old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/genindex.html b/src/app/docs/build/html/genindex.html old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/index.html b/src/app/docs/build/html/index.html old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/objects.inv b/src/app/docs/build/html/objects.inv old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/py-modindex.html b/src/app/docs/build/html/py-modindex.html old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/search.html b/src/app/docs/build/html/search.html old mode 100644 new mode 100755 diff --git a/src/app/docs/build/html/searchindex.js b/src/app/docs/build/html/searchindex.js old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/LICRcyr2utf8.xdy b/src/app/docs/build/latex/LICRcyr2utf8.xdy old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/LICRlatin2utf8.xdy b/src/app/docs/build/latex/LICRlatin2utf8.xdy old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/LatinRules.xdy b/src/app/docs/build/latex/LatinRules.xdy old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/Makefile b/src/app/docs/build/latex/Makefile old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/beelance2.aux b/src/app/docs/build/latex/beelance2.aux old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/beelance2.fdb_latexmk b/src/app/docs/build/latex/beelance2.fdb_latexmk old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/beelance2.fls b/src/app/docs/build/latex/beelance2.fls old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/beelance2.idx b/src/app/docs/build/latex/beelance2.idx old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/beelance2.ilg b/src/app/docs/build/latex/beelance2.ilg old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/beelance2.ind b/src/app/docs/build/latex/beelance2.ind old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/beelance2.log b/src/app/docs/build/latex/beelance2.log old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/beelance2.out b/src/app/docs/build/latex/beelance2.out old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/beelance2.pdf b/src/app/docs/build/latex/beelance2.pdf old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/beelance2.tex b/src/app/docs/build/latex/beelance2.tex old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/beelance2.toc b/src/app/docs/build/latex/beelance2.toc old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/footnotehyper-sphinx.sty b/src/app/docs/build/latex/footnotehyper-sphinx.sty old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/latexmkjarc b/src/app/docs/build/latex/latexmkjarc old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/latexmkrc b/src/app/docs/build/latex/latexmkrc old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/make.bat b/src/app/docs/build/latex/make.bat old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/python.ist b/src/app/docs/build/latex/python.ist old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/sphinx.sty b/src/app/docs/build/latex/sphinx.sty old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/sphinx.xdy b/src/app/docs/build/latex/sphinx.xdy old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/sphinxcyrillic.sty b/src/app/docs/build/latex/sphinxcyrillic.sty old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/sphinxhighlight.sty b/src/app/docs/build/latex/sphinxhighlight.sty old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/sphinxhowto.cls b/src/app/docs/build/latex/sphinxhowto.cls old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/sphinxmanual.cls b/src/app/docs/build/latex/sphinxmanual.cls old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/sphinxmessages.sty b/src/app/docs/build/latex/sphinxmessages.sty old mode 100644 new mode 100755 diff --git a/src/app/docs/build/latex/sphinxmulticell.sty b/src/app/docs/build/latex/sphinxmulticell.sty old mode 100644 new mode 100755 diff --git a/src/app/docs/make.bat b/src/app/docs/make.bat old mode 100644 new mode 100755 diff --git a/src/app/docs/source/conf.py b/src/app/docs/source/conf.py old mode 100644 new mode 100755 diff --git a/src/app/docs/source/index.rst b/src/app/docs/source/index.rst old mode 100644 new mode 100755 diff --git a/src/app/main.py b/src/app/main.py old mode 100644 new mode 100755 diff --git a/src/app/models/database.py b/src/app/models/database.py old mode 100644 new mode 100755 diff --git a/src/app/models/project.py b/src/app/models/project.py old mode 100644 new mode 100755 diff --git a/src/app/models/register.py b/src/app/models/register.py old mode 100644 new mode 100755 diff --git a/src/app/models/user.py b/src/app/models/user.py old mode 100644 new mode 100755 diff --git a/src/app/requirements.txt b/src/app/requirements.txt old mode 100644 new mode 100755 diff --git a/src/app/static/friends.jpeg b/src/app/static/friends.jpeg old mode 100644 new mode 100755 diff --git a/src/app/static/honeybee.png b/src/app/static/honeybee.png old mode 100644 new mode 100755 diff --git a/src/app/static/stylesheet.css b/src/app/static/stylesheet.css old mode 100644 new mode 100755 diff --git a/src/app/templates/apply.html b/src/app/templates/apply.html old mode 100644 new mode 100755 diff --git a/src/app/templates/index.html b/src/app/templates/index.html old mode 100644 new mode 100755 diff --git a/src/app/templates/login.html b/src/app/templates/login.html old mode 100644 new mode 100755 diff --git a/src/app/templates/new_project.html b/src/app/templates/new_project.html old mode 100644 new mode 100755 diff --git a/src/app/templates/open_projects.html b/src/app/templates/open_projects.html old mode 100644 new mode 100755 diff --git a/src/app/templates/project.html b/src/app/templates/project.html old mode 100644 new mode 100755 diff --git a/src/app/templates/register.html b/src/app/templates/register.html old mode 100644 new mode 100755 diff --git a/src/app/uwsgi.ini b/src/app/uwsgi.ini old mode 100644 new mode 100755 diff --git a/src/app/views/app.py b/src/app/views/app.py old mode 100644 new mode 100755 index ae1523f..900fae4 --- a/src/app/views/app.py +++ b/src/app/views/app.py @@ -10,6 +10,16 @@ from views.project import Project from views.index import Index from views.apply import Apply +# Connect to smtp server, enables web.sendmail() +try: + smtp_server = os.getenv("smtp_server") + ":25" + web.config.smtp_server = smtp_server +except: + smtp_server = "molde.idi.ntnu.no:25" + web.config.smtp_server = smtp_server + +# Example use of the smtp server, insert username +# web.sendmail("beelance@ntnu.no", "@stud.ntnu.no", "Hello", "Grz, the beelance app is running") # Define application routes urls = ( diff --git a/src/app/views/apply.py b/src/app/views/apply.py old mode 100644 new mode 100755 diff --git a/src/app/views/forms.py b/src/app/views/forms.py old mode 100644 new mode 100755 diff --git a/src/app/views/index.py b/src/app/views/index.py old mode 100644 new mode 100755 diff --git a/src/app/views/login.py b/src/app/views/login.py old mode 100644 new mode 100755 diff --git a/src/app/views/logout.py b/src/app/views/logout.py old mode 100644 new mode 100755 diff --git a/src/app/views/new_project.py b/src/app/views/new_project.py old mode 100644 new mode 100755 diff --git a/src/app/views/open_projects.py b/src/app/views/open_projects.py old mode 100644 new mode 100755 diff --git a/src/app/views/project.py b/src/app/views/project.py old mode 100644 new mode 100755 diff --git a/src/app/views/register.py b/src/app/views/register.py old mode 100644 new mode 100755 diff --git a/src/app/views/utils.py b/src/app/views/utils.py old mode 100644 new mode 100755 diff --git a/src/entrypoint.sh b/src/entrypoint.sh old mode 100644 new mode 100755