Commit 5a0a75e8 authored by RenanMontenegro3's avatar RenanMontenegro3

fix: "ajeitando problema com as bandeiras e nome do front"

parent 839320b5
...@@ -6,7 +6,7 @@ RUN npm run build || true ...@@ -6,7 +6,7 @@ RUN npm run build || true
FROM nginx:alpine FROM nginx:alpine
COPY --from=builder /app/dist/login-page/browser /usr/share/nginx/html COPY --from=builder /app/dist/aceite-navio/browser /usr/share/nginx/html
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf
COPY mime.types /etc/nginx/mime.types COPY mime.types /etc/nginx/mime.types
EXPOSE 80 EXPOSE 80
......
...@@ -7,8 +7,8 @@ Uma aplicação Front-End desenvolvida com o framework **Angular (JavaScript)** ...@@ -7,8 +7,8 @@ Uma aplicação Front-End desenvolvida com o framework **Angular (JavaScript)**
--- ---
**COMANDOS DOCKER** **COMANDOS DOCKER**
1. docker build -t login-page . 1. docker build -t aceite-navio .
2. docker run -d -p 4200:80 --name login-container login-page 2. docker run -d -p 4200:80 --name login-container aceite-navio
### 🎯 **Descrição** ### 🎯 **Descrição**
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"version": 1, "version": 1,
"newProjectRoot": "projects", "newProjectRoot": "projects",
"projects": { "projects": {
"login-page": { "aceite-navio": {
"projectType": "application", "projectType": "application",
"schematics": { "schematics": {
"@schematics/angular:component": { "@schematics/angular:component": {
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"build": { "build": {
"builder": "@angular-devkit/build-angular:application", "builder": "@angular-devkit/build-angular:application",
"options": { "options": {
"outputPath": "dist/login-page", "outputPath": "dist/aceite-navio",
"index": "src/index.html", "index": "src/index.html",
"browser": "src/main.ts", "browser": "src/main.ts",
"polyfills": [ "polyfills": [
...@@ -63,10 +63,10 @@ ...@@ -63,10 +63,10 @@
"builder": "@angular-devkit/build-angular:dev-server", "builder": "@angular-devkit/build-angular:dev-server",
"configurations": { "configurations": {
"production": { "production": {
"buildTarget": "login-page:build:production" "buildTarget": "aceite-navio:build:production"
}, },
"development": { "development": {
"buildTarget": "login-page:build:development" "buildTarget": "aceite-navio:build:development"
} }
}, },
"defaultConfiguration": "development" "defaultConfiguration": "development"
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
"extract-i18n": { "extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n", "builder": "@angular-devkit/build-angular:extract-i18n",
"options": { "options": {
"buildTarget": "login-page:build" "buildTarget": "aceite-navio:build"
} }
}, },
"test": { "test": {
......
{ {
"name": "login-page", "name": "aceite-navio",
"version": "0.0.0", "version": "0.0.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "login-page", "name": "aceite-navio",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"@angular/animations": "^17.2.0", "@angular/animations": "^17.2.0",
......
{ {
"name": "login-page", "name": "aceite-navio",
"version": "0.0.0", "version": "0.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
......
...@@ -14,7 +14,7 @@ describe('AppComponent', () => { ...@@ -14,7 +14,7 @@ describe('AppComponent', () => {
expect(app).toBeTruthy(); expect(app).toBeTruthy();
}); });
it(`should have the 'login-page' title`, () => { it(`should have the 'aceite-navio' title`, () => {
const fixture = TestBed.createComponent(AppComponent); const fixture = TestBed.createComponent(AppComponent);
const app = fixture.componentInstance; const app = fixture.componentInstance;
}); });
...@@ -23,6 +23,6 @@ describe('AppComponent', () => { ...@@ -23,6 +23,6 @@ describe('AppComponent', () => {
const fixture = TestBed.createComponent(AppComponent); const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges(); fixture.detectChanges();
const compiled = fixture.nativeElement as HTMLElement; const compiled = fixture.nativeElement as HTMLElement;
expect(compiled.querySelector('h1')?.textContent).toContain('Hello, login-page'); expect(compiled.querySelector('h1')?.textContent).toContain('Hello, aceite-navio');
}); });
}); });
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<div class="row"> <div class="row">
<mat-form-field class="field large" appearance="outline"> <mat-form-field class="field large" appearance="outline">
<mat-label>DWT</mat-label> <mat-label>DWT</mat-label>
<input matInput type="text" [currencyMask]="{ prefix: 'tons ', thousands: '.', decimal: ',' }" <input matInput type="text" [currencyMask]="{ prefix: '', thousands: '.', decimal: ',' }"
formControlName="dwt" /> formControlName="dwt" />
<mat-error *ngIf="empForm.get('dwt')?.invalid">{{ <mat-error *ngIf="empForm.get('dwt')?.invalid">{{
getErrorMessage("dwt") getErrorMessage("dwt")
......
<app-default-login-layout <app-default-login-layout
title="Login into your account" title="ACESSE SUA CONTA"
primaryBtnText="Login Now" primaryBtnText="Entrar"
secondaryBtnText="Signup Now" secondaryBtnText="Criar conta"
(submit)="submit()" (submit)="submit()"
(navigate)="navigate()" (navigate)="navigate()"
[disablePrimaryBtn]="!loginForm.valid" [disablePrimaryBtn]="!loginForm.valid"
...@@ -11,20 +11,22 @@ ...@@ -11,20 +11,22 @@
formControlName="email" formControlName="email"
inputName="email" inputName="email"
type="email" type="email"
label="Email" label="E-mail"
placeholder="johndoe@gmail.com" placeholder="exemplo@email.com"
(enterPressed)="submit()" (enterPressed)="submit()"
> >
</app-primary-input> </app-primary-input>
<app-primary-input <app-primary-input
formControlName="password" formControlName="password"
inputName="password" inputName="password"
type="password" type="password"
label="Your Password" label="Senha"
placeholder="Senha" placeholder="Digite sua senha"
(enterPressed)="submit()" (enterPressed)="submit()"
> >
</app-primary-input> </app-primary-input>
<span>Forgot password?</span>
<span>Esqueceu sua senha?</span>
</form> </form>
</app-default-login-layout> </app-default-login-layout>
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>LoginPage</title> <title>aceite-navio</title>
<base href="/"> <base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment