Bläddra i källkod

Merge branch 'master' of gitlab.stud.idi.ntnu.no:tdt4237-2020/group32

pull/33/head
Sindre Stephansen 5 år sedan
förälder
incheckning
8fd4e006ca
95 ändrade filer med 12 tillägg och 2 borttagningar
  1. +0
    -0
      .env
  2. +0
    -0
      .gitignore
  3. +2
    -2
      README.md
  4. +0
    -0
      app_structure.png
  5. +0
    -0
      docker-compose.yml
  6. +0
    -0
      mysql/Dockerfile
  7. +0
    -0
      mysql/sql/init.sql
  8. +0
    -0
      src/Dockerfile
  9. +0
    -0
      src/app/.gitignore
  10. +0
    -0
      src/app/docs/Makefile
  11. +0
    -0
      src/app/docs/build/doctrees/environment.pickle
  12. +0
    -0
      src/app/docs/build/doctrees/index.doctree
  13. +0
    -0
      src/app/docs/build/html/.buildinfo
  14. +0
    -0
      src/app/docs/build/html/_sources/index.rst.txt
  15. +0
    -0
      src/app/docs/build/html/_static/alabaster.css
  16. +0
    -0
      src/app/docs/build/html/_static/basic.css
  17. +0
    -0
      src/app/docs/build/html/_static/custom.css
  18. +0
    -0
      src/app/docs/build/html/_static/doctools.js
  19. +0
    -0
      src/app/docs/build/html/_static/documentation_options.js
  20. +0
    -0
      src/app/docs/build/html/_static/file.png
  21. +0
    -0
      src/app/docs/build/html/_static/jquery-3.4.1.js
  22. +0
    -0
      src/app/docs/build/html/_static/jquery.js
  23. +0
    -0
      src/app/docs/build/html/_static/language_data.js
  24. +0
    -0
      src/app/docs/build/html/_static/minus.png
  25. +0
    -0
      src/app/docs/build/html/_static/plus.png
  26. +0
    -0
      src/app/docs/build/html/_static/pygments.css
  27. +0
    -0
      src/app/docs/build/html/_static/searchtools.js
  28. +0
    -0
      src/app/docs/build/html/_static/underscore-1.3.1.js
  29. +0
    -0
      src/app/docs/build/html/_static/underscore.js
  30. +0
    -0
      src/app/docs/build/html/genindex.html
  31. +0
    -0
      src/app/docs/build/html/index.html
  32. +0
    -0
      src/app/docs/build/html/objects.inv
  33. +0
    -0
      src/app/docs/build/html/py-modindex.html
  34. +0
    -0
      src/app/docs/build/html/search.html
  35. +0
    -0
      src/app/docs/build/html/searchindex.js
  36. +0
    -0
      src/app/docs/build/latex/LICRcyr2utf8.xdy
  37. +0
    -0
      src/app/docs/build/latex/LICRlatin2utf8.xdy
  38. +0
    -0
      src/app/docs/build/latex/LatinRules.xdy
  39. +0
    -0
      src/app/docs/build/latex/Makefile
  40. +0
    -0
      src/app/docs/build/latex/beelance2.aux
  41. +0
    -0
      src/app/docs/build/latex/beelance2.fdb_latexmk
  42. +0
    -0
      src/app/docs/build/latex/beelance2.fls
  43. +0
    -0
      src/app/docs/build/latex/beelance2.idx
  44. +0
    -0
      src/app/docs/build/latex/beelance2.ilg
  45. +0
    -0
      src/app/docs/build/latex/beelance2.ind
  46. +0
    -0
      src/app/docs/build/latex/beelance2.log
  47. +0
    -0
      src/app/docs/build/latex/beelance2.out
  48. +0
    -0
      src/app/docs/build/latex/beelance2.pdf
  49. +0
    -0
      src/app/docs/build/latex/beelance2.tex
  50. +0
    -0
      src/app/docs/build/latex/beelance2.toc
  51. +0
    -0
      src/app/docs/build/latex/footnotehyper-sphinx.sty
  52. +0
    -0
      src/app/docs/build/latex/latexmkjarc
  53. +0
    -0
      src/app/docs/build/latex/latexmkrc
  54. +0
    -0
      src/app/docs/build/latex/make.bat
  55. +0
    -0
      src/app/docs/build/latex/python.ist
  56. +0
    -0
      src/app/docs/build/latex/sphinx.sty
  57. +0
    -0
      src/app/docs/build/latex/sphinx.xdy
  58. +0
    -0
      src/app/docs/build/latex/sphinxcyrillic.sty
  59. +0
    -0
      src/app/docs/build/latex/sphinxhighlight.sty
  60. +0
    -0
      src/app/docs/build/latex/sphinxhowto.cls
  61. +0
    -0
      src/app/docs/build/latex/sphinxmanual.cls
  62. +0
    -0
      src/app/docs/build/latex/sphinxmessages.sty
  63. +0
    -0
      src/app/docs/build/latex/sphinxmulticell.sty
  64. +0
    -0
      src/app/docs/make.bat
  65. +0
    -0
      src/app/docs/source/conf.py
  66. +0
    -0
      src/app/docs/source/index.rst
  67. +0
    -0
      src/app/main.py
  68. +0
    -0
      src/app/models/database.py
  69. +0
    -0
      src/app/models/project.py
  70. +0
    -0
      src/app/models/register.py
  71. +0
    -0
      src/app/models/user.py
  72. +0
    -0
      src/app/requirements.txt
  73. +0
    -0
      src/app/static/friends.jpeg
  74. +0
    -0
      src/app/static/honeybee.png
  75. +0
    -0
      src/app/static/stylesheet.css
  76. +0
    -0
      src/app/templates/apply.html
  77. +0
    -0
      src/app/templates/index.html
  78. +0
    -0
      src/app/templates/login.html
  79. +0
    -0
      src/app/templates/new_project.html
  80. +0
    -0
      src/app/templates/open_projects.html
  81. +0
    -0
      src/app/templates/project.html
  82. +0
    -0
      src/app/templates/register.html
  83. +0
    -0
      src/app/uwsgi.ini
  84. +10
    -0
      src/app/views/app.py
  85. +0
    -0
      src/app/views/apply.py
  86. +0
    -0
      src/app/views/forms.py
  87. +0
    -0
      src/app/views/index.py
  88. +0
    -0
      src/app/views/login.py
  89. +0
    -0
      src/app/views/logout.py
  90. +0
    -0
      src/app/views/new_project.py
  91. +0
    -0
      src/app/views/open_projects.py
  92. +0
    -0
      src/app/views/project.py
  93. +0
    -0
      src/app/views/register.py
  94. +0
    -0
      src/app/views/utils.py
  95. +0
    -0
      src/entrypoint.sh

