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

Jump to bottom

Bump webpack-subresource-integrity from 1.1.0-rc.4 to 1.5.2 in /RepoWebShop #18

Open
wants to merge 2 commits into
base: Dev
Choose a base branch
from
Open

Bump webpack-subresource-integrity from 1.1.0-rc.4 to 1.5.2 in /RepoWebShop #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a47eb59
New working hours
Mar 14, 2021
56bd554
Bump webpack-subresource-integrity in /RepoWebShop
dependabot[bot] Mar 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
105 changes: 59 additions & 46 deletions RepoWebShop/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.

20 changes: 6 additions & 14 deletions RepoWebShop/src/app/home/components/welcome-dialog/welcome-dialog.component.html
View file
Open in desktop
@@ -1,25 +1,17 @@
<h2 mat-dialog-title>Cambios en la forma de comprar</h2>
<h2 mat-dialog-title>Nuevos horarios de atencion al publico</h2>

<mat-dialog-content style="font-family: Noto Serif">

<p>
Hola, gracias por visitarnos!
</p>
<p>
Queriamos avisarte que a modo de prueba, las cosas van a ser un poco distintas desde el Martes 22 de Febrero, hasta el Domingo 14 de Marzo.
Hola! Nuevos horarios y modalidad de trabajo renovada.
</p>
<ul>
<li>
Durante este tiempo vamos a tomar pedidos a través de nuestro WhatsApp solamente.
Martes a Viernes de 8.30hs a 18.00hs, Sabados de 8.30hs a 14.00hs, Domingos y Lunes estaremos cerrados.
</li>
<li>
Solo vamos a tomar pedidos de nuestro catálo de productos dulces.
</li>
<li>
Las compras se podrán retirar los días Sábados entre las 9hs y 14hs.
Nuestra producción estará enfocada en compras y reservas con antelación. Por favor, hacé tu pedido con tiempo por cualquiera de nuestras redes.
</li>
</ul>


<div>
<p>
Expand All @@ -33,9 +25,9 @@ <h2 mat-dialog-title>Cambios en la forma de comprar</h2>

<mat-dialog-actions>
<div style="display: grid; grid-template-columns: auto auto; gap: 10px; width: 100%;">
<a href='https://api.whatsapp.com/send?phone=5491127778899' target="_blank" style="display: flex; align-items: center; color: black; margin-right: auto;">
<button tabindex="1" style="margin-right: auto;" mat-button color="primary" (click)="close()">Entendido</button>
<a tabindex="2" href='https://api.whatsapp.com/send?phone=5491127778899' target="_blank" style="display: flex; align-items: center; color: black; margin-left: auto;">
<img src="../../../assets/images/icons/whapp.png" style="width:25px; height: 25px; margin-right: 10px;" class="icon">11 2777 8899
</a>
<button style="margin-left: auto;" mat-button color="primary" (click)="close()">Entendido</button>
</div>
</mat-dialog-actions>
2 changes: 1 addition & 1 deletion RepoWebShop/src/app/home/containers/home-shell/home-shell.component.ts
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ export class HomeShellComponent implements OnInit {
// this.store.dispatch(new productActions.LoadProducts());
// this.store.dispatch(new cateringActions.LoadCaterings());
// this.store.dispatch(new cateringActions.LoadItems());
if (new Date() < new Date(2021,2, 14)){
if (new Date() < new Date(2021,3, 1)){
this.openDialog();
}
}
Expand Down
13 changes: 10 additions & 3 deletions RepoWebShop/yarn.lock
View file
Open in desktop
Expand Up @@ -6474,6 +6474,13 @@ run-queue@^1.0.0, run-queue@^1.0.3:
dependencies:
aproba "^1.1.1"

rxjs@6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0.tgz#d647e029b5854617f994c82fe57a4c6747b352da"
integrity sha512-2MgLQr1zvks8+Kip4T6hcJdiBhV+SIvxguoWjhwtSpNPTp/5e09HJbgclCwR/nW0yWzhubM+6Q0prl8G5RuoBA==
dependencies:
tslib "^1.9.0"

rxjs@^6.0.0:
version "6.5.3"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
Expand Down Expand Up @@ -7898,9 +7905,9 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.3.0:
source-map "~0.6.1"

webpack-subresource-integrity@^1.1.0-rc.4:
version "1.3.3"
resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.3.3.tgz#8a320457a93ef480707884443d886f7f677ccbf7"
integrity sha512-t668hZNc/fZCgt2u83A4Tp9l5sDEwAhEC5XQ2QugshEr9WkNNDQC6551pB/JUfy5DwqTa/MJzAjeG5QQ9vxCEA==
version "1.5.2"
resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz#e40b6578d3072e2d24104975249c52c66e9a743e"
integrity sha512-GBWYBoyalbo5YClwWop9qe6Zclp8CIXYGIz12OPclJhIrSplDxs1Ls1JDMH8xBPPrg1T6ISaTW9Y6zOrwEiAzw==
dependencies:
webpack-sources "^1.3.0"

Expand Down