Merge branch 'develop'

memeLab · Sep 28, 2021 · d2b4431 · d2b4431
2 parents cf2868a + c38865f
commit d2b4431
Show file tree

Hide file tree

Showing 100 changed files with 1,489 additions and 710 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,9 @@
 ---
 name: Bug report
 about: Report a bug to help us improve Jandig
+title: ''
+labels: bug
+assignees: ''
 
 ---
 
@@ -17,11 +20,12 @@ Steps to reproduce the behavior:
 **Expected behavior**
 A clear and concise description of what was expected to happen.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+**Screen captures**
+If applicable, add screenshots or screencasts to help explain your problem.
 
-**Please, tell us which device/browser is used when finding the bug):**
- - OS: [ex.: iOS], Browser [ex.: chrome], Version [ex.: 22]
+**Please, tell us which device/browser (with versions) are used when finding the bug:**
+ - OS: [ex.: iOS 12]
+ - Browser: [ex.: Chrome 91.0.4472.114]
 
 **Additional Information**
-Add other information about the problem here, if necessary.
+Add other information about the problem here, if necessary.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,22 @@
+---
+name: Feature Request
+about: I have a suggestion to Jandig (and may want to implement it)!
+title: ''
+labels: feature, enhancement
+assignees: ''
+
+---
+
+## Feature Request
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I have an issue when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen. Add any considered drawbacks.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Is there anything else you can add about the proposal? Maybe a screenshot or design?
diff --git a/.github/ISSUE_TEMPLATE/refactoring.md b/.github/ISSUE_TEMPLATE/refactoring.md
@@ -0,0 +1,27 @@
+---
+name: Refactoring proposal
+about: Suggest a way to improve our source code
+title: ''
+labels: code
+assignees: ''
+
+---
+
+## Refactoring Proposal
+
+**Describe the design issue(s) you have identified in the code**
+Clear and concise description of code smells, technical debits or general code improvements.
+
+**Which source files are affected to this issue(s)?**
+Clear and concise list of relative paths to files that are affected to this issue.
+
+1. Relative path to file 1;
+2. Relative path to file 2;
+3. Etc.
+
+**Describe refactoring alternatives to redesign the code**
+Clear and concise list with descriptions of how to refactor the code. Maybe [potential solutions from the refactoring catalog](https://refactoring.com/catalog/).
+
+1. Refactoring 1;
+2. Refactoring 2;
+3. Etc.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,5 @@ docker/media/
 # translations
 *.mo
 *.po~
+
+src/.envs/.env
diff --git a/README.md b/README.md
@@ -11,25 +11,25 @@ Jandig ARte uses image pattern detection to detect [augmented reality markers](h
 Jandig ARte is a Progressive Web App, which means you can open in every device with a browser and a camera. Also you can add Jandig ARte to your homescreen and it will run like a native app on your device.
 
 ### People
-We are a small team based in Brazil :D talk to us on [Telegram](https://t.me/joinchat/HES_ShA6TMPP-aiHxH7thQ). There's a list of the main contributors of Jandig development:
-* @vjpixel - [GitHub](https://github.com/vjpixel), [Twitter](https://twitter.com/vjpixel), [Instagram](https://instagram.com/vjpixel), 
-* @pablodiegoss - [GitHub](https://github.com/pablodiegoss), [Twitter](https://twitter.com/pablodiegosds)
-* @rodrigocam - [GitHub](https://github.com/rodrigocam), [Twitter](https://twitter.com/sayadiguin)
-* @hvalois - [GitHub](https://github.com/hvalois), [Twitter](https://twitter.com/hebertvalois), [Instagram](https://www.instagram.com/hebertvalois/)
-* @hockpond - [GitHub](https://github.com/hockpond)
-* @anacforcelli - [GitHub](https://github.com/anacforcelli)
-* @luccaepp - [GitHub](https://github.com/luccaepp), [Twitter](https://twitter.com/luccaepp)
-* @Heloisecs - [GitHub](https://github.com/Heloisecs), [Twitter](https://twitter.com/heloisecullen)
-* @LeoSGomes - [GitHub](https://github.com/LeoSilvaGomes), [Twitter](https://twitter.com/LeoSGomes), [Instagram](https://www.instagram.com/leonardodasilvagomes/)
-* @kisobral - [GitHub](https://github.com/KiSobral), [Instagram](https://www.instagram.com/hugsob/)
-* @rhuancpq - [GitHub](https://github.com/Rhuancpq), [Twitter](https://twitter.com/rhuancpq)
-* @thiagohersan - [GitHub](https://github.com/thiagohersan)
-* @manuengsf - [Github](https://github.com/manuengsf)
-* @darmsDD - [Github](https://github.com/darmsDD)
-* @MatheusBlanco - [Github](https://github.com/MatheusBlanco)
-* @devsalula - [Github](https://github.com/devsalula)
-* @shayanealcantara [Github](https://github.com/shayanealcantara)
-* @victoralvesgomide - [Github](https://github.com/victoralvesgomide)
+We are a small team based in Brazil :D talk to us on [Telegram](https://t.me/joinchat/HES_ShA6TMPP-aiHxH7thQ). Here's a list of some of the contributors for the development:
+* [@pablodiegoss](https://github.com/pablodiegoss) ([Twitter](https://twitter.com/pablodiegosds))
+* [@hvalois](https://github.com/hvalois) ([Twitter](https://twitter.com/hebertvalois), [Instagram](https://www.instagram.com/hebertvalois/))
+* [@rodrigocam](https://github.com/rodrigocam) ([Twitter](https://twitter.com/sayadiguin))
+* [@vjpixel](https://github.com/vjpixel) ([Twitter](https://twitter.com/vjpixel), [Instagram](https://instagram.com/vjpixel))
+* [@anacforcelli](https://github.com/anacforcelli)
+* [@MatheusBlanco](https://github.com/MatheusBlanco)
+* [@hockpond](https://github.com/hockpond)
+* [@devsalula](https://github.com/devsalula)
+* [@shayanealcantara](https://github.com/shayanealcantara)
+* [@victoralvesgomide](https://github.com/victoralvesgomide)
+* [@manuengsf](https://github.com/manuengsf)
+* [@darmsDD](https://github.com/darmsDD)
+* [@luccaepp](https://github.com/luccaepp) ([Twitter](https://twitter.com/luccaepp))
+* [@Heloisecs](https://github.com/Heloisecs) ([Twitter](https://twitter.com/heloisecullen))
+* [@rhuancpq](https://github.com/Rhuancpq) ([Twitter](https://twitter.com/rhuancpq))
+* [@LeoSGomes](https://github.com/LeoSilvaGomes) ([Twitter](https://twitter.com/LeoSGomes), [Instagram](https://www.instagram.com/leonardodasilvagomes/))
+* [@kisobral](https://github.com/KiSobral) ([Instagram](https://www.instagram.com/hugsob/))
+* [@thiagohersan](https://github.com/thiagohersan)
 
 ### Collab
 We are looking for artists (both illustrators and animators) to create great content and help us testing the platform, people to translate our website from Portuguese to English (and vice versa), and developers to help us with the platform, please contact us via the Telegram channel or an issue on GitHub!

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -6,6 +6,7 @@ COPY docs/ /ARte/docs/
 COPY ./src/ARte /ARte/src/ARte/
 COPY ./locale/ /ARte/locale/
 COPY ./tasks.py /ARte/tasks.py
+COPY ./run.sh /ARte/run.sh
 COPY ./etc/ /ARte/etc/
 
 RUN find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -14,16 +14,15 @@ services:
       - ../locale/:/ARte/locale/
       - ./media/:/ARte/src/ARte/users/media/
     env_file:
-      - ../src/.envs/.django
-      - ../src/.envs/.postgres
+      - ../src/.envs/.env
     depends_on:
       - postgres
-    command: inv db -p i18n --compile docs collect run -p
+    command: ./run.sh
 
   postgres:
-    image: postgres:11.6
+    image: postgres:12.6
     env_file:
-      - ../src/.envs/.postgres
+      - ../src/.envs/.env
     command: postgres -c max_connections=10000
     ports:
       - "5432:5432"

diff --git a/docs/jandig_prototype.fig b/docs/jandig_prototype.fig
diff --git a/docs/prototype_png_files/Change Idiom.png b/docs/prototype_png_files/Change Idiom.png
diff --git a/docs/prototype_png_files/Collections.png b/docs/prototype_png_files/Collections.png
diff --git a/docs/prototype_png_files/Confirm Delete.png b/docs/prototype_png_files/Confirm Delete.png
diff --git a/docs/prototype_png_files/Create artwork.png b/docs/prototype_png_files/Create artwork.png
diff --git a/docs/prototype_png_files/Create exhibition.png b/docs/prototype_png_files/Create exhibition.png
diff --git a/docs/prototype_png_files/Delete Account.png b/docs/prototype_png_files/Delete Account.png
diff --git a/docs/prototype_png_files/Edit Profile.png b/docs/prototype_png_files/Edit Profile.png
diff --git a/docs/prototype_png_files/Help.png b/docs/prototype_png_files/Help.png
diff --git a/docs/prototype_png_files/Homepage.png b/docs/prototype_png_files/Homepage.png
diff --git a/docs/prototype_png_files/Login.png b/docs/prototype_png_files/Login.png
diff --git a/docs/prototype_png_files/Modal Artwork.png b/docs/prototype_png_files/Modal Artwork.png
diff --git a/docs/prototype_png_files/Modal Marker.png b/docs/prototype_png_files/Modal Marker.png
diff --git a/docs/prototype_png_files/Modal Objects.png b/docs/prototype_png_files/Modal Objects.png
diff --git a/docs/prototype_png_files/My stuff.png b/docs/prototype_png_files/My stuff.png
diff --git a/docs/prototype_png_files/Profile.png b/docs/prototype_png_files/Profile.png
diff --git a/docs/prototype_png_files/Register.png b/docs/prototype_png_files/Register.png
diff --git a/docs/prototype_png_files/Select artwork exhibition.png b/docs/prototype_png_files/Select artwork exhibition.png
diff --git a/docs/prototype_png_files/Select object artwork.png b/docs/prototype_png_files/Select object artwork.png
diff --git a/docs/prototype_png_files/Unified Upload Marker.png b/docs/prototype_png_files/Unified Upload Marker.png
diff --git a/docs/prototype_png_files/Unified Upload Object.png b/docs/prototype_png_files/Unified Upload Object.png
diff --git a/docs/prototype_png_files/Unified create artwork (1).png b/docs/prototype_png_files/Unified create artwork (1).png
diff --git a/docs/prototype_png_files/Unified create artwork.png b/docs/prototype_png_files/Unified create artwork.png
diff --git a/docs/prototype_png_files/Unified create exhibition.png b/docs/prototype_png_files/Unified create exhibition.png
diff --git a/docs/prototype_png_files/Upload Marker.png b/docs/prototype_png_files/Upload Marker.png
diff --git a/docs/prototype_png_files/Upload Object.png b/docs/prototype_png_files/Upload Object.png
diff --git a/docs/prototype_png_files/search exhibition.png b/docs/prototype_png_files/search exhibition.png
diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po
@@ -136,6 +136,10 @@ msgstr "Título da Exposição"
 msgid "Exhibit URL"
 msgstr "URL da exposição"
 
+#: src/ARte/users/forms.py:251
+msgid "Complete with your Exhibit URL here"
+msgstr "Complete sua URL de exibição aqui"
+
 #: src/ARte/core/jinja2/core/base.jinja2:44
 #, fuzzy
 msgid "Please override the \"content\" block of your template!"
@@ -333,6 +337,10 @@ msgstr ""
 msgid "Next"
 msgstr "Próximo"
 
+#: src/ARte/users/jinja2/users/exhibit-create.jinja2:43
+msgid "Your exhibit URL will look like this"
+msgstr "Sua URL de exibição vai se parecer com isso."
+
 #: src/ARte/users/jinja2/users/artwork-create.jinja2:57
 msgid "Select Object (2/3)"
 msgstr "Selecione Objeto (2/3)"
@@ -349,6 +357,22 @@ msgstr "Publicar obra"
 msgid "Create Jandig Exhibition"
 msgstr "Criar Exposição Jandig"
 
+#: src/ARte/users/jinja2/users/artwork-edit.jinja2:11
+msgid "Edit Jandig Artwork"
+msgstr "Editar Obra Jandig"
+
+#: src/ARte/users/jinja2/users/artwork-edit.jinja2:75
+msgid "Edit Artwork"
+msgstr "Editar Obra"
+
+#: src/ARte/users/jinja2/users/exhibit-edit.jinja2:12
+msgid "Edit Jandig Exhibition"
+msgstr "Editar Exposição Jandig"
+
+#: src/ARte/users/jinja2/users/exhibit-edit.jinja2:49
+msgid "Edit Exhibit"
+msgstr "Editar Exposição"
+
 #: src/ARte/users/jinja2/users/exhibit-create.jinja2:13
 msgid "Select Artworks"
 msgstr "Escolher Obras"
@@ -369,6 +393,10 @@ msgstr "Informações da Exposição (2/2)"
 msgid "Publish Exhibit"
 msgstr "Publicar Exposição"
 
+#: src/ARte/users/jinja2/users/exhibit-create.jinja2:82
+msgid "Urls can't contain spaces or special characters (i.e: .:, /)"
+msgstr "Urls não podem conter espaços ou caracteres especiais (i.e: .:, /)"
+
 #: src/ARte/users/jinja2/users/invalid-recovering-email.jinja2:14
 msgid "There is no user with this e-mail/username."
 msgstr "Não há usuário com esse e-mail/nome."
@@ -630,6 +658,10 @@ msgstr "Curador Jandig"
 msgid "No Exhibitions yet."
 msgstr "Sem Exposições ainda."
 
+#: src/ARte/users/jinja2/users/edit-object.jinja2:31
+msgid "Scale should be adjusted relative to Marker size on the screen. A scale of 2 will render an Object twice the size of the Marker."
+msgstr "A escala deve ser ajustada relativa ao tamanho do Marcador na tela. Uma escala de 2 irá renderizar um Objeto duas vezes o tamanho do Marcador."
+
 #~ msgid " exhibits"
 #~ msgstr " exposições"
 

diff --git a/locustfile.py b/locustfile.py
@@ -1,4 +1,4 @@
-from locust import HttpLocust, TaskSet, between
+from locust import HttpLocust, Set, between
 
 def index(l):
     l.client.get("/")
@@ -9,9 +9,9 @@ def load_gifs(l):
 def exhibit(l):
     l.client.get("/longavida/")
 
-class UserBehavior(TaskSet):
-    tasks = {exhibit:1}
+class UserBehavior(Set):
+    s = {exhibit:1}
 
 class WebsiteUser(HttpLocust):
-    task_set = UserBehavior
+    _set = UserBehavior
     wait_time = between(3,5)
diff --git a/run.sh b/run.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+pip list
+inv i18n --compile docs run -p -g
diff --git a/src/.envs/.dev_deploy b/src/.envs/.dev_deploy
diff --git a/src/.envs/.django b/src/.envs/.django
diff --git a/src/.envs/.example b/src/.envs/.example
@@ -0,0 +1,29 @@
+# Use this file to create a .env with filled variables
+# Django Variables
+DJANGO_DEBUG=True
+DJANGO_SETTINGS_MODULE=config.settings
+DJANGO_ADMIN_URL=admin/
+DEV_DB=False
+DEV_STATIC=False
+DEBUG_TOOLBAR=True
+DJANGO_SECRET_KEY=
+
+## Amazon AWS Variables
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_STORAGE_BUCKET_NAME=
+AWS_S3_REGION_NAME=
+USE_S3=
+
+## Postgres variables
+POSTGRES_HOST=postgres
+POSTGRES_PORT=5432
+POSTGRES_DB=goldpenny
+POSTGRES_USER=goldpenny
+POSTGRES_PASSWORD=goldpenny123
+
+# Email server variables
+SMTP_SERVER=smtp.gmail.com
+SMTP_PORT=587
+JANDIG_EMAIL=local_jandig@memelab.com.br
+JANDIG_EMAIL_PASSWORD=local_password
diff --git a/src/.envs/.postgres b/src/.envs/.postgres
diff --git a/src/.envs/.prod_deploy b/src/.envs/.prod_deploy
diff --git a/src/.envs/.staging_deploy b/src/.envs/.staging_deploy