+ 0
- 0
.env Visa fil


+ 0
- 0
.gitignore Visa fil


+ 2
- 2
README.md Visa fil

@@ -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\<groupid\> <br>
http://0.0.0.0:80<groupid\> or http://127.0.0.1:80<groupid\> <br>
Or if you are running docker-toolbox :
http://192.168.99.100:80\<groupid\>
http://192.168.99.100:80<groupid\>

### Build / Rebuild



+ 0
- 0
app_structure.png Visa fil

Before After
Width: 521  |  Height: 371  |  Size: 24KB Width: 521  |  Height: 371  |  Size: 24KB

+ 0
- 0
docker-compose.yml Visa fil


+ 0
- 0
mysql/Dockerfile Visa fil


+ 0
- 0
mysql/sql/init.sql Visa fil


+ 0
- 0
src/Dockerfile Visa fil


+ 0
- 0
src/app/.gitignore Visa fil


+ 0
- 0
src/app/docs/Makefile Visa fil


+ 0
- 0
src/app/docs/build/doctrees/environment.pickle Visa fil


+ 0
- 0
src/app/docs/build/doctrees/index.doctree Visa fil


+ 0
- 0
src/app/docs/build/html/.buildinfo Visa fil


+ 0
- 0
src/app/docs/build/html/_sources/index.rst.txt Visa fil


+ 0
- 0
src/app/docs/build/html/_static/alabaster.css Visa fil


+ 0
- 0
src/app/docs/build/html/_static/basic.css Visa fil


+ 0
- 0
src/app/docs/build/html/_static/custom.css Visa fil


+ 0
- 0
src/app/docs/build/html/_static/doctools.js Visa fil


+ 0
- 0
src/app/docs/build/html/_static/documentation_options.js Visa fil


+ 0
- 0
src/app/docs/build/html/_static/file.png Visa fil

Before After
Width: 16  |  Height: 16  |  Size: 286B Width: 16  |  Height: 16  |  Size: 286B

+ 0
- 0
src/app/docs/build/html/_static/jquery-3.4.1.js Visa fil


+ 0
- 0
src/app/docs/build/html/_static/jquery.js Visa fil


+ 0
- 0
src/app/docs/build/html/_static/language_data.js Visa fil


+ 0
- 0
src/app/docs/build/html/_static/minus.png Visa fil

Before After
Width: 11  |  Height: 11  |  Size: 90B Width: 11  |  Height: 11  |  Size: 90B

+ 0
- 0
src/app/docs/build/html/_static/plus.png Visa fil

Before After
Width: 11  |  Height: 11  |  Size: 90B Width: 11  |  Height: 11  |  Size: 90B

+ 0
- 0
src/app/docs/build/html/_static/pygments.css Visa fil


+ 0
- 0
src/app/docs/build/html/_static/searchtools.js Visa fil


+ 0
- 0
src/app/docs/build/html/_static/underscore-1.3.1.js Visa fil


+ 0
- 0
src/app/docs/build/html/_static/underscore.js Visa fil


+ 0
- 0
src/app/docs/build/html/genindex.html Visa fil


+ 0
- 0
src/app/docs/build/html/index.html Visa fil


+ 0
- 0
src/app/docs/build/html/objects.inv Visa fil


+ 0
- 0
src/app/docs/build/html/py-modindex.html Visa fil


+ 0
- 0
src/app/docs/build/html/search.html Visa fil


