diff --git a/README.md b/README.md index 2c6fe1f..5c15480 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,12 @@ git clone "https://github.com/**seu-usuario**/frontend-test.git" ```sh git checkout -b "meunomeEsobrenome" ``` +**4. Rodando o json** +*Baixar o json-server caso nao tenha. ir na pasta **/devpartner/Devpartner-PortalAdmin/data** e digitar...* +```sh +json-server galeria.json +``` + **4. Instalando as dependências** ```sh diff --git a/devpartner/Devpartner-PortalAdmin/app/app.controllers.js b/devpartner/Devpartner-PortalAdmin/app/app.controllers.js index b61b62e..d04de4c 100644 --- a/devpartner/Devpartner-PortalAdmin/app/app.controllers.js +++ b/devpartner/Devpartner-PortalAdmin/app/app.controllers.js @@ -61,6 +61,7 @@ app.controller('loadMenu', ['$scope', '$http', '$rootScope', 'sysServicos', '$st } ); + $scope.makeMenu = function (dataSet) { $scope.menuAreas = []; diff --git a/devpartner/Devpartner-PortalAdmin/app/galeria.json b/devpartner/Devpartner-PortalAdmin/app/galeria.json new file mode 100644 index 0000000..f2ae48d --- /dev/null +++ b/devpartner/Devpartner-PortalAdmin/app/galeria.json @@ -0,0 +1,19 @@ +{ + "posts": [ + { + "id": 1, + "title": "json-server", + "author": "typicode" + } + ], + "comments": [ + { + "id": 1, + "body": "some comment", + "postId": 1 + } + ], + "profile": { + "name": "typicode" + } +} \ No newline at end of file diff --git a/devpartner/Devpartner-PortalAdmin/app/index.html b/devpartner/Devpartner-PortalAdmin/app/index.html index 85abbde..25b18a5 100644 --- a/devpartner/Devpartner-PortalAdmin/app/index.html +++ b/devpartner/Devpartner-PortalAdmin/app/index.html @@ -1,128 +1,133 @@  - - DevPartner - ADMIN - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
- -
-
- - - - - - - - - - - - - + + + DevPartner - ADMIN + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/devpartner/Devpartner-PortalAdmin/app/modules/galeria/controllers/galeriaCtrl.js b/devpartner/Devpartner-PortalAdmin/app/modules/galeria/controllers/galeriaCtrl.js index be25bbf..316709f 100644 --- a/devpartner/Devpartner-PortalAdmin/app/modules/galeria/controllers/galeriaCtrl.js +++ b/devpartner/Devpartner-PortalAdmin/app/modules/galeria/controllers/galeriaCtrl.js @@ -1,6 +1,16 @@ 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.title = 'Galeria' + + $http.get('http://localhost:4000/items/').success(function (data, status, headers, config) {// ou localhost + + $scope.galeria = data; + + }).error(function (data, status, headers, config) { + + }) @@ -8,9 +18,41 @@ ]) - .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) { + + $http.get('http://localhost:4000/items/').success(function (data, status, headers, config) {// ou localhost + + $scope.galeria = data; - } + }).error(function (data, status, headers, config) { + console.log(data, 'status do erro: ' + status) + }) + + var obj = { + galeriaId: '', + titulo: 'galeria.titulo', + subTitulo: 'galeria.subTitulo', + conteudo: 'galeria.conteudo', + perfilgaleria: [], + imagemPrincipal: { + imagemPrincipalId: "", + url: "" + }, + imagemThumbnail: { + imagemThumbnailId: "", + url: "" + }, + youtubeId: '' + + } + + $scope.adicionarGaleria = function (galeria, obj) { + galeria.push({obj}); + // debugger + } + } + + + ]) -]) diff --git a/devpartner/Devpartner-PortalAdmin/app/modules/galeria/views/galeriaDetalhe.html b/devpartner/Devpartner-PortalAdmin/app/modules/galeria/views/galeriaDetalhe.html index bd03831..092c5cf 100644 --- a/devpartner/Devpartner-PortalAdmin/app/modules/galeria/views/galeriaDetalhe.html +++ b/devpartner/Devpartner-PortalAdmin/app/modules/galeria/views/galeriaDetalhe.html @@ -13,8 +13,10 @@

Cadastro de Galeria

- + +

{{galeria.titulo}}

+ @@ -24,7 +26,8 @@

Cadastro de Galeria

- + +

{{galeria.subtitulo}}

@@ -35,7 +38,8 @@

Cadastro de Galeria

- + + {{galeria.conteudo}} @@ -46,7 +50,8 @@

Cadastro de Galeria

- + + {{galeria.youtube}}