From 4a38cb16e2471453bf49a0c6e2726a67519ac899 Mon Sep 17 00:00:00 2001 From: Fernando Jose Gonzalez Sierra <90760906+UO277938@users.noreply.github.com> Date: Fri, 26 Apr 2024 13:44:59 +0200 Subject: [PATCH 1/2] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 207909d..a15c313 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: - develop - LaraFMz - Pablo-Arreglos - - Jota + - jota pull_request: types: [opened, synchronize, reopened] jobs: From bf9bf6396ceca5be58539879992d6ffb697f6d57 Mon Sep 17 00:00:00 2001 From: Fernando Jose Gonzalez Sierra <90760906+UO277938@users.noreply.github.com> Date: Fri, 26 Apr 2024 13:47:26 +0200 Subject: [PATCH 2/2] Delete webapp/webapp directory --- webapp/webapp/package-lock.json | 48 --------------------------------- webapp/webapp/package.json | 5 ---- 2 files changed, 53 deletions(-) delete mode 100644 webapp/webapp/package-lock.json delete mode 100644 webapp/webapp/package.json diff --git a/webapp/webapp/package-lock.json b/webapp/webapp/package-lock.json deleted file mode 100644 index cf1946e..0000000 --- a/webapp/webapp/package-lock.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "name": "webapp", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "dependencies": { - "webapp": "file:.." - } - }, - "..": { - "version": "0.1.0", - "dependencies": { - "@emotion/react": "^11.11.3", - "@emotion/styled": "^11.11.0", - "@mui/material": "^5.15.3", - "@testing-library/jest-dom": "^5.17.0", - "@testing-library/react": "^14.1.2", - "@testing-library/user-event": "^14.5.2", - "axios": "^1.6.5", - "bootstrap": "^5.3.3", - "firebase": "^10.8.0", - "react": "^18.2.0", - "react-bootstrap": "^2.10.1", - "react-dom": "^18.2.0", - "react-router-bootstrap": "^0.26.2", - "react-router-dom": "^6.22.2", - "react-scripts": "5.0.1", - "web-vitals": "^3.5.1" - }, - "devDependencies": { - "axios-mock-adapter": "^1.22.0", - "expect-puppeteer": "^9.0.2", - "jest": "^29.3.1", - "jest-cucumber": "^3.0.1", - "jest-environment-node": "^29.7.0", - "mongodb-memory-server": "^9.1.4", - "puppeteer": "^21.7.0", - "serve": "^14.2.1", - "start-server-and-test": "^2.0.3" - } - }, - "node_modules/webapp": { - "resolved": "..", - "link": true - } - } -} diff --git a/webapp/webapp/package.json b/webapp/webapp/package.json deleted file mode 100644 index 96fd912..0000000 --- a/webapp/webapp/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "webapp": "file:.." - } -}