+ 0
- 0
src/app/docs/build/html/searchindex.js Visa fil


+ 0
- 0
src/app/docs/build/latex/LICRcyr2utf8.xdy Visa fil


+ 0
- 0
src/app/docs/build/latex/LICRlatin2utf8.xdy Visa fil


+ 0
- 0
src/app/docs/build/latex/LatinRules.xdy Visa fil


+ 0
- 0
src/app/docs/build/latex/Makefile Visa fil


+ 0
- 0
src/app/docs/build/latex/beelance2.aux Visa fil


+ 0
- 0
src/app/docs/build/latex/beelance2.fdb_latexmk Visa fil


+ 0
- 0
src/app/docs/build/latex/beelance2.fls Visa fil


+ 0
- 0
src/app/docs/build/latex/beelance2.idx Visa fil


+ 0
- 0
src/app/docs/build/latex/beelance2.ilg Visa fil


+ 0
- 0
src/app/docs/build/latex/beelance2.ind Visa fil


+ 0
- 0
src/app/docs/build/latex/beelance2.log Visa fil


+ 0
- 0
src/app/docs/build/latex/beelance2.out Visa fil


+ 0
- 0
src/app/docs/build/latex/beelance2.pdf Visa fil


+ 0
- 0
src/app/docs/build/latex/beelance2.tex Visa fil


+ 0
- 0
src/app/docs/build/latex/beelance2.toc Visa fil


+ 0
- 0
src/app/docs/build/latex/footnotehyper-sphinx.sty Visa fil


+ 0
- 0
src/app/docs/build/latex/latexmkjarc Visa fil


+ 0
- 0
src/app/docs/build/latex/latexmkrc Visa fil


+ 0
- 0
src/app/docs/build/latex/make.bat Visa fil


+ 0
- 0
src/app/docs/build/latex/python.ist Visa fil


+ 0
- 0
src/app/docs/build/latex/sphinx.sty Visa fil


+ 0
- 0
src/app/docs/build/latex/sphinx.xdy Visa fil


+ 0
- 0
src/app/docs/build/latex/sphinxcyrillic.sty Visa fil


+ 0
- 0
src/app/docs/build/latex/sphinxhighlight.sty Visa fil


+ 0
- 0
src/app/docs/build/latex/sphinxhowto.cls Visa fil


+ 0
- 0
src/app/docs/build/latex/sphinxmanual.cls Visa fil


+ 0
- 0
src/app/docs/build/latex/sphinxmessages.sty Visa fil


+ 0
- 0
src/app/docs/build/latex/sphinxmulticell.sty Visa fil


+ 0
- 0
src/app/docs/make.bat Visa fil


+ 0
- 0
src/app/docs/source/conf.py Visa fil


+ 0
- 0
src/app/docs/source/index.rst Visa fil


+ 0
- 0
src/app/main.py Visa fil


+ 0
- 0
src/app/models/database.py Visa fil


+ 0
- 0
src/app/models/project.py Visa fil


+ 0
- 0
src/app/models/register.py Visa fil


+ 0
- 0
src/app/models/user.py Visa fil


+ 0
- 0
src/app/requirements.txt Visa fil


+ 0
- 0
src/app/static/friends.jpeg Visa fil

Before After
Width: 600  |  Height: 339  |  Size: 48KB Width: 600  |  Height: 339  |  Size: 48KB

+ 0
- 0
src/app/static/honeybee.png Visa fil

Before After
Width: 200  |  Height: 188  |  Size: 28KB Width: 200  |  Height: 188  |  Size: 28KB

+ 0
- 0
src/app/static/stylesheet.css Visa fil


+ 0
- 0
src/app/templates/apply.html Visa fil


+ 0
- 0
src/app/templates/index.html Visa fil


+ 0
- 0
src/app/templates/login.html Visa fil


+ 0
- 0
src/app/templates/new_project.html Visa fil


+ 0
- 0
src/app/templates/open_projects.html Visa fil


+ 0
- 0
src/app/templates/project.html Visa fil


+ 0
- 0
src/app/templates/register.html Visa fil


+ 0
- 0
src/app/uwsgi.ini Visa fil


+ 10
- 0
src/app/views/app.py Visa fil

@@ -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", "<username>@stud.ntnu.no", "Hello", "Grz, the beelance app is running")

# Define application routes
urls = (


+ 0
- 0
src/app/views/apply.py Visa fil


+ 0
- 0
src/app/views/forms.py Visa fil


+ 0
- 0
src/app/views/index.py Visa fil


+ 0
- 0
src/app/views/login.py Visa fil


+ 0
- 0
src/app/views/logout.py Visa fil


+ 0
- 0
src/app/views/new_project.py Visa fil


+ 0
- 0
src/app/views/open_projects.py Visa fil


+ 0
- 0
src/app/views/project.py Visa fil


+ 0
- 0
src/app/views/register.py Visa fil


+ 0
- 0
src/app/views/utils.py Visa fil


+ 0
- 0
src/entrypoint.sh Visa fil


Laddar…
Avbryt
Spara