Skip to content
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.

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

First release #31

Open
wants to merge 105 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
d923a75
menu-dropdown
bruno-damato Mar 14, 2016
f959982
Incluindo modificacoes na VIEW
claudineigomes Mar 14, 2016
28faee0
Melhorando a pesquisa e incluindo pesquisa em TODOS
claudineigomes Mar 14, 2016
661056d
Buog nao pesquisava por nome da aplicacao resolvido.
claudineigomes Mar 15, 2016
8a9783f
Incluindo metodo de filtro mas nao esta' completo.
claudineigomes Mar 15, 2016
8fee056
Trocando o filtro de checkbox para radio button.
claudineigomes Mar 16, 2016
ad73f9a
AUDIT-4_Configurando o pool de conexão HikariCP
bruno-damato Mar 17, 2016
f3b0f84
Correcao erro gradle. Era so atualizar o gradle via IDE
claudineigomes Mar 17, 2016
03f22b2
Incluindo pesquisa melhorada e filtro.
claudineigomes Mar 18, 2016
ae74acd
Modificacoes JPA e DAO
bruno-damato Mar 28, 2016
c8f544d
Arquivo application-dev.properties
claudineigomes Mar 28, 2016
d5afded
Retirada DAO, configurando conexao externa
bruno-damato Mar 29, 2016
433633b
Incluindo DAO
claudineigomes Mar 29, 2016
c8eefd3
Aplication.yml OK, funcional
bruno-damato Mar 29, 2016
0f9de19
Configurando LogsDAO
bruno-damato Mar 30, 2016
8a929af
Usando SpringBoot
claudineigomes Apr 1, 2016
006a883
Incluindo repository
claudineigomes Apr 4, 2016
dece3ae
Atualizando versao.
claudineigomes Apr 5, 2016
ed91d15
.gitignore modificado
claudineigomes Apr 5, 2016
2b2e8f7
Incluindo insercao e recuracao de logs.
claudineigomes Apr 5, 2016
e7bf679
Incluindo filtro usando spring data rest
claudineigomes Apr 6, 2016
b2a66ae
Request no server para listagem
claudineigomes Apr 6, 2016
b1ba177
Pesquisa por mais de um parametro.
claudineigomes Apr 7, 2016
ba14803
Incluindo controller
claudineigomes Apr 7, 2016
f3f4d17
Commit de seguranca
claudineigomes Apr 7, 2016
ef0d79b
Temp
claudineigomes Apr 7, 2016
11c2e6b
commit de seguranca
claudineigomes Apr 7, 2016
da1cf37
Incluindo request no server para filtro.
claudineigomes Apr 8, 2016
3bec3b4
Filtro quase finalizado.
claudineigomes Apr 11, 2016
530ee07
Incluindo filtro por data. In progress.
claudineigomes Apr 13, 2016
dcd0916
Incluindo box de filtros no canto esquerdo da pagina principal.
claudineigomes Apr 13, 2016
7c0fabe
In Progress Filtros
claudineigomes Apr 13, 2016
816c5de
Interface melhorada
claudineigomes Apr 14, 2016
451da4f
Tela melhorada
claudineigomes Apr 14, 2016
dab9738
Falta colocar a data no padrao iso
claudineigomes Apr 15, 2016
f792133
Print data na tela principal esta formatado.
claudineigomes Apr 18, 2016
0336071
Filtros quase prontos. Tentar usar query para filtro de data.
claudineigomes Apr 19, 2016
6a18aaa
Filtros prontos.
claudineigomes Apr 20, 2016
097847b
Fazer funcionar [ui.bootstrap]
claudineigomes Apr 29, 2016
cbf7333
Paginacao feita. Melhorar layout.
claudineigomes May 3, 2016
5c40831
Falta autenticacao com keycloak
claudineigomes May 5, 2016
159e80f
pagina de login comecada.
claudineigomes May 6, 2016
c84282c
bug nao repopulava tabela resolvido
claudineigomes May 11, 2016
6220e25
Incluindo imagens
claudineigomes May 12, 2016
a35c707
Incluindo imagens
claudineigomes May 12, 2016
ce9b403
Merge remote-tracking branch 'origin/audit-index' into develop
May 19, 2016
98f19b2
apagando arquivos de configuracao errados
May 19, 2016
ca76dc9
ajustes menores para sistema funcionar sem errors
May 19, 2016
87931b1
entity-model funcional
May 19, 2016
71e6e0a
exemplo de apllication-dev.properties
May 19, 2016
460cddc
Merge branch 'master' of ssh://bitbucket.org/pucmg/audit-view into de…
May 19, 2016
9225d67
movido client para src/main/webapp
May 19, 2016
992350c
resources.projectroot desnecessario
May 19, 2016
45ea5c5
jar depende de bowerInstall
May 19, 2016
ce070ff
AUDIT-10 Visualizacao central ocupa pagina toda
May 19, 2016
99e7a97
AUDIT-4 Fix
May 19, 2016
dc0f16c
exemplo de apllication-dev.properties updated
May 20, 2016
2645ffa
AUDIT-11 Login e logout com keycloak
May 20, 2016
140b9f1
AUDIT-11 Login na pagina inicial nao faz nada
May 20, 2016
64ed7e7
chore: deletado InitDataBase.sql
May 20, 2016
1e38487
doc: configuration.md
May 20, 2016
483126d
deleted keycloak.json files
May 20, 2016
e17fc12
docs: documentation for development and production
May 20, 2016
a8eea3b
added license
May 21, 2016
31bf33a
removido entity-model como submodulo
May 21, 2016
41bb13e
audit-model como dependencia do gradle
May 21, 2016
5ee5755
optimize imports
May 21, 2016
2cca4c0
Merge pull request #2 from atende/feature/AUDIT-11-login-da-aplicacao
May 21, 2016
709024a
build and deploy with wercker
Jun 13, 2016
81078e8
documentation and adjusts about running on keycloak
Aug 21, 2016
517143c
remove keycloak-dev.json from git
Aug 22, 2016
a7b58e6
Angular2 Migration Finished (#9)
Sep 25, 2016
a91ab89
app-navbar e app-toolbar
Sep 26, 2016
6cbeb5e
remove keycloak files
Sep 26, 2016
5629069
angular natural route
Sep 26, 2016
02f405d
#6 Logout works
Oct 1, 2016
0ecdb6e
#6 Try build with wercker
Oct 2, 2016
69bdd86
ci build
Oct 2, 2016
d8cff79
update project
Feb 14, 2017
993a6ae
#14 gradle updated, keycloak with springboot adapter
Apr 6, 2017
3f59776
#15 fix
Apr 6, 2017
80c6cb7
#14 fix
Apr 6, 2017
e2c4022
script sql to with 1000 generated rows
Apr 6, 2017
8fadbfd
build.prod pass (#16)
federicojansen Apr 7, 2017
b3a7f0a
#17 Fix
Apr 7, 2017
4dc1b30
#17 production true in environment.prod.dist
Apr 7, 2017
be71b05
Feature/keycloak auth spa (#18)
Apr 7, 2017
e14cf82
.DS_Store ignore
Apr 10, 2017
61ed963
update package.json
May 13, 2017
b04e4f9
Audit view#13 (#25)
May 13, 2017
e2f5d79
fix client test with chrome
May 13, 2017
25c47d5
Merge remote-tracking branch 'origin/develop' into develop
May 14, 2017
a865c61
fix broke package.json in merge
May 14, 2017
725d6fc
Feature/interface improvements (#24)
May 14, 2017
e570adb
Merge remote-tracking branch 'origin/develop' into develop
May 14, 2017
7052953
Merge remote-tracking branch 'origin/feature/keycloak-auth-spa' into …
May 14, 2017
c6fb634
Audit view#19 (#29)
May 17, 2017
972f83b
refact: client search better
May 21, 2017
390fa83
Merge remote-tracking branch 'origin/develop' into develop
May 21, 2017
83d5609
refact: AuditEvent interface
May 21, 2017
c13bc57
lint typescript
May 21, 2017
e71037b
lint and code style
May 21, 2017
6e6ec91
run client lint on ci test
May 21, 2017
cb29e76
[ci skip] Add build status for master
May 21, 2017
d359209
Merge branch 'master' into newbranch
May 21, 2017
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
Binary file removed .DS_Store
Binary file not shown.
35 changes: 35 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[*]
charset=utf-8
end_of_line=lf
insert_final_newline=false
indent_style=space
indent_size=4

[{.babelrc,.stylelintrc,.eslintrc,jest.config,*.bowerrc,*.jsb3,*.jsb2,*.json}]
indent_style=space
indent_size=2

[{jshint.json,*.jshintrc}]
indent_style=space
indent_size=2

[{*.ddl,*.sql}]
indent_style=space
indent_size=2

[*.less]
indent_style=space
indent_size=2

[*.scss]
indent_style=space
indent_size=2

[{*.yml,*.yaml}]
indent_style=space
indent_size=2

[tslint.json]
indent_style=space
indent_size=2

7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Created by .ignore support plugin (hsz.mobi)
.idea/
build/
.DS_Store
#src/main/resources/application-dev.properties
*.iml
/classes
Expand Down Expand Up @@ -31,10 +32,14 @@ conf/test.conf
/*.log
/work
/src/main/resources/application-dev.properties
/src/main/resources/application-test.properties
/application-test1.properties
/src/main/resources/keycloak-dev.json
/src/main/resources/keycloak.json
# Wercker
_builds/
_cache/
_projects/
_steps/
_steps/
.wercker/
src/main/webapp/
16 changes: 16 additions & 0 deletions .idea/codeStyleSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Audit View

[![wercker status](https://app.wercker.com/status/5116f2ef82779fbea92e5ca1803c39ab/s/master "wercker status")](https://app.wercker.com/project/byKey/5116f2ef82779fbea92e5ca1803c39ab)

This project use [keycloak](http://keycloak.org) for authentication.
The **AUDIT_VIEW_ACCESS** role is necessary to have access
42 changes: 25 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
springBootVersion = '1.3.5.RELEASE'
springBootVersion = '1.4.0.RELEASE'
}
repositories {
mavenCentral()
Expand All @@ -11,17 +11,17 @@ buildscript {
}

apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'spring-boot'
apply plugin: 'idea'

jar {
baseName = 'audit-view'
version = '0.0.1-SNAPSHOT'
// from ("${projectDir}/src/main/webapp") {
//
// }
idea {
module {
excludeDirs += file('.wercker')
excludeDirs += file('client/dist')
}
}


sourceCompatibility = 1.8
targetCompatibility = 1.8

Expand All @@ -34,34 +34,42 @@ repositories {


dependencies {

runtime(project(":client"))

compile('org.springframework.boot:spring-boot-starter-data-jpa')
compile('org.springframework.boot:spring-boot-starter-data-rest')
compile('org.springframework.boot:spring-boot-starter-web')
compile('org.springframework.boot:spring-boot-starter-thymeleaf')
// compile('org.springframework.boot:spring-boot-starter-thymeleaf')
// Thymeleaf legacy html
runtime group: 'net.sourceforge.nekohtml', name: 'nekohtml', version: '1.9.22'
// runtime group: 'net.sourceforge.nekohtml', name: 'nekohtml', version: '1.9.22'

compile('com.zaxxer:HikariCP:2.4.4')//JPA HikariCP
compile('com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.7.3')

compile('org.apache.httpcomponents:httpclient:4.5.2')


compile group: 'org.keycloak', name: 'keycloak-spring-security-adapter', version: '1.9.4.Final'
compile group: 'org.keycloak', name: 'keycloak-spring-security-adapter', version: '2.5.5.Final'
compile group: 'org.keycloak', name: 'keycloak-spring-boot-adapter', version: '2.5.5.Final'
compile group: 'org.keycloak', name: 'keycloak-tomcat8-adapter', version: '2.5.5.Final'
compile('org.codehaus.jackson:jackson-mapper-asl:1.9.13')

compile group: 'org.apache.poi', name: 'poi', version: '3.16'


compile group: 'info.atende.audition', name: 'audit-model', version: '1.0.0-SNAPSHOT', changing: true
compile group: 'commons-lang', name: 'commons-lang', version: '2.6'
runtime('org.postgresql:postgresql')
testCompile('org.springframework.boot:spring-boot-starter-test')
}

task bowerInstall(type: Exec) {
workingDir "${projectDir}/src/main/webapp"
commandLine 'bower', 'install', '--allow-root'
test {
testLogging {
exceptionFormat = 'full'
}
}

jar.dependsOn(bowerInstall)

task wrapper(type: Wrapper) {
gradleVersion = '2.13'
gradleVersion = '3.4.1'
}
63 changes: 63 additions & 0 deletions client/.angular-cli.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "audit-view"
},
"apps": [
{
"root": "src",
"outDir": "dist",
"assets": [
"assets",
"favicon.ico"
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"../node_modules/bootstrap/dist/css/bootstrap.css",
"../node_modules/primeng/resources/primeng.min.css",
"../node_modules/primeng/resources/themes/omega/theme.css",
"../node_modules/font-awesome/css/font-awesome.min.css",
"styles.css"
],
"scripts": [
"../node_modules/keycloak-js/dist/keycloak.min.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json"
},
{
"project": "src/tsconfig.spec.json"
},
{
"project": "e2e/tsconfig.e2e.json"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "css",
"component": {}
}
}
13 changes: 13 additions & 0 deletions client/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Editor configuration, see http://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
45 changes: 45 additions & 0 deletions client/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp

# dependencies
/node_modules

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.sass-cache
/connect.lock
/coverage/*
/libpeerconnection.log
npm-debug.log
testem.log
/typings

# e2e
/e2e/*.js
/e2e/*.map

#System Files
.DS_Store
Thumbs.db

# Because will change for the team

src/environments/environment.prod.ts
src/environments/environment.ts
31 changes: 31 additions & 0 deletions client/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Client2

This project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.15.

## Development server
Run `ng serve --proxy proxy.conf.json` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.

## Code scaffolding

Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive/pipe/service/class`.

## Build

Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.

## Running unit tests

Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).

## Running end-to-end tests

Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
Before running the tests make sure you are serving the app via `ng serve`.

## Deploying to Github Pages

Run `ng github-pages:deploy` to deploy to Github Pages.

## Further help

To get more help on the `angular-cli` use `ng --help` or go check out the [Angular-CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
44 changes: 44 additions & 0 deletions client/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
buildscript {
repositories {
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath "com.moowork.gradle:gradle-node-plugin:0.13"
}
}
apply plugin: "com.moowork.node"
apply plugin: "java"

jar {
baseName 'client'
from 'dist/'
eachFile { details ->
details.path = details.path.startsWith('META-INF') ?: 'static/'+details.path
}
// Jar contains duplicate empty folders, see Gradle issue:
// http://issues.gradle.org/browse/GRADLE-1830
// so we need to set includeEmptyDirs to false
includeEmptyDirs = false

}

task npmBuildProd(dependsOn: npmInstall, type: NpmTask) {
inputs.dir "src"
inputs.file "packages.json"
outputs.dir "dist"
args = ['run', 'build.prod']
}

task testJS(type: NpmTask) {
inputs.dir "src"
inputs.file "packages.json"
outputs.dir "dist"
args = ['run', 'test:ci']
}

test.dependsOn testJS

jar.dependsOn npmBuildProd

Loading