Skip to content

Commit

Permalink
refactor: CSS e select da etapa 2 do cadastro de Entidade #21 e #9
Browse files Browse the repository at this point in the history
  • Loading branch information
@edoura
edoura committed Feb 27, 2019
1 parent 1da23f5 commit 9022c22
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 52 deletions.
124 changes: 73 additions & 51 deletions src/app/home/home.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="position:fixed;z-index:99;width:100%;">
<div class="container">
<a class="ml-2 img-brand" href="">
<img id="logo" src="https://firebasestorage.googleapis.com/v0/b/mvp-ongbook.appspot.com/o/ongbook-marker.png?alt=media&token=54548289-eb45-41b9-aebf-0db0660c1570" alt="Ongbook" style="width:33px">
<img id="logo" src="https://firebasestorage.googleapis.com/v0/b/mvp-ongbook.appspot.com/o/ongbook-marker.png?alt=media&token=54548289-eb45-41b9-aebf-0db0660c1570"
alt="Ongbook" style="width:33px">
</a>
<span class="brand-title ml-lg-4 mr-lg-5">Ongbook</span>

Expand All @@ -16,34 +17,34 @@
ONG</a>
</li>
<!-- para próxima entrega.
<li class="nav-item">
<a class="nav-link" href="#">Causa</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Apoie</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Parceiros</a>
</li>
-->
<li class="nav-item">
<a class="nav-link" href="#">Causa</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Apoie</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Parceiros</a>
</li>
-->
</ul>
<!-- para próxima entrega.
<ul class="nav navbar-nav pt-3 pt-lg-0">
<div class="dropdown">
<button class="btn btn-sm btn-outline-warning dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
Entrar
</button>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
<small class="dropdown-header" style="font-size:12px">Entidades Sociais</small>
<a class="dropdown-item" href="#" (click)="smModal.show()">Coordenador</a>
<!-- <div class="dropdown-divider"></div>
<small class="dropdown-header" style="font-size:12px">Painel</small>
<a class="dropdown-item" href="#">Usuário solidário</a>
<ul class="nav navbar-nav pt-3 pt-lg-0">
<div class="dropdown">
<button class="btn btn-sm btn-outline-warning dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
Entrar
</button>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
<small class="dropdown-header" style="font-size:12px">Entidades Sociais</small>
<a class="dropdown-item" href="#" (click)="smModal.show()">Coordenador</a>
<!-- <div class="dropdown-divider"></div>
<small class="dropdown-header" style="font-size:12px">Painel</small>
<a class="dropdown-item" href="#">Usuário solidário</a>
</div>
</div>
</div>
</ul>
-->
</ul>
-->
</div>
</div>
</nav>
Expand All @@ -69,60 +70,80 @@ <h5 class="modal-title pull-left">Cadastrar Entidade Social</h5>

<input type="text" id="cnpj" formControlName="cnpj" maxlength="14" name="cnpj" #buscaCnpj class="form-control form-control-lg"
placeholder="CNPJ - apenas números" aria-describedby="basic-addon2">

<div class="input-group-append">
<button class="btn btn-secondary" type="button" (click)="findCnpj(buscaCnpj.value);"><i class="fas fa-search"></i></button>
</div>
</div>

<div class="form-group" *ngIf="registrationSteps == 2">
<input type="text" formControlName="razaoSocial" name="razaoSocial" class="form-control form-control-sm" id="razao-social" disabled>
<input type="text" formControlName="razaoSocial" name="razaoSocial" class="form-control form-control-sm" id="razao-social"
disabled>
<small class="form-text">Razão Social</small>
</div>

<div class="form-group" *ngIf="registrationSteps == 2">
<input type="text" formControlName="atividadePrincipal" name="atividadePrincipal" class="form-control form-control-sm"
id="atividade-principal" disabled>
</div>
<!--<div class="form-group" *ngIf="registrationSteps == 2">
<input type="text" formControlName="atividadePrincipal" name="atividadePrincipal" class="form-control form-control-sm"
id="atividade-principal" disabled>
</div>-->

<div class="form-group" *ngIf="registrationSteps == 2">
<input type="text" formControlName="nomeFantasia" name="nomeFantasia" class="form-control font-weight-bold text-uppercase" id="nomeFantasia">
<input type="text" formControlName="nomeFantasia" name="nomeFantasia" class="form-control font-weight-bold text-uppercase"
id="nomeFantasia">
<small class="form-text">Nome fantasia</small>
</div>

<div class="form-group" *ngIf="registrationSteps == 2">
<input type="email" formControlName="email" name="email" class="form-control font-weight-bold text-lowercase" id="email">
<small class="form-text">E-mail</small>
<input type="email" formControlName="email" name="email" class="form-control text-lowercase" id="email">
<small class="form-text">E-mail principal da ONG</small>
</div>

