-
@@ -30,8 +30,9 @@ const emit = defineEmits(["makeAnotherTransaction"]);
{{ props.tokenAmount }} BRZ
-
- Não encontrou os tokens? Clique no botão abaixo para
+
+ Não encontrou os tokens? Clique no botão abaixo para
+
cadastrar o BRZ em sua carteira.
@@ -48,18 +49,24 @@ const emit = defineEmits(["makeAnotherTransaction"]);
Fazer nova transação
-
+
-
+
+
+ Gerenciar Transações
+
@@ -77,7 +84,7 @@ p {
}
.text {
- @apply text-gray-800 text-center;
+ @apply text-white text-center;
}
.blur-container-row {
@apply flex flex-row justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md mt-8 w-1/3;
@@ -99,4 +106,22 @@ input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
-webkit-appearance: none;
}
+
+.lg-view {
+ display: inline-block;
+}
+
+.sm-view {
+ display: none;
+}
+
+@media screen and (max-width: 500px) {
+ .lg-view {
+ display: none;
+ }
+
+ .sm-view {
+ display: inline-block;
+ }
+}
diff --git a/src/components/CustomModal.vue b/src/components/CustomModal.vue
new file mode 100644
index 0000000..8d0e70d
--- /dev/null
+++ b/src/components/CustomModal.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+ ATENÇÃO!
+ A transação só será processada após inserir o código de autenticação.
+ Caso contrário não conseguiremos comprovar o seu depósito e não será
+ possível transferir os tokens para sua carteira.
+
+
+ Entendi
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/ListingComponent/ListingComponent.vue b/src/components/ListingComponent/ListingComponent.vue
index 7bd3bd8..7d903ea 100644
--- a/src/components/ListingComponent/ListingComponent.vue
+++ b/src/components/ListingComponent/ListingComponent.vue
@@ -74,76 +74,73 @@ watch(props, async (): Promise
=> {
//emits
const emit = defineEmits(["cancelDeposit", "withdrawDeposit"]);
-// initial itemsToShow value
+// initial itemsToShow valueb
showInitialItems();
- Valor
- Data
- {{
- props.isManageMode ? "Cancelar oferta" : "Tipo de transação"
- }}
- {{
- props.isManageMode ? "Retirar tokens" : "Checar transação"
- }}
-
-
-
- {{
- isValidDeposit(item)
- ? item.remaining
- : getAmountFormatted(item.args?.amount)
- }}
- BRZ
-
-
-
20 out 2022
-
-
- {{ getEventName((item as Event).event) }}
-
-
-
-
Etherscan
-
+
+
+
+ {{ getEventName((item as Event).event) }}
+
+
+ {{
+ isValidDeposit(item)
+ ? item.remaining
+ : getAmountFormatted(item.args?.amount)
+ }}
+ BRZ
+
+
20/08/2022
+
+
+
+ Finalizado
+
+
+
Etherscan
+
+
+
+
+
-
-
Cancelar
-
-
+
+
+
+ Cancelar
+
-
-
Retirar
-
+
+
+
Sacar
+
+
- {{
- props.title ? props.title : "Confirme em sua carteira"
- }}
+
+ {{ props.title ? props.title : "Confirme em sua carteira" }}
+
-
+
-
+
{{ $props.message }}
@@ -55,11 +57,11 @@ const props = defineProps({
}
.text {
- @apply text-gray-800 text-center;
+ @apply text-white text-center;
}
.blur-container {
- @apply flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md mt-10;
+ @apply flex flex-col justify-center items-center sm:px-8 px-6 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md mt-10;
}
input[type="number"] {
diff --git a/src/components/QrCodeComponent.vue b/src/components/QrCodeComponent.vue
index 18e50a5..e6fc5d3 100644
--- a/src/components/QrCodeComponent.vue
+++ b/src/components/QrCodeComponent.vue
@@ -3,6 +3,7 @@ import { pix } from "../utils/QrCodePix";
import { ref } from "vue";
import { debounce } from "@/utils/debounce";
import CustomButton from "./CustomButton/CustomButton.vue";
+import CustomModal from "./CustomModal.vue";
import api from "../services/index";
// props and store references
@@ -15,6 +16,7 @@ const qrCode = ref
("");
const qrCodePayload = ref("");
const isPixValid = ref(false);
const isCodeInputEmpty = ref(true);
+const showModal = ref(true);
const e2eId = ref("");
// Emits
@@ -71,17 +73,19 @@ const validatePix = async (): Promise => {
-
-
+
Código pix
@@ -95,9 +99,9 @@ const validatePix = async (): Promise
=> {
src="@/assets/copyPix.svg"
width="16"
height="16"
- class="pt-2 mb-5 cursor-pointer"
+ class="pt-2 lg:mb-5 cursor-pointer"
/>
-
+
ATENÇÃO! A transação só será processada após inserir
o código de autenticação. Caso contrário não conseguiremos comprovar o
seu depósito e não será possível transferir os tokens para sua
@@ -111,7 +115,7 @@ const validatePix = async (): Promise => {
type="text"
placeholder="Digite o código do comprovante PIX"
@input="debounce(handleInputEvent, 500)($event)"
- class="text-md w-full box-border p-2 h-6 mb-2 outline-none"
+ class="sm:text-md text-sm w-full box-border p-2 sm:h-6 h-2 mb-2 outline-none"
/>
=> {
@button-clicked="emit('pixValidated', e2eId)"
/>
+
@@ -195,7 +203,7 @@ h2 {
}
.text {
- @apply text-gray-800 text-center;
+ @apply text-white text-center;
}
.blur-container {
@@ -210,4 +218,22 @@ input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
-webkit-appearance: none;
}
+
+.lg-view {
+ display: inline-block;
+}
+
+.sm-view {
+ display: none;
+}
+
+@media screen and (max-width: 500px) {
+ .lg-view {
+ display: none;
+ }
+
+ .sm-view {
+ display: inline-block;
+ }
+}
diff --git a/src/components/SearchComponent.vue b/src/components/SearchComponent.vue
index dd328cb..b3efe26 100644
--- a/src/components/SearchComponent.vue
+++ b/src/components/SearchComponent.vue
@@ -114,22 +114,25 @@ watch(networkName, (): void => {
-
-
+ Digite um valor, confira a oferta, conecte sua carteira e receba os
tokens após realizar o Pix
+
-
+
-
-
BRZ
+
+
BRZ
@@ -215,11 +222,11 @@ watch(networkName, (): void => {
}
.text {
- @apply text-gray-800 text-center;
+ @apply text-white text-center;
}
.blur-container {
- @apply flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md mt-10;
+ @apply flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 mt-10;
}
input[type="number"] {
diff --git a/src/components/SellerSteps/SellerSearchComponent.vue b/src/components/SellerSteps/SellerSearchComponent.vue
index d92103c..dac415e 100644
--- a/src/components/SellerSteps/SellerSearchComponent.vue
+++ b/src/components/SellerSteps/SellerSearchComponent.vue
@@ -122,7 +122,7 @@ const handleInputEvent = (event: any): void => {
}
.text {
- @apply text-gray-800 text-center;
+ @apply text-white text-center;
}
.blur-container {
diff --git a/src/components/SellerSteps/SendNetwork.vue b/src/components/SellerSteps/SendNetwork.vue
index 14c004f..016e15a 100644
--- a/src/components/SellerSteps/SendNetwork.vue
+++ b/src/components/SellerSteps/SendNetwork.vue
@@ -14,10 +14,10 @@ const props = defineProps({
-
-
Após a confirmação sua oferta estará disponível para outros usuários.
Caso deseje retirar a oferta, será necessário aguardar 24h para receber
os tokens de volta.
-
+
-
- Digite sua oferta, informe a chave Pix, selecione a rede, aprove o
envio da transação e confirme sua oferta.
+
-
+
-
-
BRZ
+
+
+ BRZ
+
@@ -92,13 +99,13 @@ const handleButtonClick = async (
@@ -131,11 +138,11 @@ const handleButtonClick = async (
}
.text {
- @apply text-gray-800 text-center;
+ @apply text-white text-center;
}
.blur-container {
- @apply flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md mt-10;
+ @apply flex flex-col justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 mt-10 w-auto;
}
input[type="number"] {
@@ -146,4 +153,8 @@ input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
-webkit-appearance: none;
}
+
+input {
+ @apply sm:text-lg text-sm;
+}
diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index 0e513c0..d8ad3ec 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -1,7 +1,8 @@
-
+
+
-
-
FAQ
-
+
+
FAQ
+
+ FAQ
+
+
+ {{ sellerView ? "Quero comprar" : "Quero vender" }}
+
+
{{ sellerView ? "Quero comprar" : "Quero vender" }}
{
:src="getNetworkImage(etherStore.networkName)"
/>
@@ -176,15 +214,24 @@ const getNetworkImage = (networkName: NetworkEnum): string => {
Conectar carteira
+
+ Conectar
+
{
>
{
@@ -264,6 +311,93 @@ const getNetworkImage = (networkName: NetworkEnum): string => {
+
+
@@ -273,7 +407,7 @@ header {
}
.default-button {
- @apply px-4 py-2 rounded text-gray-50 font-semibold text-base hover:bg-transparent;
+ @apply sm:px-4 px-3 py-2 rounded text-gray-50 font-semibold sm:text-base text-xs hover:bg-transparent;
}
.account-info {
@@ -285,18 +419,42 @@ header {
}
.top-bar-info {
- @apply flex justify-between gap-2 px-4 py-2 border-amber-500 border-2 rounded;
+ @apply flex justify-between gap-2 px-4 py-2 border-amber-500 border-2 sm:rounded rounded-lg items-center;
}
.redirect_button {
- @apply py-4 text-gray-900 font-semibold text-xs w-full;
+ @apply py-5 text-gray-900 sm:font-semibold font-bold sm:text-xs text-sm w-full;
}
.menu-button {
- @apply flex text-center justify-center hover:bg-gray-200;
+ @apply flex sm:text-center sm:justify-center hover:bg-gray-200 ml-8 sm:ml-0;
}
a:hover {
@apply bg-gray-200 rounded;
}
+
+.lg-view {
+ display: inline-block;
+}
+
+.sm-view {
+ display: none;
+}
+
+.mobile-menu {
+ margin-top: 1400px;
+ bottom: 0px;
+ height: auto;
+}
+
+@media screen and (max-width: 500px) {
+ .lg-view {
+ display: none;
+ }
+
+ .sm-view {
+ display: inline-block;
+ }
+}
diff --git a/src/model/ValidDeposit.ts b/src/model/ValidDeposit.ts
index d22693b..95868b6 100644
--- a/src/model/ValidDeposit.ts
+++ b/src/model/ValidDeposit.ts
@@ -7,4 +7,5 @@ export type ValidDeposit = {
seller: string;
pixKey: string;
pixTarget?: string;
+ open?: boolean;
};
diff --git a/src/views/FaqView.vue b/src/views/FaqView.vue
index ecbbebe..632b5fa 100644
--- a/src/views/FaqView.vue
+++ b/src/views/FaqView.vue
@@ -96,7 +96,7 @@ const openItem = (index: number) => {
-
Sumário
+ Sumário
{
class="mr-3"
v-if="item.isOpen"
/>
- {{ item.title }}
+ {{ item.title }}
@@ -159,12 +159,8 @@ const openItem = (index: number) => {
margin: 24px 0;
}
-p,
-h2,
-h3,
-h4 {
- @apply text-gray-800 text-xl;
- color: #1f2937;
+h3 {
+ @apply text-white;
}
h2,
@@ -177,7 +173,7 @@ h4 {
}
.text {
- @apply text-gray-800 text-center;
+ @apply text-white text-center;
}
.blur-container-row {
@apply flex flex-row justify-center items-center px-8 py-6 gap-2 rounded-lg shadow-md shadow-gray-600 backdrop-blur-md mt-8 w-1/3;
diff --git a/src/views/TransactionHistoryView.vue b/src/views/TransactionHistoryView.vue
index b463172..4e0033f 100644
--- a/src/views/TransactionHistoryView.vue
+++ b/src/views/TransactionHistoryView.vue
@@ -58,6 +58,6 @@ watch(networkName, async () => {
}
.header {
- @apply text-3xl text-gray-900 leading-9 font-bold justify-center flex;
+ @apply text-3xl text-white leading-9 font-bold justify-center flex;
}