{{ post.title }}
+{{ post.body[:PREVIEW_SIZE] | safe }}... {{ _("Read More") }}
+{{ _('Create Jandig Artwork') }}
- - -
-
-
-
- {{ category }}
+{% endblock page_title %} + +{%block button%} + {{ _('< Back to Blog') }} ++{%endblock%} \ No newline at end of file diff --git a/src/blog/jinja2/blog/clipping.jinja2 b/src/blog/jinja2/blog/clipping.jinja2 new file mode 100644 index 00000000..30d70cf7 --- /dev/null +++ b/src/blog/jinja2/blog/clipping.jinja2 @@ -0,0 +1,31 @@ +{% extends '/core/home.jinja2' %} + +{% block extra_css %} + +{% endblock %} + +{% block content %} +
+ {% block button %}
+ {% endblock %}
+ {% block page_title %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/src/blog/jinja2/blog/detail.jinja2 b/src/blog/jinja2/blog/detail.jinja2
new file mode 100644
index 00000000..13d48ccb
--- /dev/null
+++ b/src/blog/jinja2/blog/detail.jinja2
@@ -0,0 +1,26 @@
+{% extends "blog/index.jinja2" %}
+
+{% block content %}
+ {{ _("Clipping") }}
+ {% endblock page_title %} + {{_( "The content below is in the original languages.")}} + {% for clipping in clippings %} +
+
+ {% endfor %}
+ {{ clipping.title }}
+ {{ clipping.created.date().strftime('%d %B %Y') }} +{{ clipping.description }}
+ {{ clipping.link }} + {%if clipping.file.url[-3:] == "pdf" %} + {{ _("View as PDF")}} + {% elif clipping.file.url[-3:] in ["png","jpg"] %} + {{ _("View as JPG")}} + {% else %} + {{ _("View File")}} + {% endif %} +
+ {{ _('< Back to Blog') }}
+
+ {% block page_title %} +
+ + {% block page_title %} +
{{ post.title }}
+ {% endblock page_title %} +
+
+
+ {{ post.body |safe }}
+ {% for image in images %} +
+ 
+ {% if image.description %}
+ {{ image.description }}
+ {% endif %}
+
+ {% endfor %}
+ + {{_("Back to Top")}} + +{% endblock %} \ No newline at end of file diff --git a/src/blog/jinja2/blog/index.jinja2 b/src/blog/jinja2/blog/index.jinja2 new file mode 100644 index 00000000..615d2736 --- /dev/null +++ b/src/blog/jinja2/blog/index.jinja2 @@ -0,0 +1,18 @@ +{% extends '/core/home.jinja2' %} + +{% block extra_css %} + +{% endblock %} + +{% block content %} +
+ {% block button %}
+ {% endblock %}
+ {% block page_title %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/src/blog/jinja2/blog/post_preview.jinja2 b/src/blog/jinja2/blog/post_preview.jinja2
new file mode 100644
index 00000000..5d0db089
--- /dev/null
+++ b/src/blog/jinja2/blog/post_preview.jinja2
@@ -0,0 +1,9 @@
+{% for post in posts %}
+ {{ _("Memories") }}
+ {% endblock page_title %} +
+ {% include "/blog/post_preview.jinja2" %}
+
+
+
+{% endfor %}
+{% if posts.count() == page_size %}
+
+{% endif %}
\ No newline at end of file
diff --git a/src/blog/migrations/0001_initial.py b/src/blog/migrations/0001_initial.py
new file mode 100644
index 00000000..d1c06fa2
--- /dev/null
+++ b/src/blog/migrations/0001_initial.py
@@ -0,0 +1,93 @@
+# Generated by Django 4.1.5 on 2024-06-23 17:41
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ("users", "0009_alter_profile_id"),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name="Category",
+ fields=[
+ (
+ "id",
+ models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("name", models.CharField(max_length=100)),
+ ],
+ options={
+ "verbose_name_plural": "categories",
+ },
+ ),
+ migrations.CreateModel(
+ name="PostImage",
+ fields=[
+ (
+ "id",
+ models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("file", models.FileField()),
+ (
+ "description",
+ models.CharField(blank=True, max_length=500, null=True),
+ ),
+ ],
+ ),
+ migrations.CreateModel(
+ name="Post",
+ fields=[
+ ("id", models.BigAutoField(primary_key=True, serialize=False)),
+ ("title", models.CharField(max_length=200)),
+ (
+ "status",
+ models.CharField(
+ choices=[("draft", "Draft"), ("published", "Published")],
+ default="draft",
+ max_length=20,
+ ),
+ ),
+ ("body", models.TextField()),
+ ("created", models.DateTimeField()),
+ ("updated", models.DateTimeField(auto_now=True)),
+ (
+ "author",
+ models.ForeignKey(
+ blank=True,
+ null=True,
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name="posts",
+ to="users.profile",
+ ),
+ ),
+ (
+ "categories",
+ models.ManyToManyField(
+ blank=True, related_name="posts", to="blog.category"
+ ),
+ ),
+ (
+ "images",
+ models.ManyToManyField(
+ blank=True, related_name="posts", to="blog.postimage"
+ ),
+ ),
+ ],
+ ),
+ ]
diff --git a/src/blog/migrations/0002_legacy_posts.py b/src/blog/migrations/0002_legacy_posts.py
new file mode 100644
index 00000000..5e19b39e
--- /dev/null
+++ b/src/blog/migrations/0002_legacy_posts.py
@@ -0,0 +1,410 @@
+from django.db import migrations, models
+import datetime
+from zoneinfo import ZoneInfo
+
+
+def create_initial_posts(apps, schema_editor):
+ Category = apps.get_model("blog", "Category")
+ Post = apps.get_model("blog", "Post")
+ PostImage = apps.get_model("blog", "PostImage")
+
+ obras_category, _ = Category.objects.get_or_create(name="Obras")
+ noticias_category, _ = Category.objects.get_or_create(name="Notícias")
+ ativas_category, _ = Category.objects.get_or_create(name="Ativas")
+ exhibitions_category, _ = Category.objects.get_or_create(name="Exhibitions")
+
+ timezone = ZoneInfo("America/Sao_Paulo")
+ initial_posts = [
+ {
+ "post": {
+ "id": 1,
+ "title": "Making Of",
+ "status": "published",
+ "created": datetime.datetime(2011, 11, 25, 17, 0, tzinfo=timezone),
+ "categories": [exhibitions_category],
+ "body": """Behind-the-scenes images of development, various interventions, and exhibitions.""",
+ },
+ "images": [
+ {
+ "file": "IMG_1283-2.jpg",
+ "description": "Preparing homemade paste for the first urban intervention",
+ },
+ {
+ "file": "IMG_1289.jpg",
+ "description": "Preparing homemade paste for the first urban intervention",
+ },
+ {
+ "file": "IMG_20170419_124719_832.jpg",
+ "description": "Installing the Janelas Digitais exhibition",
+ },
+ {
+ "file": "IMG_20170420_154121_254-1.jpg",
+ "description": "Installing the Janelas Digitais exhibition",
+ },
+ {
+ "file": "IMG_20170420_170458.jpg",
+ "description": "Installing the Janelas Digitais exhibition",
+ },
+ {
+ "file": "2011-11-29-19.40.27.jpg",
+ "description": "Drafting the poster for the CulturaDigital.br festival",
+ },
+ {
+ "file": "IMG_20170413_163535_258.jpg",
+ "description": "Test of the “Sexy na Janela” animation",
+ },
+ {"file": "Jandig_20131031_154312.jpg", "description": "Marker tests"},
+ {
+ "file": "IMG_20170519_193224_636.jpg",
+ "description": "Marker tests for the “Algo a Mais” exhibition",
+ },
+ {
+ "file": "Jandig_20120331_201203.jpg",
+ "description": "Testing a marker on a yellow T-shirt",
+ },
+ {
+ "file": "Jandig_20120331_200803.jpg",
+ "description": "Testing a marker on a sticker",
+ },
+ ],
+ },
+ {
+ "post": {
+ "id": 2,
+ "title": "Urban Interventions",
+ "status": "published",
+ "created": datetime.datetime(2011, 11, 25, 17, 1, tzinfo=timezone),
+ "categories": [exhibitions_category],
+ "body": """Urban interventions in London, UK (2017); Montreal, Canada (2017); and São Paulo, Brazil (2011).""",
+ },
+ "images": [
+ {"file": "DLTITQXXkAA_-Ar.jpg", "description": "London"},
+ {"file": "IMG_20171017_165803462_HDR.jpg", "description": "Montreal"},
+ {"file": "DMXanr4WkAEQ1pP.jpg", "description": "Montreal"},
+ {"file": "IMG_1304.jpg", "description": "São Paulo"},
+ {"file": "IMG_1322.jpg", "description": "São Paulo"},
+ {"file": "IMG_1325.jpg", "description": "São Paulo"},
+ {"file": "IMG_1328.jpg", "description": "São Paulo"},
+ {"file": "IMG_1338.jpg", "description": "São Paulo"},
+ {"file": "IMG_13491.jpg", "description": "São Paulo"},
+ {"file": "IMG_1350.jpg", "description": "São Paulo"},
+ {"file": "IMG_1355.jpg", "description": "São Paulo"},
+ {"file": "IMG_1327-1.jpg", "description": "São Paulo"},
+ ],
+ },
+ {
+ "post": {
+ "id": 3,
+ "title": "Ônibus Hacker",
+ "status": "published",
+ "created": datetime.datetime(2011, 11, 25, 17, 2, tzinfo=timezone),
+ "categories": [exhibitions_category],
+ "body": """The intervention was carried out on the Ônibus Hacker in São Paulo, Brazil (December 2011), during the departure for the CulturaDigital.br festival at MAM in Rio de Janeiro.""",
+ },
+ "images": [
+ {"file": "IMG_1358.jpg", "description": None},
+ {"file": "IMG_1362.jpg", "description": None},
+ {"file": "IMG_1365-1.jpg", "description": None},
+ ],
+ },
+ {
+ "post": {
+ "id": 4,
+ "title": "CulturaDigital.br Festival",
+ "status": "published",
+ "created": datetime.datetime(2011, 11, 25, 17, 3, tzinfo=timezone),
+ "categories": [exhibitions_category],
+ "body": """Posters and a lecture on Jandig were presented at the Museum of Modern Art in Rio de Janeiro, Brazil, from December 2 to 4, 2011, during the CulturaDigital.br Festival.
+
+ More than just an event for showcasing ideas and projects, the CulturaDigital.br Festival was a gathering of Brazilian digital culture agents with their global peers. It brought together creators, producers, and activists working at the intersection of culture, politics, and technology, promoting innovations in their fields.
+
+ Jandig had its first concrete realization during the Festival. It was our trial by fire! We conducted an intervention and had a representative give a lecture presenting the project and the techniques and concepts involved in its execution.""",
+ },
+ "images": [
+ {
+ "file": "6477047909_edf32607a8_o.jpg",
+ "description": "Talk presenting Jandig",
+ },
+ {
+ "file": "6477047909_edf32607a8_o.jpg",
+ "description": "Remix of one of Jandig's posters and a photo taken at the event",
+ },
+ {
+ "file": "fitacrepe_mam-1.jpg",
+ "description": "One of Jandig's posters with markers spread across the event",
+ },
+ ],
+ },
+ {
+ "post": {
+ "id": 5,
+ "title": "Campus Party Brazil",
+ "status": "published",
+ "created": datetime.datetime(2011, 11, 25, 17, 4, tzinfo=timezone),
+ "categories": [exhibitions_category],
+ "body": """The first official Jandig exhibition occurred from February 6 to 12, 2012, at Campus Party in São Paulo, Brazil. We displayed a series of markers of various sizes arranged in a maze. The markers were printed by us on 180g paper and later cut with a paper cutter.
+
+ During the seven-day exhibition, attendees could bring t-shirts to have a marker printed on them using the silk-screen technique. While the t-shirts dried, they were hung on a clothesline as part of the installation.
+
+ On the esteemed Digital Arts stage, we had the privilege of sharing the (still brief) history of Jandig: from its inception, the journey of uniting people, the software development, the first interventions, to the invaluable lessons we've gleaned along the way. This session was followed by an interview with Campus Party TV.
+
+ Moreover, during the event, we had the exciting opportunity to collaborate with the renowned band Móveis Coloniais de Acaju. The band incorporated images of Jandig and the unique sound of the stamp into a music video recorded live during the event, adding a new dimension to our artistic expression. They also interviewed us during the event.""",
+ },
+ "images": [
+ {
+ "file": "jandig-CP-6-1.jpg",
+ "description": "Placa apresentando o Jandig",
+ },
+ {
+ "file": "palestra_jandig_cp2012-5.jpg",
+ "description": "Palestra sobre o Jandig no palco de Artes Digitais",
+ },
+ {
+ "file": "palestra_jandig_cp2012-6.jpg",
+ "description": "Demonstração durante a palestra",
+ },
+ {
+ "file": "palestra_jandig_cp2012-10.jpg",
+ "description": "Um urso de pelúcia ganhou um marcador",
+ },
+ {
+ "file": "palestra_jandig_cp2012-13-1.jpg",
+ "description": "Entrevista para a TV Campus Party",
+ },
+ {
+ "file": "jandig-CP-15-1.jpg",
+ "description": "Aplicando silk-screen em uma camiseta",
+ },
+ {
+ "file": "jandig-CP-14.jpg",
+ "description": "Camiseta após a aplicação de silk",
+ },
+ {
+ "file": "jandig-CP-17.jpg",
+ "description": "Verificando se a tinta secou",
+ },
+ {"file": "jandig-CP-1-1.jpg", "description": "Exposição"},
+ {"file": "Jandig_20120211_133940.jpg", "description": "Exposição"},
+ {"file": "Jandig_20120211_134014.jpg", "description": "Exposição"},
+ {
+ "file": "jandig-CP-7.jpg",
+ "description": "Entrevista para a Móveis Coloniais de Acaju",
+ },
+ {
+ "file": "Jandig_20120211_134137.jpg",
+ "description": "Superfície utilizada pela Móveis Coloniais de Araju para gravar som de carimbadas, após a gravação",
+ },
+ ],
+ },
+ {
+ "post": {
+ "id": 6,
+ "title": "AiR – Mobile Media Art",
+ "status": "published",
+ "created": datetime.datetime(2011, 11, 25, 17, 5, tzinfo=timezone),
+ "categories": [exhibitions_category],
+ "body": """Mobile Media Art Artists in Residency was an initiative organized by NIMk (Netherlands) and Vivo ARTE.MOV (Brazil) from March to April 2012. This pioneering artistic residency utilized mobile laboratories equipped for digital production and dissemination, developed in Amsterdam and São Paulo.
+ Pixel was selected for the residency with the Jandig initiative. During the residency, Jandig inspired the design of the Narrative Navigation installation. The final installation was presented in São Paulo and Rotterdam (Netherlands).
+ During the residency Artistic interventions at the São Paulo Cultural Center and at Dom José Gaspar Square (São Paulo, Brazil).""",
+ },
+ "images": [
+ {"file": "2012-03-25-19.07.29.jpg", "description": None},
+ {"file": "2012-04-15-16.39.58.jpg", "description": None},
+ {"file": "LabMovel-24.jpg", "description": None},
+ {"file": "LabMovel-26.jpg", "description": None},
+ {"file": "LabMovel-32.jpg", "description": None},
+ {"file": "LabMovel-37.jpg", "description": None},
+ {"file": "LabMovel-38.jpg", "description": None},
+ {"file": "LabMovel-41.jpg", "description": None},
+ {"file": "LabMovel-43.jpg", "description": None},
+ ],
+ },
+ {
+ "post": {
+ "id": 7,
+ "title": "BaixoCentro Festival",
+ "status": "published",
+ "created": datetime.datetime(2011, 11, 25, 17, 6, tzinfo=timezone),
+ "categories": [exhibitions_category],
+ "body": """BaixoCentro, a street festival that began as a seed of an idea at the Casa da Cultura Digital in mid-2011, was nurtured into existence by a collective effort. The aim was to create a festival that would connect cultural hubs in the neighborhoods around the Minhocão in São Paulo, a vision that we all shared and worked towards.
+
+ By early 2012, the festival had blossomed into a network of over a hundred volunteers, a testament to the community's dedication and belief in the project. A crowdfunding campaign, which achieved the project's funding, was a significant milestone, making it one of the most successful campaigns in Brazil at the time.
+
+ Jandig carried out urban interventions from March 23 to 31 for the festival's 2012 program. The interventions started with meetings with the public at the Casa da Cultura Digital, who then joined us in posting art in various locations.""",
+ },
+ "images": [
+ {"file": "2012-03-31-20.42.27.jpg", "description": None},
+ {"file": "Jandig_20120331_204753.jpg", "description": None},
+ {"file": "Jandig_20120331_204837.jpg", "description": None},
+ {"file": "2012-03-31-21.08.32.jpg", "description": None},
+ ],
+ },
+ {
+ "post": {
+ "id": 8,
+ "title": "Algo a Mais?",
+ "status": "published",
+ "created": datetime.datetime(2011, 11, 25, 17, 7, tzinfo=timezone),
+ "categories": [exhibitions_category],
+ "body": """In 2012, we were invited to create an exhibition for the opening of Sesc Sorocaba (Brazil).
+
+ The Algo a Mais? (Something More?) exhibition theme was robots. We invited animators to create content to appear in augmented reality, a designer to create the markers, and a hacker to develop moving robots that held markers.
+ Besides the robots, we also had markers in magnets (allowing the public to rearrange part of the exhibition). We gave stickers with markers to the attendees, allowing them to get part of the exhibition.
+
+ The Algo a Mais? exhibition was a resounding success. Originally planned for September, its popularity led to an extension. Sesc, impressed by the response, requested to prolong the exhibition for an additional month until the end of October.
+
+
+
+ """,
+ },
+ "images": [
+ {"file": "IMG_1567.jpg", "description": None},
+ {"file": "IMG_1541.jpg", "description": None},
+ {"file": "2012-09-02-16.50.06.jpg", "description": None},
+ {"file": "IMG_1564.jpg", "description": None},
+ {"file": "2012-09-01-10.22.42.jpg", "description": None},
+ {"file": "2012-09-01-10.24.07.jpg", "description": None},
+ {"file": "2012-09-01-10.24.18.jpg", "description": None},
+ {"file": "IMG_1565.jpg", "description": None},
+ ],
+ },
+ {
+ "post": {
+ "id": 9,
+ "title": "FISL",
+ "status": "published",
+ "created": datetime.datetime(2011, 11, 25, 17, 8, tzinfo=timezone),
+ "categories": [exhibitions_category],
+ "body": """The International Free Software Forum - FISL - took place annually from 2000 to 2018 in Porto Alegre, Brazil. FISL is considered one of the world's most significant open-source events, providing integrated technical, political, and social discussions about free software. In July 2012, the event hosted 7,709 participants from 23 countries.
+
+ At the invitation of the event's organization, we gave a lecture. We also created artwork based on the event's logo, which was featured on posters throughout the exhibition area, and stickers were distributed to participants (along with stickers from other exhibitions).""",
+ },
+ "images": [
+ {"file": "Jandig_20120724_184642.jpg", "description": None},
+ {"file": "Ay1b6kICYAEP2FF.jpg", "description": None},
+ {"file": "Ay1cEu1CAAAcYvO.jpg", "description": None},
+ {"file": "Ayv8FkGCIAIqVWJ.jpg", "description": None},
+ {"file": "Jandig_20120724_194605.jpg", "description": None},
+ {"file": "Jandig_20120724_201008.jpg", "description": None},
+ ],
+ },
+ {
+ "post": {
+ "id": 10,
+ "title": "Janelas Digitais",
+ "status": "published",
+ "created": datetime.datetime(2011, 11, 25, 17, 9, tzinfo=timezone),
+ "categories": [exhibitions_category],
+ "body": """The Janelas Digitais exhibition was at Coletivo Digital São Paulo (Brazil) from April to June 2017.
+
+ The text below is by Thiago Esperandio, curator of Coletivo Digital.
+
+ Janelas Digitais (Jandig), conceived by VJ Pixel
+ There is much to say about the Jandig Project that brings this exhibition to Coletivo Digital. However, it’s inevitable to break any formality and start by saying it is incredibly cool. The reaction of anyone who downloads the app and sees this joyful fusion of art and technology is usually a big smile… whether it’s due to the interaction with a technology that still feels quite futuristic or the access to virtual works that bring a playful and colorful vision to the black and white markers (most likely, it’s both). After this initial moment of fun, Janelas Digitais becomes even more extraordinary when we know that the works – both virtual and tangible – are licensed under Creative Commons, allowing other creators to use them; that the app’s source code is open for anyone to explore and learn from; and that the entire project involved various artists working collaboratively. In times of technological wars, the rise of ultra-conservative thinking, a society of control, and the internet under attack from corrupt powers, it is a privilege for Coletivo Digital to host these digital windows, bringing such fraternal and inspiring landscapes to our welcoming space.""",
+ },
+ "images": [
+ {"file": "IMG_9909-1.jpg", "description": None},
+ {"file": "MG_9905.jpg", "description": None},
+ {"file": "Jandig.jpg", "description": None},
+ {"file": "IMG_9921-2.jpg", "description": None},
+ {"file": "IMG_20170421_191253_178.jpg", "description": None},
+ {"file": "IMG_9935-1.jpg", "description": None},
+ {"file": "Jandig_20170420_220437.jpg", "description": None},
+ {"file": "Jandig_20170420_220602.jpg", "description": None},
+ {"file": "IMG_20170313_150654.jpg", "description": None},
+ {"file": "Jandig_20170420_220550.jpg", "description": None},
+ {"file": "Jandig_20170420_201543.jpg", "description": None},
+ {"file": "IMG_9923.jpg", "description": None},
+ {"file": "Jandig2.jpg", "description": None},
+ {"file": "FB_IMG_1492460805870.jpg", "description": None},
+ ],
+ },
+ {
+ "post": {
+ "id": 11,
+ "title": "Virada Cultural",
+ "status": "published",
+ "created": datetime.datetime(2011, 11, 25, 17, 10, tzinfo=timezone),
+ "categories": [exhibitions_category],
+ "body": """Exhibition during Virada Cultural at Sesc Belenzinho (São Paulo, Brazil), May 2017.
+
+ Virada Cultural is an annual event promoted by the São Paulo municipal government since 2005. With the support of various artistic and institutional partners, it aims to provide 24 continuous hours of cultural events at various locations throughout the city.
+
+ This exhibition premiered the cube with markers. In addition to the displayed boxes, there were also buildable cubes with markers. Some works from this exhibition have become “classics,” such as Tokusatsu and Temaki.""",
+ },
+ "images": [
+ {"file": "IMG_20170521_142327_972.jpg", "description": None},
+ {"file": "Jandig_20170520_204811.jpg", "description": None},
+ {"file": "Jandig_20170520_201449.jpg", "description": None},
+ {
+ "file": "Jandig_20170520_201544.jpg",
+ "description": None,
+ },
+ {"file": "IMG_20170520_214145_290.jpg", "description": None},
+ {"file": "IMG_20170521_154532_735.jpg", "description": None},
+ {"file": "IMG_20170520_233302589.jpg", "description": None},
+ {"file": "IMG-20170520-WA0003.jpg", "description": None},
+ {"file": "IMG_20170520_205738_867.jpg", "description": None},
+ {"file": "IMG_20170521_172545_124.jpg", "description": None},
+ ],
+ },
+ {
+ "post": {
+ "id": 12,
+ "title": "GAS Station",
+ "status": "published",
+ "created": datetime.datetime(2011, 11, 25, 17, 11, tzinfo=timezone),
+ "categories": [exhibitions_category],
+ "body": """GAS Station (Games and Art Stratford) is a space dedicated to projects, ideas, and conversations at the intersection of games, performing arts, and technology. GAS supports early-stage projects in London with space, equipment, and mentorship, fostering partnerships and exchanges among professionals from various creative fields. The space is curated by ZU-UK, an internationally renowned company known for creating critically acclaimed and socially engaged performances and digital art that place the audience at the center of the experience.
+
+ In October 2017, a Jandig intervention was carried out in the institution's container area.""",
+ },
+ "images": [
+ {"file": "20171006_155417.jpg", "description": None},
+ {"file": "20171006_154846.jpg", "description": None},
+ {"file": "20171006_155353.jpg", "description": None},
+ {"file": "20171006_155338.jpg", "description": None},
+ {"file": "20171006_155322.jpg", "description": None},
+ {"file": "20171006_154803.jpg", "description": None},
+ ],
+ },
+ ]
+
+ for dict_data in initial_posts:
+ post_data = dict_data["post"]
+ images = dict_data["images"]
+ categories = post_data["categories"]
+
+ del post_data["categories"]
+ post = Post.objects.create(**post_data)
+ post.categories.set(categories)
+ post.save()
+
+ for image_data in images:
+ image_data["file"] = "post_images/" + image_data["file"]
+ image = PostImage.objects.create(**image_data)
+ image.posts.add(post)
+
+
+def remove_initial_posts(apps, schema_editor):
+ Category = apps.get_model("blog", "Category")
+ Post = apps.get_model("blog", "Post")
+ PostImage = apps.get_model("blog", "PostImage")
+
+ Category.objects.filter(name="Obras").delete()
+ Category.objects.filter(name="Notícias").delete()
+ Category.objects.filter(name="Ativas").delete()
+
+ Post.objects.filter(id__in=range(0, 12)).delete()
+ PostImage.objects.filter(id__in=range(0, 99)).delete()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("blog", "0001_initial"),
+ ]
+
+ operations = [
+ migrations.RunPython(create_initial_posts, reverse_code=remove_initial_posts),
+ ]
diff --git a/src/blog/migrations/0003_alter_post_created_alter_postimage_file.py b/src/blog/migrations/0003_alter_post_created_alter_postimage_file.py
new file mode 100644
index 00000000..1e432858
--- /dev/null
+++ b/src/blog/migrations/0003_alter_post_created_alter_postimage_file.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.1.5 on 2024-06-23 18:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("blog", "0002_legacy_posts"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="post",
+ name="created",
+ field=models.DateTimeField(auto_now_add=True),
+ ),
+ migrations.AlterField(
+ model_name="postimage",
+ name="file",
+ field=models.FileField(upload_to="post_images/"),
+ ),
+ ]
diff --git a/src/blog/migrations/0004_clipping.py b/src/blog/migrations/0004_clipping.py
new file mode 100644
index 00000000..bb7bbea4
--- /dev/null
+++ b/src/blog/migrations/0004_clipping.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.1.5 on 2024-06-23 21:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("blog", "0003_alter_post_created_alter_postimage_file"),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name="Clipping",
+ fields=[
+ ("id", models.BigAutoField(primary_key=True, serialize=False)),
+ ("title", models.CharField(max_length=200)),
+ ("description", models.CharField(max_length=500)),
+ ("link", models.URLField()),
+ ("file", models.FileField(upload_to="")),
+ ("created", models.DateTimeField()),
+ ("updated", models.DateTimeField(auto_now=True)),
+ ],
+ ),
+ ]
diff --git a/src/blog/migrations/0005_legacy_clippings.py b/src/blog/migrations/0005_legacy_clippings.py
new file mode 100644
index 00000000..16505759
--- /dev/null
+++ b/src/blog/migrations/0005_legacy_clippings.py
@@ -0,0 +1,138 @@
+from django.db import migrations, models
+import datetime
+from zoneinfo import ZoneInfo
+
+
+def create_initial_clippings(apps, schema_editor):
+ Clipping = apps.get_model("blog", "Clipping")
+
+ timezone = ZoneInfo("America/Sao_Paulo")
+ initial_clippings = [
+ {
+ "id": 1,
+ "title": "Jandig #CulturaDigitalBR",
+ "description": "Select Magazine",
+ "created": datetime.datetime(2011, 12, 12, tzinfo=timezone),
+ "link": "https://www.select.art.br/jandig-culturadigitalbr/",
+ "file": "7.-Jandig-CulturaDigitalBR.pdf",
+ },
+ {
+ "id": 2,
+ "title": "Uma parceria inusitada: MARTE + JANDIG + Escola de Design/UEMG",
+ "description": "Estado de Minas Gerais University Website",
+ "created": datetime.datetime(2019, 7, 22, tzinfo=timezone),
+ "link": "http://ed.uemg.br/uma-parceria-inusitada-marte-jandig-escola-de-design-uemg/",
+ "file": "Jandig-UEMG.jpg",
+ },
+ {
+ "id": 3,
+ "title": "Programação formativa do X-Reality contou com workshops de realidade virtual e aumentada",
+ "description": "LabArteMídia Website",
+ "created": datetime.datetime(2019, 7, 1, tzinfo=timezone),
+ "link": "https://sites.usp.br/labartemidia/programacao-formativa-do-x-reality-contou-com-workshops-de-realidade-virtual-e-aumentada/",
+ "file": "Jandig-LabArteMidia.pdf",
+ },
+ {
+ "id": 4,
+ "title": "Create Art with Augmented Reality",
+ "description": "Mozilla Open Leaders Blog",
+ "created": datetime.datetime(2019, 5, 31, tzinfo=timezone),
+ "link": "https://medium.com/read-write-participate/create-art-with-augmented-reality-e26572524021",
+ "file": "Jandig-MozOL.pdf",
+ },
+ {
+ "id": 5,
+ "title": "Programação Cultural / Abril de 2017",
+ "description": "Coletivo Digital Website",
+ "created": datetime.datetime(2017, 4, 10, tzinfo=timezone),
+ "link": "http://portalnovo.coletivodigital.org.br/2017/04/",
+ "file": "1-programacao-cultural-abril-de-2017.pdf",
+ },
+ {
+ "id": 6,
+ "title": "Sesc Sorocaba abre as portas em 1º de setembro com visão sustentável",
+ "description": "Sorocaba's Newspaper",
+ "created": datetime.datetime(2012, 8, 21, tzinfo=timezone),
+ "link": "http://www.diariodesorocaba.com.br/noticia/222472",
+ "file": "2-sesc-Sorocaba-abre-as-portas.pdf",
+ },
+ {
+ "id": 7,
+ "title": "Do artista ao articulador",
+ "description": "Select Magazine",
+ "created": datetime.datetime(2012, 7, 30, tzinfo=timezone),
+ "link": "https://www.select.art.br/do-artista-ao-articulador/",
+ "file": "3.-Do-artista-ao-articulador.pdf",
+ },
+ {
+ "id": 8,
+ "title": "Ráfagas de software libre",
+ "description": "20 Minutos Newspaper",
+ "created": datetime.datetime(2012, 7, 30, tzinfo=timezone),
+ "link": "https://blogs.20minutos.es/codigo-abierto/category/software-libre/",
+ "file": "9.-Rafagas-de-software-livre.pdf",
+ },
+ {
+ "id": 9,
+ "title": "Conheça o Jandig",
+ "description": "Labmóvel Website",
+ "created": datetime.datetime(2012, 3, 31, tzinfo=timezone),
+ "link": "https://labmovel.net/2012/03/31/conheca-o-jandig/",
+ "file": "4-conheca-o-Jandig.pdf",
+ },
+ {
+ "id": 10,
+ "title": "Entrevista com Pixel",
+ "description": "Labmóvel Website",
+ "created": datetime.datetime(2012, 3, 21, tzinfo=timezone),
+ "link": "https://labmovel.net/2012/03/21/entrevista-com-pixel/",
+ "file": "5.-Entrevista-com-Pixel.pdf",
+ },
+ {
+ "id": 11,
+ "title": "Campus Party: hackers, multinacionales y activistas",
+ "description": "20 Minutos Newspaper",
+ "created": datetime.datetime(2012, 2, 12, tzinfo=timezone),
+ "link": "https://blogs.20minutos.es/codigo-abierto/2012/02/12/campus-party-hackers-multinacionales-y-activistas/",
+ "file": "10.-Campus-Party-hackers-multinacionales-y-activistas.pdf",
+ },
+ {
+ "id": 12,
+ "title": "New artist in residence projects mobile media art",
+ "description": "NIMk Website",
+ "created": datetime.datetime(2012, 2, 1, tzinfo=timezone),
+ "link": "http://www.nimk.nl/eng/new-artist-in-residence-projects-mobile-media-art",
+ "file": "8.-New-artist-in-residence-projects-mobile-media-art.pdf",
+ },
+ {
+ "id": 13,
+ "title": "Residência artística Labmovel + NimK",
+ "description": "Site Labmóvel",
+ "created": datetime.datetime(2012, 2, 1, tzinfo=timezone),
+ "link": "https://labmovel.net/2012/02/01/residencia-artistica-labmovel-nimk/",
+ "file": "6-residencia-artistica-labmovel-NimK.pdf",
+ },
+ ]
+
+ for clipping_data in initial_clippings:
+ clipping_data["file"] = "clipping_files/" + clipping_data["file"]
+ post = Clipping.objects.create(**clipping_data)
+
+
+def remove_initial_clippings(apps, schema_editor):
+ Clipping = apps.get_model("blog", "Clipping")
+
+ Clipping.objects.filter(id__in=range(0, 14)).delete()
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("blog", "0004_clipping"),
+ ]
+
+ operations = [
+ migrations.RunPython(
+ create_initial_clippings, reverse_code=remove_initial_clippings
+ ),
+ ]
diff --git a/src/blog/migrations/0006_alter_clipping_created_alter_clipping_file.py b/src/blog/migrations/0006_alter_clipping_created_alter_clipping_file.py
new file mode 100644
index 00000000..212912db
--- /dev/null
+++ b/src/blog/migrations/0006_alter_clipping_created_alter_clipping_file.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.1.5 on 2024-06-23 21:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("blog", "0005_legacy_clippings"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="clipping",
+ name="created",
+ field=models.DateTimeField(auto_now_add=True),
+ ),
+ migrations.AlterField(
+ model_name="clipping",
+ name="file",
+ field=models.FileField(upload_to="clipping_files/"),
+ ),
+ ]
diff --git a/src/ARte/core/migrations/__init__.py b/src/blog/migrations/__init__.py
similarity index 100%
rename from src/ARte/core/migrations/__init__.py
rename to src/blog/migrations/__init__.py
diff --git a/src/blog/models.py b/src/blog/models.py
new file mode 100644
index 00000000..20e7d4d9
--- /dev/null
+++ b/src/blog/models.py
@@ -0,0 +1,67 @@
+from django.core.files.storage import default_storage
+from django.db import models
+from users.models import Profile
+
+IMAGE_BASE_PATH = "post_images/"
+
+
+class PostStatus(models.TextChoices):
+ DRAFT = "draft"
+ PUBLISHED = "published"
+
+
+class Category(models.Model):
+ name = models.CharField(max_length=100)
+
+ def __str__(self):
+ return self.name
+
+ class Meta:
+ verbose_name_plural = "categories"
+
+
+class PostImage(models.Model):
+ file = models.FileField(storage=default_storage, upload_to=IMAGE_BASE_PATH)
+ description = models.CharField(max_length=500, blank=True, null=True)
+
+ def __str__(self):
+ return self.file.name.lstrip(IMAGE_BASE_PATH)
+
+
+class Clipping(models.Model):
+ id = models.BigAutoField(primary_key=True)
+ title = models.CharField(max_length=200)
+ description = models.CharField(max_length=500)
+ link = models.URLField()
+ file = models.FileField(upload_to="clipping_files/")
+ created = models.DateTimeField(auto_now_add=True, editable=True)
+ updated = models.DateTimeField(auto_now=True, editable=True)
+
+ def __str__(self):
+ return self.title
+
+
+class Post(models.Model):
+ id = models.BigAutoField(primary_key=True)
+ title = models.CharField(max_length=200)
+ status = models.CharField(
+ choices=PostStatus.choices, max_length=20, default=PostStatus.DRAFT
+ )
+ author = models.ForeignKey(
+ Profile,
+ on_delete=models.DO_NOTHING,
+ related_name="posts",
+ null=True,
+ blank=True,
+ )
+ body = models.TextField()
+ created = models.DateTimeField(auto_now_add=True, editable=True)
+ updated = models.DateTimeField(auto_now=True, editable=True)
+ categories = models.ManyToManyField(Category, related_name="posts", blank=True)
+ images = models.ManyToManyField(PostImage, related_name="posts", blank=True)
+
+ def __str__(self):
+ return self.title
+
+ def get_absolute_url(self):
+ return f"/memories/{self.slug}/"
diff --git a/src/blog/static/css/blog.css b/src/blog/static/css/blog.css
new file mode 100644
index 00000000..a2fffb48
--- /dev/null
+++ b/src/blog/static/css/blog.css
@@ -0,0 +1,81 @@
+/* General Blog Pages */
+#blog-area,
+#clipping-area,
+#posts-area{
+ max-width: 600px;
+ margin: 0 auto;
+}
+.post{
+ margin: 0px 1.5em 3em 1.5em;
+}
+.post a,
+#category-header a{
+
+ transition: all 0.2s ease-in;
+ background-image: linear-gradient( to top, #05f7ae, #05f7ae 50%, transparent 50%, transparent );
+ background-position: 100% 0%;
+ background-size: 100% 200%;
+}
+.post a:hover,
+#category-header a:hover{
+ color: #fff;
+ background-position: 0 100%;
+}
+
+#blog-area p {
+ text-align: justify;
+ margin-left: 1.5em;
+}
+
+
+/* Post Detail Page */
+#post,
+#post-area{
+ max-width: 600px;
+ margin: 0 auto;
+}
+#post{
+ margin-top: 25px;
+}
+#post p{
+ text-align: justify;
+ margin: 1.5em 1.5em 0 1.5em;
+}
+#back-button{
+ float: left;
+}
+
+.post-image img{
+ max-width: 100%;
+ max-height: 100%;
+}
+.post-image h5{
+ margin-top: 10px;
+}
+.post-image small{
+ display: block;
+}
+
+
+/* Clipping page */
+.clipping{
+ text-align: left;
+ margin: 1.5em 1.5em 0 1.5em;
+}
+.clipping p{
+ margin: 0;
+}
+.clipping h3{
+ margin: 0;
+}
+.clipping a{
+ display: inline-block;
+ margin-bottom: 8px;
+}
+
+
+@media all and (min-width: 800px) {
+ #blog-area p {
+ text-align: left;
+ }
+}
\ No newline at end of file
diff --git a/src/blog/tests.py b/src/blog/tests.py
new file mode 100644
index 00000000..7ce503c2
--- /dev/null
+++ b/src/blog/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/src/blog/urls.py b/src/blog/urls.py
new file mode 100644
index 00000000..124606f4
--- /dev/null
+++ b/src/blog/urls.py
@@ -0,0 +1,11 @@
+# blog/urls.py
+
+from blog import views
+from django.urls import path
+
+urlpatterns = [
+ path("", views.blog_index, name="blog_index"),
+ path("post/
diff --git a/src/ARte/core/jinja2/core/home.jinja2 b/src/core/jinja2/core/home.jinja2
similarity index 91%
rename from src/ARte/core/jinja2/core/home.jinja2
rename to src/core/jinja2/core/home.jinja2
index fa8a191b..6199f324 100644
--- a/src/ARte/core/jinja2/core/home.jinja2
+++ b/src/core/jinja2/core/home.jinja2
@@ -12,6 +12,7 @@
+
@@ -20,9 +21,12 @@
+
+ {% block extra_css %}
+ {% endblock %}
+
-
{% include "core/header.jinja2" %}
diff --git a/src/ARte/core/jinja2/core/language-select-modal.jinja2 b/src/core/jinja2/core/language-select-modal.jinja2
similarity index 100%
rename from src/ARte/core/jinja2/core/language-select-modal.jinja2
rename to src/core/jinja2/core/language-select-modal.jinja2
diff --git a/src/ARte/core/jinja2/core/manifest.json b/src/core/jinja2/core/manifest.json
similarity index 100%
rename from src/ARte/core/jinja2/core/manifest.json
rename to src/core/jinja2/core/manifest.json
diff --git a/src/ARte/core/jinja2/core/sw.js b/src/core/jinja2/core/sw.js
similarity index 100%
rename from src/ARte/core/jinja2/core/sw.js
rename to src/core/jinja2/core/sw.js
diff --git a/src/ARte/core/jinja2/core/ui.jinja2 b/src/core/jinja2/core/ui.jinja2
similarity index 100%
rename from src/ARte/core/jinja2/core/ui.jinja2
rename to src/core/jinja2/core/ui.jinja2
diff --git a/src/ARte/core/jinja2/core/upload.jinja2 b/src/core/jinja2/core/upload.jinja2
similarity index 100%
rename from src/ARte/core/jinja2/core/upload.jinja2
rename to src/core/jinja2/core/upload.jinja2
diff --git a/src/ARte/core/jinja2/core/useful_links.jinja2 b/src/core/jinja2/core/useful_links.jinja2
similarity index 65%
rename from src/ARte/core/jinja2/core/useful_links.jinja2
rename to src/core/jinja2/core/useful_links.jinja2
index 39e4877f..bbb5bbaf 100644
--- a/src/ARte/core/jinja2/core/useful_links.jinja2
+++ b/src/core/jinja2/core/useful_links.jinja2
@@ -9,7 +9,13 @@
{{ _('Collection') }}
+
+
{{ _('Help') }}
diff --git a/src/ARte/core/migrations/0001_initial.py b/src/core/migrations/0001_initial.py
similarity index 100%
rename from src/ARte/core/migrations/0001_initial.py
rename to src/core/migrations/0001_initial.py
diff --git a/src/ARte/core/migrations/0002_exhibit_creation_date.py b/src/core/migrations/0002_exhibit_creation_date.py
similarity index 100%
rename from src/ARte/core/migrations/0002_exhibit_creation_date.py
rename to src/core/migrations/0002_exhibit_creation_date.py
diff --git a/src/ARte/core/migrations/0003_auto_20200213_1934.py b/src/core/migrations/0003_auto_20200213_1934.py
similarity index 100%
rename from src/ARte/core/migrations/0003_auto_20200213_1934.py
rename to src/core/migrations/0003_auto_20200213_1934.py
diff --git a/src/ARte/core/migrations/0004_delete_artwork2.py b/src/core/migrations/0004_delete_artwork2.py
similarity index 100%
rename from src/ARte/core/migrations/0004_delete_artwork2.py
rename to src/core/migrations/0004_delete_artwork2.py
diff --git a/src/ARte/core/migrations/0005_fake_create_tables.py b/src/core/migrations/0005_fake_create_tables.py
similarity index 100%
rename from src/ARte/core/migrations/0005_fake_create_tables.py
rename to src/core/migrations/0005_fake_create_tables.py
diff --git a/src/core/migrations/0006_fake_alter_model_table.py b/src/core/migrations/0006_fake_alter_model_table.py
new file mode 100644
index 00000000..79b84298
--- /dev/null
+++ b/src/core/migrations/0006_fake_alter_model_table.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.1.2 on 2022-10-30 19:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("core", "0005_fake_create_tables"),
+ ]
+
+ operations = [
+ migrations.SeparateDatabaseAndState(
+ state_operations=[
+ migrations.AlterModelTable(
+ name="artwork",
+ table=None,
+ ),
+ migrations.AlterModelTable(
+ name="marker",
+ table=None,
+ ),
+ migrations.AlterModelTable(
+ name="object",
+ table=None,
+ )],
+ database_operations=[]),
+ ]
diff --git a/src/core/migrations/0007_alter_artwork_id_alter_exhibit_id_alter_marker_id_and_more.py b/src/core/migrations/0007_alter_artwork_id_alter_exhibit_id_alter_marker_id_and_more.py
new file mode 100644
index 00000000..d7b983b0
--- /dev/null
+++ b/src/core/migrations/0007_alter_artwork_id_alter_exhibit_id_alter_marker_id_and_more.py
@@ -0,0 +1,41 @@
+# Generated by Django 4.1.2 on 2022-10-30 20:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("core", "0006_fake_alter_model_table"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="artwork",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+ ),
+ ),
+ migrations.AlterField(
+ model_name="exhibit",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+ ),
+ ),
+ migrations.AlterField(
+ model_name="marker",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+ ),
+ ),
+ migrations.AlterField(
+ model_name="object",
+ name="id",
+ field=models.BigAutoField(
+ auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+ ),
+ )
+ ]
diff --git a/src/core/migrations/0008_alter_artwork_author_alter_marker_owner_and_more.py b/src/core/migrations/0008_alter_artwork_author_alter_marker_owner_and_more.py
new file mode 100644
index 00000000..6169cc73
--- /dev/null
+++ b/src/core/migrations/0008_alter_artwork_author_alter_marker_owner_and_more.py
@@ -0,0 +1,41 @@
+# Generated by Django 4.1.5 on 2023-06-24 18:58
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("core", "0007_alter_artwork_id_alter_exhibit_id_alter_marker_id_and_more"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="artwork",
+ name="author",
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name="artworks",
+ to="users.profile",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="marker",
+ name="owner",
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name="markers",
+ to="users.profile",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="object",
+ name="owner",
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.DO_NOTHING,
+ related_name="ar_objects",
+ to="users.profile",
+ ),
+ ),
+ ]
diff --git a/src/ARte/users/services/__init__.py b/src/core/migrations/__init__.py
similarity index 100%
rename from src/ARte/users/services/__init__.py
rename to src/core/migrations/__init__.py
diff --git a/src/ARte/core/models.py b/src/core/models.py
similarity index 57%
rename from src/ARte/core/models.py
rename to src/core/models.py
index 853416b2..8f301cb3 100644
--- a/src/ARte/core/models.py
+++ b/src/core/models.py
@@ -1,19 +1,68 @@
+import re
+
+from django.core.files.base import ContentFile
from django.db import models
-from users.models import Profile
-from datetime import datetime
+from django.db.models.signals import post_delete
from django.dispatch import receiver
-from django.db.models.signals import post_save, post_delete
-import urllib
-import re
+from PIL import Image
+from pymarker.core import generate_marker_from_image, generate_patt_from_image
+
+from config.storage_backends import PublicMediaStorage
+from users.models import Profile
+
+import logging
+log = logging.getLogger()
+
+def create_patt(filename, original_filename):
+ filestorage = PublicMediaStorage()
+ with Image.open(filestorage.open(filename)) as image:
+ patt_str = generate_patt_from_image(image)
+ # string_file = StringIO(patt_str.encode('UTF-8'))
+ # string_file.name = original_filename
+ patt_file = filestorage.save(
+ "patts/" + original_filename + ".patt",
+ ContentFile(patt_str.encode("utf-8")),
+ )
+ return patt_file
+
+
+def create_marker(filename, original_filename):
+ filestorage = PublicMediaStorage()
+ with Image.open(filestorage.open(filename)) as image:
+ marker_image = generate_marker_from_image(image)
+ marker_image.name = original_filename
+ marker_image.__commited = False
+ # marker = filestorage.save("markers/" + original_filename, marker_image)
+ return marker_image
+
class Marker(models.Model):
- owner = models.ForeignKey(Profile, on_delete=models.DO_NOTHING)
- source = models.ImageField(upload_to='markers/')
+ owner = models.ForeignKey(Profile, on_delete=models.DO_NOTHING, related_name="markers")
+ source = models.ImageField(upload_to="markers/")
uploaded_at = models.DateTimeField(auto_now=True)
author = models.CharField(max_length=60, blank=False)
- title = models.CharField(max_length=60, default='')
- patt = models.FileField(upload_to='patts/')
-
+ title = models.CharField(max_length=60, default="")
+ patt = models.FileField(upload_to="patts/")
+
+ def save(self, *args, **kwargs):
+ # filestorage = PublicMediaStorage()
+ # # Image Filename
+ # original_filename = self.source.name
+ # filename = filestorage.save(f"original_{original_filename}", self.source)
+ # # Complete Image URL on storage
+ # print("aaaaa"*30)
+ # with Image.open(self.source) as image:
+ # print(image)
+ # print("aaaaa"*30)
+ # # fileurl = filestorage.url(filename)
+ # print(filename)
+ # self.source = create_marker(filename, original_filename)
+ # self.patt = create_patt(filename, original_filename)
+ print("B" * 30)
+ print(self.source)
+ print(self.patt)
+ print("B" * 30)
+ super().save(*args, **kwargs)
def __str__(self):
return self.source.name
@@ -24,16 +73,14 @@ def artworks_count(self):
@property
def artworks_list(self):
- return Artwork.objects.filter(marker=self)
+ return Artwork.objects.filter(marker=self).order_by("-id")
@property
def exhibits_count(self):
- from core.models import Exhibit
return Exhibit.objects.filter(artworks__marker=self).count()
@property
def exhibits_list(self):
- from core.models import Exhibit
return Exhibit.objects.filter(artworks__marker=self)
@property
@@ -42,17 +89,17 @@ def in_use(self):
return True
return False
+
class Object(models.Model):
- owner = models.ForeignKey(Profile, on_delete=models.DO_NOTHING)
- source = models.FileField(upload_to='objects/')
+ owner = models.ForeignKey(Profile, on_delete=models.DO_NOTHING, related_name="ar_objects")
+ source = models.FileField(upload_to="objects/")
uploaded_at = models.DateTimeField(auto_now=True)
author = models.CharField(max_length=60, blank=False)
- title = models.CharField(max_length=60, default='')
+ title = models.CharField(max_length=60, default="")
scale = models.CharField(default="1 1", max_length=50)
position = models.CharField(default="0 0 0", max_length=50)
rotation = models.CharField(default="270 0 0", max_length=50)
-
def __str__(self):
return self.source.name
@@ -62,16 +109,14 @@ def artworks_count(self):
@property
def artworks_list(self):
- return Artwork.objects.filter(augmented=self)
+ return Artwork.objects.filter(augmented=self).order_by("-id")
@property
def exhibits_count(self):
- from core.models import Exhibit
return Exhibit.objects.filter(artworks__augmented=self).count()
@property
def exhibits_list(self):
- from core.models import Exhibit
return Exhibit.objects.filter(artworks__augmented=self)
@property
@@ -80,108 +125,105 @@ def in_use(self):
return True
return False
-
+
@property
def xproportion(self):
- '''
+ """
The 'xproportion' method is used to always reduce scale
- to 1:[something], so that new calculations can be made
+ to 1:[something], so that new calculations can be made
when a new scale value is entered by the user.
- '''
- a = re.findall(r'[\d\.\d]+', self.scale)
+ """
+ a = re.findall(r"[\d\.\d]+", self.scale)
width = float(a[0])
height = float(a[1])
- if width > height :
- height = (height*1.0)/width
+ if width > height:
+ height = (height * 1.0) / width
width = 1
- else :
- width = (width*1.0)/height
+ else:
+ width = (width * 1.0) / height
height = 1
return width
@property
def yproportion(self):
- '''
+ """
The 'yproportion' method is used to always reduce scale
- to 1:[something], so that new calculations can be made
+ to 1:[something], so that new calculations can be made
when a new scale value is entered by the user.
- '''
- a = re.findall(r'[\d\.\d]+', self.scale)
+ """
+ a = re.findall(r"[\d\.\d]+", self.scale)
width = float(a[0])
height = float(a[1])
- if width > height :
- height = (height*1.0)/width
+ if width > height:
+ height = (height * 1.0) / width
width = 1
- else :
- width = (width*1.0)/height
+ else:
+ width = (width * 1.0) / height
height = 1
return height
@property
def xscale(self):
- '''
+ """
The 'xscale' method returns the original proportion
of the Object multiplied by the scale value entered
by the user, and thus the Object appears resized in
augmented reality.
- '''
- a = re.findall(r'[\d\.\d]+', self.scale)
+ """
+ a = re.findall(r"[\d\.\d]+", self.scale)
return a[0]
@property
def yscale(self):
- '''
+ """
The 'yscale' method returns the original proportion
of the Object multiplied by the scale value entered
by the user, and thus the Object appears resized in
augmented reality.
- '''
- a = re.findall(r'[\d\.\d]+', self.scale)
+ """
+ a = re.findall(r"[\d\.\d]+", self.scale)
return a[1]
@property
def fullscale(self):
- '''
+ """
The 'fullscale' method is a workaround to show the
users the last scale value entered by them, when
they attempt to edit it.
- '''
+ """
x = self.xscale
y = self.yscale
if x > y:
return x
- else:
- return y
+ return y
@property
def xposition(self):
- a = re.findall(r'[\d\.\d]+', self.position)
- return a[0]
+ x = self.position.split(" ")[0]
+ return float(x)
@property
def yposition(self):
- a = re.findall(r'[\d\.\d]+', self.position)
- return a[1]
+ y = self.position.split(" ")[1]
+ return float(y)
+
class Artwork(models.Model):
- author = models.ForeignKey(Profile, on_delete=models.DO_NOTHING)
+ author = models.ForeignKey(Profile, on_delete=models.DO_NOTHING, related_name="artworks")
marker = models.ForeignKey(Marker, on_delete=models.DO_NOTHING)
augmented = models.ForeignKey(Object, on_delete=models.DO_NOTHING)
title = models.CharField(max_length=50, blank=False)
description = models.TextField(max_length=500, blank=True)
created_at = models.DateTimeField(auto_now=True)
-
@property
def exhibits_count(self):
- from core.models import Exhibit
return Exhibit.objects.filter(artworks__in=[self]).count()
@property
def exhibits_list(self):
- from core.models import Exhibit
return list(Exhibit.objects.filter(artworks__in=[self]))
-
+
@property
def in_use(self):
if self.exhibits_count > 0:
@@ -189,16 +231,18 @@ def in_use(self):
return False
+
@receiver(post_delete, sender=Object)
@receiver(post_delete, sender=Marker)
def remove_source_file(sender, instance, **kwargs):
instance.source.delete(False)
+
class Exhibit(models.Model):
- owner = models.ForeignKey(Profile,on_delete=models.DO_NOTHING,related_name="exhibits")
+ owner = models.ForeignKey(Profile, on_delete=models.DO_NOTHING, related_name="exhibits")
name = models.CharField(unique=True, max_length=50)
slug = models.CharField(unique=True, max_length=50)
- artworks = models.ManyToManyField(Artwork,related_name="exhibits")
+ artworks = models.ManyToManyField(Artwork, related_name="exhibits")
creation_date = models.DateTimeField(auto_now=True)
def __str__(self):
diff --git a/src/ARte/core/routes.py b/src/core/routes.py
similarity index 75%
rename from src/ARte/core/routes.py
rename to src/core/routes.py
index 2c7eff76..1b99d0aa 100644
--- a/src/ARte/core/routes.py
+++ b/src/core/routes.py
@@ -11,8 +11,5 @@
@urlpatterns.route("/")
def exhibit(request, exhibit):
- ctx = {
- 'exhibit' : exhibit,
- 'artworks': exhibit.artworks.all()
- }
+ ctx = {"exhibit": exhibit, "artworks": exhibit.artworks.all()}
return ctx
diff --git a/src/ARte/core/static/js/rotationLock.js b/src/core/serializers/__init__.py
similarity index 100%
rename from src/ARte/core/static/js/rotationLock.js
rename to src/core/serializers/__init__.py
diff --git a/src/core/serializers/artworks.py b/src/core/serializers/artworks.py
new file mode 100644
index 00000000..04751a7d
--- /dev/null
+++ b/src/core/serializers/artworks.py
@@ -0,0 +1,21 @@
+from rest_framework.serializers import ModelSerializer
+
+from core.models import Artwork
+
+
+class ArtworkSerializer(ModelSerializer):
+ class Meta:
+ model = Artwork
+ fields = (
+ "id",
+ "author",
+ "marker",
+ "augmented",
+ "title",
+ "description",
+ "created_at",
+ )
+ read_only_fields = (
+ "id",
+ "uploaded_at",
+ )
diff --git a/src/core/serializers/exhibits.py b/src/core/serializers/exhibits.py
new file mode 100644
index 00000000..502e7272
--- /dev/null
+++ b/src/core/serializers/exhibits.py
@@ -0,0 +1,13 @@
+from rest_framework.serializers import ModelSerializer
+
+from core.models import Exhibit
+
+
+class ExhibitSerializer(ModelSerializer):
+ class Meta:
+ model = Exhibit
+ fields = ("id", "owner", "name", "slug", "artworks", "creation_date")
+ read_only_fields = (
+ "id",
+ "creation_date",
+ )
diff --git a/src/core/serializers/markers.py b/src/core/serializers/markers.py
new file mode 100644
index 00000000..9b0ac3ae
--- /dev/null
+++ b/src/core/serializers/markers.py
@@ -0,0 +1,13 @@
+from rest_framework.serializers import ModelSerializer
+
+from core.models import Marker
+
+
+class MarkerSerializer(ModelSerializer):
+ class Meta:
+ model = Marker
+ fields = ("id", "owner", "source", "uploaded_at", "author", "title", "patt")
+ read_only_fields = (
+ "id",
+ "uploaded_at",
+ )
diff --git a/src/core/serializers/objects.py b/src/core/serializers/objects.py
new file mode 100644
index 00000000..38f7edd4
--- /dev/null
+++ b/src/core/serializers/objects.py
@@ -0,0 +1,23 @@
+from rest_framework.serializers import ModelSerializer
+
+from core.models import Object
+
+
+class ObjectSerializer(ModelSerializer):
+ class Meta:
+ model = Object
+ fields = (
+ "id",
+ "owner",
+ "source",
+ "uploaded_at",
+ "author",
+ "title",
+ "scale",
+ "position",
+ "rotation",
+ )
+ read_only_fields = (
+ "id",
+ "uploaded_at",
+ )
diff --git a/src/ARte/core/static/ar-gif.min.js b/src/core/static/ar-gif.min.js
similarity index 100%
rename from src/ARte/core/static/ar-gif.min.js
rename to src/core/static/ar-gif.min.js
diff --git a/src/ARte/core/static/artoolkit.min.js b/src/core/static/artoolkit.min.js
similarity index 100%
rename from src/ARte/core/static/artoolkit.min.js
rename to src/core/static/artoolkit.min.js
diff --git a/src/ARte/core/static/artoolkit.three.js b/src/core/static/artoolkit.three.js
similarity index 100%
rename from src/ARte/core/static/artoolkit.three.js
rename to src/core/static/artoolkit.three.js
diff --git a/src/ARte/core/static/css/exhibit-detail.css b/src/core/static/css/exhibit-detail.css
similarity index 100%
rename from src/ARte/core/static/css/exhibit-detail.css
rename to src/core/static/css/exhibit-detail.css
diff --git a/src/ARte/core/static/css/generator.css b/src/core/static/css/generator.css
similarity index 100%
rename from src/ARte/core/static/css/generator.css
rename to src/core/static/css/generator.css
diff --git a/src/ARte/core/static/css/home.css b/src/core/static/css/home.css
similarity index 97%
rename from src/ARte/core/static/css/home.css
rename to src/core/static/css/home.css
index 9f933ab2..93da6413 100644
--- a/src/ARte/core/static/css/home.css
+++ b/src/core/static/css/home.css
@@ -7,6 +7,7 @@
padding: 0px 8px;
}
+
.header .login-btn {
background-color: #03b595;
}
@@ -51,7 +52,6 @@
height: 40px;
line-height: 40px;
width: calc(50% - 5px);
- padding-left: 0px;
margin: 0;
margin-left: 10px;
}
diff --git a/src/ARte/core/static/css/language-select-modal.css b/src/core/static/css/language-select-modal.css
similarity index 100%
rename from src/ARte/core/static/css/language-select-modal.css
rename to src/core/static/css/language-select-modal.css
diff --git a/src/ARte/core/static/css/main.css b/src/core/static/css/main.css
similarity index 100%
rename from src/ARte/core/static/css/main.css
rename to src/core/static/css/main.css
diff --git a/src/core/static/css/reset.css b/src/core/static/css/reset.css
new file mode 100644
index 00000000..2b0de121
--- /dev/null
+++ b/src/core/static/css/reset.css
@@ -0,0 +1,896 @@
+/* @import url('https://fonts.googleapis.com/css?family=Istok+Web:400,400i,700,700i&display=swap'); */
+
+body {
+ color: #000;
+ background: #fff;
+ margin: 0;
+ padding: 0;
+ line-height: 1;
+ font-family: "Istok Web", sans-serif;
+ text-align: center;
+}
+
+body.colorful {
+ background-image: url(../images/icons/bg.png);
+ background-repeat: repeat-x;
+ background-position: center top;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ font-family: "Istok Web", serif;
+ font-weight: bolder;
+}
+
+p,
+ul,
+ol {
+ line-height: 1.75;
+ margin: 0 0 1em 0;
+}
+
+section,
+form {
+ margin-bottom: 20px;
+}
+
+a,
+a:visited {
+ color: #03b595;
+ color: #777;
+ padding: 0;
+ text-decoration: none;
+}
+
+h1 {
+ font-size: 1.25em;
+ line-height: 50px;
+ background-image: linear-gradient(
+ to top,
+ #77777766,
+ #77777766 50%,
+ transparent 50%,
+ transparent
+ );
+ background-position: 100% 15%;
+ background-size: 100% 200%;
+ margin-top: 10px;
+ width: 100%;
+}
+
+h2 {
+ font-size: 1.25em;
+ color: #03b595;
+ margin: 30px auto 10px;
+}
+
+h3 {
+ font-size: 1.1em;
+ line-height: 20px;
+ text-align: left;
+}
+
+h3:before {
+ width: 20px;
+ height: 20px;
+ background: #03b595;
+ display: inline-block;
+ margin: 5px 10px -3px 0px;
+ content: " ";
+}
+
+h4 {
+ font-size: 1.1em;
+ color: #03b595;
+}
+
+h5 {
+ font-size: 1.1em;
+}
+
+h6 {
+ font-size: 1em;
+ color: #03b595;
+}
+
+hr {
+ height: 10px;
+ width: 80%;
+ border: none;
+ background: #03b595;
+ margin: 20px auto;
+}
+
+.account-options a {
+ color: #777;
+ padding: 0;
+ text-decoration: none;
+ transition: all 0.2s ease-in;
+ background-image: linear-gradient(
+ to top,
+ #77777766,
+ #77777766 50%,
+ transparent 50%,
+ transparent
+ );
+ background-position: 100% 10%;
+ background-size: 100% 200%;
+}
+
+ul {
+ list-style: square;
+}
+
+ul,
+ol {
+ padding: 0 0 0 5em;
+ text-align: left;
+}
+
+blockquote {
+ font-size: 1.1em;
+ line-height: 2em;
+ margin: 10px 40px;
+ color: #888;
+ font-style: italic;
+}
+
+blockquote:before,
+blockquote:after {
+ max-width: 40px;
+ height: 40px;
+ display: block;
+ margin: 0 auto -20px 0;
+ background-image: url(../images/icons/fill.png);
+ content: "";
+ text-align: left;
+}
+
+blockquote:after {
+ text-align: right;
+ margin: -30px 0 20px auto;
+}
+
+input {
+ width: calc(100% - 24px);
+ padding: 0 10px;
+ height: 40px;
+}
+
+textarea {
+ width: calc(100% - 24px);
+ padding: 10px;
+}
+
+select {
+ width: 100%;
+ height: 40px;
+ padding: 0 10px;
+}
+
+input[type="submit"],
+input[type="submit" i],
+button,
+.button {
+ width: 100%;
+ margin: 20px 0;
+ background: #000;
+ border: none;
+ color: #fff;
+ font-weight: bold;
+ font-size: 0.75em;
+ line-height: 40px;
+ text-transform: uppercase;
+ text-align: center;
+ display: inline-block;
+}
+
+input:disabled,
+input[type="submit" i]:disabled,
+input[type="submit"]:disabled,
+button.disabled,
+button:disabled {
+ opacity: 0.4;
+ pointer-events: none;
+ color: #777;
+}
+
+button.secondary,
+input[type="submit"].secondary {
+ background: #666;
+ width: 100%;
+ line-height: 30px;
+ color: #fff;
+}
+
+input[type="text"] {
+ padding: 0 10px;
+}
+
+input[type="checkbox" i],
+input[type="radio" i] {
+ height: 20px;
+ width: 45px;
+ margin: 10px 0;
+ line-height: 40px;
+ display: inline-block;
+ vertical-align: sub;
+}
+
+.flex {
+ display: flex;
+ flex-flow: row wrap;
+ align-items: center;
+ justify-content: space-between;
+}
+
+.half {
+ width: calc(50% - 10px);
+}
+
+.one-third {
+ width: calc(33% - 10px);
+}
+
+.sm-one-third {
+ flex-basis: calc(33% - 10px);
+}
+
+.sm-half {
+ flex-basis: calc(50% - 10px);
+}
+
+.sm-full {
+ flex-basis: 100%;
+}
+
+.left {
+ text-align: left;
+}
+
+.right {
+ text-align: right;
+}
+
+/* Structure */
+.container {
+ max-width: 320px;
+ margin: 0 auto;
+ text-align: center;
+ width: 100%;
+}
+
+.colorful .container {
+ background-color: #fff;
+ margin-top: 40px;
+ padding: 20px;
+ max-width: 280px;
+}
+
+a.button,
+a.button:visited {
+ color: #fff;
+}
+
+a.changeExb,
+a.jandigIco {
+ height: 40px;
+ text-align: left;
+ line-height: 40px;
+ background-repeat: no-repeat;
+ background-size: contain;
+ min-width: calc(50% - 20px);
+}
+
+a.changeExb {
+ height: 20px;
+ line-height: 20px;
+ font-size: 0.75em;
+ color: #fff;
+ padding: 5px 0 5px 40px;
+ background-image: url(../images/icons/icoChgExb.png);
+ background-position: center left;
+}
+
+a.jandigIco {
+ text-indent: -9999px;
+ background-image: url(../images/icons/jandigIcon.png);
+ background-position: center right;
+}
+
+.header {
+ margin-top: 25px;
+ font-size: 75%;
+}
+
+.aside {
+ max-width: 120px;
+ margin-left: -120px;
+ padding-left: 10px;
+ height: 70px;
+ float: right;
+ background: #fff;
+}
+
+.logo {
+ text-align: left;
+ height: 60px;
+ width: 100%;
+ float: left;
+ background-image: linear-gradient(
+ to top,
+ #77777766,
+ #77777766 50%,
+ transparent 50%,
+ transparent
+ );
+ background-position: 100% 10%;
+ background-size: 100% 200%;
+}
+
+.logo a {
+ display: block;
+}
+
+.logo img {
+ max-height: 55px;
+ height: auto;
+ margin: auto;
+}
+
+.welcome,
+.icon-menu,
+.connect {
+ height: 30px;
+ text-align: right;
+ flex-flow: nowrap;
+}
+
+.welcome {
+ height: 30px;
+ font-size: 0.65em;
+ overflow: hidden;
+ vertical-align: bottom;
+}
+
+.welcome a,
+.welcome a:visited {
+ font-size: 1.25em;
+ font-weight: bold;
+ color: #03b595;
+}
+
+.welcome p {
+ line-height: 45px;
+}
+
+.icon-menu a {
+ width: 30px;
+ height: 30px;
+ margin: 0 0 0 10px;
+ display: block;
+ font-size: 0;
+}
+
+/****** temporary disable icons ******/
+.icon-menu a {
+ opacity: 0.2;
+ pointer-events: none;
+}
+
+.icon-menu a.btnLang {
+ background: url(../images/icons/icoLng.png) no-repeat;
+ background-position: center center;
+ background-size: contain;
+ margin: 0 0 0 auto;
+ font-size: 0.8em;
+ font-weight: bold;
+ font-family: monospace;
+ text-transform: uppercase;
+ color: #000;
+ padding: 10px;
+ height: 10px;
+ width: 10px;
+ line-height: 13px;
+ text-align: center;
+ overflow: hidden;
+}
+
+.icon-menu a.btnSearch {
+ background: url(../images/icons/icoSrc.png) no-repeat;
+ background-position: center center;
+ background-size: contain;
+}
+
+.icon-menu a.btnHelp {
+ background: url(../images/icons/icoHlp.png) no-repeat;
+ background-position: center center;
+ background-size: contain;
+}
+
+.trigger-lang-modal {
+ margin: 0 0 0 auto;
+}
+
+.contCam {
+ min-width: 90px;
+}
+
+div.contCam:before {
+ content: "";
+ display: block;
+ height: 0;
+ width: 0;
+ position: relative;
+ top: -21px;
+ left: 45px;
+ border-color: #c9c9c9 transparent transparent #c9c9c9;
+ border-style: solid;
+ border-width: 7px;
+ pointer-events: none;
+ z-index: 1;
+}
+
+.animCam {
+ width: 40px;
+ height: 40px;
+ margin: -25px auto 0;
+ background: #03b595;
+}
+
+.useful-links a.cambtn {
+ width: 40px;
+ height: 40px;
+ margin: 0;
+ padding: 0;
+ display: block;
+ text-indent: -999999px;
+ background: url(../images/icons/icoARV.png) no-repeat;
+ background-position: center center;
+ background-size: contain;
+}
+
+.useful-links {
+ margin-bottom: 20px;
+ font-size: 0.75em;
+ font-weight: bold;
+ clear: both;
+ font-size: 75%;
+}
+
+.useful-links .container {
+ height: 50px;
+ margin: auto;
+ column-gap: 1.5em;
+}
+
+.useful-links a,
+.footer a.useful {
+ padding: 0 5px;
+ background-image: linear-gradient(
+ to top,
+ #05f7ae,
+ #05f7ae 50%,
+ transparent 50%,
+ transparent
+ );
+ background-position: 100% 15%;
+ background-size: 100% 200%;
+}
+
+.fill {
+ background: url(../images/icons/fill.png), #e6e6e6;
+ padding: 20px;
+ width: calc(100% - 40px);
+ margin-bottom: 20px;
+}
+
+h1.titExb,
+h1.titArt,
+h1.titMrk,
+h1.titObj {
+ height: 40px;
+ line-height: 45px;
+ text-align: left;
+ padding-left: 35px;
+ width: calc(100% - 35px);
+ background-position: left center;
+ background-size: 25px 25px;
+ background-repeat: no-repeat;
+ border-bottom: 10px solid #f1f1f1;
+}
+
+h1.titExb {
+ background-image: url(../images/icons/icoExb.png);
+}
+
+h1.titArt {
+ background-image: url(../images/icons/icoArt.png);
+}
+
+h1.titMrk {
+ background-image: url(../images/icons/icoMrk.png);
+}
+
+h1.titObj {
+ background-image: url(../images/icons/icoObj.png);
+}
+
+.footer {
+ min-height: 90px;
+}
+
+.footer .container {
+ height: 25px;
+ margin-bottom: 20px;
+}
+
+.footer a {
+ font-size: 75%;
+ line-height: 25px;
+ margin: auto;
+}
+
+.footer a.useful {
+ margin: 0;
+ line-height: 25px;
+}
+
+a.github {
+ background-image: url(../images/icons/bulGit.png);
+ background-size: contain;
+ background-position: left center;
+ background-repeat: no-repeat;
+ color: #03b595;
+ padding-left: 35px;
+}
+
+a.license {
+ background-image: url(../images/icons/license.png);
+ background-size: contain;
+ background-position: left center;
+ background-repeat: no-repeat;
+ padding-left: 65px;
+ font-size: 0.5em;
+ line-height: 20px;
+ margin-left: 0;
+ text-align: left;
+ white-space: nowrap;
+ max-width: calc(100% - 160px);
+ overflow: inherit;
+ text-indent: -9999999px;
+}
+
+a.memelab {
+ background-image: url(../images/icons/memelab.png);
+ background-size: contain;
+ background-position: left center;
+ background-repeat: no-repeat;
+ width: 20px;
+ height: 20px;
+ text-indent: -99999px;
+ max-width: 35px;
+ margin: 0;
+}
+
+a.instagram,
+a.twitter,
+a.facebook,
+a.telegram,
+a.sq-github {
+ background-size: contain;
+ background-position: left center;
+ background-repeat: no-repeat;
+ width: 25px;
+ height: 25px;
+ text-indent: -99999px;
+ max-width: 35px;
+ margin: 5px 0px 5px 5px;
+}
+
+a.instagram {
+ background-image: url(../images/icons/icoIst.png);
+}
+
+a.twitter {
+ background-image: url(../images/icons/icoTwt.png);
+}
+
+a.facebook {
+ background-image: url(../images/icons/icoFcb.png);
+}
+
+a.telegram {
+ background-image: url(../images/icons/icoTel.png);
+}
+
+a.sq-github {
+ background-image: url(../images/icons/icoGit.png);
+}
+
+.form-options {
+ text-align: left;
+}
+
+.artwork-elements .separator {
+ width: 10px;
+ height: 50px;
+ max-height: 50px;
+ min-height: 50px;
+ background: #06f6ab;
+ margin: 0 10px 0 -5px;
+}
+
+.artwork-elements img.trigger-modal {
+ cursor: pointer;
+ margin: 0px 15px 10px;
+}
+
+.artwork-elements .separator:after {
+ content: "";
+ display: block;
+ height: 0;
+ width: 0;
+ position: relative;
+ top: 15px;
+ left: 10px;
+ border-color: #06f6ab transparent transparent #06f6ab;
+ border-style: solid;
+ border-width: 7px;
+ pointer-events: none;
+ z-index: 1;
+}
+
+/* Media Queries */
+@media all and (min-width: 800px) {
+ .container {
+ max-width: 600px;
+ margin: 0 auto;
+ }
+
+ .colorful .container {
+ padding: 20px;
+ max-width: 560px;
+ }
+
+ .header {
+ margin-top: 25px;
+ }
+
+ .aside {
+ max-width: 250px;
+ min-width: 250px;
+ height: 100px;
+ margin-left: -250px;
+ }
+
+ .half {
+ width: 270px;
+ }
+
+ .lg-one-third {
+ flex-basis: calc(33% - 10px);
+ }
+
+ .lg-half {
+ flex-basis: calc(50% - 10px);
+ }
+
+ .lg-full {
+ flex-basis: 100%;
+ }
+
+ .logo {
+ text-align: left;
+ height: 95px;
+ width: calc(100% - 160px);
+ float: left;
+ background-image: linear-gradient(
+ to top,
+ #77777766,
+ #77777766 50%,
+ transparent 50%,
+ transparent
+ );
+ background-position: 100% 10%;
+ background-size: 100% 200%;
+ }
+
+ .welcome,
+ .icon-menu,
+ .connect {
+ height: 50px;
+ text-align: right;
+ font-size: 0.75em;
+ }
+
+ .welcome,
+ .welcome p {
+ line-height: 80px;
+ font-size: 1em;
+ }
+
+ .header .logo img {
+ max-height: 75px;
+ height: auto;
+ margin: auto;
+ }
+
+ .icon-menu a {
+ width: 40px;
+ height: 40px;
+ margin: 0 0 0 10px;
+ }
+
+ .icon-menu a.btnLang {
+ height: 20px;
+ width: 19px;
+ line-height: 23px;
+ font-size: 2.5em;
+ }
+
+ .useful-links a,
+ a.useful {
+ padding: 5px;
+ background-image: linear-gradient(
+ to top,
+ #05f7ae,
+ #05f7ae 50%,
+ transparent 50%,
+ transparent
+ );
+ background-position: 100% 15%;
+ background-size: 100% 200%;
+ }
+ .useful-links .container {
+ column-gap: 0;
+ }
+ .contCam {
+ min-width: 250px;
+ }
+
+ div.contCam:before {
+ top: -10px;
+ left: 125px;
+ border-width: 10px;
+ }
+
+ .animCam {
+ width: 40px;
+ height: 40px;
+ margin: 0 auto;
+ margin-top: -20px;
+ background: #03b595;
+ }
+
+ .useful-links a.cambtn {
+ width: 40px;
+ height: 40px;
+ margin: 0;
+ padding: 0;
+ display: block;
+ text-indent: -999999px;
+ background: url(../images/icons/icoARV.png) no-repeat;
+ background-position: center center;
+ background-size: contain;
+ }
+
+ .footer {
+ min-height: 100px;
+ }
+
+ .footer .container {
+ height: 30px;
+ margin-bottom: 40px;
+ }
+
+ .footer a {
+ line-height: 30px;
+ }
+
+ a.instagram,
+ a.twitter,
+ a.facebook,
+ a.telegram,
+ a.sq-github {
+ width: 30px;
+ height: 30px;
+ }
+
+ a.github {
+ padding-left: 40px;
+ }
+
+ a.license {
+ padding-left: 100px;
+ height: 30px;
+ line-height: 30px;
+ font-size: 0.75em;
+ text-indent: 0;
+ }
+
+ a.memelab {
+ width: 30px;
+ height: 30px;
+ max-width: 40px;
+ }
+
+}
+
+/* Hover Elements */
+.useful-links a,
+.footer a.useful,
+.account-options a,
+.header .logo img,
+.animCam,
+.memelab,
+.social a,
+.editProf a.option-link,
+.welcome a,
+a.changeExb,
+a.jandigIco,
+.signup-btn,
+.login-btn,
+.trigger-lang-modal,
+.license {
+ transition: all 0.2s ease-in;
+}
+
+.useful-links a:hover,
+.footer a.useful:hover,
+.account-options a:hover {
+ color: #fff;
+ background-position: 0 100%;
+}
+
+.header .logo img:hover,
+.animCam:hover,
+.memelab:hover,
+.social a:hover,
+a.changeExb:hover,
+a.jandigIco:hover,
+.signup-btn:hover,
+.login-btn:hover,
+.trigger-lang-modal:hover,
+.license:hover {
+ opacity: 0.7;
+}
+
+.editProf a.option-link:hover,
+.welcome a:hover {
+ color: #06f7ae;
+}
+
+/****** Animation ********/
+.animCam {
+ animation: colorchange 4s infinite; /* animation-name followed by duration in seconds*/
+ -webkit-animation: colorchange 4s infinite; /* Chrome and Safari */
+}
+
+@keyframes colorchange {
+ 0% {
+ background: #03b595;
+ }
+ 50% {
+ background: #06f7ae;
+ }
+ 100% {
+ background: #03b595;
+ }
+}
+
+@-webkit-keyframes colorchange {
+ 0% {
+ background: #03b595;
+ }
+ 50% {
+ background: #06f7ae;
+ }
+ 100% {
+ background: #03b595;
+ }
+}
diff --git a/src/ARte/core/static/images/icons/app/App Icon Back.svg b/src/core/static/images/icons/app/App Icon Back.svg
similarity index 100%
rename from src/ARte/core/static/images/icons/app/App Icon Back.svg
rename to src/core/static/images/icons/app/App Icon Back.svg
diff --git a/src/ARte/core/static/images/icons/app/App Icon Front.svg b/src/core/static/images/icons/app/App Icon Front.svg
similarity index 100%
rename from src/ARte/core/static/images/icons/app/App Icon Front.svg
rename to src/core/static/images/icons/app/App Icon Front.svg
diff --git a/src/ARte/core/static/images/icons/app/GooglePlay.png b/src/core/static/images/icons/app/GooglePlay.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/GooglePlay.png
rename to src/core/static/images/icons/app/GooglePlay.png
diff --git a/src/ARte/core/static/images/icons/app/Icon-20@1x.png b/src/core/static/images/icons/app/Icon-20@1x.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/Icon-20@1x.png
rename to src/core/static/images/icons/app/Icon-20@1x.png
diff --git a/src/ARte/core/static/images/icons/app/Icon-20@2x.png b/src/core/static/images/icons/app/Icon-20@2x.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/Icon-20@2x.png
rename to src/core/static/images/icons/app/Icon-20@2x.png
diff --git a/src/ARte/core/static/images/icons/app/Icon-20@3x.png b/src/core/static/images/icons/app/Icon-20@3x.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/Icon-20@3x.png
rename to src/core/static/images/icons/app/Icon-20@3x.png
diff --git a/src/ARte/core/static/images/icons/app/Icon-29.png b/src/core/static/images/icons/app/Icon-29.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/Icon-29.png
rename to src/core/static/images/icons/app/Icon-29.png
diff --git a/src/ARte/core/static/images/icons/app/Icon-29@2x.png b/src/core/static/images/icons/app/Icon-29@2x.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/Icon-29@2x.png
rename to src/core/static/images/icons/app/Icon-29@2x.png
diff --git a/src/ARte/core/static/images/icons/app/Icon-29@3x.png b/src/core/static/images/icons/app/Icon-29@3x.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/Icon-29@3x.png
rename to src/core/static/images/icons/app/Icon-29@3x.png
diff --git a/src/ARte/core/static/images/icons/app/Icon-40.png b/src/core/static/images/icons/app/Icon-40.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/Icon-40.png
rename to src/core/static/images/icons/app/Icon-40.png
diff --git a/src/ARte/core/static/images/icons/app/Icon-40@2x.png b/src/core/static/images/icons/app/Icon-40@2x.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/Icon-40@2x.png
rename to src/core/static/images/icons/app/Icon-40@2x.png
diff --git a/src/ARte/core/static/images/icons/app/Icon-40@3x.png b/src/core/static/images/icons/app/Icon-40@3x.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/Icon-40@3x.png
rename to src/core/static/images/icons/app/Icon-40@3x.png
diff --git a/src/ARte/core/static/images/icons/app/Icon-60@2x.png b/src/core/static/images/icons/app/Icon-60@2x.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/Icon-60@2x.png
rename to src/core/static/images/icons/app/Icon-60@2x.png
diff --git a/src/ARte/core/static/images/icons/app/Icon-60@3x.png b/src/core/static/images/icons/app/Icon-60@3x.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/Icon-60@3x.png
rename to src/core/static/images/icons/app/Icon-60@3x.png
diff --git a/src/ARte/core/static/images/icons/app/Icon-76.png b/src/core/static/images/icons/app/Icon-76.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/Icon-76.png
rename to src/core/static/images/icons/app/Icon-76.png
diff --git a/src/ARte/core/static/images/icons/app/Icon-76@2x.png b/src/core/static/images/icons/app/Icon-76@2x.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/Icon-76@2x.png
rename to src/core/static/images/icons/app/Icon-76@2x.png
diff --git a/src/ARte/core/static/images/icons/app/Icon-83.5@2x.png b/src/core/static/images/icons/app/Icon-83.5@2x.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/Icon-83.5@2x.png
rename to src/core/static/images/icons/app/Icon-83.5@2x.png
diff --git a/src/ARte/core/static/images/icons/app/iTunesArtwork@2x.png b/src/core/static/images/icons/app/iTunesArtwork@2x.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/iTunesArtwork@2x.png
rename to src/core/static/images/icons/app/iTunesArtwork@2x.png
diff --git a/src/ARte/core/static/images/icons/app/ic_launcher_HDPI.png b/src/core/static/images/icons/app/ic_launcher_HDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_launcher_HDPI.png
rename to src/core/static/images/icons/app/ic_launcher_HDPI.png
diff --git a/src/ARte/core/static/images/icons/app/ic_launcher_MDPI.png b/src/core/static/images/icons/app/ic_launcher_MDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_launcher_MDPI.png
rename to src/core/static/images/icons/app/ic_launcher_MDPI.png
diff --git a/src/ARte/core/static/images/icons/app/ic_launcher_XHDPI.png b/src/core/static/images/icons/app/ic_launcher_XHDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_launcher_XHDPI.png
rename to src/core/static/images/icons/app/ic_launcher_XHDPI.png
diff --git a/src/ARte/core/static/images/icons/app/ic_launcher_XXHDPI.png b/src/core/static/images/icons/app/ic_launcher_XXHDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_launcher_XXHDPI.png
rename to src/core/static/images/icons/app/ic_launcher_XXHDPI.png
diff --git a/src/ARte/core/static/images/icons/app/ic_launcher_XXXHDPI.png b/src/core/static/images/icons/app/ic_launcher_XXXHDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_launcher_XXXHDPI.png
rename to src/core/static/images/icons/app/ic_launcher_XXXHDPI.png
diff --git a/src/ARte/core/static/images/icons/app/ic_notification_HDPI.png b/src/core/static/images/icons/app/ic_notification_HDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_notification_HDPI.png
rename to src/core/static/images/icons/app/ic_notification_HDPI.png
diff --git a/src/ARte/core/static/images/icons/app/ic_notification_MDPI.png b/src/core/static/images/icons/app/ic_notification_MDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_notification_MDPI.png
rename to src/core/static/images/icons/app/ic_notification_MDPI.png
diff --git a/src/ARte/core/static/images/icons/app/ic_notification_XHDPI.png b/src/core/static/images/icons/app/ic_notification_XHDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_notification_XHDPI.png
rename to src/core/static/images/icons/app/ic_notification_XHDPI.png
diff --git a/src/ARte/core/static/images/icons/app/ic_notification_XXHDPI.png b/src/core/static/images/icons/app/ic_notification_XXHDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_notification_XXHDPI.png
rename to src/core/static/images/icons/app/ic_notification_XXHDPI.png
diff --git a/src/ARte/core/static/images/icons/app/ic_notification_XXXHDPI.png b/src/core/static/images/icons/app/ic_notification_XXXHDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_notification_XXXHDPI.png
rename to src/core/static/images/icons/app/ic_notification_XXXHDPI.png
diff --git a/src/ARte/core/static/images/icons/app/ic_status_bar_HDPI.png b/src/core/static/images/icons/app/ic_status_bar_HDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_status_bar_HDPI.png
rename to src/core/static/images/icons/app/ic_status_bar_HDPI.png
diff --git a/src/ARte/core/static/images/icons/app/ic_status_bar_MDPI.png b/src/core/static/images/icons/app/ic_status_bar_MDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_status_bar_MDPI.png
rename to src/core/static/images/icons/app/ic_status_bar_MDPI.png
diff --git a/src/ARte/core/static/images/icons/app/ic_status_bar_XHDPI.png b/src/core/static/images/icons/app/ic_status_bar_XHDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_status_bar_XHDPI.png
rename to src/core/static/images/icons/app/ic_status_bar_XHDPI.png
diff --git a/src/ARte/core/static/images/icons/app/ic_status_bar_XXHDPI.png b/src/core/static/images/icons/app/ic_status_bar_XXHDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_status_bar_XXHDPI.png
rename to src/core/static/images/icons/app/ic_status_bar_XXHDPI.png
diff --git a/src/ARte/core/static/images/icons/app/ic_status_bar_XXXHDPI.png b/src/core/static/images/icons/app/ic_status_bar_XXXHDPI.png
similarity index 100%
rename from src/ARte/core/static/images/icons/app/ic_status_bar_XXXHDPI.png
rename to src/core/static/images/icons/app/ic_status_bar_XXXHDPI.png
diff --git a/src/ARte/core/static/images/icons/bdgArt.png b/src/core/static/images/icons/bdgArt.png
similarity index 100%
rename from src/ARte/core/static/images/icons/bdgArt.png
rename to src/core/static/images/icons/bdgArt.png
diff --git a/src/ARte/core/static/images/icons/bdgCur.png b/src/core/static/images/icons/bdgCur.png
similarity index 100%
rename from src/ARte/core/static/images/icons/bdgCur.png
rename to src/core/static/images/icons/bdgCur.png
diff --git a/src/ARte/core/static/images/icons/bg.png b/src/core/static/images/icons/bg.png
similarity index 100%
rename from src/ARte/core/static/images/icons/bg.png
rename to src/core/static/images/icons/bg.png
diff --git a/src/ARte/core/static/images/icons/bulGit.png b/src/core/static/images/icons/bulGit.png
similarity index 100%
rename from src/ARte/core/static/images/icons/bulGit.png
rename to src/core/static/images/icons/bulGit.png
diff --git a/src/ARte/core/static/images/icons/delete.png b/src/core/static/images/icons/delete.png
similarity index 100%
rename from src/ARte/core/static/images/icons/delete.png
rename to src/core/static/images/icons/delete.png
diff --git a/src/ARte/core/static/images/icons/edit.png b/src/core/static/images/icons/edit.png
similarity index 100%
rename from src/ARte/core/static/images/icons/edit.png
rename to src/core/static/images/icons/edit.png
diff --git a/favicon.ico b/src/core/static/images/icons/favicon.ico
similarity index 100%
rename from favicon.ico
rename to src/core/static/images/icons/favicon.ico
diff --git a/src/ARte/core/static/images/icons/fill.png b/src/core/static/images/icons/fill.png
similarity index 100%
rename from src/ARte/core/static/images/icons/fill.png
rename to src/core/static/images/icons/fill.png
diff --git a/src/ARte/core/static/images/icons/header_icon.png b/src/core/static/images/icons/header_icon.png
similarity index 100%
rename from src/ARte/core/static/images/icons/header_icon.png
rename to src/core/static/images/icons/header_icon.png
diff --git a/src/ARte/core/static/images/icons/icoARV.png b/src/core/static/images/icons/icoARV.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoARV.png
rename to src/core/static/images/icons/icoARV.png
diff --git a/src/ARte/core/static/images/icons/icoArt.png b/src/core/static/images/icons/icoArt.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoArt.png
rename to src/core/static/images/icons/icoArt.png
diff --git a/src/ARte/core/static/images/icons/icoCamPurp.png b/src/core/static/images/icons/icoCamPurp.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoCamPurp.png
rename to src/core/static/images/icons/icoCamPurp.png
diff --git a/src/ARte/core/static/images/icons/icoChgExb.png b/src/core/static/images/icons/icoChgExb.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoChgExb.png
rename to src/core/static/images/icons/icoChgExb.png
diff --git a/src/ARte/core/static/images/icons/icoEpt.png b/src/core/static/images/icons/icoEpt.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoEpt.png
rename to src/core/static/images/icons/icoEpt.png
diff --git a/src/ARte/core/static/images/icons/icoEptG.png b/src/core/static/images/icons/icoEptG.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoEptG.png
rename to src/core/static/images/icons/icoEptG.png
diff --git a/src/ARte/core/static/images/icons/icoExb.png b/src/core/static/images/icons/icoExb.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoExb.png
rename to src/core/static/images/icons/icoExb.png
diff --git a/src/ARte/core/static/images/icons/icoFcb.png b/src/core/static/images/icons/icoFcb.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoFcb.png
rename to src/core/static/images/icons/icoFcb.png
diff --git a/src/ARte/core/static/images/icons/icoGit.png b/src/core/static/images/icons/icoGit.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoGit.png
rename to src/core/static/images/icons/icoGit.png
diff --git a/src/ARte/core/static/images/icons/icoHlp.png b/src/core/static/images/icons/icoHlp.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoHlp.png
rename to src/core/static/images/icons/icoHlp.png
diff --git a/src/ARte/core/static/images/icons/icoIst.png b/src/core/static/images/icons/icoIst.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoIst.png
rename to src/core/static/images/icons/icoIst.png
diff --git a/src/ARte/core/static/images/icons/icoLng.png b/src/core/static/images/icons/icoLng.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoLng.png
rename to src/core/static/images/icons/icoLng.png
diff --git a/src/ARte/core/static/images/icons/icoMrk.png b/src/core/static/images/icons/icoMrk.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoMrk.png
rename to src/core/static/images/icons/icoMrk.png
diff --git a/src/ARte/core/static/images/icons/icoObj.png b/src/core/static/images/icons/icoObj.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoObj.png
rename to src/core/static/images/icons/icoObj.png
diff --git a/src/ARte/core/static/images/icons/icoSrc.png b/src/core/static/images/icons/icoSrc.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoSrc.png
rename to src/core/static/images/icons/icoSrc.png
diff --git a/src/ARte/core/static/images/icons/icoTel.png b/src/core/static/images/icons/icoTel.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoTel.png
rename to src/core/static/images/icons/icoTel.png
diff --git a/src/ARte/core/static/images/icons/icoTwt.png b/src/core/static/images/icons/icoTwt.png
similarity index 100%
rename from src/ARte/core/static/images/icons/icoTwt.png
rename to src/core/static/images/icons/icoTwt.png
diff --git a/src/ARte/core/static/images/icons/jandigIcon.png b/src/core/static/images/icons/jandigIcon.png
similarity index 100%
rename from src/ARte/core/static/images/icons/jandigIcon.png
rename to src/core/static/images/icons/jandigIcon.png
diff --git a/src/ARte/core/static/images/icons/jandigMG.png b/src/core/static/images/icons/jandigMG.png
similarity index 100%
rename from src/ARte/core/static/images/icons/jandigMG.png
rename to src/core/static/images/icons/jandigMG.png
diff --git a/src/ARte/core/static/images/icons/license.png b/src/core/static/images/icons/license.png
similarity index 100%
rename from src/ARte/core/static/images/icons/license.png
rename to src/core/static/images/icons/license.png
diff --git a/src/ARte/core/static/images/icons/memelab.png b/src/core/static/images/icons/memelab.png
similarity index 100%
rename from src/ARte/core/static/images/icons/memelab.png
rename to src/core/static/images/icons/memelab.png
diff --git a/src/ARte/core/static/images/icons/preview.png b/src/core/static/images/icons/preview.png
similarity index 100%
rename from src/ARte/core/static/images/icons/preview.png
rename to src/core/static/images/icons/preview.png
diff --git a/src/ARte/core/static/ios-manifest.json b/src/core/static/ios-manifest.json
similarity index 100%
rename from src/ARte/core/static/ios-manifest.json
rename to src/core/static/ios-manifest.json
diff --git a/src/ARte/core/static/js/bowser.js b/src/core/static/js/bowser.js
similarity index 100%
rename from src/ARte/core/static/js/bowser.js
rename to src/core/static/js/bowser.js
diff --git a/src/ARte/core/static/js/detect.js b/src/core/static/js/detect.js
similarity index 100%
rename from src/ARte/core/static/js/detect.js
rename to src/core/static/js/detect.js
diff --git a/src/ARte/core/static/js/fetch-worker.js b/src/core/static/js/fetch-worker.js
similarity index 100%
rename from src/ARte/core/static/js/fetch-worker.js
rename to src/core/static/js/fetch-worker.js
diff --git a/src/core/static/js/htmx.min.js b/src/core/static/js/htmx.min.js
new file mode 100644
index 00000000..de5f0f1a
--- /dev/null
+++ b/src/core/static/js/htmx.min.js
@@ -0,0 +1 @@
+(function(e,t){if(typeof define==="function"&&define.amd){define([],t)}else if(typeof module==="object"&&module.exports){module.exports=t()}else{e.htmx=e.htmx||t()}})(typeof self!=="undefined"?self:this,function(){return function(){"use strict";var Q={onLoad:F,process:zt,on:de,off:ge,trigger:ce,ajax:Nr,find:C,findAll:f,closest:v,values:function(e,t){var r=dr(e,t||"post");return r.values},remove:_,addClass:z,removeClass:n,toggleClass:$,takeClass:W,defineExtension:Ur,removeExtension:Br,logAll:V,logNone:j,logger:null,config:{historyEnabled:true,historyCacheSize:10,refreshOnHistoryMiss:false,defaultSwapStyle:"innerHTML",defaultSwapDelay:0,defaultSettleDelay:20,includeIndicatorStyles:true,indicatorClass:"htmx-indicator",requestClass:"htmx-request",addedClass:"htmx-added",settlingClass:"htmx-settling",swappingClass:"htmx-swapping",allowEval:true,allowScriptTags:true,inlineScriptNonce:"",attributesToSettle:["class","style","width","height"],withCredentials:false,timeout:0,wsReconnectDelay:"full-jitter",wsBinaryType:"blob",disableSelector:"[hx-disable], [data-hx-disable]",useTemplateFragments:false,scrollBehavior:"smooth",defaultFocusScroll:false,getCacheBusterParam:false,globalViewTransitions:false,methodsThatUseUrlParams:["get"],selfRequestsOnly:false,ignoreTitle:false,scrollIntoViewOnBoost:true,triggerSpecsCache:null},parseInterval:d,_:t,createEventSource:function(e){return new EventSource(e,{withCredentials:true})},createWebSocket:function(e){var t=new WebSocket(e,[]);t.binaryType=Q.config.wsBinaryType;return t},version:"1.9.12"};var r={addTriggerHandler:Lt,bodyContains:se,canAccessLocalStorage:U,findThisElement:xe,filterValues:yr,hasAttribute:o,getAttributeValue:te,getClosestAttributeValue:ne,getClosestMatch:c,getExpressionVars:Hr,getHeaders:xr,getInputValues:dr,getInternalData:ae,getSwapSpecification:wr,getTriggerSpecs:it,getTarget:ye,makeFragment:l,mergeObjects:le,makeSettleInfo:T,oobSwap:Ee,querySelectorExt:ue,selectAndSwap:je,settleImmediately:nr,shouldCancel:ut,triggerEvent:ce,triggerErrorEvent:fe,withExtensions:R};var w=["get","post","put","delete","patch"];var i=w.map(function(e){return"[hx-"+e+"], [data-hx-"+e+"]"}).join(", ");var S=e("head"),q=e("title"),H=e("svg",true);function e(e,t){return new RegExp("<"+e+"(\\s[^>]*>|>)([\\s\\S]*?)<\\/"+e+">",!!t?"gim":"im")}function d(e){if(e==undefined){return undefined}let t=NaN;if(e.slice(-2)=="ms"){t=parseFloat(e.slice(0,-2))}else if(e.slice(-1)=="s"){t=parseFloat(e.slice(0,-1))*1e3}else if(e.slice(-1)=="m"){t=parseFloat(e.slice(0,-1))*1e3*60}else{t=parseFloat(e)}return isNaN(t)?undefined:t}function ee(e,t){return e.getAttribute&&e.getAttribute(t)}function o(e,t){return e.hasAttribute&&(e.hasAttribute(t)||e.hasAttribute("data-"+t))}function te(e,t){return ee(e,t)||ee(e,"data-"+t)}function u(e){return e.parentElement}function re(){return document}function c(e,t){while(e&&!t(e)){e=u(e)}return e?e:null}function L(e,t,r){var n=te(t,r);var i=te(t,"hx-disinherit");if(e!==t&&i&&(i==="*"||i.split(" ").indexOf(r)>=0)){return"unset"}else{return n}}function ne(t,r){var n=null;c(t,function(e){return n=L(t,e,r)});if(n!=="unset"){return n}}function h(e,t){var r=e.matches||e.matchesSelector||e.msMatchesSelector||e.mozMatchesSelector||e.webkitMatchesSelector||e.oMatchesSelector;return r&&r.call(e,t)}function A(e){var t=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i;var r=t.exec(e);if(r){return r[1].toLowerCase()}else{return""}}function s(e,t){var r=new DOMParser;var n=r.parseFromString(e,"text/html");var i=n.body;while(t>0){t--;i=i.firstChild}if(i==null){i=re().createDocumentFragment()}return i}function N(e){return/"+n+"",0);var a=i.querySelector("template").content;if(Q.config.allowScriptTags){oe(a.querySelectorAll("script"),function(e){if(Q.config.inlineScriptNonce){e.nonce=Q.config.inlineScriptNonce}e.htmxExecuted=navigator.userAgent.indexOf("Firefox")===-1})}else{oe(a.querySelectorAll("script"),function(e){_(e)})}return a}switch(r){case"thead":case"tbody":case"tfoot":case"colgroup":case"caption":return s(""+n+"
",1);case"col":return s("
",2);case"tr":return s(""+n+"
",2);case"td":case"th":return s("
",3);case"script":case"style":return s("=0}function se(e){if(e.getRootNode&&e.getRootNode()instanceof window.ShadowRoot){return re().body.contains(e.getRootNode().host)}else{return re().body.contains(e)}}function D(e){return e.trim().split(/\s+/)}function le(e,t){for(var r in t){if(t.hasOwnProperty(r)){e[r]=t[r]}}return e}function E(e){try{return JSON.parse(e)}catch(e){b(e);return null}}function U(){var e="htmx:localStorageTest";try{localStorage.setItem(e,e);localStorage.removeItem(e);return true}catch(e){return false}}function B(t){try{var e=new URL(t);if(e){t=e.pathname+e.search}if(!/^\/$/.test(t)){t=t.replace(/\/+$/,"")}return t}catch(e){return t}}function t(e){return Tr(re().body,function(){return eval(e)})}function F(t){var e=Q.on("htmx:load",function(e){t(e.detail.elt)});return e}function V(){Q.logger=function(e,t,r){if(console){console.log(t,e,r)}}}function j(){Q.logger=null}function C(e,t){if(t){return e.querySelector(t)}else{return C(re(),e)}}function f(e,t){if(t){return e.querySelectorAll(t)}else{return f(re(),e)}}function _(e,t){e=p(e);if(t){setTimeout(function(){_(e);e=null},t)}else{e.parentElement.removeChild(e)}}function z(e,t,r){e=p(e);if(r){setTimeout(function(){z(e,t);e=null},r)}else{e.classList&&e.classList.add(t)}}function n(e,t,r){e=p(e);if(r){setTimeout(function(){n(e,t);e=null},r)}else{if(e.classList){e.classList.remove(t);if(e.classList.length===0){e.removeAttribute("class")}}}}function $(e,t){e=p(e);e.classList.toggle(t)}function W(e,t){e=p(e);oe(e.parentElement.children,function(e){n(e,t)});z(e,t)}function v(e,t){e=p(e);if(e.closest){return e.closest(t)}else{do{if(e==null||h(e,t)){return e}}while(e=e&&u(e));return null}}function g(e,t){return e.substring(0,t.length)===t}function G(e,t){return e.substring(e.length-t.length)===t}function J(e){var t=e.trim();if(g(t,"<")&&G(t,"/>")){return t.substring(1,t.length-2)}else{return t}}function Z(e,t){if(t.indexOf("closest ")===0){return[v(e,J(t.substr(8)))]}else if(t.indexOf("find ")===0){return[C(e,J(t.substr(5)))]}else if(t==="next"){return[e.nextElementSibling]}else if(t.indexOf("next ")===0){return[K(e,J(t.substr(5)))]}else if(t==="previous"){return[e.previousElementSibling]}else if(t.indexOf("previous ")===0){return[Y(e,J(t.substr(9)))]}else if(t==="document"){return[document]}else if(t==="window"){return[window]}else if(t==="body"){return[document.body]}else{return re().querySelectorAll(J(t))}}var K=function(e,t){var r=re().querySelectorAll(t);for(var n=0;n=0;n--){var i=r[n];if(i.compareDocumentPosition(e)===Node.DOCUMENT_POSITION_FOLLOWING){return i}}};function ue(e,t){if(t){return Z(e,t)[0]}else{return Z(re().body,e)[0]}}function p(e){if(I(e,"String")){return C(e)}else{return e}}function ve(e,t,r){if(k(t)){return{target:re().body,event:e,listener:t}}else{return{target:p(e),event:t,listener:r}}}function de(t,r,n){jr(function(){var e=ve(t,r,n);e.target.addEventListener(e.event,e.listener)});var e=k(r);return e?r:n}function ge(t,r,n){jr(function(){var e=ve(t,r,n);e.target.removeEventListener(e.event,e.listener)});return k(r)?r:n}var pe=re().createElement("output");function me(e,t){var r=ne(e,t);if(r){if(r==="this"){return[xe(e,t)]}else{var n=Z(e,r);if(n.length===0){b('The selector "'+r+'" on '+t+" returned no matches!");return[pe]}else{return n}}}}function xe(e,t){return c(e,function(e){return te(e,t)!=null})}function ye(e){var t=ne(e,"hx-target");if(t){if(t==="this"){return xe(e,"hx-target")}else{return ue(e,t)}}else{var r=ae(e);if(r.boosted){return re().body}else{return e}}}function be(e){var t=Q.config.attributesToSettle;for(var r=0;r0){o=e.substr(0,e.indexOf(":"));t=e.substr(e.indexOf(":")+1,e.length)}else{o=e}var r=re().querySelectorAll(t);if(r){oe(r,function(e){var t;var r=i.cloneNode(true);t=re().createDocumentFragment();t.appendChild(r);if(!Se(o,e)){t=r}var n={shouldSwap:true,target:e,fragment:t};if(!ce(e,"htmx:oobBeforeSwap",n))return;e=n.target;if(n["shouldSwap"]){Fe(o,e,e,t,a)}oe(a.elts,function(e){ce(e,"htmx:oobAfterSwap",n)})});i.parentNode.removeChild(i)}else{i.parentNode.removeChild(i);fe(re().body,"htmx:oobErrorNoTarget",{content:i})}return e}function Ce(e,t,r){var n=ne(e,"hx-select-oob");if(n){var i=n.split(",");for(var a=0;a0){var r=t.replace("'","\\'");var n=e.tagName.replace(":","\\:");var i=o.querySelector(n+"[id='"+r+"']");if(i&&i!==o){var a=e.cloneNode();we(e,i);s.tasks.push(function(){we(e,a)})}}})}function Oe(e){return function(){n(e,Q.config.addedClass);zt(e);Nt(e);qe(e);ce(e,"htmx:load")}}function qe(e){var t="[autofocus]";var r=h(e,t)?e:e.querySelector(t);if(r!=null){r.focus()}}function a(e,t,r,n){Te(e,r,n);while(r.childNodes.length>0){var i=r.firstChild;z(i,Q.config.addedClass);e.insertBefore(i,t);if(i.nodeType!==Node.TEXT_NODE&&i.nodeType!==Node.COMMENT_NODE){n.tasks.push(Oe(i))}}}function He(e,t){var r=0;while(r-1){var t=e.replace(H,"");var r=t.match(q);if(r){return r[2]}}}function je(e,t,r,n,i,a){i.title=Ve(n);var o=l(n);if(o){Ce(r,o,i);o=Be(r,o,a);Re(o);return Fe(e,r,t,o,i)}}function _e(e,t,r){var n=e.getResponseHeader(t);if(n.indexOf("{")===0){var i=E(n);for(var a in i){if(i.hasOwnProperty(a)){var o=i[a];if(!P(o)){o={value:o}}ce(r,a,o)}}}else{var s=n.split(",");for(var l=0;l0){var o=t[0];if(o==="]"){n--;if(n===0){if(a===null){i=i+"true"}t.shift();i+=")})";try{var s=Tr(e,function(){return Function(i)()},function(){return true});s.source=i;return s}catch(e){fe(re().body,"htmx:syntax:error",{error:e,source:i});return null}}}else if(o==="["){n++}if(Qe(o,a,r)){i+="(("+r+"."+o+") ? ("+r+"."+o+") : (window."+o+"))"}else{i=i+o}a=t.shift()}}}function y(e,t){var r="";while(e.length>0&&!t.test(e[0])){r+=e.shift()}return r}function tt(e){var t;if(e.length>0&&Ze.test(e[0])){e.shift();t=y(e,Ke).trim();e.shift()}else{t=y(e,x)}return t}var rt="input, textarea, select";function nt(e,t,r){var n=[];var i=Ye(t);do{y(i,Je);var a=i.length;var o=y(i,/[,\[\s]/);if(o!==""){if(o==="every"){var s={trigger:"every"};y(i,Je);s.pollInterval=d(y(i,/[,\[\s]/));y(i,Je);var l=et(e,i,"event");if(l){s.eventFilter=l}n.push(s)}else if(o.indexOf("sse:")===0){n.push({trigger:"sse",sseEvent:o.substr(4)})}else{var u={trigger:o};var l=et(e,i,"event");if(l){u.eventFilter=l}while(i.length>0&&i[0]!==","){y(i,Je);var f=i.shift();if(f==="changed"){u.changed=true}else if(f==="once"){u.once=true}else if(f==="consume"){u.consume=true}else if(f==="delay"&&i[0]===":"){i.shift();u.delay=d(y(i,x))}else if(f==="from"&&i[0]===":"){i.shift();if(Ze.test(i[0])){var c=tt(i)}else{var c=y(i,x);if(c==="closest"||c==="find"||c==="next"||c==="previous"){i.shift();var h=tt(i);if(h.length>0){c+=" "+h}}}u.from=c}else if(f==="target"&&i[0]===":"){i.shift();u.target=tt(i)}else if(f==="throttle"&&i[0]===":"){i.shift();u.throttle=d(y(i,x))}else if(f==="queue"&&i[0]===":"){i.shift();u.queue=y(i,x)}else if(f==="root"&&i[0]===":"){i.shift();u[f]=tt(i)}else if(f==="threshold"&&i[0]===":"){i.shift();u[f]=y(i,x)}else{fe(e,"htmx:syntax:error",{token:i.shift()})}}n.push(u)}}if(i.length===a){fe(e,"htmx:syntax:error",{token:i.shift()})}y(i,Je)}while(i[0]===","&&i.shift());if(r){r[t]=n}return n}function it(e){var t=te(e,"hx-trigger");var r=[];if(t){var n=Q.config.triggerSpecsCache;r=n&&n[t]||nt(e,t,n)}if(r.length>0){return r}else if(h(e,"form")){return[{trigger:"submit"}]}else if(h(e,'input[type="button"], input[type="submit"]')){return[{trigger:"click"}]}else if(h(e,rt)){return[{trigger:"change"}]}else{return[{trigger:"click"}]}}function at(e){ae(e).cancelled=true}function ot(e,t,r){var n=ae(e);n.timeout=setTimeout(function(){if(se(e)&&n.cancelled!==true){if(!ct(r,e,Wt("hx:poll:trigger",{triggerSpec:r,target:e}))){t(e)}ot(e,t,r)}},r.pollInterval)}function st(e){return location.hostname===e.hostname&&ee(e,"href")&&ee(e,"href").indexOf("#")!==0}function lt(t,r,e){if(t.tagName==="A"&&st(t)&&(t.target===""||t.target==="_self")||t.tagName==="FORM"){r.boosted=true;var n,i;if(t.tagName==="A"){n="get";i=ee(t,"href")}else{var a=ee(t,"method");n=a?a.toLowerCase():"get";if(n==="get"){}i=ee(t,"action")}e.forEach(function(e){ht(t,function(e,t){if(v(e,Q.config.disableSelector)){m(e);return}he(n,i,e,t)},r,e,true)})}}function ut(e,t){if(e.type==="submit"||e.type==="click"){if(t.tagName==="FORM"){return true}if(h(t,'input[type="submit"], button')&&v(t,"form")!==null){return true}if(t.tagName==="A"&&t.href&&(t.getAttribute("href")==="#"||t.getAttribute("href").indexOf("#")!==0)){return true}}return false}function ft(e,t){return ae(e).boosted&&e.tagName==="A"&&t.type==="click"&&(t.ctrlKey||t.metaKey)}function ct(e,t,r){var n=e.eventFilter;if(n){try{return n.call(t,r)!==true}catch(e){fe(re().body,"htmx:eventFilter:error",{error:e,source:n.source});return true}}return false}function ht(a,o,e,s,l){var u=ae(a);var t;if(s.from){t=Z(a,s.from)}else{t=[a]}if(s.changed){t.forEach(function(e){var t=ae(e);t.lastValue=e.value})}oe(t,function(n){var i=function(e){if(!se(a)){n.removeEventListener(s.trigger,i);return}if(ft(a,e)){return}if(l||ut(e,a)){e.preventDefault()}if(ct(s,a,e)){return}var t=ae(e);t.triggerSpec=s;if(t.handledFor==null){t.handledFor=[]}if(t.handledFor.indexOf(a)<0){t.handledFor.push(a);if(s.consume){e.stopPropagation()}if(s.target&&e.target){if(!h(e.target,s.target)){return}}if(s.once){if(u.triggeredOnce){return}else{u.triggeredOnce=true}}if(s.changed){var r=ae(n);if(r.lastValue===n.value){return}r.lastValue=n.value}if(u.delayed){clearTimeout(u.delayed)}if(u.throttle){return}if(s.throttle>0){if(!u.throttle){o(a,e);u.throttle=setTimeout(function(){u.throttle=null},s.throttle)}}else if(s.delay>0){u.delayed=setTimeout(function(){o(a,e)},s.delay)}else{ce(a,"htmx:trigger");o(a,e)}}};if(e.listenerInfos==null){e.listenerInfos=[]}e.listenerInfos.push({trigger:s.trigger,listener:i,on:n});n.addEventListener(s.trigger,i)})}var vt=false;var dt=null;function gt(){if(!dt){dt=function(){vt=true};window.addEventListener("scroll",dt);setInterval(function(){if(vt){vt=false;oe(re().querySelectorAll("[hx-trigger='revealed'],[data-hx-trigger='revealed']"),function(e){pt(e)})}},200)}}function pt(t){if(!o(t,"data-hx-revealed")&&X(t)){t.setAttribute("data-hx-revealed","true");var e=ae(t);if(e.initHash){ce(t,"revealed")}else{t.addEventListener("htmx:afterProcessNode",function(e){ce(t,"revealed")},{once:true})}}}function mt(e,t,r){var n=D(r);for(var i=0;i=0){var t=wt(n);setTimeout(function(){xt(s,r,n+1)},t)}};t.onopen=function(e){n=0};ae(s).webSocket=t;t.addEventListener("message",function(e){if(yt(s)){return}var t=e.data;R(s,function(e){t=e.transformResponse(t,null,s)});var r=T(s);var n=l(t);var i=M(n.children);for(var a=0;a0){ce(u,"htmx:validation:halted",i);return}t.send(JSON.stringify(l));if(ut(e,u)){e.preventDefault()}})}else{fe(u,"htmx:noWebSocketSourceError")}}function wt(e){var t=Q.config.wsReconnectDelay;if(typeof t==="function"){return t(e)}if(t==="full-jitter"){var r=Math.min(e,6);var n=1e3*Math.pow(2,r);return n*Math.random()}b('htmx.config.wsReconnectDelay must either be a function or the string "full-jitter"')}function St(e,t,r){var n=D(r);for(var i=0;i0){setTimeout(i,n)}else{i()}}function Ht(t,i,e){var a=false;oe(w,function(r){if(o(t,"hx-"+r)){var n=te(t,"hx-"+r);a=true;i.path=n;i.verb=r;e.forEach(function(e){Lt(t,e,i,function(e,t){if(v(e,Q.config.disableSelector)){m(e);return}he(r,n,e,t)})})}});return a}function Lt(n,e,t,r){if(e.sseEvent){Rt(n,r,e.sseEvent)}else if(e.trigger==="revealed"){gt();ht(n,r,t,e);pt(n)}else if(e.trigger==="intersect"){var i={};if(e.root){i.root=ue(n,e.root)}if(e.threshold){i.threshold=parseFloat(e.threshold)}var a=new IntersectionObserver(function(e){for(var t=0;t0){t.polling=true;ot(n,r,e)}else{ht(n,r,t,e)}}function At(e){if(!e.htmxExecuted&&Q.config.allowScriptTags&&(e.type==="text/javascript"||e.type==="module"||e.type==="")){var t=re().createElement("script");oe(e.attributes,function(e){t.setAttribute(e.name,e.value)});t.textContent=e.textContent;t.async=false;if(Q.config.inlineScriptNonce){t.nonce=Q.config.inlineScriptNonce}var r=e.parentElement;try{r.insertBefore(t,e)}catch(e){b(e)}finally{if(e.parentElement){e.parentElement.removeChild(e)}}}}function Nt(e){if(h(e,"script")){At(e)}oe(f(e,"script"),function(e){At(e)})}function It(e){var t=e.attributes;if(!t){return false}for(var r=0;r0){var o=n.shift();var s=o.match(/^\s*([a-zA-Z:\-\.]+:)(.*)/);if(a===0&&s){o.split(":");i=s[1].slice(0,-1);r[i]=s[2]}else{r[i]+=o}a+=Bt(o)}for(var l in r){Ft(e,l,r[l])}}}function jt(e){Ae(e);for(var t=0;tQ.config.historyCacheSize){i.shift()}while(i.length>0){try{localStorage.setItem("htmx-history-cache",JSON.stringify(i));break}catch(e){fe(re().body,"htmx:historyCacheError",{cause:e,cache:i});i.shift()}}}function Yt(e){if(!U()){return null}e=B(e);var t=E(localStorage.getItem("htmx-history-cache"))||[];for(var r=0;r=200&&this.status<400){ce(re().body,"htmx:historyCacheMissLoad",o);var e=l(this.response);e=e.querySelector("[hx-history-elt],[data-hx-history-elt]")||e;var t=Zt();var r=T(t);var n=Ve(this.response);if(n){var i=C("title");if(i){i.innerHTML=n}else{window.document.title=n}}Ue(t,e,r);nr(r.tasks);Jt=a;ce(re().body,"htmx:historyRestore",{path:a,cacheMiss:true,serverResponse:this.response})}else{fe(re().body,"htmx:historyCacheMissLoadError",o)}};e.send()}function ar(e){er();e=e||location.pathname+location.search;var t=Yt(e);if(t){var r=l(t.content);var n=Zt();var i=T(n);Ue(n,r,i);nr(i.tasks);document.title=t.title;setTimeout(function(){window.scrollTo(0,t.scroll)},0);Jt=e;ce(re().body,"htmx:historyRestore",{path:e,item:t})}else{if(Q.config.refreshOnHistoryMiss){window.location.reload(true)}else{ir(e)}}}function or(e){var t=me(e,"hx-indicator");if(t==null){t=[e]}oe(t,function(e){var t=ae(e);t.requestCount=(t.requestCount||0)+1;e.classList["add"].call(e.classList,Q.config.requestClass)});return t}function sr(e){var t=me(e,"hx-disabled-elt");if(t==null){t=[]}oe(t,function(e){var t=ae(e);t.requestCount=(t.requestCount||0)+1;e.setAttribute("disabled","")});return t}function lr(e,t){oe(e,function(e){var t=ae(e);t.requestCount=(t.requestCount||0)-1;if(t.requestCount===0){e.classList["remove"].call(e.classList,Q.config.requestClass)}});oe(t,function(e){var t=ae(e);t.requestCount=(t.requestCount||0)-1;if(t.requestCount===0){e.removeAttribute("disabled")}})}function ur(e,t){for(var r=0;r=0}function wr(e,t){var r=t?t:ne(e,"hx-swap");var n={swapStyle:ae(e).boosted?"innerHTML":Q.config.defaultSwapStyle,swapDelay:Q.config.defaultSwapDelay,settleDelay:Q.config.defaultSettleDelay};if(Q.config.scrollIntoViewOnBoost&&ae(e).boosted&&!br(e)){n["show"]="top"}if(r){var i=D(r);if(i.length>0){for(var a=0;a0?l.join(":"):null;n["scroll"]=u;n["scrollTarget"]=f}else if(o.indexOf("show:")===0){var c=o.substr(5);var l=c.split(":");var h=l.pop();var f=l.length>0?l.join(":"):null;n["show"]=h;n["showTarget"]=f}else if(o.indexOf("focus-scroll:")===0){var v=o.substr("focus-scroll:".length);n["focusScroll"]=v=="true"}else if(a==0){n["swapStyle"]=o}else{b("Unknown modifier in hx-swap: "+o)}}}}return n}function Sr(e){return ne(e,"hx-encoding")==="multipart/form-data"||h(e,"form")&&ee(e,"enctype")==="multipart/form-data"}function Er(t,r,n){var i=null;R(r,function(e){if(i==null){i=e.encodeParameters(t,n,r)}});if(i!=null){return i}else{if(Sr(r)){return mr(n)}else{return pr(n)}}}function T(e){return{tasks:[],elts:[e]}}function Cr(e,t){var r=e[0];var n=e[e.length-1];if(t.scroll){var i=null;if(t.scrollTarget){i=ue(r,t.scrollTarget)}if(t.scroll==="top"&&(r||i)){i=i||r;i.scrollTop=0}if(t.scroll==="bottom"&&(n||i)){i=i||n;i.scrollTop=i.scrollHeight}}if(t.show){var i=null;if(t.showTarget){var a=t.showTarget;if(t.showTarget==="window"){a="body"}i=ue(r,a)}if(t.show==="top"&&(r||i)){i=i||r;i.scrollIntoView({block:"start",behavior:Q.config.scrollBehavior})}if(t.show==="bottom"&&(n||i)){i=i||n;i.scrollIntoView({block:"end",behavior:Q.config.scrollBehavior})}}}function Rr(e,t,r,n){if(n==null){n={}}if(e==null){return n}var i=te(e,t);if(i){var a=i.trim();var o=r;if(a==="unset"){return null}if(a.indexOf("javascript:")===0){a=a.substr(11);o=true}else if(a.indexOf("js:")===0){a=a.substr(3);o=true}if(a.indexOf("{")!==0){a="{"+a+"}"}var s;if(o){s=Tr(e,function(){return Function("return ("+a+")")()},{})}else{s=E(a)}for(var l in s){if(s.hasOwnProperty(l)){if(n[l]==null){n[l]=s[l]}}}}return Rr(u(e),t,r,n)}function Tr(e,t,r){if(Q.config.allowEval){return t()}else{fe(e,"htmx:evalDisallowedError");return r}}function Or(e,t){return Rr(e,"hx-vars",true,t)}function qr(e,t){return Rr(e,"hx-vals",false,t)}function Hr(e){return le(Or(e),qr(e))}function Lr(t,r,n){if(n!==null){try{t.setRequestHeader(r,n)}catch(e){t.setRequestHeader(r,encodeURIComponent(n));t.setRequestHeader(r+"-URI-AutoEncoded","true")}}}function Ar(t){if(t.responseURL&&typeof URL!=="undefined"){try{var e=new URL(t.responseURL);return e.pathname+e.search}catch(e){fe(re().body,"htmx:badResponseUrl",{url:t.responseURL})}}}function O(e,t){return t.test(e.getAllResponseHeaders())}function Nr(e,t,r){e=e.toLowerCase();if(r){if(r instanceof Element||I(r,"String")){return he(e,t,null,null,{targetOverride:p(r),returnPromise:true})}else{return he(e,t,p(r.source),r.event,{handler:r.handler,headers:r.headers,values:r.values,targetOverride:p(r.target),swapOverride:r.swap,select:r.select,returnPromise:true})}}else{return he(e,t,null,null,{returnPromise:true})}}function Ir(e){var t=[];while(e){t.push(e);e=e.parentElement}return t}function kr(e,t,r){var n;var i;if(typeof URL==="function"){i=new URL(t,document.location.href);var a=document.location.origin;n=a===i.origin}else{i=t;n=g(t,document.location.origin)}if(Q.config.selfRequestsOnly){if(!n){return false}}return ce(e,"htmx:validateUrl",le({url:i,sameHost:n},r))}function he(t,r,n,i,a,e){var o=null;var s=null;a=a!=null?a:{};if(a.returnPromise&&typeof Promise!=="undefined"){var l=new Promise(function(e,t){o=e;s=t})}if(n==null){n=re().body}var M=a.handler||Mr;var X=a.select||null;if(!se(n)){ie(o);return l}var u=a.targetOverride||ye(n);if(u==null||u==pe){fe(n,"htmx:targetError",{target:te(n,"hx-target")});ie(s);return l}var f=ae(n);var c=f.lastButtonClicked;if(c){var h=ee(c,"formaction");if(h!=null){r=h}var v=ee(c,"formmethod");if(v!=null){if(v.toLowerCase()!=="dialog"){t=v}}}var d=ne(n,"hx-confirm");if(e===undefined){var D=function(e){return he(t,r,n,i,a,!!e)};var U={target:u,elt:n,path:r,verb:t,triggeringEvent:i,etc:a,issueRequest:D,question:d};if(ce(n,"htmx:confirm",U)===false){ie(o);return l}}var g=n;var p=ne(n,"hx-sync");var m=null;var x=false;if(p){var B=p.split(":");var F=B[0].trim();if(F==="this"){g=xe(n,"hx-sync")}else{g=ue(n,F)}p=(B[1]||"drop").trim();f=ae(g);if(p==="drop"&&f.xhr&&f.abortable!==true){ie(o);return l}else if(p==="abort"){if(f.xhr){ie(o);return l}else{x=true}}else if(p==="replace"){ce(g,"htmx:abort")}else if(p.indexOf("queue")===0){var V=p.split(" ");m=(V[1]||"last").trim()}}if(f.xhr){if(f.abortable){ce(g,"htmx:abort")}else{if(m==null){if(i){var y=ae(i);if(y&&y.triggerSpec&&y.triggerSpec.queue){m=y.triggerSpec.queue}}if(m==null){m="last"}}if(f.queuedRequests==null){f.queuedRequests=[]}if(m==="first"&&f.queuedRequests.length===0){f.queuedRequests.push(function(){he(t,r,n,i,a)})}else if(m==="all"){f.queuedRequests.push(function(){he(t,r,n,i,a)})}else if(m==="last"){f.queuedRequests=[];f.queuedRequests.push(function(){he(t,r,n,i,a)})}ie(o);return l}}var b=new XMLHttpRequest;f.xhr=b;f.abortable=x;var w=function(){f.xhr=null;f.abortable=false;if(f.queuedRequests!=null&&f.queuedRequests.length>0){var e=f.queuedRequests.shift();e()}};var j=ne(n,"hx-prompt");if(j){var S=prompt(j);if(S===null||!ce(n,"htmx:prompt",{prompt:S,target:u})){ie(o);w();return l}}if(d&&!e){if(!confirm(d)){ie(o);w();return l}}var E=xr(n,u,S);if(t!=="get"&&!Sr(n)){E["Content-Type"]="application/x-www-form-urlencoded"}if(a.headers){E=le(E,a.headers)}var _=dr(n,t);var C=_.errors;var R=_.values;if(a.values){R=le(R,a.values)}var z=Hr(n);var $=le(R,z);var T=yr($,n);if(Q.config.getCacheBusterParam&&t==="get"){T["org.htmx.cache-buster"]=ee(u,"id")||"true"}if(r==null||r===""){r=re().location.href}var O=Rr(n,"hx-request");var W=ae(n).boosted;var q=Q.config.methodsThatUseUrlParams.indexOf(t)>=0;var H={boosted:W,useUrlParams:q,parameters:T,unfilteredParameters:$,headers:E,target:u,verb:t,errors:C,withCredentials:a.credentials||O.credentials||Q.config.withCredentials,timeout:a.timeout||O.timeout||Q.config.timeout,path:r,triggeringEvent:i};if(!ce(n,"htmx:configRequest",H)){ie(o);w();return l}r=H.path;t=H.verb;E=H.headers;T=H.parameters;C=H.errors;q=H.useUrlParams;if(C&&C.length>0){ce(n,"htmx:validation:halted",H);ie(o);w();return l}var G=r.split("#");var J=G[0];var L=G[1];var A=r;if(q){A=J;var Z=Object.keys(T).length!==0;if(Z){if(A.indexOf("?")<0){A+="?"}else{A+="&"}A+=pr(T);if(L){A+="#"+L}}}if(!kr(n,A,H)){fe(n,"htmx:invalidPath",H);ie(s);return l}b.open(t.toUpperCase(),A,true);b.overrideMimeType("text/html");b.withCredentials=H.withCredentials;b.timeout=H.timeout;if(O.noHeaders){}else{for(var N in E){if(E.hasOwnProperty(N)){var K=E[N];Lr(b,N,K)}}}var I={xhr:b,target:u,requestConfig:H,etc:a,boosted:W,select:X,pathInfo:{requestPath:r,finalRequestPath:A,anchor:L}};b.onload=function(){try{var e=Ir(n);I.pathInfo.responsePath=Ar(b);M(n,I);lr(k,P);ce(n,"htmx:afterRequest",I);ce(n,"htmx:afterOnLoad",I);if(!se(n)){var t=null;while(e.length>0&&t==null){var r=e.shift();if(se(r)){t=r}}if(t){ce(t,"htmx:afterRequest",I);ce(t,"htmx:afterOnLoad",I)}}ie(o);w()}catch(e){fe(n,"htmx:onLoadError",le({error:e},I));throw e}};b.onerror=function(){lr(k,P);fe(n,"htmx:afterRequest",I);fe(n,"htmx:sendError",I);ie(s);w()};b.onabort=function(){lr(k,P);fe(n,"htmx:afterRequest",I);fe(n,"htmx:sendAbort",I);ie(s);w()};b.ontimeout=function(){lr(k,P);fe(n,"htmx:afterRequest",I);fe(n,"htmx:timeout",I);ie(s);w()};if(!ce(n,"htmx:beforeRequest",I)){ie(o);w();return l}var k=or(n);var P=sr(n);oe(["loadstart","loadend","progress","abort"],function(t){oe([b,b.upload],function(e){e.addEventListener(t,function(e){ce(n,"htmx:xhr:"+t,{lengthComputable:e.lengthComputable,loaded:e.loaded,total:e.total})})})});ce(n,"htmx:beforeSend",I);var Y=q?null:Er(b,n,T);b.send(Y);return l}function Pr(e,t){var r=t.xhr;var n=null;var i=null;if(O(r,/HX-Push:/i)){n=r.getResponseHeader("HX-Push");i="push"}else if(O(r,/HX-Push-Url:/i)){n=r.getResponseHeader("HX-Push-Url");i="push"}else if(O(r,/HX-Replace-Url:/i)){n=r.getResponseHeader("HX-Replace-Url");i="replace"}if(n){if(n==="false"){return{}}else{return{type:i,path:n}}}var a=t.pathInfo.finalRequestPath;var o=t.pathInfo.responsePath;var s=ne(e,"hx-push-url");var l=ne(e,"hx-replace-url");var u=ae(e).boosted;var f=null;var c=null;if(s){f="push";c=s}else if(l){f="replace";c=l}else if(u){f="push";c=o||a}if(c){if(c==="false"){return{}}if(c==="true"){c=o||a}if(t.pathInfo.anchor&&c.indexOf("#")===-1){c=c+"#"+t.pathInfo.anchor}return{type:f,path:c}}else{return{}}}function Mr(l,u){var f=u.xhr;var c=u.target;var e=u.etc;var t=u.requestConfig;var h=u.select;if(!ce(l,"htmx:beforeOnLoad",u))return;if(O(f,/HX-Trigger:/i)){_e(f,"HX-Trigger",l)}if(O(f,/HX-Location:/i)){er();var r=f.getResponseHeader("HX-Location");var v;if(r.indexOf("{")===0){v=E(r);r=v["path"];delete v["path"]}Nr("GET",r,v).then(function(){tr(r)});return}var n=O(f,/HX-Refresh:/i)&&"true"===f.getResponseHeader("HX-Refresh");if(O(f,/HX-Redirect:/i)){location.href=f.getResponseHeader("HX-Redirect");n&&location.reload();return}if(n){location.reload();return}if(O(f,/HX-Retarget:/i)){if(f.getResponseHeader("HX-Retarget")==="this"){u.target=l}else{u.target=ue(l,f.getResponseHeader("HX-Retarget"))}}var d=Pr(l,u);var i=f.status>=200&&f.status<400&&f.status!==204;var g=f.response;var a=f.status>=400;var p=Q.config.ignoreTitle;var o=le({shouldSwap:i,serverResponse:g,isError:a,ignoreTitle:p},u);if(!ce(c,"htmx:beforeSwap",o))return;c=o.target;g=o.serverResponse;a=o.isError;p=o.ignoreTitle;u.target=c;u.failed=a;u.successful=!a;if(o.shouldSwap){if(f.status===286){at(l)}R(l,function(e){g=e.transformResponse(g,f,l)});if(d.type){er()}var s=e.swapOverride;if(O(f,/HX-Reswap:/i)){s=f.getResponseHeader("HX-Reswap")}var v=wr(l,s);if(v.hasOwnProperty("ignoreTitle")){p=v.ignoreTitle}c.classList.add(Q.config.swappingClass);var m=null;var x=null;var y=function(){try{var e=document.activeElement;var t={};try{t={elt:e,start:e?e.selectionStart:null,end:e?e.selectionEnd:null}}catch(e){}var r;if(h){r=h}if(O(f,/HX-Reselect:/i)){r=f.getResponseHeader("HX-Reselect")}if(d.type){ce(re().body,"htmx:beforeHistoryUpdate",le({history:d},u));if(d.type==="push"){tr(d.path);ce(re().body,"htmx:pushedIntoHistory",{path:d.path})}else{rr(d.path);ce(re().body,"htmx:replacedInHistory",{path:d.path})}}var n=T(c);je(v.swapStyle,c,l,g,n,r);if(t.elt&&!se(t.elt)&&ee(t.elt,"id")){var i=document.getElementById(ee(t.elt,"id"));var a={preventScroll:v.focusScroll!==undefined?!v.focusScroll:!Q.config.defaultFocusScroll};if(i){if(t.start&&i.setSelectionRange){try{i.setSelectionRange(t.start,t.end)}catch(e){}}i.focus(a)}}c.classList.remove(Q.config.swappingClass);oe(n.elts,function(e){if(e.classList){e.classList.add(Q.config.settlingClass)}ce(e,"htmx:afterSwap",u)});if(O(f,/HX-Trigger-After-Swap:/i)){var o=l;if(!se(l)){o=re().body}_e(f,"HX-Trigger-After-Swap",o)}var s=function(){oe(n.tasks,function(e){e.call()});oe(n.elts,function(e){if(e.classList){e.classList.remove(Q.config.settlingClass)}ce(e,"htmx:afterSettle",u)});if(u.pathInfo.anchor){var e=re().getElementById(u.pathInfo.anchor);if(e){e.scrollIntoView({block:"start",behavior:"auto"})}}if(n.title&&!p){var t=C("title");if(t){t.innerHTML=n.title}else{window.document.title=n.title}}Cr(n.elts,v);if(O(f,/HX-Trigger-After-Settle:/i)){var r=l;if(!se(l)){r=re().body}_e(f,"HX-Trigger-After-Settle",r)}ie(m)};if(v.settleDelay>0){setTimeout(s,v.settleDelay)}else{s()}}catch(e){fe(l,"htmx:swapError",u);ie(x);throw e}};var b=Q.config.globalViewTransitions;if(v.hasOwnProperty("transition")){b=v.transition}if(b&&ce(l,"htmx:beforeTransition",u)&&typeof Promise!=="undefined"&&document.startViewTransition){var w=new Promise(function(e,t){m=e;x=t});var S=y;y=function(){document.startViewTransition(function(){S();return w})}}if(v.swapDelay>0){setTimeout(y,v.swapDelay)}else{y()}}if(a){fe(l,"htmx:responseError",le({error:"Response Status Error Code "+f.status+" from "+u.pathInfo.requestPath},u))}}var Xr={};function Dr(){return{init:function(e){return null},onEvent:function(e,t){return true},transformResponse:function(e,t,r){return e},isInlineSwap:function(e){return false},handleSwap:function(e,t,r,n){return false},encodeParameters:function(e,t,r){return null}}}function Ur(e,t){if(t.init){t.init(r)}Xr[e]=le(Dr(),t)}function Br(e){delete Xr[e]}function Fr(e,r,n){if(e==undefined){return r}if(r==undefined){r=[]}if(n==undefined){n=[]}var t=te(e,"hx-ext");if(t){oe(t.split(","),function(e){e=e.replace(/ /g,"");if(e.slice(0,7)=="ignore:"){n.push(e.slice(7));return}if(n.indexOf(e)<0){var t=Xr[e];if(t&&r.indexOf(t)<0){r.push(t)}}})}return Fr(u(e),r,n)}var Vr=false;re().addEventListener("DOMContentLoaded",function(){Vr=true});function jr(e){if(Vr||re().readyState==="complete"){e()}else{re().addEventListener("DOMContentLoaded",e)}}function _r(){if(Q.config.includeIndicatorStyles!==false){re().head.insertAdjacentHTML("beforeend","")}}function zr(){var e=re().querySelector('meta[name="htmx-config"]');if(e){return E(e.content)}else{return null}}function $r(){var e=zr();if(e){Q.config=le(Q.config,e)}}jr(function(){$r();_r();var e=re().body;zt(e);var t=re().querySelectorAll("[hx-trigger='restored'],[data-hx-trigger='restored']");e.addEventListener("htmx:abort",function(e){var t=e.target;var r=ae(t);if(r&&r.xhr){r.xhr.abort()}});const r=window.onpopstate?window.onpopstate.bind(window):null;window.onpopstate=function(e){if(e.state&&e.state.htmx){ar();oe(t,function(e){ce(e,"htmx:restored",{document:re(),triggerEvent:ce})})}else{if(r){r(e)}}};setTimeout(function(){ce(e,"htmx:load",{});e=null},0)});return Q}()});
\ No newline at end of file
diff --git a/src/ARte/core/static/js/main.js b/src/core/static/js/main.js
similarity index 100%
rename from src/ARte/core/static/js/main.js
rename to src/core/static/js/main.js
diff --git a/src/ARte/core/static/js/multi-marker.js b/src/core/static/js/multi-marker.js
similarity index 100%
rename from src/ARte/core/static/js/multi-marker.js
rename to src/core/static/js/multi-marker.js
diff --git a/src/ARte/core/static/js/pdfGenerator.js b/src/core/static/js/pdfGenerator.js
similarity index 100%
rename from src/ARte/core/static/js/pdfGenerator.js
rename to src/core/static/js/pdfGenerator.js
diff --git a/src/ARte/users/media/markers/.gitkeep b/src/core/static/js/rotationLock.js
similarity index 100%
rename from src/ARte/users/media/markers/.gitkeep
rename to src/core/static/js/rotationLock.js
diff --git a/src/ARte/core/static/js/takePhoto.js b/src/core/static/js/takePhoto.js
similarity index 100%
rename from src/ARte/core/static/js/takePhoto.js
rename to src/core/static/js/takePhoto.js
diff --git a/src/ARte/core/static/js/threex-arpatternfile.js b/src/core/static/js/threex-arpatternfile.js
similarity index 100%
rename from src/ARte/core/static/js/threex-arpatternfile.js
rename to src/core/static/js/threex-arpatternfile.js
diff --git a/src/ARte/core/static/three.min.js b/src/core/static/three.min.js
similarity index 100%
rename from src/ARte/core/static/three.min.js
rename to src/core/static/three.min.js
diff --git a/src/ARte/users/media/objects/.gitkeep b/src/core/tests/__init__.py
similarity index 100%
rename from src/ARte/users/media/objects/.gitkeep
rename to src/core/tests/__init__.py
diff --git a/src/core/tests/test_artworks_api.py b/src/core/tests/test_artworks_api.py
new file mode 100644
index 00000000..f1df0650
--- /dev/null
+++ b/src/core/tests/test_artworks_api.py
@@ -0,0 +1,51 @@
+"""Test using the artwork API for Jandig Artwork"""
+
+from django.conf import settings
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.test import TestCase
+
+from core.models import Artwork, Marker, Object
+from users.models import User
+
+fake_file = SimpleUploadedFile("fake_file.png", b"these are the file contents!")
+
+
+class TestArtworkAPI(TestCase):
+ def setUp(self):
+ self.user = User.objects.create()
+ self.profile = self.user.profile
+
+ def test_url(self):
+ response = self.client.get("/api/v1/artworks/")
+ self.assertEqual(response.status_code, 200)
+ data = response.json()
+ self.assertEqual(data["count"], 0)
+ self.assertEqual(data["next"], None)
+ self.assertEqual(data["previous"], None)
+ self.assertEqual(data["results"], [])
+
+ def test_api_artworks_lists_one_artwork(self):
+ marker = Marker.objects.create(owner=self.profile, source=fake_file)
+ obj = Object.objects.create(owner=self.profile, source=fake_file)
+ artwork = Artwork.objects.create(author=self.profile, augmented=obj, marker=marker)
+ self.assertEqual(artwork.author, self.profile)
+ response = self.client.get("/api/v1/artworks/")
+ self.assertEqual(response.status_code, 200)
+
+ def test_api_artwork_lists_multiple_artworks(self):
+ for _ in range(0, settings.PAGE_SIZE + 1):
+ marker = Marker.objects.create(owner=self.profile, source=fake_file)
+ obj = Object.objects.create(owner=self.profile, source=fake_file)
+ Artwork.objects.create(author=self.profile, augmented=obj, marker=marker)
+
+ response = self.client.get("/api/v1/artworks/")
+ self.assertEqual(response.status_code, 200)
+
+ def test_retrieve_artwork(self):
+ marker = Marker.objects.create(owner=self.profile, source=fake_file)
+ obj = Object.objects.create(owner=self.profile, source=fake_file)
+ artwork = Artwork.objects.create(author=self.profile, augmented=obj, marker=marker) # noqa F841
+ self.assertEqual(artwork.author, self.profile)
+
+ response = self.client.get("/api/v1/artworks/1/")
+ self.assertEqual(response.status_code, 200)
diff --git a/src/core/tests/test_exhibits_api.py b/src/core/tests/test_exhibits_api.py
new file mode 100644
index 00000000..66365b98
--- /dev/null
+++ b/src/core/tests/test_exhibits_api.py
@@ -0,0 +1,52 @@
+"""Test using the exhibit API for Jandig Exhibit"""
+
+from django.conf import settings
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.test import TestCase
+
+from core.models import Artwork, Exhibit, Marker, Object
+from users.models import User
+
+fake_file = SimpleUploadedFile("fake_file.png", b"these are the file contents!")
+
+
+class TestExhibitAPI(TestCase):
+ def setUp(self):
+ self.user = User.objects.create()
+ self.profile = self.user.profile
+
+ def test_url(self):
+ response = self.client.get("/api/v1/exhibits/")
+ self.assertEqual(response.status_code, 200)
+ data = response.json()
+ self.assertEqual(data["count"], 0)
+ self.assertEqual(data["next"], None)
+ self.assertEqual(data["previous"], None)
+ self.assertEqual(data["results"], [])
+
+ def test_api_exhibits_lists_one_exhibit(self):
+ marker = Marker.objects.create(owner=self.profile, source=fake_file)
+ obj = Object.objects.create(owner=self.profile, source=fake_file)
+ artwork = Artwork.objects.create(author=self.profile, augmented=obj, marker=marker)
+ exhibit = Exhibit.objects.create(owner=self.profile, name="test")
+ exhibit.artworks.add(artwork)
+ response = self.client.get("/api/v1/artworks/")
+ self.assertEqual(response.status_code, 200)
+
+ def test_api_exhibit_lists_multiple_exhibits(self):
+ for i in range(0, settings.PAGE_SIZE + 1):
+ marker = Marker.objects.create(owner=self.profile, source=fake_file)
+ obj = Object.objects.create(owner=self.profile, source=fake_file)
+ artwork = Artwork.objects.create(author=self.profile, augmented=obj, marker=marker) # noqa F841
+ exhibit = Exhibit.objects.create(owner=self.profile, name=f"name_{i}", slug=f"slug_{i}") # noqa F841
+ response = self.client.get("/api/v1/exhibits/")
+ self.assertEqual(response.status_code, 200)
+
+ def test_retrieve_exhibit(self):
+ marker = Marker.objects.create(owner=self.profile, source=fake_file)
+ obj = Object.objects.create(owner=self.profile, source=fake_file)
+ artwork = Artwork.objects.create(author=self.profile, augmented=obj, marker=marker)
+ exhibit = Exhibit.objects.create(owner=self.profile, name="test")
+ exhibit.artworks.add(artwork)
+ response = self.client.get("/api/v1/exhibits/1/")
+ self.assertEqual(response.status_code, 200)
diff --git a/src/core/tests/test_markers_api.py b/src/core/tests/test_markers_api.py
new file mode 100644
index 00000000..3ce10ad5
--- /dev/null
+++ b/src/core/tests/test_markers_api.py
@@ -0,0 +1,74 @@
+"""Test using the marker API for Jandig Markers"""
+
+from django.conf import settings
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.test import TestCase
+
+from core.models import Marker
+from core.serializers.markers import MarkerSerializer
+from users.models import User
+
+fake_file = SimpleUploadedFile("fake_file.png", b"these are the file contents!")
+
+
+class TestMarkerAPI(TestCase):
+ def setUp(self):
+ self.user = User.objects.create()
+ self.profile = self.user.profile
+
+ def test_url(self):
+ response = self.client.get("/api/v1/markers/")
+ self.assertEqual(response.status_code, 200)
+ data = response.json()
+ self.assertEqual(data["count"], 0)
+ self.assertEqual(data["next"], None)
+ self.assertEqual(data["previous"], None)
+ self.assertEqual(data["results"], [])
+
+ def test_api_markers_lists_one_marker(self):
+ marker = Marker.objects.create(owner=self.profile, source=fake_file)
+ response = self.client.get("/api/v1/markers/")
+ self.assertEqual(response.status_code, 200)
+ data = response.json()
+ self.assertEqual(data["count"], 1)
+ self.assertEqual(data["next"], None)
+ self.assertEqual(data["previous"], None)
+ first_result = data["results"][0]
+ serializer_data = MarkerSerializer(marker).data
+ serializer_data["source"] = "http://testserver" + serializer_data["source"]
+ # Asserts the serializer is being used by the endpoint
+ self.assertDictEqual(first_result, serializer_data)
+
+ # Asserts the serializer uses all the needed fields
+ self.assertIn("id", first_result)
+ self.assertIn("owner", first_result)
+ self.assertIn("source", first_result)
+ self.assertIn("uploaded_at", first_result)
+ self.assertIn("author", first_result)
+ self.assertIn("title", first_result)
+ self.assertIn("patt", first_result)
+
+ def test_api_markers_lists_multiple_markers(self):
+ for _ in range(0, settings.PAGE_SIZE + 1):
+ Marker.objects.create(owner=self.profile, source=fake_file)
+
+ response = self.client.get("/api/v1/markers/")
+ self.assertEqual(response.status_code, 200)
+ data = response.json()
+ self.assertEqual(data["count"], settings.PAGE_SIZE + 1)
+ self.assertEqual(
+ data["next"],
+ f"http://testserver/api/v1/markers/?limit={settings.PAGE_SIZE}&offset=20",
+ )
+ self.assertEqual(data["previous"], None)
+ self.assertEqual(len(data["results"]), 20)
+
+ def test_retrieve_marker(self):
+ marker = Marker.objects.create(owner=self.profile, source=fake_file)
+ response = self.client.get(f"/api/v1/markers/{marker.id}/")
+ self.assertEqual(response.status_code, 200)
+ data = response.json()
+ serializer_data = MarkerSerializer(marker).data
+ serializer_data["source"] = "http://testserver" + serializer_data["source"]
+ # Asserts the serializer is being used by the endpoint
+ self.assertDictEqual(data, serializer_data)
diff --git a/src/core/tests/test_objects_api.py b/src/core/tests/test_objects_api.py
new file mode 100644
index 00000000..d084ad78
--- /dev/null
+++ b/src/core/tests/test_objects_api.py
@@ -0,0 +1,76 @@
+"""Test using the object API for Jandig Objects"""
+
+from django.conf import settings
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.test import TestCase
+
+from core.models import Object
+from core.serializers.objects import ObjectSerializer
+from users.models import User
+
+fake_file = SimpleUploadedFile("fake_file.png", b"these are the file contents!")
+
+
+class TestObjectAPI(TestCase):
+ def setUp(self):
+ self.user = User.objects.create()
+ self.profile = self.user.profile
+
+ def test_url(self):
+ response = self.client.get("/api/v1/objects/")
+ self.assertEqual(response.status_code, 200)
+ data = response.json()
+ self.assertEqual(data["count"], 0)
+ self.assertEqual(data["next"], None)
+ self.assertEqual(data["previous"], None)
+ self.assertEqual(data["results"], [])
+
+ def test_api_objects_lists_one_object(self):
+ obj = Object.objects.create(owner=self.profile, source=fake_file)
+ response = self.client.get("/api/v1/objects/")
+ self.assertEqual(response.status_code, 200)
+ data = response.json()
+ self.assertEqual(data["count"], 1)
+ self.assertEqual(data["next"], None)
+ self.assertEqual(data["previous"], None)
+ first_result = data["results"][0]
+ serializer_data = ObjectSerializer(obj).data
+ serializer_data["source"] = "http://testserver" + serializer_data["source"]
+ # Asserts the serializer is being used by the endpoint
+ self.assertDictEqual(first_result, serializer_data)
+
+ # Asserts the serializer uses all the needed fields
+ self.assertIn("id", first_result)
+ self.assertIn("owner", first_result)
+ self.assertIn("source", first_result)
+ self.assertIn("uploaded_at", first_result)
+ self.assertIn("author", first_result)
+ self.assertIn("title", first_result)
+ self.assertIn("scale", first_result)
+ self.assertIn("position", first_result)
+ self.assertIn("rotation", first_result)
+
+ def test_api_objects_lists_multiple_objects(self):
+ for _ in range(0, settings.PAGE_SIZE + 1):
+ Object.objects.create(owner=self.profile, source=fake_file)
+
+ response = self.client.get("/api/v1/objects/")
+ self.assertEqual(response.status_code, 200)
+ data = response.json()
+ self.assertEqual(data["count"], settings.PAGE_SIZE + 1)
+ self.assertEqual(
+ data["next"],
+ f"http://testserver/api/v1/objects/?limit={settings.PAGE_SIZE}&offset=20",
+ )
+ self.assertEqual(data["previous"], None)
+ self.assertEqual(len(data["results"]), 20)
+
+ def test_retrieve_object(self):
+ obj = Object.objects.create(owner=self.profile, source=fake_file)
+ response = self.client.get(f"/api/v1/objects/{obj.id}/")
+ self.assertEqual(response.status_code, 200)
+ data = response.json()
+ serializer_data = ObjectSerializer(obj).data
+ serializer_data["source"] = "http://testserver" + serializer_data["source"]
+ # Asserts the serializer is being used by the endpoint
+ self.assertDictEqual(data, serializer_data)
diff --git a/src/core/urls.py b/src/core/urls.py
new file mode 100644
index 00000000..eb4cc5f7
--- /dev/null
+++ b/src/core/urls.py
@@ -0,0 +1,51 @@
+from django.conf import settings
+from django.urls import include, path
+from rest_framework_nested.routers import DefaultRouter
+
+from core.views.artworks import ArtworkViewset
+from core.views.exhibits import ExhibitViewset
+from core.views.markers import MarkerViewset
+from core.views.objects import ObjectViewset
+from core.views.static_views import (
+ community,
+ documentation,
+ health_check,
+ home,
+ marker_generator,
+)
+from core.views.views import (
+ artwork_preview,
+ collection,
+ exhibit_detail,
+ exhibit_select,
+ manifest,
+ robots_txt,
+ see_all,
+ service_worker,
+ upload_image,
+)
+
+api_router = DefaultRouter()
+api_router.register("markers", MarkerViewset, basename="marker")
+api_router.register("objects", ObjectViewset, basename="object")
+api_router.register("artworks", ArtworkViewset, basename="artwork")
+api_router.register("exhibits", ExhibitViewset, basename="exhibit")
+
+urlpatterns = [
+ path("", home, name="home"),
+ path("api/v1/", include(api_router.urls)),
+ path("documentation/", documentation, name="documentation"),
+ path("community/", community, name="community"),
+ path("collection/", collection, name="collection"),
+ path("exhibit_select/", exhibit_select, name="exhibit_select"),
+ path("exhibit/", exhibit_detail, name="exhibit-detail"),
+ path("artwork/", artwork_preview, name="artwork-preview"),
+ path("generator/", marker_generator, name="marker-generator"),
+ path("sw.js", service_worker, name="sw"),
+ path("manifest.json", manifest, name="manifest"),
+ path("upload", upload_image, name="upload-image"),
+ path("i18n/", include("django.conf.urls.i18n")),
+ path("see_all/", see_all, name="see_all"),
+ path("robots.txt/", robots_txt),
+ path(settings.HEALTH_CHECK_URL, health_check),
+]
diff --git a/src/core/views/__init__.py b/src/core/views/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/core/views/artworks.py b/src/core/views/artworks.py
new file mode 100644
index 00000000..eaaea233
--- /dev/null
+++ b/src/core/views/artworks.py
@@ -0,0 +1,10 @@
+from rest_framework.mixins import ListModelMixin, RetrieveModelMixin
+from rest_framework.viewsets import GenericViewSet
+
+from core.models import Artwork
+from core.serializers.artworks import ArtworkSerializer
+
+
+class ArtworkViewset(ListModelMixin, RetrieveModelMixin, GenericViewSet):
+ serializer_class = ArtworkSerializer
+ queryset = Artwork.objects.all().order_by("id")
diff --git a/src/core/views/exhibits.py b/src/core/views/exhibits.py
new file mode 100644
index 00000000..e3a2fe46
--- /dev/null
+++ b/src/core/views/exhibits.py
@@ -0,0 +1,10 @@
+from rest_framework.mixins import ListModelMixin, RetrieveModelMixin
+from rest_framework.viewsets import GenericViewSet
+
+from core.models import Exhibit
+from core.serializers.exhibits import ExhibitSerializer
+
+
+class ExhibitViewset(ListModelMixin, RetrieveModelMixin, GenericViewSet):
+ serializer_class = ExhibitSerializer
+ queryset = Exhibit.objects.all().order_by("id")
diff --git a/src/core/views/markers.py b/src/core/views/markers.py
new file mode 100644
index 00000000..bd185f5a
--- /dev/null
+++ b/src/core/views/markers.py
@@ -0,0 +1,10 @@
+from rest_framework.mixins import ListModelMixin, RetrieveModelMixin
+from rest_framework.viewsets import GenericViewSet
+
+from core.models import Marker
+from core.serializers.markers import MarkerSerializer
+
+
+class MarkerViewset(ListModelMixin, RetrieveModelMixin, GenericViewSet):
+ serializer_class = MarkerSerializer
+ queryset = Marker.objects.all().order_by("id")
diff --git a/src/core/views/objects.py b/src/core/views/objects.py
new file mode 100644
index 00000000..e7a01f61
--- /dev/null
+++ b/src/core/views/objects.py
@@ -0,0 +1,10 @@
+from rest_framework.mixins import ListModelMixin, RetrieveModelMixin
+from rest_framework.viewsets import GenericViewSet
+
+from core.models import Object
+from core.serializers.objects import ObjectSerializer
+
+
+class ObjectViewset(ListModelMixin, RetrieveModelMixin, GenericViewSet):
+ serializer_class = ObjectSerializer
+ queryset = Object.objects.all().order_by("id")
diff --git a/src/core/views/static_views.py b/src/core/views/static_views.py
new file mode 100644
index 00000000..e1bc971d
--- /dev/null
+++ b/src/core/views/static_views.py
@@ -0,0 +1,26 @@
+from django.http import JsonResponse
+from django.shortcuts import render
+
+
+def home(request):
+ return render(request, "users/profile.jinja2", {})
+
+
+def documentation(request):
+ return render(request, "core/documentation.jinja2", {})
+
+
+def ar_viewer(request):
+ return render(request, "core/exhibit.jinja2")
+
+
+def community(request):
+ return render(request, "core/community.jinja2")
+
+
+def marker_generator(request):
+ return render(request, "core/generator.html", {})
+
+
+def health_check(request):
+ return JsonResponse({"status": "ok"}, status=200)
diff --git a/src/core/views/views.py b/src/core/views/views.py
new file mode 100644
index 00000000..8e38659d
--- /dev/null
+++ b/src/core/views/views.py
@@ -0,0 +1,133 @@
+from django.core.paginator import Paginator
+from django.http import HttpResponse, HttpResponseRedirect
+from django.shortcuts import redirect, render
+from django.urls import reverse
+from django.views.decorators.cache import cache_page
+from django.views.decorators.http import require_http_methods
+
+from core.forms import ExhibitForm, UploadFileForm
+from core.helpers import handle_upload_image
+from core.models import Artwork, Exhibit, Marker, Object
+
+
+@cache_page(60 * 60)
+@require_http_methods(["GET"])
+def service_worker(request):
+ return render(request, "core/sw.js", content_type="application/x-javascript")
+
+
+@cache_page(60 * 60)
+@require_http_methods(["GET"])
+def manifest(request):
+ return render(
+ request, "core/manifest.json", content_type="application/x-javascript"
+ )
+
+
+def index(request):
+ ctx = {"artworks": []}
+
+ return render(request, "core/exhibit.jinja2", ctx)
+
+
+@cache_page(60 * 2)
+@require_http_methods(["GET"])
+def collection(request):
+ exhibits = Exhibit.objects.all().order_by("creation_date")[:4]
+ artworks = Artwork.objects.all().order_by("created_at")[:6]
+ markers = Marker.objects.all().order_by("uploaded_at")[:8]
+ objects = Object.objects.all().order_by("uploaded_at")[:8]
+
+ ctx = {
+ "artworks": artworks,
+ "exhibits": exhibits,
+ "markers": markers,
+ "objects": objects,
+ "seeall": False,
+ }
+
+ return render(request, "core/collection.jinja2", ctx)
+
+
+@cache_page(60 * 2)
+@require_http_methods(["GET"])
+def see_all(request):
+ request_type = request.GET.get("which")
+ ctx = {}
+ per_page = 20
+ page = request.GET.get("page", 1)
+
+ data_types = {
+ "objects": Object.objects.all().order_by("uploaded_at"),
+ "markers": Marker.objects.all().order_by("uploaded_at"),
+ "artworks": Artwork.objects.all().order_by("created_at"),
+ "exhibits": Exhibit.objects.all().order_by("creation_date"),
+ }
+
+ data = data_types.get(request_type)
+ if data:
+ paginator = Paginator(data, per_page)
+ data = paginator.get_page(page)
+ data.adjusted_elided_pages = paginator.get_elided_page_range(page)
+ ctx = {
+ request_type: data,
+ "seeall": True,
+ }
+
+ return render(request, "core/collection.jinja2", ctx)
+
+
+def upload_image(request):
+ if request.method == "POST":
+ form = UploadFileForm(request.POST, request.FILES)
+ image = request.FILES.get("file")
+ if form.is_valid() and image:
+ handle_upload_image(image)
+ return HttpResponseRedirect(reverse("index"))
+ else:
+ form = UploadFileForm()
+ return render(request, "core/upload.jinja2", {"form": form})
+
+
+def exhibit_select(request):
+ if request.method == "POST":
+ form = ExhibitForm(request.POST)
+ if form.is_valid():
+ exhibit = form.cleaned_data.get("exhibit")
+ return redirect("/" + exhibit.slug)
+ else:
+ form = ExhibitForm()
+
+ return render(request, "core/exhibit_select.jinja2", {"form": form})
+
+
+@cache_page(60 * 60)
+@require_http_methods(["GET"])
+def exhibit_detail(request):
+ index = request.GET.get("id")
+ exhibit = Exhibit.objects.get(id=index)
+ ctx = {
+ "exhibit": exhibit,
+ "exhibitImage": "https://cdn3.iconfinder.com/data/icons/basic-mobile-part-2/512/painter-512.png",
+ "artworks": exhibit.artworks.all(),
+ }
+ return render(request, "core/exhibit_detail.jinja2", ctx)
+
+
+@require_http_methods(["GET"])
+def artwork_preview(request):
+ artwork_id = request.GET.get("id")
+
+ ctx = {
+ "artworks": Artwork.objects.filter(id=artwork_id).order_by("-id"),
+ }
+ return render(request, "core/exhibit.jinja2", ctx)
+
+
+@require_http_methods(["GET"])
+def robots_txt(request):
+ lines = [
+ "User-Agent: *",
+ "Disallow: ",
+ ]
+ return HttpResponse("\n".join(lines), content_type="text/plain")
diff --git a/src/data/nginx/http.conf b/src/data/nginx/http.conf
deleted file mode 100644
index 2ed04c0e..00000000
--- a/src/data/nginx/http.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-server {
- listen 80;
- server_name dev.jandig.app;
-
- location / {
- return 301 https://$host$request_uri;
- }
-
- location /.well-known/acme-challenge/ {
- root /var/www/certbot;
- }
-}
-server {
- listen 80;
- server_name staging.jandig.app;
-
- location / {
- return 301 https://$host$request_uri;
- }
-
- location /.well-known/acme-challenge/ {
- root /var/www/certbot;
- }
-}
-server {
- listen 80;
- server_name jandig.app;
-
- location / {
- return 301 https://$host$request_uri;
- }
-
- location /.well-known/acme-challenge/ {
- root /var/www/certbot;
- }
-}
\ No newline at end of file
diff --git a/src/data/nginx/ssl.conf b/src/data/nginx/ssl.conf
deleted file mode 100644
index f9c7d854..00000000
--- a/src/data/nginx/ssl.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-# upstream dev_django {
-# server 208.113.128.83:8000;
-# }
-# upstream staging_django {
-# server 208.113.128.83:8001;
-# }
-# upstream prod_django {
-# server 208.113.128.83:8002;
-# }
-
-server {
- listen 443 ssl;
- server_name dev.jandig.app;
-
- ssl_certificate /etc/letsencrypt/live/dev.jandig.app/fullchain.pem;
- ssl_certificate_key /etc/letsencrypt/live/dev.jandig.app/privkey.pem;
-
- include /etc/letsencrypt/options-ssl-nginx.conf;
- ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-
- location / {
- proxy_set_header Host $http_host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_pass http://dev_django:8000/;
- }
-
- location /static {
- alias /usr/share/nginx/html/static/dev;
- }
- charset utf-8;
- client_max_body_size 0;
-}
-server {
- listen 443 ssl;
- server_name staging.jandig.app;
-
- ssl_certificate /etc/letsencrypt/live/staging.jandig.app/fullchain.pem;
- ssl_certificate_key /etc/letsencrypt/live/staging.jandig.app/privkey.pem;
-
- include /etc/letsencrypt/options-ssl-nginx.conf;
- ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-
- location / {
- proxy_set_header Host $http_host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_pass http://staging_django:8000/;
- }
-
- location /static {
- alias /usr/share/nginx/html/static/staging;
- }
- charset utf-8;
- client_max_body_size 0;
-}
-server {
- listen 443 ssl;
- server_name jandig.app;
-
- ssl_certificate /etc/letsencrypt/live/jandig.app/fullchain.pem;
- ssl_certificate_key /etc/letsencrypt/live/jandig.app/privkey.pem;
-
- include /etc/letsencrypt/options-ssl-nginx.conf;
- ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-
- location / {
- proxy_set_header Host $http_host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_pass http://prod_django:8000/;
- }
-
- location /static {
- alias /usr/share/nginx/html/static/prod;
- }
- charset utf-8;
- client_max_body_size 0;
-}
\ No newline at end of file
diff --git a/src/manage.py b/src/manage.py
new file mode 100755
index 00000000..41464304
--- /dev/null
+++ b/src/manage.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
+ try:
+ from django.core.management import execute_from_command_line
+ except ImportError as exc:
+ raise ImportError("Couldn't import Django. Are you sure it's installed and " "available on your PYTHONPATH environment variable? Did you " "forget to activate a virtual environment?") from exc
+ execute_from_command_line(sys.argv)
diff --git a/src/requirements.txt b/src/requirements.txt
deleted file mode 100644
index c498a8fc..00000000
--- a/src/requirements.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-django ~= 2.2.24
-jinja2 ~= 2.10
-gunicorn ~= 19.0
-pillow ~= 5.3.0
-django-cors-headers
-invoke ~= 1.2.0
-django-environ == 0.4.4
-psycopg2-binary~=2.8.6
-django-boogie
-sphinx ~= 2.1.1
-django-docs ~= 0.3.1
-babel ~= 2.7.0
-django-debug-toolbar
-gevent
-django-extensions
-factory_boy
-boto3~=1.17.26
-django-storages~=1.11.1
-sentry-sdk~=1.3.1
\ No newline at end of file
diff --git a/src/tests/home_tests.py b/src/tests/home_tests.py
new file mode 100644
index 00000000..a1cc097e
--- /dev/null
+++ b/src/tests/home_tests.py
@@ -0,0 +1,22 @@
+import re
+from playwright.sync_api import Page, expect
+
+def test_home_loads_in_english(page: Page):
+ page.goto("http://localhost:8000/")
+
+ page.get_by_role("heading", name="Welcome to Jandig").click()
+
+
+def test_changing_language_to_portuguese_and_back_to_english(page: Page) -> None:
+ page.goto("http://localhost:8000/")
+ page.locator(".trigger-lang-modal").click()
+ page.get_by_label("pt-br").check()
+ page.get_by_role("button", name="Ok").click()
+ expect(page).to_have_url("http://localhost:8000/")
+
+ expect(page.get_by_role("heading")).to_have_text("Bem vindo ao Jandig")
+ page.locator(".trigger-lang-modal").click()
+ page.get_by_label("en-us").check()
+ page.get_by_role("button", name="Ok").click()
+ expect(page).to_have_url("http://localhost:8000/")
+ expect(page.get_by_role("heading")).to_have_text("Welcome to Jandig")
\ No newline at end of file
diff --git a/src/users/__init__.py b/src/users/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/users/admin.py b/src/users/admin.py
new file mode 100644
index 00000000..64b5c99c
--- /dev/null
+++ b/src/users/admin.py
@@ -0,0 +1,108 @@
+from typing import Any
+from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.models import User
+from django.db.models.query import QuerySet
+from django.http import HttpRequest
+from django.db.models import Q, Count
+from django.urls import reverse
+from django.utils.html import format_html
+from django.contrib import admin
+from users.models import Profile
+from django.contrib.admin.filters import ListFilter
+admin.site.unregister(User)
+
+class NoArtFilter(admin.SimpleListFilter):
+ title = "Art Qtdy"
+
+ # Parameter for the filter that will be used in the URL query.
+ parameter_name = "art_qtd"
+ def lookups(self, request, model_admin):
+ return [
+ ("no_artwork", "Zero Artworks"),
+ ("no_marker", "Zero Markers"),
+ ("no_objects", "Zero Objects"),
+ ("no_exhibits", "Zero Exhibits"),
+ ("no_art", "Zero Content"),
+ ]
+
+ def queryset(self, request, queryset):
+ conditions = Q()
+ if not self.value():
+ return queryset
+ query = self.value().split(",")
+ if "no_artwork" in query:
+ conditions &= Q(_artworks_count=0)
+ if "no_marker" in query:
+ conditions &= Q(_markers_count=0)
+ if "no_objects" in query:
+ conditions &= Q(_ar_objects_count=0)
+ if "no_exhibits" in query:
+ conditions &= Q(_exhibits_count=0)
+ if "no_art" in query:
+ return queryset.filter(Q(_artworks_count=0)&Q(_ar_objects_count=0)&Q(_exhibits_count=0)&Q(_markers_count=0))
+
+ # Apply the filter
+ filtered_queryset = queryset.filter(conditions)
+ return filtered_queryset
+
+@admin.register(Profile)
+class ProfileAdmin(admin.ModelAdmin):
+ list_display=["id", "user_link","artworks_count","markers_count","ar_objects_count","exhibits_count", "created", "last_login"]
+ ordering=["-id"]
+ list_filter = [NoArtFilter]
+ def get_queryset(self, request):
+ queryset = super().get_queryset(request).select_related("user").prefetch_related("artworks", "markers", "exhibits", "ar_objects")
+ queryset = queryset.annotate(
+ _markers_count = Count("markers", distinct=True),
+ _artworks_count = Count("artworks", distinct=True),
+ _ar_objects_count = Count("ar_objects", distinct=True),
+ _exhibits_count = Count("exhibits", distinct=True)
+ )
+ return queryset
+
+ def username(self, obj):
+ return obj.user.username
+
+ def created(self,obj):
+ return obj.user.date_joined
+
+ def last_login(self,obj):
+ return obj.user.last_login
+
+ def user_link(self,obj):
+ """Link to related User"""
+ link = reverse("admin:index") + "auth/user/?id=" + str(obj.user.id)
+ return format_html('{}', link, obj.user.username)
+
+ def artworks_count(self, obj):
+ return obj._artworks_count
+
+ def markers_count(self, obj):
+ return obj._markers_count
+
+ def ar_objects_count(self, obj):
+ return obj._ar_objects_count
+
+ def exhibits_count(self, obj):
+ return obj._exhibits_count
+
+ artworks_count.admin_order_field = "_artworks_count"
+ markers_count.admin_order_field= "_markers_count"
+ ar_objects_count.admin_order_field="_ar_objects_count"
+ exhibits_count.admin_order_field="_exhibits_count"
+
+
+@admin.register(User)
+class JandigUserAdmin(UserAdmin):
+ list_display = ("username", "email","profile_link", "last_login", "date_joined", "is_staff")
+ list_filter = ("is_staff", "is_superuser", "is_active", "groups")
+ def get_queryset(self, request: HttpRequest) -> QuerySet[Any]:
+ queryset = super().get_queryset(request).select_related("profile")
+ return queryset
+
+
+ def profile_link(self,obj):
+ """Link to related Profile"""
+ link = reverse("admin:index") + "users/profile/?id=" + str(obj.profile.id)
+ return format_html('{}', link, obj.username)
diff --git a/src/ARte/users/apps.py b/src/users/apps.py
similarity index 77%
rename from src/ARte/users/apps.py
rename to src/users/apps.py
index 4ce1fabc..3ef1284a 100644
--- a/src/ARte/users/apps.py
+++ b/src/users/apps.py
@@ -2,4 +2,4 @@
class UsersConfig(AppConfig):
- name = 'users'
+ name = "users"
diff --git a/src/users/choices.py b/src/users/choices.py
new file mode 100644
index 00000000..c9cc23b2
--- /dev/null
+++ b/src/users/choices.py
@@ -0,0 +1,239 @@
+COUNTRY_CHOICES = (
+ ("AF", "AFGHANISTAN"),
+ ("AL", "ALBANIA"),
+ ("DZ", "ALGERIA"),
+ ("AS", "AMERICAN SAMOA"),
+ ("AD", "ANDORRA"),
+ ("AO", "ANGOLA"),
+ ("AI", "ANGUILLA"),
+ ("AQ", "ANTARCTICA"),
+ ("AG", "ANTIGUA AND BARBUDA"),
+ ("AR", "ARGENTINA"),
+ ("AM", "ARMENIA"),
+ ("AW", "ARUBA"),
+ ("AU", "AUSTRALIA"),
+ ("AT", "AUSTRIA"),
+ ("AZ", "AZERBAIJAN"),
+ ("BS", "BAHAMAS"),
+ ("BH", "BAHRAIN"),
+ ("BD", "BANGLADESH"),
+ ("BB", "BARBADOS"),
+ ("BY", "BELARUS"),
+ ("BE", "BELGIUM"),
+ ("BZ", "BELIZE"),
+ ("BJ", "BENIN"),
+ ("BM", "BERMUDA"),
+ ("BT", "BHUTAN"),
+ ("BO", "BOLIVIA"),
+ ("BA", "BOSNIA AND HERZEGOVINA"),
+ ("BW", "BOTSWANA"),
+ ("BV", "BOUVET ISLAND"),
+ ("BR", "BRAZIL"),
+ ("IO", "BRITISH INDIAN OCEAN TERRITORY"),
+ ("BN", "BRUNEI DARUSSALAM"),
+ ("BG", "BULGARIA"),
+ ("BF", "BURKINA FASO"),
+ ("BI", "BURUNDI"),
+ ("KH", "CAMBODIA"),
+ ("CM", "CAMEROON"),
+ ("CA", "CANADA"),
+ ("CV", "CAPE VERDE"),
+ ("KY", "CAYMAN ISLANDS"),
+ ("CF", "CENTRAL AFRICAN REPUBLIC"),
+ ("TD", "CHAD"),
+ ("CL", "CHILE"),
+ ("CN", "PEOPLE'S REPUBLIC OF CHINA"),
+ ("CX", "ISLAND"),
+ ("CC", "COCOS (KEELING) ISLANDS"),
+ ("CO", "COLOMBIA"),
+ ("KM", "COMOROS"),
+ ("CG", "CONGO"),
+ ("CD", "CONGO, THE DEMOCRATIC REPUBLIC OF"),
+ ("CK", "COOK ISLANDS"),
+ ("CR", "COSTA RICA"),
+ ("CI", "CÔTE D'IVOIRE"),
+ ("HR", "CROATIA"),
+ ("CU", "CUBA"),
+ ("CY", "CYPRUS"),
+ ("CZ", "CZECH REPUBLIC"),
+ ("DK", "DENMARK"),
+ ("DJ", "DJIBOUTI"),
+ ("DM", "DOMINICA"),
+ ("DO", "DOMINICAN REPUBLIC"),
+ ("EC", "ECUADOR"),
+ ("EG", "EGYPT"),
+ ("EH", "WESTERN SAHARA"),
+ ("SV", "EL SALVADOR"),
+ ("GQ", "EQUATORIAL GUINEA"),
+ ("ER", "ERITREA"),
+ ("EE", "ESTONIA"),
+ ("ET", "ETHIOPIA"),
+ ("FK", "FALKLAND ISLANDS (MALVINAS)"),
+ ("FO", "ISLANDS"),
+ ("FJ", "FIJI"),
+ ("FI", "FINLAND"),
+ ("FR", "FRANCE"),
+ ("GF", "FRENCH GUIANA"),
+ ("PF", "FRENCH POLYNESIA"),
+ ("TF", "FRENCH SOUTHERN TERRITORIES"),
+ ("GA", "GABON"),
+ ("GM", "GAMBIA"),
+ ("GE", "GEORGIA"),
+ ("DE", "GERMANY"),
+ ("GH", "GHANA"),
+ ("GI", "GIBRALTAR"),
+ ("GR", "GREECE"),
+ ("GL", "GREENLAND"),
+ ("GD", "GRENADA"),
+ ("GP", "GUADELOUPE"),
+ ("GU", "GUAM"),
+ ("GT", "GUATEMALA"),
+ ("GN", "GUINEA"),
+ ("GW", "GUINEA-BISSAU"),
+ ("GY", "GUYANA"),
+ ("HT", "HAITI"),
+ ("HM", "HEARD ISLAND AND MCDONALD ISLANDS"),
+ ("HN", "HONDURAS"),
+ ("HK", "HONG KONG"),
+ ("HU", "HUNGARY"),
+ ("IS", "ICELAND"),
+ ("IN", "INDIA"),
+ ("ID", "INDONESIA"),
+ ("IR", "IRAN, ISLAMIC REPUBLIC OF"),
+ ("IQ", "IRAQ"),
+ ("IE", "IRELAND"),
+ ("IL", "ISRAEL"),
+ ("IT", "ITALY"),
+ ("JM", "JAMAICA"),
+ ("JP", "JAPAN"),
+ ("JO", "JORDAN"),
+ ("KZ", "KAZAKHSTAN"),
+ ("KE", "KENYA"),
+ ("KI", "KIRIBATI"),
+ ("KP", "KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF"),
+ ("KR", "KOREA, REPUBLIC OF"),
+ ("KW", "KUWAIT"),
+ ("KG", "KYRGYZSTAN"),
+ ("LA", "LAO PEOPLE'S DEMOCRATIC REPUBLIC"),
+ ("LV", "LATVIA"),
+ ("LB", "LEBANON"),
+ ("LS", "LESOTHO"),
+ ("LR", "LIBERIA"),
+ ("LY", "LIBYAN ARAB JAMAHIRIYA"),
+ ("LI", "LIECHTENSTEIN"),
+ ("LT", "LITHUANIA"),
+ ("LU", "LUXEMBOURG"),
+ ("MO", "MACAO"),
+ ("MK", "MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF"),
+ ("MG", "MADAGASCAR"),
+ ("MW", "MALAWI"),
+ ("MY", "MALAYSIA"),
+ ("MV", "MALDIVES"),
+ ("ML", "MALI"),
+ ("MT", "MALTA"),
+ ("MH", "MARSHALL ISLANDS"),
+ ("MQ", "MARTINIQUE"),
+ ("MR", "MAURITANIA"),
+ ("MU", "MAURITIUS"),
+ ("YT", "MAYOTTE"),
+ ("MX", "MEXICO"),
+ ("FM", "MICRONESIA, FEDERATED STATES OF"),
+ ("MD", "MOLDOVA, REPUBLIC OF"),
+ ("MC", "MONACO"),
+ ("MN", "MONGOLIA"),
+ ("MS", "MONTSERRAT"),
+ ("MA", "MOROCCO"),
+ ("MZ", "MOZAMBIQUE"),
+ ("MM", "MYANMAR"),
+ ("NA", "NAMIBIA"),
+ ("NR", "NAURU"),
+ ("NP", "NEPAL"),
+ ("NL", "NETHERLANDS"),
+ ("AN", "NETHERLANDS ANTILLES"),
+ ("NC", "NEW CALEDONIA"),
+ ("NZ", "NEW ZEALAND"),
+ ("NI", "NICARAGUA"),
+ ("NE", "NIGER"),
+ ("NG", "NIGERIA"),
+ ("NU", "NIUE"),
+ ("NF", "NORFOLK ISLAND"),
+ ("MP", "NORTHERN MARIANA ISLANDS"),
+ ("NO", "NORWAY"),
+ ("OM", "OMAN"),
+ ("PK", "PAKISTAN"),
+ ("PW", "PALAU"),
+ ("PS", "PALESTINIAN TERRITORY, OCCUPIED"),
+ ("PA", "PANAMA"),
+ ("PG", "PAPUA NEW GUINEA"),
+ ("PY", "PARAGUAY"),
+ ("PE", "PERU"),
+ ("PH", "PHILIPPINES"),
+ ("PN", "PITCAIRN"),
+ ("PL", "POLAND"),
+ ("PT", "PORTUGAL"),
+ ("PR", "PUERTO RICO"),
+ ("QA", "QATAR"),
+ ("RE", "RÉUNION"),
+ ("RO", "ROMANIA"),
+ ("RU", "RUSSIAN FEDERATION"),
+ ("RW", "RWANDA"),
+ ("SH", "SAINT HELENA"),
+ ("KN", "SAINT KITTS AND NEVIS"),
+ ("LC", "SAINT LUCIA"),
+ ("PM", "SAINT PIERRE AND MIQUELON"),
+ ("VC", "SAINT VINCENT AND THE GRENADINES"),
+ ("WS", "SAMOA"),
+ ("SM", "SAN MARINO"),
+ ("ST", "SAO TOME AND PRINCIPE"),
+ ("SA", "SAUDI ARABIA"),
+ ("SN", "SENEGAL"),
+ ("CS", "SERBIA AND MONTENEGRO"),
+ ("SC", "SEYCHELLES"),
+ ("SL", "SIERRA LEONE"),
+ ("SG", "SINGAPORE"),
+ ("SK", "SLOVAKIA"),
+ ("SI", "SLOVENIA"),
+ ("SB", "SOLOMON ISLANDS"),
+ ("SO", "SOMALIA"),
+ ("ZA", "SOUTH AFRICA"),
+ ("GS", "SOUTH GEORGIA AND SOUTH SANDWICH ISLANDS"),
+ ("ES", "SPAIN"),
+ ("LK", "SRI LANKA"),
+ ("SD", "SUDAN"),
+ ("SR", "SURINAME"),
+ ("SJ", "SVALBARD AND JAN MAYEN"),
+ ("SZ", "SWAZILAND"),
+ ("SE", "SWEDEN"),
+ ("CH", "SWITZERLAND"),
+ ("SY", "SYRIAN ARAB REPUBLIC"),
+ ("TW", "TAIWAN, REPUBLIC OF CHINA"),
+ ("TJ", "TAJIKISTAN"),
+ ("TZ", "TANZANIA, UNITED REPUBLIC OF"),
+ ("TH", "THAILAND"),
+ ("TL", "TIMOR-LESTE"),
+ ("TG", "TOGO"),
+ ("TK", "TOKELAU"),
+ ("TO", "TONGA"),
+ ("TT", "TRINIDAD AND TOBAGO"),
+ ("TN", "TUNISIA"),
+ ("TR", "TURKEY"),
+ ("TM", "TURKMENISTAN"),
+ ("TC", "TURKS AND CAICOS ISLANDS"),
+ ("TV", "TUVALU"),
+ ("UG", "UGANDA"),
+ ("UA", "UKRAINE"),
+ ("AE", "UNITED ARAB EMIRATES"),
+ ("GB", "UNITED KINGDOM"),
+ ("US", "UNITED STATES"),
+ ("UM", "UNITED STATES MINOR OUTLYING ISLANDS"),
+ ("UY", "URUGUAY"),
+ ("UZ", "UZBEKISTAN"),
+ ("VE", "VENEZUELA"),
+ ("VU", "VANUATU"),
+ ("VN", "VIET NAM"),
+ ("VG", "BRITISH VIRGIN ISLANDS"),
+ ("VI", "U.S. VIRGIN ISLANDS"),
+ ("WF", "WALLIS AND FUTUNA"),
+ ("YE", "YEMEN"),
+ ("ZW", "ZIMBABWE"),
+)
diff --git a/src/users/factory.py b/src/users/factory.py
new file mode 100644
index 00000000..fc89688a
--- /dev/null
+++ b/src/users/factory.py
@@ -0,0 +1,28 @@
+from django.contrib.auth.models import User
+from factory.django import DjangoModelFactory
+
+from core.models import Object
+
+
+class UserFactory(DjangoModelFactory):
+ username = "Testador"
+ email = "testador@memelab.com"
+
+ class Meta:
+ model = User
+
+
+class ObjectFactory(DjangoModelFactory):
+ id = 1
+ source = "objects/osaka.gif"
+ owner = "Matheus"
+ author = "Matheus"
+ uploaded_at = (2020, 11, 25, 14, 30, 0)
+ title = "osaka"
+ position = "0 0 0"
+ scale = "1 1"
+ rotation = "270 0 0"
+
+ class Meta:
+
+ model = Object
diff --git a/src/users/forms.py b/src/users/forms.py
new file mode 100644
index 00000000..7e321b84
--- /dev/null
+++ b/src/users/forms.py
@@ -0,0 +1,281 @@
+import logging
+import re
+from io import BytesIO
+
+from django import forms
+from django.contrib.auth import authenticate, get_user_model
+from django.contrib.auth.forms import AuthenticationForm
+from django.contrib.auth.forms import PasswordChangeForm as OrigPasswordChangeForm
+from django.contrib.auth.forms import UserCreationForm
+from django.core.files.base import ContentFile, File
+from django.forms.widgets import HiddenInput
+from django.utils.translation import gettext_lazy as _
+from PIL import Image
+from pymarker.core import generate_marker_from_image, generate_patt_from_image
+
+from core.models import Marker, Object
+
+from .choices import COUNTRY_CHOICES
+
+log = logging.getLogger("ej")
+
+User = get_user_model()
+
+
+class SignupForm(UserCreationForm):
+ """
+ Form to register a new user
+ """
+
+ email = forms.EmailField(
+ max_length=254,
+ help_text=_("Your e-mail address"),
+ )
+
+ username = forms.CharField(
+ max_length=12,
+ help_text=_("Your username"),
+ )
+
+ def __init__(self, *args, **kwargs):
+ super(SignupForm, self).__init__(*args, **kwargs)
+
+ self.fields["email"].widget.attrs["placeholder"] = _("email")
+ self.fields["username"].widget.attrs["placeholder"] = _("chosen username")
+ self.fields["password1"].widget.attrs["placeholder"] = _("password")
+ self.fields["password2"].widget.attrs["placeholder"] = _("confirm password")
+
+ class Meta:
+ model = User
+ fields = ["email", "username", "password1", "password2"]
+
+ def clean_email(self):
+ email = self.cleaned_data.get("email")
+ username = self.cleaned_data.get("username")
+ if email and User.objects.filter(email=email).exclude(username=username).exists():
+ raise forms.ValidationError(_("E-mail taken"))
+
+ return email
+
+
+class PasswordChangeForm(OrigPasswordChangeForm):
+ def __init__(self, *args, **kwargs):
+ super(PasswordChangeForm, self).__init__(*args, **kwargs)
+ self.fields["old_password"].widget.attrs["placeholder"] = _("Old Password")
+ self.fields["new_password1"].widget.attrs["placeholder"] = _("New Password")
+ self.fields["new_password2"].widget.attrs["placeholder"] = _("New Password Again")
+
+
+class ProfileForm(forms.ModelForm):
+ class Meta:
+ model = User
+ fields = ["username", "email", "bio", "country", "personal_site"]
+
+ field_order = ["email", "username", "personal_site", "country", "bio"]
+
+ def __init__(self, *args, **kwargs):
+ super(ProfileForm, self).__init__(*args, **kwargs)
+ self.initial["username"] = self.instance.user.username
+
+ # FIXME: user.email come as a string of a tuple, no idea why. "('email@bla.com',)"
+ # email = self.instance.user.email.replace("('", "").replace("',)", "")
+ self.initial["email"] = self.instance.user.email
+ self.initial["bio"] = self.instance.bio
+ self.initial["country"] = self.instance.country
+ self.initial["personal_site"] = self.instance.personal_site
+ self.fields["email"].widget.attrs["placeholder"] = _("E-mail")
+ self.fields["username"].widget.attrs["placeholder"] = _("Username")
+ self.fields["bio"].widget.attrs["placeholder"] = _("Personal Bio / Description")
+ self.fields["personal_site"].widget.attrs["placeholder"] = _("Personal Website")
+
+ email = forms.EmailField(
+ max_length=254,
+ help_text=_("Your e-mail address"),
+ )
+ username = forms.CharField(
+ max_length=12,
+ help_text=_("Your username"),
+ )
+ country = forms.ChoiceField(choices=COUNTRY_CHOICES, required=False)
+ bio = forms.CharField(
+ max_length=500,
+ required=False,
+ widget=forms.Textarea,
+ help_text=_("Personal Bio / Description"),
+ )
+ personal_site = forms.URLField(
+ required=False,
+ help_text=_("Personal Website"),
+ )
+
+ def clean_username(self):
+ username = self.cleaned_data.get("username")
+ if username and User.objects.filter(username=username).exclude(username=self.instance.user.username).exists():
+ raise forms.ValidationError(_("Username already in use"))
+ return username
+
+ def clean_email(self):
+ email = self.cleaned_data.get("email")
+ if email and User.objects.filter(email=email).exclude(username=self.instance.user.username).exists():
+ raise forms.ValidationError(_("Email address must be unique"))
+
+ return email
+
+
+class LoginForm(AuthenticationForm):
+ def __init__(self, *args, **kwargs):
+ super(LoginForm, self).__init__(*args, **kwargs)
+ self.fields["username"].widget.attrs["placeholder"] = _("username / email")
+ self.fields["password"].widget.attrs["placeholder"] = _("password")
+
+ def clean_username(self):
+ username_or_email = self.cleaned_data.get("username")
+ if "@" in username_or_email:
+ if not User.objects.filter(email=username_or_email).exists():
+ raise forms.ValidationError(_("Username/email not found"))
+ user = User.objects.get(email=username_or_email)
+ if user:
+ return user.username
+ else:
+ if not User.objects.filter(username=username_or_email).exists():
+ raise forms.ValidationError(_("Username/email not found"))
+
+ # Already is a valid username
+ return username_or_email
+
+ def clean_password(self):
+ password = self.cleaned_data.get("password")
+ username_or_email = self.cleaned_data.get("username")
+ user = None
+ username_or_email_wrong = False
+
+ if "@" in username_or_email:
+ if User.objects.filter(email=username_or_email).exists():
+ username = User.objects.get(email=username_or_email).username
+ user = authenticate(username=username, password=password)
+ else:
+ username_or_email_wrong = True
+ # raise forms.ValidationError(_('Email Wrong!'))
+ else:
+ if User.objects.filter(username=username_or_email).exists():
+ user = authenticate(username=username_or_email, password=password)
+ else:
+ username_or_email_wrong = True
+ # raise forms.ValidationError(_('Username Wrong!'))
+
+ if not user and not username_or_email_wrong:
+ raise forms.ValidationError(_("Wrong password!"))
+
+ return password
+
+
+class RecoverPasswordForm(forms.Form):
+ username_or_email = forms.CharField(label="username / email", max_length="50")
+
+
+class RecoverPasswordCodeForm(forms.Form):
+ verification_code = forms.CharField(label="Verification code", max_length="200")
+
+
+class UploadMarkerForm(forms.ModelForm):
+ def __init__(self, *args, **kwargs):
+ super(UploadMarkerForm, self).__init__(*args, **kwargs)
+
+ log.warning(self.fields)
+ self.fields["source"].widget.attrs["placeholder"] = _("browse file")
+ self.fields["source"].widget.attrs["accept"] = "image/png, image/jpg"
+ self.fields["author"].widget.attrs["placeholder"] = _("declare different author name")
+ self.fields["title"].widget.attrs["placeholder"] = _("Marker's title")
+
+ class Meta:
+ model = Marker
+ exclude = ("owner", "uploaded_at", "patt")
+
+ def save(self, *args, **kwargs):
+ commit = kwargs.get("commit", True)
+
+ with Image.open(self.instance.source) as image:
+ pil_image = generate_marker_from_image(image)
+ blob = BytesIO()
+ pil_image.save(blob, "JPEG")
+ filename = self.instance.source.name
+ self.instance.source.save(filename, File(blob), save=commit)
+ patt_str = generate_patt_from_image(image)
+
+ self.instance.patt.save(
+ f"{filename}.patt",
+ ContentFile(patt_str.encode("utf-8")),
+ save=commit,
+ )
+
+ if kwargs.get("owner"):
+ self.instance.owner = kwargs.get("owner")
+ del kwargs["owner"]
+
+ return super(UploadMarkerForm, self).save(*args, **kwargs)
+
+
+class UploadObjectForm(forms.ModelForm):
+ def __init__(self, *args, **kwargs):
+ super(UploadObjectForm, self).__init__(*args, **kwargs)
+
+ self.fields["source"].widget.attrs["placeholder"] = _("browse file")
+ self.fields["source"].widget.attrs["accept"] = "image/*, .mp4, .webm"
+ self.fields["author"].widget.attrs["placeholder"] = _("declare different author name")
+ self.fields["scale"].widget = HiddenInput()
+ self.fields["rotation"].widget = HiddenInput()
+ self.fields["position"].widget = HiddenInput()
+ self.fields["title"].widget.attrs["placeholder"] = _("Object's title")
+ log.warning(self.fields)
+
+ class Meta:
+ model = Object
+ fields = ("source", "author", "title", "scale", "position", "rotation")
+
+ def save(self, *args, **kwargs):
+ if owner := kwargs.get("owner", None):
+ self.instance.owner = owner
+ del kwargs["owner"]
+
+ return super(UploadObjectForm, self).save(*args, **kwargs)
+
+
+class ArtworkForm(forms.Form):
+
+ marker = forms.ImageField(required=False)
+ marker_author = forms.CharField(max_length=12, required=False)
+ augmented = forms.ImageField(required=False)
+ augmented_author = forms.CharField(max_length=12, required=False)
+ existent_marker = forms.IntegerField(min_value=1, required=False)
+ existent_object = forms.IntegerField(min_value=1, required=False)
+ title = forms.CharField(max_length=50)
+ description = forms.CharField(widget=forms.Textarea, max_length=500, required=False)
+
+ def __init__(self, *args, **kwargs):
+ super(ArtworkForm, self).__init__(*args, **kwargs)
+
+ self.fields["marker_author"].widget.attrs["placeholder"] = _("declare different author name")
+ self.fields["augmented_author"].widget.attrs["placeholder"] = _("declare different author name")
+ self.fields["title"].widget.attrs["placeholder"] = _("Artwork title")
+ self.fields["description"].widget.attrs["placeholder"] = _("Artwork description")
+
+
+class ExhibitForm(forms.Form):
+
+ name = forms.CharField(max_length=50, required=True)
+ slug = forms.CharField(max_length=50, required=True)
+
+ # FIXME: maybe this can be improved. Possible bug on max artworks per exhibit
+ artworks = forms.CharField(max_length=1000)
+
+ def clean_slug(self):
+ data = self.cleaned_data["slug"]
+ if not re.match("^[a-zA-Z0-9_]*$", data):
+ raise forms.ValidationError(_("Url can't contain spaces or special characters"))
+ return data
+
+ def __init__(self, *args, **kwargs):
+ super(ExhibitForm, self).__init__(*args, **kwargs)
+
+ self.fields["name"].widget.attrs["placeholder"] = _("Exhibit Title")
+ self.fields["slug"].widget.attrs["placeholder"] = _("Complete with your Exhibit URL here")
diff --git a/src/ARte/users/jinja2/users/artwork-edit.jinja2 b/src/users/jinja2/users/artwork.jinja2
similarity index 55%
rename from src/ARte/users/jinja2/users/artwork-edit.jinja2
rename to src/users/jinja2/users/artwork.jinja2
index 85241a4e..c8278075 100644
--- a/src/ARte/users/jinja2/users/artwork-edit.jinja2
+++ b/src/users/jinja2/users/artwork.jinja2
@@ -4,11 +4,11 @@
{% block content %}
{# FIXME: maybe this can be improved #}
-
+
-
- "+n+"
",1);default:return s(n,0)}}function ie(e){if(e){e()}}function I(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"}function k(e){return I(e,"Function")}function P(e){return I(e,"Object")}function ae(e){var t="htmx-internal-data";var r=e[t];if(!r){r=e[t]={}}return r}function M(e){var t=[];if(e){for(var r=0;r