Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

En pos de la sincronización #1

Merged
merged 8 commits into from
Jan 26, 2024
Merged

En pos de la sincronización #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
72fedaf
Fixing some old-fashioned code in the actions and README.md file
augustocristian Jan 23, 2024
2f84702
Merge pull request #3 from Arquisoft/dev_fixcomposeandactions
pglez82 Jan 23, 2024
d658968
Adding the .env to the service deployment
augustocristian Jan 23, 2024
d6ec049
Merge pull request #4 from Arquisoft/ft_Addenvfiledeployment
augustocristian Jan 23, 2024
f7c5893
Adding -O to wget to overwrite existing files
augustocristian Jan 23, 2024
88c299b
Changed welcome message and some devDependencies
labra Jan 26, 2024
fa9aec3
Merge branch 'master' of https://github.com/Arquisoft/wiq_0
labra Jan 26, 2024
dbaea69
Merge branch 'master' into master
ExarcaFidalgo Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
27 changes: 24 additions & 3 deletions webapp/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions webapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}>
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/App.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});