Skip to content
Open

Dev #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
9fe6a4a
atualizando dev
vxima May 1, 2021
4b2c514
Criado o projeto angular http
nogsp May 1, 2021
39ef13a
db.jason adicionado
nogsp May 1, 2021
e251886
Modulo –HttpClientModule e FormsModule adicionados
nogsp May 1, 2021
137c03a
Adicionado model e interface
nogsp May 1, 2021
03a0b51
Atualização de coezao com o projeto
nogsp May 1, 2021
ca2a683
Services adicionado
nogsp May 1, 2021
0d17a63
Criada metodos para interagir com o servidor
nogsp May 1, 2021
05c968e
Adicionado metodos de interacoes basicas entre component e server
nogsp May 1, 2021
9e7207a
Update nos metodos
nogsp May 1, 2021
f2daef2
bootstrap adicionado
nogsp May 1, 2021
cb9bda0
html template para testes
nogsp May 1, 2021
1132382
template Css adicionado para testes
nogsp May 1, 2021
bcf5a2f
Modificacoes para checar o id e correcao de bugs
nogsp May 1, 2021
33bf03b
Update README.md
nogsp May 1, 2021
7dccf6f
Ultimas alteracoes triviais
nogsp May 1, 2021
f718dbf
Merge branch 'server' of https://github.com/vxima/SACA into server
nogsp May 1, 2021
ab7825b
Merge pull request #27 from vxima/server
nogsp May 1, 2021
d0e0de9
Update README.md
nogsp May 1, 2021
8021169
Update README.md
nogsp May 1, 2021
c9b114c
Diagrama_geral_do_site.drawio
nogsp May 2, 2021
cfab11f
Delete Untitled Diagram.drawio
nogsp May 2, 2021
481b915
Bootstrap adicionado
nogsp May 2, 2021
94f1d26
Refatoração da pagina de registro e criação da barra de navegação
nogsp May 2, 2021
2d0b63e
Links para as funcionalidades já implementadas funcionando
nogsp May 2, 2021
b420b1a
Alteração no banco de dados
nogsp May 2, 2021
6f82600
Merge pull request #29 from vxima/navBar
nogsp May 2, 2021
d837d40
Modulo para ver os pre-requesitos da meta adicionado
nogsp May 2, 2021
040f6d5
Add Pais em Child
vxima May 2, 2021
6e47775
Corrigindo PATH em styles.css
vxima May 2, 2021
0031f22
Interfaces adicionadas
nogsp May 3, 2021
46f9159
Merge branch 'Dev' into interfaces
nogsp May 3, 2021
e176578
Merge pull request #33 from vxima/interfaces
nogsp May 3, 2021
89e9fab
Adicionado as interfaces e servicos necessariso para iniciar a elabor…
nogsp May 3, 2021
f3b9ac3
componente indevido apagado
nogsp May 3, 2021
47f67ed
Cadastro de metas e novo modelo do site
nogsp May 3, 2021
204f2aa
Tudo preparado para implementar as funcionalidades
nogsp May 3, 2021
6d3255e
Funcionando porem com bugs
vxima May 3, 2021
01c0870
Corrigindo bug da funcionalidade
vxima May 3, 2021
f67b1e5
Merge pull request #34 from vxima/projeto_base
vxima May 3, 2021
05d6d97
Corrigindo descriçao em banco de dados
vxima May 3, 2021
b6eddfc
Add exemplos do cenario no banco de dados
vxima May 4, 2021
f138ec0
Teste base executando
vxima May 4, 2021
55845f3
Correção de comentario
vxima May 4, 2021
b95049f
Add configuraçoes de testes
vxima May 4, 2021
0afaea5
Merge pull request #38 from vxima/#Task10
vxima May 4, 2021
0c2558e
Refactoring prerequisite.component,ts
vxima May 4, 2021
9f4dd87
Merge pull request #39 from vxima/#Task10
vxima May 4, 2021
1b6cb7e
criando nova funcionalidade
kinhosz May 4, 2021
c3c7bf1
adicionando dados para teste manual
kinhosz May 4, 2021
35ff06d
conteúdo da funcionalidade "porcentagem para task"
kinhosz May 4, 2021
0befbfd
correcao de bug no task-goals
kinhosz May 4, 2021
360fbbc
Merge branch 'Dev' into task/18
kinhosz May 4, 2021
7e3be87
Merge pull request #40 from vxima/task/18
kinhosz May 4, 2021
d848e88
correcao de erro de compilacao
kinhosz May 4, 2021
8e21bb1
refatorando codigo
kinhosz May 4, 2021
89d0c16
button organizado
kinhosz May 4, 2021
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
node_modules
.vs_code

