Merge pull request #1 from Arquisoft/master

En pos de la sincronización
Arquisoft · Jan 26, 2024 · 15a547f · 15a547f
2 parents d7948e9 + dbaea69
commit 15a547f
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -122,7 +122,7 @@ jobs:
         user: ${{ secrets.DEPLOY_USER }}
         key: ${{ secrets.DEPLOY_KEY }}
         command: |
-          wget https://raw.githubusercontent.com/arquisoft/wiq_es6c/master/docker-compose.yml
-          wget https://raw.githubusercontent.com/arquisoft/wiq_es6c/master/docker-compose-deploy.override.yml
+          wget https://raw.githubusercontent.com/arquisoft/wiq_es6c/master/docker-compose.yml -O docker-compose.yml
+          wget https://raw.githubusercontent.com/arquisoft/wiq_es6c/master/.env -O .env
           docker compose down
           docker compose --profile prod up -d
diff --git a/README.md b/README.md
@@ -100,8 +100,9 @@ deploy:
         user: ${{ secrets.DEPLOY_USER }}
         key: ${{ secrets.DEPLOY_KEY }}
         command: |
-          wget https://raw.githubusercontent.com/arquisoft/wiq_es6c/master/docker-compose-deploy.yml -O docker-compose.yml
-          docker compose down --volumes
+          wget https://raw.githubusercontent.com/arquisoft/wiq_es6c/master/docker-compose.yml -O docker-compose.yml
+          wget https://raw.githubusercontent.com/arquisoft/wiq_es6c/master/.env -O .env
+          docker compose down
           docker compose --profile prod up -d
 ```
 

diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -42,6 +42,8 @@
     ]
   },
   "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "@babel/plugin-transform-private-property-in-object": "^7.23.4",
     "axios-mock-adapter": "^1.22.0",
     "expect-puppeteer": "^9.0.2",
     "jest": "^29.3.1",

diff --git a/webapp/src/App.js b/webapp/src/App.js
@@ -17,7 +17,7 @@ function App() {
     <Container component="main" maxWidth="xs">
       <CssBaseline />
       <Typography component="h1" variant="h5" align="center" sx={{ marginTop: 2 }}>
-        Welcome to the 2024 edition of the Software Architecture course
+        Welcome to wiq_0
       </Typography>
       {showLogin ? <Login /> : <AddUser />}
       <Typography component="div" align="center" sx={{ marginTop: 2 }}>

diff --git a/webapp/src/App.test.js b/webapp/src/App.test.js
@@ -3,6 +3,6 @@ import App from './App';
 
 test('renders learn react link', () => {
   render(<App />);
-  const linkElement = screen.getByText(/Welcome to the 2024 edition of the Software Architecture course/i);
+  const linkElement = screen.getByText(/Welcome to wiq_0/i);
   expect(linkElement).toBeInTheDocument();
 });