From 2cf301b339da8b3b9c73fbd6a2a06e2615505de2 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 11 Oct 2025 18:57:46 -0300 Subject: [PATCH 1/6] working --- .../{InvalidateOldQrCodes.php => InvalidateDonations.php} | 0 docker-compose.yml | 1 - package-lock.json | 2 +- 3 files changed, 1 insertion(+), 2 deletions(-) rename app/Console/Commands/{InvalidateOldQrCodes.php => InvalidateDonations.php} (100%) diff --git a/app/Console/Commands/InvalidateOldQrCodes.php b/app/Console/Commands/InvalidateDonations.php similarity index 100% rename from app/Console/Commands/InvalidateOldQrCodes.php rename to app/Console/Commands/InvalidateDonations.php diff --git a/docker-compose.yml b/docker-compose.yml index 7941f86..d08accf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,7 +25,6 @@ services: depends_on: pgsql: condition: service_healthy - command: sh -c "./docker/init.sh" pgsql: image: "postgres:17" diff --git a/package-lock.json b/package-lock.json index 285d95b..f028c10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@tailwindcss/forms": "^0.5.2", "alpinejs": "^3.15.0", "autoprefixer": "^10.4.21", - "axios": "^1.8.2", + "axios": "^1.12.0", "laravel-echo": "^1.19.0", "laravel-vite-plugin": "^1.0", "postcss": "^8.5.4", From 03b5ff4ad1d194f26b267ba7690ac256a158acf0 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 12 Oct 2025 17:07:50 -0300 Subject: [PATCH 2/6] visual feedback for password recover + return to login button --- resources/css/app.css | 3 +- resources/js/app.js | 1 + .../views/auth/forgot-password.blade.php | 90 +++++++++++++++++-- tailwind.config.js | 6 +- 4 files changed, 90 insertions(+), 10 deletions(-) diff --git a/resources/css/app.css b/resources/css/app.css index bd6213e..eb5e8ba 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -1,3 +1,4 @@ @tailwind base; @tailwind components; -@tailwind utilities; \ No newline at end of file +@tailwind utilities; +@import "flowbite/src/themes/default"; \ No newline at end of file diff --git a/resources/js/app.js b/resources/js/app.js index 4f20077..f381b23 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -9,6 +9,7 @@ Alpine.start(); import "swiper/swiper-bundle.css"; import Swiper from "swiper/bundle"; +import 'flowbite'; // Lógica para o botão de copiar URL document.addEventListener("DOMContentLoaded", () => { diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php index bb923cb..05d0fb3 100644 --- a/resources/views/auth/forgot-password.blade.php +++ b/resources/views/auth/forgot-password.blade.php @@ -14,7 +14,6 @@ @vite(['resources/css/app.css', 'resources/js/app.js']) Esqueceu a Senha? - Doeit + \ No newline at end of file diff --git a/tailwind.config.js b/tailwind.config.js index e04c8a3..542f96f 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,6 +1,5 @@ import defaultTheme from "tailwindcss/defaultTheme"; import forms from "@tailwindcss/forms"; -import flowbitePlugin from "flowbite/plugin"; // Adicionar para Flowbite /** @type {import('tailwindcss').Config} */ export default { @@ -22,5 +21,8 @@ export default { darkMode: "class", // Usar 'class' para dark mode - plugins: [forms, flowbitePlugin], + plugins: [ + forms, + require('flowbite/plugin') + ], }; From 99c0ef968adabcc1b4c3b3781f6fa47a3c2471bb Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 12 Oct 2025 17:40:22 -0300 Subject: [PATCH 3/6] button white theme text collor correction --- resources/views/auth/forgot-password.blade.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php index 05d0fb3..3578a0b 100644 --- a/resources/views/auth/forgot-password.blade.php +++ b/resources/views/auth/forgot-password.blade.php @@ -26,14 +26,13 @@ -
- - - Voltar - -
- +
+ + + Voltar + +
logo doeit
From 185aff9ad15da5d5b7873a584186b877b6d844ed Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 12 Oct 2025 18:07:45 -0300 Subject: [PATCH 4/6] addition of instascan for tests --- resources/js/app.js | 1 + resources/js/instascan.js | 51 ++++++++++++++++++++++++ resources/views/campaigns/show.blade.php | 29 +++++++++++++- 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 resources/js/instascan.js diff --git a/resources/js/app.js b/resources/js/app.js index f381b23..5368734 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -2,6 +2,7 @@ import "./bootstrap"; import "./echo"; +import "./instascan"; import Alpine from "alpinejs"; window.Alpine = Alpine; diff --git a/resources/js/instascan.js b/resources/js/instascan.js new file mode 100644 index 0000000..7e9f674 --- /dev/null +++ b/resources/js/instascan.js @@ -0,0 +1,51 @@ +// Instascan QR Code Scanner Initialization for Laravel +document.addEventListener('DOMContentLoaded', async () => { + // Verifica se Instascan está disponível + if (typeof Instascan === 'undefined') { + console.error('Instascan não está carregado. Certifique-se de importar o script corretamente.'); + return; + } + + // Seleciona o elemento
+ + - \ No newline at end of file From 83f2e0efb58e3fe18c00d6359f0bc2c27f531e8f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 15 Oct 2025 18:00:52 -0300 Subject: [PATCH 5/6] instascan feature update --- ...Donations.php => InvalidateOldQrCodes.php} | 0 docker-compose.yml | 2 +- package-lock.json | 110 ++++++++++ package.json | 1 + resources/css/app.css | 3 +- resources/js/app.js | 4 +- resources/js/instascan.js | 51 ----- resources/views/campaigns/show.blade.php | 193 +++++++++++++++++- tailwind.config.js | 4 - 9 files changed, 297 insertions(+), 71 deletions(-) rename app/Console/Commands/{InvalidateDonations.php => InvalidateOldQrCodes.php} (100%) delete mode 100644 resources/js/instascan.js diff --git a/app/Console/Commands/InvalidateDonations.php b/app/Console/Commands/InvalidateOldQrCodes.php similarity index 100% rename from app/Console/Commands/InvalidateDonations.php rename to app/Console/Commands/InvalidateOldQrCodes.php diff --git a/docker-compose.yml b/docker-compose.yml index d08accf..555b78a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,7 +25,7 @@ services: depends_on: pgsql: condition: service_healthy - + command: sh -c "./docker/init.sh" pgsql: image: "postgres:17" ports: diff --git a/package-lock.json b/package-lock.json index f028c10..af6514d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,6 +6,7 @@ "": { "dependencies": { "flowbite": "^3.1.2", + "instascan": "^1.0.0", "jquery": "^3.7.1", "jquery-mask-plugin": "^1.14.16", "swiper": "^11.2.8" @@ -1026,6 +1027,33 @@ "proxy-from-env": "^1.1.0" } }, + "node_modules/babel-polyfill": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz", + "integrity": "sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==", + "license": "MIT", + "dependencies": { + "babel-runtime": "^6.26.0", + "core-js": "^2.5.0", + "regenerator-runtime": "^0.10.5" + } + }, + "node_modules/babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==", + "license": "MIT", + "dependencies": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + } + }, + "node_modules/babel-runtime/node_modules/regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "license": "MIT" + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -1216,6 +1244,14 @@ "node": ">= 6" } }, + "node_modules/core-js": { + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", + "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", + "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.", + "hasInstallScript": true, + "license": "MIT" + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -1355,6 +1391,12 @@ "node": ">= 0.4" } }, + "node_modules/es6-promise": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", + "license": "MIT" + }, "node_modules/esbuild": { "version": "0.25.5", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz", @@ -1572,6 +1614,20 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/fsm-as-promised": { + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/fsm-as-promised/-/fsm-as-promised-0.13.2.tgz", + "integrity": "sha512-1tjwtVOEzqygbG3vHbfaQ4XJql5H0Zv2hMm7Mx1DndCeyTYjHNwgklsrC8fTHUslB0eHMSg9HBMV5QZodJpAcg==", + "license": "MIT", + "dependencies": { + "es6-promise": "^4.0.2", + "lodash": "^4.16.2", + "stampit": "^3.0.1" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -1704,6 +1760,18 @@ "node": ">= 0.4" } }, + "node_modules/instascan": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/instascan/-/instascan-1.0.0.tgz", + "integrity": "sha512-u9US1kM0IhVPUoozJ3EuxLFff6v/kuE3wwGiKPbH4NEyzxPXNDWEUb4s8z6i30KhjMC84pXSGAt5eLC3wY4Fxw==", + "license": "MIT", + "dependencies": { + "babel-polyfill": "^6.9.1", + "fsm-as-promised": "^0.13.0", + "visibilityjs": "^1.2.3", + "webrtc-adapter": "^1.4.0" + } + }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -1862,6 +1930,12 @@ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", "dev": true }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "license": "MIT" + }, "node_modules/lru-cache": { "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", @@ -2295,6 +2369,12 @@ "node": ">=8.10.0" } }, + "node_modules/regenerator-runtime": { + "version": "0.10.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz", + "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==", + "license": "MIT" + }, "node_modules/resolve": { "version": "1.22.8", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", @@ -2383,6 +2463,12 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/sdp": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/sdp/-/sdp-1.5.4.tgz", + "integrity": "sha512-9x0+fpJHW2bbqtIktmL+H9m+BswgurPVPhWrur4cCZPDWDSsdGYvRBaKhDXlnNCD1b/Xi8cOTG2u703CTQuwgg==", + "license": "MIT" + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -2424,6 +2510,12 @@ "node": ">=0.10.0" } }, + "node_modules/stampit": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/stampit/-/stampit-3.2.1.tgz", + "integrity": "sha512-2QXR/GWaz3qgLUvyTjIyvWLdT9iGC8rjZdyAt2IduajSCJUusehWJ1QAKmXdXWhJSofYJyCNZHCmp5yETiV4CA==", + "license": "MIT" + }, "node_modules/string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", @@ -2731,6 +2823,12 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true }, + "node_modules/visibilityjs": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/visibilityjs/-/visibilityjs-1.2.8.tgz", + "integrity": "sha512-Y+aL3OUX88b+/VSmkmC2ApuLbf0grzbNLpCfIDSw3BzTU6PqcPsdgIOaw8b+eZoy+DdQqnVN3y/Evow9vQq9Ig==", + "license": "MIT" + }, "node_modules/vite": { "version": "6.3.6", "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.6.tgz", @@ -2842,6 +2940,18 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/webrtc-adapter": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-1.4.0.tgz", + "integrity": "sha512-QY3cFbkvUW9kSim9XzzKr7jl1zdfxh7ii9j67kZz+Jc/HsKOXcC+mEmovbTID3QthyZCiYsWz2Qs6aUwxEDa/w==", + "license": "BSD-3-Clause", + "dependencies": { + "sdp": "^1.0.0" + }, + "engines": { + "npm": "~3.0.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index a6fc951..19ca27c 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "packageManager": "pnpm@10.5.1+sha512.c424c076bd25c1a5b188c37bb1ca56cc1e136fbf530d98bcb3289982a08fd25527b8c9c4ec113be5e3393c39af04521dd647bcf1d0801eaf8ac6a7b14da313af", "dependencies": { "flowbite": "^3.1.2", + "instascan": "^1.0.0", "jquery": "^3.7.1", "jquery-mask-plugin": "^1.14.16", "swiper": "^11.2.8" diff --git a/resources/css/app.css b/resources/css/app.css index eb5e8ba..bd6213e 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -1,4 +1,3 @@ @tailwind base; @tailwind components; -@tailwind utilities; -@import "flowbite/src/themes/default"; \ No newline at end of file +@tailwind utilities; \ No newline at end of file diff --git a/resources/js/app.js b/resources/js/app.js index 5368734..6925ad6 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -2,7 +2,8 @@ import "./bootstrap"; import "./echo"; -import "./instascan"; + +import "instascan"; import Alpine from "alpinejs"; window.Alpine = Alpine; @@ -10,7 +11,6 @@ Alpine.start(); import "swiper/swiper-bundle.css"; import Swiper from "swiper/bundle"; -import 'flowbite'; // Lógica para o botão de copiar URL document.addEventListener("DOMContentLoaded", () => { diff --git a/resources/js/instascan.js b/resources/js/instascan.js deleted file mode 100644 index 7e9f674..0000000 --- a/resources/js/instascan.js +++ /dev/null @@ -1,51 +0,0 @@ -// Instascan QR Code Scanner Initialization for Laravel -document.addEventListener('DOMContentLoaded', async () => { - // Verifica se Instascan está disponível - if (typeof Instascan === 'undefined') { - console.error('Instascan não está carregado. Certifique-se de importar o script corretamente.'); - return; - } - - // Seleciona o elemento