diff --git a/package-lock.json b/package-lock.json index cc2fccb..15d4cf9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { - "name": "sales", - "version": "0.0.0", + "name": "simplifique-sales", + "version": "2026.1.01", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "sales", - "version": "0.0.0", + "name": "simplifique-sales", + "version": "2026.1.01", "dependencies": { "@agm/core": "^1.1.0", "@angular/animations": "^9.1.13", diff --git a/src/app/admin/permission-user/permission-user.component.scss b/src/app/admin/permission-user/permission-user.component.scss index d00ad0f..5a5b912 100644 --- a/src/app/admin/permission-user/permission-user.component.scss +++ b/src/app/admin/permission-user/permission-user.component.scss @@ -3,7 +3,7 @@ } .logo { - background-image: url("../../../assets/img/logo.svg"); + background-image: url("../../../assets/img/logo_simplifique.png"); background-position: center; cursor: pointer; width: 100%; @@ -305,14 +305,14 @@ .noData { display: flex; - justify-content: center; - align-items: center; - height: 100%; - flex-direction: column; - text-align: center; + justify-content: center; + align-items: center; + height: 100%; + flex-direction: column; + text-align: center; } -.text-muted{ +.text-muted { font-size: 14px; } @@ -326,16 +326,16 @@ width: 100%; } - .title-page{ + .title-page { margin-top: 10px; } .noData { - padding: 10px; + padding: 10px; } .noData p { - font-size: 14px; + font-size: 14px; } } @@ -346,7 +346,7 @@ width: 100%; } - .title-page{ + .title-page { margin-top: 10px; } } @@ -357,7 +357,7 @@ max-width: 200px; } - .title-page{ + .title-page { margin-top: 10px; } } \ No newline at end of file diff --git a/src/app/auth/login/login.component.ts b/src/app/auth/login/login.component.ts index 9223b04..503e034 100644 --- a/src/app/auth/login/login.component.ts +++ b/src/app/auth/login/login.component.ts @@ -47,21 +47,21 @@ export class LoginComponent implements OnInit, AfterViewInit { this.submitForm(); // Apenas submete se o formulário for válido } } - + public submitForm(): void { this.form.markAllAsTouched(); if (this.form.valid) { this.loadingIcon = 'loading'; - const domain = '@jurunense.com.br'; + // const domain = '@jurunense.com.br'; let email = this.form.value.email; // Remover domínio existente se já foi digitado - if (email.toLowerCase().endsWith(domain)) { - email = email.substring(0, email.length - domain.length); - } + // if (email.toLowerCase().endsWith(domain)) { + // email = email.substring(0, email.length - domain.length); + // } - const emailUpperCase = (email + domain).toUpperCase(); + const emailUpperCase = (email).toUpperCase(); const passwordUpperCase = this.form.value.password.toUpperCase(); this.authService.login({ diff --git a/src/app/components/header-admin/header-admin.component.html b/src/app/components/header-admin/header-admin.component.html index ef5e636..2988c1c 100644 --- a/src/app/components/header-admin/header-admin.component.html +++ b/src/app/components/header-admin/header-admin.component.html @@ -1,39 +1,32 @@
-
- -
- - Imagem - +
+ +
+ + Imagem + +
+ + +
+ +
+ {{ userName }} + Loja: {{ storeName }}
- - -
- -
- {{ userName }} - Loja: {{ storeName }} -
- - - + + +
-
- \ No newline at end of file + + \ No newline at end of file diff --git a/src/app/components/header-sales/header-sales.component.html b/src/app/components/header-sales/header-sales.component.html index de37b7e..97ebd22 100644 --- a/src/app/components/header-sales/header-sales.component.html +++ b/src/app/components/header-sales/header-sales.component.html @@ -3,7 +3,7 @@
- Logo Jurunense + Logo Jurunense
diff --git a/src/app/components/header-shopping/header-shopping.component.html b/src/app/components/header-shopping/header-shopping.component.html index c745d1d..e7817fd 100644 --- a/src/app/components/header-shopping/header-shopping.component.html +++ b/src/app/components/header-shopping/header-shopping.component.html @@ -10,7 +10,7 @@
- Imagem + Imagem
diff --git a/src/app/components/header-system/header-system.component.html b/src/app/components/header-system/header-system.component.html index ef653a9..62ccd6a 100644 --- a/src/app/components/header-system/header-system.component.html +++ b/src/app/components/header-system/header-system.component.html @@ -3,7 +3,7 @@
- Imagem + Imagem
@@ -12,29 +12,23 @@
- Carrinho - - {{ (shopping$ | async).length }} - + Carrinho + + {{ (shopping$ | async).length }} + -
+
{{ userName }} Loja: {{ storeName }}
- + - + \ No newline at end of file diff --git a/src/app/menu/menu.component.html b/src/app/menu/menu.component.html index 441b88e..9a2c0ba 100644 --- a/src/app/menu/menu.component.html +++ b/src/app/menu/menu.component.html @@ -1,66 +1,38 @@ -