From edd89dfda1ee504f2fd415d5b7bb4b48d6a7d405 Mon Sep 17 00:00:00 2001
From: Guilherme Capanema <guilherme@capanema.me>
Date: Fri, 3 Jul 2020 18:33:39 -0300
Subject: [PATCH] =?UTF-8?q?Vers=C3=A3o=201.6.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/views/material.php | 36 ++++++++++++++++++++----------------
 composer.json            |  2 +-
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/admin/views/material.php b/admin/views/material.php
index fb172d0..c219fe3 100644
--- a/admin/views/material.php
+++ b/admin/views/material.php
@@ -28,16 +28,18 @@
 			<div class="rb-flex rb-flex-col rb-space-y-2">
 				<?php if (get_field('arquivo-online')): ?>
 					<a
-						href="<?php echo is_user_logged_in() ? get_field('arquivo-online')['url'] : '#'; ?>"
-						target="<?php echo is_user_logged_in() ? '_blank' : '_self'; ?>"
+						x-data
 						class="rb-block rb-text-xs rb-text-white rb-text-center rb-font-bold rb-uppercase rb-no-underline rb-bg-orange-600 rb-px-3 rb-py-3 hover:rb-shadow-lg rb-transition-shadow rb-duration-200 rb-ease-in-out"
 						style="background-color: <?php echo get_field('cor') ?> !important"
-						<?php if (! is_user_logged_in()): ?>
-							data-toggle="modal"
-							data-target="#modal-login"
-							data-redirect="<?php echo get_field('arquivo-online')['url']; ?>"
-						<?php elseif (get_field('tag-mailchimp', $post_id)): ?>
-							@click="$dispatch('reuna-mailchimp-subscribe', { tags: ['<?php echo get_field('tag-mailchimp'); ?>'] })"
+						<?php if (is_user_logged_in()): ?>
+							href="<?php echo get_field('arquivo-online')['url'] ?>"
+							target="_blank"
+							<?php if (get_field('tag-mailchimp', $post_id)): ?>
+								@click="$dispatch('reuna-mailchimp-subscribe', { tags: ['<?php echo get_field('tag-mailchimp', $post_id); ?>'] })"
+							<?php endif; ?>
+						<?php else: ?>
+							href="#"
+							@click.prevent="$dispatch('modal-open', { modal: 'login' })"
 						<?php endif; ?>
 					>
 						<?php echo __('Baixar para estudar online', 'reuna-blocos'); ?>
@@ -46,16 +48,18 @@
 
 				<?php if (get_field('arquivo-impressao')): ?>
 					<a
-						href="<?php echo is_user_logged_in() ? get_field('arquivo-impressao')['url'] : '#'; ?>"
-						target="<?php echo is_user_logged_in() ? '_blank' : '_self'; ?>"
+						x-data
 						class="rb-block rb-text-xs rb-text-white rb-text-center rb-font-bold rb-uppercase rb-no-underline rb-bg-orange-600 rb-px-3 rb-py-3 hover:rb-shadow-lg rb-transition-shadow rb-duration-200 rb-ease-in-out"
 						style="background-color: <?php echo get_field('cor') ?> !important"
-						<?php if (! is_user_logged_in()): ?>
-							data-toggle="modal"
-							data-target="#modal-login"
-							data-redirect="<?php echo get_field('arquivo-impressao')['url']; ?>"
-						<?php elseif (get_field('tag-mailchimp', $post_id)): ?>
-							@click="$dispatch('reuna-mailchimp-subscribe', { tags: ['<?php echo get_field('tag-mailchimp'); ?>'] })"
+						<?php if (is_user_logged_in()): ?>
+							href="<?php echo get_field('arquivo-impressao')['url'] ?>"
+							target="_blank"
+							<?php if (get_field('tag-mailchimp', $post_id)): ?>
+								@click="$dispatch('reuna-mailchimp-subscribe', { tags: ['<?php echo get_field('tag-mailchimp', $post_id); ?>'] })"
+							<?php endif; ?>
+						<?php else: ?>
+							href="#"
+							@click.prevent="$dispatch('modal-open', { modal: 'login' })"
 						<?php endif; ?>
 					>
 						<?php echo __('Baixar para imprimir', 'reuna-blocos'); ?>
diff --git a/composer.json b/composer.json
index ba34f79..86800ac 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.6-dev"
+            "dev-master": "1.7-dev"
         }
     },
     "minimum-stability": "dev",