Skip to content

Teste feito #2

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

Open
PedroPMV1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Teste feito #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 devpartner/Devpartner-PortalAdmin/app/app.controllers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ app.controller('getUserData', ['$scope', '$http', '$rootScope', 'sysServicos', '
});
};

/*

var promise = $http.get(rootURL + 'consumidor');
promise.then(
function (ret) {
Expand All @@ -201,7 +201,7 @@ app.controller('getUserData', ['$scope', '$http', '$rootScope', 'sysServicos', '
function (err) {
sysServicos.sendErrorMsg(err.status, err.statusText, err.config.url, err.data.mensagem);
}
);*/
);
}
]);

Expand Down
13 changes: 7 additions & 6 deletions devpartner/Devpartner-PortalAdmin/app/app.routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ app.config(function ($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
$urlRouterProvider.otherwise("/galeria");

$ocLazyLoadProvider.config({
'debug': true, // For debugging 'true/false'
'debug': false, // For debugging 'true/false'
'events': true, // For Event 'true/false'
'modules': [{
name: 'galeria',
files: ['../app/modules/galeria/controllers/galeriaCtrl.js']
}]
name: 'galeria',
files: ['../app/modules/galeria/controllers/galeriaCtrl.js']
}]
});

$stateProvider

//Galeria List
.state('galeria', {
url: '/galeria',
Expand All @@ -31,6 +31,7 @@ app.config(function ($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
//Galeria Detalhes
.state('galeriaDetalhe', {
url: '/galeria/:galeriaId',
params: { tipo: null, objeto: {} },
views: {
'': {
templateUrl: '../app/modules/galeria/views/galeriaDetalhe.html'
Expand All @@ -43,7 +44,7 @@ app.config(function ($stateProvider, $urlRouterProvider, $ocLazyLoadProvider) {
}
})



}).run(function ($rootScope, $state) {
$rootScope.$state = $state;
Expand Down
10 changes: 5 additions & 5 deletions devpartner/Devpartner-PortalAdmin/app/directives/footer/page-footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<footer id="content-footer" class="blurish">
<div class="container">
<div class="row">
<div class="col-xs-10">
Entre em contato: <i class="fa fa-whatsapp" aria-hidden="true"></i> (11) 5078-7173
<div class="col-xs-12">
<span class="footer-text">Entre em contato: <i class="fa fa-whatsapp" aria-hidden="true"></i> (11) 5078-7173</span>
</div>
<div class="col-xs-2 text-right">
<!-- <div class="col-xs-2 text-right">
<img src="../../../assets/img/ltmLogin.png" />
</div>
</div> -->
</div>
</div>
</footer>
</footer>
25 changes: 9 additions & 16 deletions devpartner/Devpartner-PortalAdmin/app/directives/menus/menu-top.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div ng-controller="getUserData">
<header class="menu-admin">
<div class="container">
<div class="col-md-2 col-sm-3 col-xs-10"><img class="logo-main img-responsive" src="/assets/img/logoTop.png" alt=""></div>
<div class="col-md-2 col-sm-3 col-xs-10"><img class="logo-main img-responsive" src="/assets/img/logoTop.png"></div>

<div class="col-md-8 col-sm-7 col-xs-2">
<nav class="navbar navbar-default">
Expand All @@ -19,8 +19,6 @@
</div>
<div class="col-md-2 col-sm-2 col-xs-12 hidden-xs mt10">
<button class="btn btn-warning mt14 btn-logout pull-right" ng-click="logOut()">Sair</button>
<!--<button class="btn btn-primary mt14 btn-logout pull-right" ui-sref="usuario">{{userName}}</button>
<button class="btn btn-primary mt14 btn-logout pull-right" ui-sref="usuario"><img src="/assets/img/icon-user.png" alt="Usuários" title="Usuários" /></button>-->
</div>
</div>
</header>
Expand All @@ -29,29 +27,24 @@
<div class="col-md-12 col-sm-12 col-xs-12">
<nav class="navbar navbar-default">


<div class="collapse navbar-collapse" id="menu-top">
<ul class="nav navbar-nav ">


<li ui-sref-active="active" ng-class="{active: $state.includes('galeria')}"><a ui-sref="galeria" ng-click="closeSubMenu()">Galeria</a></li>
</ul>
</div>
<div class="collapse navbar-collapse" id="menu-top">
<ul class="nav navbar-nav ">
<li ui-sref-active="active" ng-class="{active: $state.includes('galeria')}"><a ui-sref="galeria"
ng-click="closeSubMenu()">Galeria</a></li>
</ul>
</div>

</nav>
</div>
</div>
</nav>
<div class="col-xs-12">
<ul class="nav navbar-nav content-center collapse navbar-collapse" id="menuOptions">



<li ui-sref-active="active"><a ui-sref="galeria">Galeria</a></li>

<li>
<!--<button class="btn btn-primary mt14 btn-logout pull-right" ui-sref="usuario">{{userName}}</button> -->
<button class="btn btn-warning mt14 btn-logout pull-right" ng-click="logOut()">Sair</button>
</li>
</ul>
</div>
</div>
</div>
4 changes: 3 additions & 1 deletion devpartner/Devpartner-PortalAdmin/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,13 @@
<div id="main-admin">
<section id="content_wrapper">
<!--Conteudo pagina-->
<div ui-view></div>
<ui-view></ui-view>
<!--Fim Conteudo pagina-->
</section>
</div>

<page-footer></page-footer>

<!--Jquery Plugins-->
<script src="../assets/libs/magnific/jquery.magnific-popup.js"></script>
<script src="../assets/libs/utility/utility.js"></script>
Expand Down
49 changes: 42 additions & 7 deletions devpartner/Devpartner-PortalAdmin/app/modules/galeria/controllers/galeriaCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,51 @@
angular.module('galeriaModule', [])
.controller('galeriaController', ['$scope', '$http', '$rootScope', 'sysServicos', '$stateParams', '$timeout','$state',
function ($scope, $http, $rootScope, sysServicos, $stateParams, $timeout,$state) {

.controller('galeriaController', ['$scope', '$http', '$rootScope', 'sysServicos', '$stateParams', '$timeout', '$state',
function ($scope, $http, $rootScope, sysServicos, $stateParams, $timeout, $state) {
$scope.dados = []
$scope.carregar = function () {
$http.get("http://localhost:3000/galeria").then(function (result) {
$scope.dados = result.data
}

);
}
$scope.cadastrar = function (tipo) {
$state.go('galeriaDetalhe', { tipo: tipo, objeto: {} });
}
$scope.detalhes = function (tipo, objeto) {
$state.go('galeriaDetalhe', { tipo: tipo, objeto: objeto });
}

}

])

.controller('galeriaDetController', ['$scope', '$http', '$rootScope', 'sysServicos', '$stateParams', '$timeout','$state',
function ($scope, $http, $rootScope, sysServicos, $stateParams, $timeout,$state) {
.controller('galeriaDetController', ['$scope', '$http', '$rootScope', 'sysServicos', '$stateParams', '$timeout', '$state',
function ($scope, $http, $rootScope, sysServicos, $stateParams, $timeout, $state) {
$scope.carregar = function () {
$scope.dado = $stateParams.objeto;
$scope.tipo = $stateParams.tipo;
console.log($scope.dado);
}

}
$scope.voltar = function () {
$state.go('galeria');
};
$scope.adicionar = function () {
$http.post("http://localhost:3000/galeria/", $scope.dado).then(function (result) {
$state.go('galeria');
})
};
$scope.deletar = function () {
$http.delete(`http://localhost:3000/galeria/${$scope.dado._id}`).then(function (result) {
$state.go('galeria');
})
};
$scope.alterar = function () {
$http.put("http://localhost:3000/galeria", $scope.dado).then(function (result) {
$state.go('galeria');
})
};
}

])
])
36 changes: 26 additions & 10 deletions devpartner/Devpartner-PortalAdmin/app/modules/galeria/views/galeriaDetalhe.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<div ng-controller="galeriaDetController">
<div ng-controller="galeriaDetController" ng-init="carregar()">
<div class="container">

<div class="panel mt20">
<div class="panel-heading">
<h2>Cadastro de Galeria</h2>
<h2 ng-if="tipo === 'alterar'">Editar item de Galeria</h2>
<h2 ng-if="tipo === 'deletar'">Deletar item de Galeria</h2>
<h2 ng-if="tipo === 'visualizar' || tipo ==='adicionar'">Cadastro item de Galeria</h2>
</div>
<div class="panel-body admin-form">
<div class="row mt40">
Expand All @@ -13,7 +15,7 @@ <h2>Cadastro de Galeria</h2>
<label>Título
<strong class="txt-obrigatorio">*</strong>
</label>
<input type="text" >
<input ng-disabled="tipo === 'visualizar' || tipo === 'deletar'" type="text" ng-model="dado.titulo">
</md-input-container>
</div>
</div>
Expand All @@ -24,7 +26,7 @@ <h2>Cadastro de Galeria</h2>
<label>Subtítulo
<strong class="txt-obrigatorio">*</strong>
</label>
<input type="text">
<input type="text" ng-disabled="tipo === 'visualizar' || tipo === 'deletar'" ng-model="dado.subTitulo">
</md-input-container>
</div>
</div>
Expand All @@ -35,7 +37,10 @@ <h2>Cadastro de Galeria</h2>
<label>Texto
<strong class="txt-obrigatorio">*</strong>
</label>
<input type="text">
<textarea type="text" ng-disabled="tipo === 'visualizar' || tipo === 'deletar'"
ng-model="dado.conteudo">

</textarea>
</md-input-container>
</div>
</div>
Expand All @@ -46,9 +51,10 @@ <h2>Cadastro de Galeria</h2>
<label>Youtube Id
<strong class="txt-obrigatorio">*</strong>
</label>
<input type="text"></input>
<span id="ptest" class="glyphicon glyphicon-question-sign toltip-question" aria-hidden="true" type="button" data-container="body"
data-toggle="popover" data-placement="bottom" title="Exemplo: B65ghzKoFUE" data-content="O Id fica no final da url do video http://www.youtube.com/B65ghzKoFUE"></span>
<input type="text" ng-disabled="tipo === 'visualizar' || tipo === 'deletar'" ng-model="dado.imagemThumbnail.url"></input>
<span id="ptest" class="glyphicon glyphicon-question-sign toltip-question" aria-hidden="true"
type="button" data-container="body" data-toggle="popover" data-placement="bottom"
title="Exemplo: B65ghzKoFUE" data-content="O Id fica no final da url do video http://www.youtube.com/B65ghzKoFUE"></span>
<script>
$(document).ready(function () {
$('#ptest').popover({
Expand All @@ -69,8 +75,18 @@ <h2>Cadastro de Galeria</h2>

<div class="row">
<div class="col-xs-12 col-sm-12 text-center mt20 mb20">

<button type="button" class="btn btn-xl btn-success" >Salvar</button>
<button ng-click="adicionar()" ng-if="tipo === 'adicionar'" type="button" class="btn btn-xl btn-default">
Salvar
</button>
<button ng-click="alterar()" ng-if="tipo === 'alterar'" type="button" class="btn btn-xl btn-success">
Salvar
</button>
<button ng-click="deletar()" ng-if="tipo === 'deletar'" type="button" class="btn btn-xl btn-danger">
Excluir
</button>
<button ng-click="voltar()" ng-if="tipo === 'visualizar'" type="button" class="btn btn-xl btn-info">
Voltar
</button>
</div>
</div>
</div>
Expand Down
71 changes: 43 additions & 28 deletions devpartner/Devpartner-PortalAdmin/app/modules/galeria/views/galeriaList.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,50 @@
<div ng-controller="galeriaController">
<div ng-controller="galeriaController" ng-init="carregar()">

<div class="container">
<div class="panel mt20">
<div class="panel-heading">
<h2>Galeria</h2>
<br>

<div class="container">
<div class="panel mt20">
<div class="panel-heading">
<h2>Galeria</h2>
<br>
</div>
<div class="panel-body admin-form">
<div class="row mb40">
</div>
<div class="panel-body admin-form">
<div class="row mb40">

</div>
<div class="row">
<div class="col-xs-12 text-center">
<a class="btn btn-xl btn-success">Cadastrar Galeria</a>
</div>


<div class="row">
<div class="col-xs-12 text-center">
<a ng-click="cadastrar('adicionar')" class="btn btn-xl btn-success">Cadastrar Galeria</a>
</div>

<div class="row mt20 mb20">
<div class="col-xs-12 text-center">
tabela
</div>


</div>

<div class="row mt20 mb20">
<div class="col-xs-12">
<table class="table" style="width: 100%;">
<thead>
<tr>
<th class="text-left">#</th>
<th class="text-left">Título</th>
<th class="text-left">subTitulo</th>
<th class="text-center">Opções</th>
</tr>
</thead>
<tbody>
<tr ng-repeat=" dado in dados ">
<th class="text-left">
<img ng-if="dado.imagemThumbnail.url" width="80px" src="{{dado.imagemThumbnail.url}}">
<img ng-if="!dado.imagemThumbnail.url" width="80px" src="../../../../assets/img/vazio.jpg">
</th>
<td class="text-left">{{dado.titulo}}</td>
<td class="text-left">{{dado.subTitulo}}</td>
<td class="text-center td-icon">
<i ng-click="detalhes('deletar', dado)" class="table-icon fa fa-trash"></i>
<i ng-click="detalhes('alterar', dado)" class="table-icon fa fa-pencil"></i>
<i ng-click="detalhes('visualizar', dado)" class="table-icon fa fa-info"></i>
</td>
</tr>
</tbody>
</table>
</div>



</div>
</div>
</div>
</div>
</div>
</div>
Loading