Merge pull request #827 from memeLab/develop

Release 2.0.0

Author: pablodiegoss

.github/workflows/PipelineRC.yml

@@ -73,7 +73,7 @@ jobs:
             -Dsonar.host.url=${{ vars.SONAR_HOST_URL }}
             -Dsonar.token=${{ secrets.SONAR_TOKEN }}
             -Dsonar.python.coverage.reportPaths=coverage.xml
-            -Dsonar.coverage.exclusions=**/migrations/**,**/tests/**,**/wsgi.py
+            -Dsonar.coverage.exclusions=**/migrations/**,**/tests/**,**/wsgi.py,**/admin.py,**/asgi.py,**/manage.py,**/ui_tests/**,**/*.css,**/*.js,**/*.jinja2
             -Dsonar.cpd.exclusions=**/migrations/**
             -Dsonar.python.version=3.13
 

Dockerfile

@@ -17,7 +17,8 @@ RUN apt-get update && \
       gettext \
       docutils-common \
       curl \
-      wget \ 
+      wget \
+      git \
   && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
   && wget "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${dpkgArch}" -O /usr/local/bin/tini \
   && chmod +x /usr/local/bin/tini && tini --version \ 
@@ -67,6 +68,11 @@ RUN --mount=type=cache,target=/root/.cache/uv \
     uv sync
 
 RUN uv run playwright install chromium --with-deps
+
+RUN groupadd -g 1000 jandig && useradd -u 1000 -g 1000 -r -m -d /home/jandig jandig
+RUN chown -R jandig:jandig /jandig
+USER jandig
+
 WORKDIR /jandig
 
-CMD ["/bin/bash", "-c", "/jandig/create_buckets.sh && /jandig/run.sh"]
+CMD ["/bin/bash", "-c", "/jandig/etc/create_buckets.sh && /jandig/run.sh"]

Makefile

@@ -29,6 +29,10 @@ migrate:
 	docker compose up -d
 	docker compose exec django python src/manage.py migrate
 
+collectstatic:
+	docker compose up -d
+	docker compose exec django python src/manage.py collectstatic --noinput
+
 gen:
 	uv run playwright codegen -b chromium --target python-pytest localhost:8000
 

Privacy.md

@@ -0,0 +1,61 @@
+**Privacy Policy**
+
+This privacy policy applies to the Jandig app (hereinafter referred to as "Application") for Meta Quest devices, which was created by memeLab (hereinafter referred to as "Service Provider") as an open-source service. This service is intended for use "AS IS".
+
+**Information Collection and Use**
+
+The Application collects information when you download and use it. This information may include information such as
+
+*   Your device's Internet Protocol (IP) address 
+*   The pages of the Application that you open, the time and date of your opening, and the time spent on those pages
+*   The time spent on the Application
+
+The Application does not gather precise information about the location of your Meta Quest.
+
+For a better experience while using the Application, the Service Provider may ask you to provide us with certain personally identifiable information, including, but not limited to, your Email Address. The information that the Service Provider requests will be retained and used as described in this privacy policy.
+
+**Third Party Access**
+
+Only aggregated, anonymized data is periodically transmitted to external services to aid the Service Provider in improving the Application and their service. The Service Provider may share your information with third parties in the ways that are described in this privacy statement.
+
+Please note that the Application utilizes third-party services that have their own privacy policies regarding data handling. Below are the links to the Privacy Policy of the third-party service providers used by the Application:
+
+*   [Unity](https://unity3d.com/legal/privacy-policy)
+
+The Service Provider may disclose User Provided and Automatically Collected Information:
+
+*   As required by law, such as to comply with a subpoena, or similar legal process;
+*   When they believe in good faith that disclosure is necessary to protect their rights, protect your safety or the safety of others, investigate fraud, or respond to a government request;
+* With their trusted service providers who work on their behalf, they do not have independent use of the information we disclose, and have agreed to adhere to the rules outlined in this privacy statement.
+
+**Opt-Out Rights**
+
+You can stop all collection of information by the Application easily by uninstalling it. You can use the standard uninstall processes available as part of your Meta Quest or via the mobile application marketplace or network.
+
+**Data Retention Policy**
+
+The Service Provider will retain User-Provided data for as long as you use the Application and for a reasonable period thereafter. If you'd like the Servie Provider to delete User-Provided Data that you have provided via the Application, please get in touch at jandig[at]memelab.com.br. They will be able to respond within a reasonable timeframe.
+
+**Children**
+
+The Service Provider does not use the Application to knowingly solicit data from or market to children under the age of 13.
+
+The Application does not address anyone under the age of 13. The Service Provider does not knowingly collect personally identifiable information from children under 13 years of age. If the Service Provider discovers a child under 13 has provided personal information, the Service Provider will immediately delete it from their servers. If you are a parent or guardian and are aware that your child has provided us with personal information, please contact the Service Provider (jandig[at]memelab.com.br) so that they can take the necessary actions.
+
+**Security**
+
+The Service Provider is committed to maintaining the confidentiality of your information. The Service Provider implements physical, electronic, and procedural safeguards to protect the data it processes and maintains.
+
+**Changes**
+
+This Privacy Policy may be updated from time to time for any reason. The Service Provider will notify you of any changes to the Privacy Policy by updating this page with the new Privacy Policy. Please review this Privacy Policy regularly for any changes, as your continued use constitutes your approval of all updates.
+
+This privacy policy is effective as of 2025-10-05.
+
+**Your Consent**
+
+By using the Application, you are consenting to the processing of your information as outlined in this Privacy Policy now and as amended by the Service Provider.
+
+**Contact Us**
+
+If you have any questions about privacy while using the Application or concerns about our practices, please do not hesitate to contact the Service Provider via email at jandig[at]memelab.com.br.

README.md

@@ -8,11 +8,11 @@ See for yourself in the 1 minute video below (make sure subtitles are on).
 
 ## How it works
 
-Jandig uses image pattern detection to detect [augmented reality markers](https://www.kudan.eu/kudan-news/augmented-reality-fundamentals-markers/) through the camera of a device and render a content (currently a GIF) on the device screen, giving the impression that your device is like a virtual window that you are looking at.
+Jandig uses image pattern detection to detect [augmented reality markers](https://www.kudan.eu/kudan-news/augmented-reality-fundamentals-markers/) through the camera of a device and render a content (currently a GIF ou video) on the device screen, giving the impression that your device is like a virtual window that you are looking at.
 
 ![usage](https://user-images.githubusercontent.com/12930004/46251341-770de200-c426-11e8-9671-d870d1b9bd5d.jpg)
 
-Jandig ARte is a Progressive Web App, which means you can open in any device with a browser and a camera. You can also add Jandig ARte to your homescreen and it will run like a native app on your device.
+Jandig is a Progressive Web App, which means you can open in any device with a browser and a camera. You can also add Jandig to your homescreen and it will run like a native app on your device.
 
 ### People
 
@@ -39,19 +39,19 @@ We are a small team based in Brazil :D talk to us on [Telegram](https://t.me/joi
 
 ### 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!
+We are looking for artists (illustrators, 3d modellers, animators, and others) 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!
 
 ### Clipping
 
-You can find interviews and references to Jandig in the press [here](https://jandig.app/memories/clipping/).
+You can find interviews and references to Jandig in the press [here](https://dev.jandig.app/memories/clipping/).
 
 ## Get Started
 
-To contribute to Jandig ARte, it would be awesome if you read [Contributing](https://github.com/memeLab/ARte/blob/master/.github/CONTRIBUTING.md) and our [Code of conduct](https://github.com/memeLab/ARte/blob/master/.github/CODE_OF_CONDUCT.md). After a good read you are ready to move foward!
+To contribute to Jandig, it would be awesome if you read [Contributing](https://github.com/memeLab/ARte/blob/master/.github/CONTRIBUTING.md) and our [Code of conduct](https://github.com/memeLab/ARte/blob/master/.github/CODE_OF_CONDUCT.md). After a good read you are ready to move foward!
 
 ### Prerequisites
 
-We use docker and docker compose to ensure a consistent development environment and to make the deploy process as painless as possible, so all you need on your development tools to run Jandig ARte is [Docker](https://www.docker.com/) or [UV](https://docs.astral.sh/uv/)
+We use docker and docker compose to ensure a consistent development environment and to make the deploy process as painless as possible, so all you need on your development tools to run Jandig is [Docker](https://www.docker.com/) or [UV](https://docs.astral.sh/uv/)
 
 ### Installing
 
@@ -62,7 +62,7 @@ On Windows, we recommend you use [WSL2](https://learn.microsoft.com/en-us/window
 
 #### Linux OS
 
-To run Jandig ARte all you need to do is:
+To run Jandig all you need to do is:
 
 * Clone this repo
 * Navigate to the repository folder
@@ -81,7 +81,7 @@ If you get any error saying ``permission denied`` try run the command with sudo
 sudo docker compose up --watch
 ```
 
-Jandig ARte server will run at localhost. To test modifications you just need to run a web browser and access [http://localhost/](http://localhost/). If you don't want to use docker or needs to update CSS files which are quite messy with Gunicorn + MinIO, you can use UV directly to run Django's development server.
+Jandig server will run at localhost. To test modifications you just need to run a web browser and access [http://localhost/](http://localhost/). If you don't want to use docker or needs to update CSS files which are quite messy with Gunicorn + MinIO, you can use UV directly to run Django's development server.
 
 ```bash
 DJANGO_READ_DOT_ENV_FILE=True uv run python src/manage.py runserver
@@ -102,7 +102,7 @@ Select the one with `https` at beginning.
 
 #### Windows OS
 
-To run Jandig ARte all you need to do is:
+To run Jandig all you need to do is:
 
 * Install WSL2, Git and Docker
 * Clone this repository

collection/sounds/happy-message-ping.mp3

@@ -6,35 +6,12 @@ services:
       dockerfile: Dockerfile
       context: .
       target: local_dev
+    user: jandig
     ports:
       - 8000:8000
     volumes:
-      - media_data:/jandig/media
-      - static_data:/jandig/static
-    develop:
-      watch:
-        - action: sync
-          path: ./src
-          target: /jandig/src/
-
-        - action: sync
-          path: ./locale
-          target: /jandig/locale/
-
-        - action: sync
-          path: ./collection
-          target: /jandig/collection/
-
-        - action: rebuild
-          path: ./uv.lock
-
-        - action: rebuild
-          path: ./run.sh
-
-        - action: rebuild
-          path: ./docs
-          target: /jandig/docs/
-
+      - ./:/jandig
+      - /jandig/minio-binaries/
     env_file:
       - .envs/.example
     environment:

collection/sounds/sonar-ping.mp3

@@ -47,7 +47,7 @@ h1, h2, h3, h4, h5, h6 {
 
 p, ul, ol {
     line-height: 1.75;
-    margin: 0 0 1em 0;
+    margin: 0 1.5em 1em 1.5em;
     text-align: justify;
 }
 
@@ -831,4 +831,4 @@ a.jandigIco:hover {
       0%   {background: #03b595;}
       50%  {background: #06f7ae;}
       100% {background: #03b595;}
-    }
+    }