# Logs
logs
*.log
17 changes: 17 additions & 0 deletions angular-http/.browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# For the full list of supported browsers by the Angular framework, please see:
# https://angular.io/guide/browser-support

# You can see what browsers were selected by your queries by running:
# npx browserslist

last 1 Chrome version
last 1 Firefox version
last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
16 changes: 16 additions & 0 deletions angular-http/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Editor configuration, see https://editorconfig.org
root = true

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

[*.ts]
quote_type = single

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

# compiled output
/dist
/tmp
/out-tsc
# Only exists if Bazel was run
/bazel-out

# dependencies
/node_modules

# profiling files
chrome-profiler-events*.json
speed-measure-plugin*.json

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

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

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

# System Files
.DS_Store
Thumbs.db
35 changes: 35 additions & 0 deletions angular-http/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# AngularHttp

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.2.10.

## Dependencies
run `sudo npm install -g @angular/cli` for angular
run `sudo npm install -g json-server` for json server
## Development server

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

## Json server
Run `json-server --watch src/assets/data/db.json`

## Code scaffolding

Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.

## 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/).



## Further help

To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
131 changes: 131 additions & 0 deletions angular-http/angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"cli": {
"analytics": "b039c453-ad64-488d-a0b1-ad121d8bfb04"
},
"version": 1,
"newProjectRoot": "projects",
"projects": {
"angular-http": {
"projectType": "application",
"schematics": {
"@schematics/angular:application": {
"strict": true
}
},
"root": "",
"sourceRoot": "src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/angular-http",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": true,
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css"
],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "1mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kb",
"maximumError": "4kb"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "angular-http:build"
},
"configurations": {
"production": {
"browserTarget": "angular-http:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "angular-http:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css"
],
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "angular-http:serve"
},
"configurations": {
"production": {
"devServerTarget": "angular-http:serve:production"
}
}
}
}
}
},
"defaultProject": "angular-http"
}
37 changes: 37 additions & 0 deletions angular-http/e2e/protractor.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts

const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');

/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
specs: [
'./src/**/*.e2e-spec.ts'
],
capabilities: {
browserName: 'chrome'
},
directConnect: true,
SELENIUM_PROMISE_MANAGER: false,
baseUrl: 'http://localhost:4200/',
framework: 'jasmine',
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
print: function() {}
},
onPrepare() {
require('ts-node').register({
project: require('path').join(__dirname, './tsconfig.json')
});
jasmine.getEnv().addReporter(new SpecReporter({
spec: {
displayStacktrace: StacktraceOption.PRETTY
}
}));
}
};
23 changes: 23 additions & 0 deletions angular-http/e2e/src/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { browser, logging } from 'protractor';
import { AppPage } from './app.po';

describe('workspace-project App', () => {
let page: AppPage;

beforeEach(() => {
page = new AppPage();
});

it('should display welcome message', async () => {
await page.navigateTo();
expect(await page.getTitleText()).toEqual('angular-http app is running!');
});

afterEach(async () => {
// Assert that there are no errors emitted from the browser
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
expect(logs).not.toContain(jasmine.objectContaining({
level: logging.Level.SEVERE,
} as logging.Entry));
});
});
11 changes: 11 additions & 0 deletions angular-http/e2e/src/app.po.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { browser, by, element } from 'protractor';

export class AppPage {
async navigateTo(): Promise<unknown> {
return browser.get(browser.baseUrl);
}

async getTitleText(): Promise<string> {
return element(by.css('app-root .content span')).getText();
}
}
13 changes: 13 additions & 0 deletions angular-http/e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es2018",
"types": [
"jasmine",
"node"
]
}
}
44 changes: 44 additions & 0 deletions angular-http/karma.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/1.0/config/configuration-file.html

module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage'),
require('@angular-devkit/build-angular/plugins/karma')
],
client: {
jasmine: {
// you can add configuration options for Jasmine here
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
// for example, you can disable the random execution with `random: false`
// or set a specific seed with `seed: 4321`
},
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
jasmineHtmlReporter: {
suppressAll: true // removes the duplicated traces
},
coverageReporter: {
dir: require('path').join(__dirname, './coverage/angular-http'),
subdir: '.',
reporters: [
{ type: 'html' },
{ type: 'text-summary' }
]
},
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false,
restartOnFileChange: true
});
};
Loading