<!-- TODO: transformar em select -->
<div class="form-group" *ngIf="registrationSteps == 2">
<input type="text" formControlName="areaAtuacao" name="areaAtuacao" class="form-control font-weight-bold text-capitalize"
id="area-de-atuacao">
<select class="custom-select" formControlName="areaAtuacao" name="areaAtuacao" id="area-de-atuacao">
<option selected="true" disabled="disabled">Selecione...</option>
<option value="Idosos">Idosos</option>
<option value="Crianças">Crianças</option>
<option value="Animais">Animais</option>
<option value="Saúde">Saúde</option>
<option value="Educação">Educação</option>
<option value="Apoio a Mulheres">Apoio às Mulheres</option>
<option value="Meio Ambiente">Meio Ambiente</option>
<option value="Combate a Pobreza">Combate à Pobreza</option>
<option value="Esporte">Esporte</option>
<option value="Inovação Tecnológica">Inovação Tecnológica</option>
<option value="Cultura">Cultura</option>
<option value="Dependentes Químicos">Dependentes Químicos</option>
<option value="Finanças">Finanças</option>
<option value="Doação de Órgãos">Doação de Órgãos</option>
<option value="Outros">Outros</option>
</select>
<small class="form-text">Área de atuação</small>
</div>

<div *ngIf="registrationSteps == 2" style="height: 120px;">
<div *ngIf="registrationSteps == 2" style="height:135px;">
<app-mapa-cadastro [lat]="lat" [lng]="lng"></app-mapa-cadastro>
</div>

<div class="input-group mb-3" *ngIf="registrationSteps == 3">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon3">ongbook.org/</span>
</div>
<input type="text" class="form-control" formControlName="sigla" name="sigla" id="sigla" aria-describedby="basic-addon3" placeholder="Sigla da ONG">
<input type="text" class="form-control" formControlName="sigla" name="sigla" id="sigla" aria-describedby="basic-addon3"
placeholder="Sigla da ONG">
</div>

<div class="jumbotron pt-3 pb-2 mb-0" *ngIf="registrationSteps == 3" formGroupName="responsavel">

<h6 *ngIf="registrationSteps == 3">Coordenador responsável</h6>

<!-- div class="input-group form-group" *ngIf="registrationSteps == 3">
<input type="text" id="cpf" formControlName="cpf" name="cpf" #buscaCpf class="form-control" placeholder="CPF"
aria-describedby="basic-addon2">
<div class="input-group-append">
<button class="btn btn-secondary" type="button" (click)="findCpf(buscaCpf);"><i class="fas fa-search"></i></button>
</div>
</div -->
<input type="text" id="cpf" formControlName="cpf" name="cpf" #buscaCpf class="form-control" placeholder="CPF"
aria-describedby="basic-addon2">
<div class="input-group-append">
<button class="btn btn-secondary" type="button" (click)="findCpf(buscaCpf);"><i class="fas fa-search"></i></button>
</div>
</div -->

<div class="form-group" *ngIf="registrationSteps == 3">
<input type="text" class="form-control" placeholder="Nome" formControlName="nome" name="nome" id="nome">
Expand All @@ -137,7 +158,8 @@ <h6 *ngIf="registrationSteps == 3">Coordenador responsável</h6>
</div>

<div class="form-group" *ngIf="registrationSteps == 3">
<input type="password" class="form-control" placeholder="Confirme a senha" formControlName="senhaOk" name="senhaOk" id="senhaOk">
<input type="password" class="form-control" placeholder="Confirme a senha" formControlName="senhaOk" name="senhaOk"
id="senhaOk">
</div>

</div>
Expand All @@ -158,10 +180,10 @@ <h6 *ngIf="registrationSteps == 3">Coordenador responsável</h6>
<div class="modal-footer rounded-bottom bg-light border-top-0 py-0" [ngClass]="{'pb-2': registrationSteps == 1}">

<!-- para próxima entrega.
<div class="col-6" *ngIf="registrationSteps == 1">
<small><a class="text-secondary" (click)="modalRef.hide(); smModal.show();" href="#">já tenho conta</a></small>
</div>
-->
<div class="col-6" *ngIf="registrationSteps == 1">
<small><a class="text-secondary" (click)="modalRef.hide(); smModal.show();" href="#">já tenho conta</a></small>
</div>
-->

<div class="text-right pr-0" [ngClass]="{'col-6': registrationSteps == 1,'pl-0 col-12': registrationSteps != 1 }">
<div class="form-group mb-1">
Expand Down Expand Up @@ -218,4 +240,4 @@ <h5 id="dialog-login-modal" class="modal-title pull-left">Painel administrativo<
</div>
</div>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion src/app/mapa-cadastro/mapa-cadastro.component.scss
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
agm-map {
height: 120px;
height: 135px;
}

0 comments on commit 9022c22

Please sign in to comment.