Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
5f46859
Agregado bootsrap
danilobassi8 Aug 21, 2020
3e311c7
pagination-list
SebaMoreyra Aug 21, 2020
abfbf1a
interfaz login hecha
danilobassi8 Aug 21, 2020
9d69db5
Agregado de comments.service
Gabriel-Campitelli Aug 21, 2020
7a5c641
Login terminado
danilobassi8 Aug 21, 2020
8c20a6a
adding buttons to tho list
SebaMoreyra Aug 21, 2020
b2bb840
merging loging with articles
SebaMoreyra Aug 21, 2020
da88bbc
Front crear/editar cuenta
danilobassi8 Aug 21, 2020
6d6534f
Resolucion de conflictos
Gabriel-Campitelli Aug 21, 2020
63e1451
Resolucion de conflictos2
Gabriel-Campitelli Aug 21, 2020
2f3348d
Haciendo testing entre todos
danilobassi8 Aug 21, 2020
150be67
updating articles
SebaMoreyra Aug 21, 2020
e713371
probando
SebaMoreyra Aug 21, 2020
b4e977e
t/ working
danilobassi8 Aug 21, 2020
4eb8afb
Login SignIn completados 100%
danilobassi8 Aug 21, 2020
b9426fe
Routing de comments
Gabriel-Campitelli Aug 21, 2020
55bf5eb
Correccion errores merge
Gabriel-Campitelli Aug 21, 2020
17455ff
delete and create article
SebaMoreyra Aug 21, 2020
3b0e510
Testing entre todos
danilobassi8 Aug 21, 2020
730e773
merging things
SebaMoreyra Aug 21, 2020
452d7dd
Empezando routing
danilobassi8 Aug 21, 2020
6b2f3d6
Casi terminamos con routing - mañana se sigue
danilobassi8 Aug 21, 2020
50865b3
Comments funcionando
Gabriel-Campitelli Aug 21, 2020
e7a753e
Arreglo de merge
Gabriel-Campitelli Aug 21, 2020
577566d
Correccion en comments services.
danilobassi8 Aug 21, 2020
98dbda8
No te deja crear articulos nuevos si no te logeaste
danilobassi8 Aug 21, 2020
dc58c77
Arreglos visuales + muestra errores en el login
danilobassi8 Aug 22, 2020
1e546dd
articleEdit funcionando - falta comprobar autor
Gabriel-Campitelli Aug 22, 2020
317a0af
Agreado de username en LS para utilizar en validaciones
danilobassi8 Aug 22, 2020
27fa872
User only can edit its articles
SebaMoreyra Aug 24, 2020
623dbd6
Resolución de conflictos para merge
Gabriel-Campitelli Aug 24, 2020
8386ab3
Resolución de conflictos para merge
Gabriel-Campitelli Aug 24, 2020
943ef7e
Daily review
SebaMoreyra Aug 24, 2020
515d765
Muestra los errores que vas teniendo en el Login
danilobassi8 Aug 24, 2020
2d63cb8
Arreglo eliminar comentarios
Gabriel-Campitelli Aug 24, 2020
c3c153e
Edit form edita y redirige correctamente
danilobassi8 Aug 24, 2020
721f27a
Merge branch 'conduit' of https://github.com/danilobassi8/angular9-ex…
Gabriel-Campitelli Aug 24, 2020
34aa52d
Adding validations in article-form
SebaMoreyra Aug 24, 2020
5fea278
Arreglado de imagenes en comentarios
danilobassi8 Aug 24, 2020
7ac0577
merging validation
SebaMoreyra Aug 24, 2020
c654676
Arreglado de ingreso de comentarios
Gabriel-Campitelli Aug 24, 2020
0af3f8e
corrigiendo errores de merge
danilobassi8 Aug 24, 2020
27a837d
Resolucion de conflictos para merge
Gabriel-Campitelli Aug 24, 2020
0cfd9ef
Arreglos visuales en comentarios
danilobassi8 Aug 24, 2020
546d9bb
Agregado de fecha en el articulo de los comentarios
Gabriel-Campitelli Aug 24, 2020
86ed5cf
Arreglo de errores en merge comments
Gabriel-Campitelli Aug 24, 2020
70e5bdd
Corregido errores en editar Articulos
danilobassi8 Aug 24, 2020
fa325fc
Ultimas correcciones antes de hacer el PR
danilobassi8 Aug 24, 2020
c935c11
Corregido los errores del ng lint
danilobassi8 Aug 24, 2020
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
5,751 changes: 3,162 additions & 2,589 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 10 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,30 @@
"@angular/platform-browser": "~9.1.1",
"@angular/platform-browser-dynamic": "~9.1.1",
"@angular/router": "~9.1.1",
"ngx-pagination": "^5.0.0",
"rxjs": "~6.5.4",
"tslib": "^1.10.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.901.1",
"@angular/cli": "~9.1.1",
"@angular/compiler-cli": "~9.1.1",
"@angular/language-service": "~9.1.1",
"@types/node": "^12.11.1",
"@types/jasmine": "~3.5.0",
"@angular-devkit/build-angular": "^0.901.12",
"@angular/cli": "^9.1.12",
"@angular/compiler-cli": "^9.1.12",
"@angular/language-service": "^9.1.12",
"@types/jasmine": "^3.5.12",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.12.54",
"codelyzer": "^5.1.2",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.4.1",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.1.0",
"karma-jasmine": "~3.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"protractor": "~5.4.3",
"karma-jasmine-html-reporter": "^1.5.4",
"protractor": "^5.4.4",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"tslint": "^6.1.3",
"typescript": "~3.8.3"
}
}
18 changes: 15 additions & 3 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { LoginComponent } from './components/login/login.component';
import { ArticlesComponent } from './components/articles/articles.component';
import { CommentsComponent } from './components/comments/comments.component';

import { ArticleFormComponent } from './components/article-form/article-form.component';

const routes: Routes = [];
const routes: Routes = [
{ path: '', redirectTo: 'login', pathMatch: 'full' },
{ path: 'login', component: LoginComponent },
{ path: 'articles', component: ArticlesComponent },
{ path: 'article/:slug', component: CommentsComponent },
{ path: 'editArticle/:slug', component: ArticleFormComponent },
{ path: 'newArticle', component: ArticleFormComponent},
{ path: '**', redirectTo: 'login' },
];

@NgModule({
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule]
exports: [RouterModule],
})
export class AppRoutingModule { }
export class AppRoutingModule {}
Loading