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

Ejercicio integrador - Dorronzoro, Blanco #52

Open
wants to merge 74 commits into
base: conduit
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
ae62c79
app structure initialized
Aug 24, 2020
dbe4308
test
Aug 24, 2020
77a974a
interfaces
Aug 25, 2020
dd238a7
http service
Aug 25, 2020
4841595
error 404 template
Aug 25, 2020
790c780
imports
Aug 25, 2020
158c94a
component started
Aug 25, 2020
efc78fc
module imports
blancoagustina Aug 25, 2020
f2dc194
conflicto solucionado
blancoagustina Aug 25, 2020
53566dd
user registration
blancoagustina Aug 26, 2020
002baf0
Merge pull request #1 from blancoagustina/master
OscarDorronzoro Aug 26, 2020
98e3c70
header styles changes
Aug 26, 2020
fd88c10
article form with errors
Aug 26, 2020
36910d9
article details
Aug 26, 2020
07f6347
comment interface
Aug 26, 2020
062fd4a
header and footer styles changes
Aug 26, 2020
1fe6f2e
services folder created
Aug 26, 2020
7139587
Merge branch 'article-page' into ejercicio-integrador
Aug 26, 2020
2db2c8a
minor changes
blancoagustina Aug 26, 2020
bbe4413
log in interface
blancoagustina Aug 26, 2020
c0fede8
Merge branch 'master' of https://github.com/OscarDorronzoro/ejercicio…
blancoagustina Aug 26, 2020
d252a85
home page styles improved, paginator
Aug 27, 2020
c6603b9
Merge pull request #2 from OscarDorronzoro/home-page
OscarDorronzoro Aug 27, 2020
1c8aa39
local storage service
blancoagustina Aug 28, 2020
bdf4a4e
authentication
blancoagustina Aug 28, 2020
baa034a
validations, minor changes
blancoagustina Aug 28, 2020
fcc6825
import webStorageService
blancoagustina Aug 28, 2020
39d0ae3
hide navigation bar item
blancoagustina Aug 28, 2020
7e042cd
minor change
Aug 29, 2020
5a14f46
user sign in
blancoagustina Sep 1, 2020
5deda61
Merge branch 'master' into authetication
blancoagustina Sep 1, 2020
3bb835f
Merge pull request #3 from blancoagustina/authetication
blancoagustina Sep 1, 2020
69be77d
create article
Sep 1, 2020
0cef5c0
Merge branch 'master' of https://github.com/OscarDorronzoro/ejercicio…
Sep 1, 2020
37764bd
empty path redirect to home
Sep 1, 2020
7b51e9b
DoCheck event to update header
Sep 1, 2020
8bfb472
redirect home
Sep 1, 2020
6a7c735
http error handling
Sep 1, 2020
c71b9a5
readonly properties
Sep 1, 2020
e26fba2
errors property
Sep 1, 2020
1595ebf
create article
Sep 1, 2020
97e2c5c
article update and delete
Sep 3, 2020
3a798ab
retrive my articles
Sep 3, 2020
5e09f13
additions of icons, delete article
Sep 3, 2020
44c951f
icons dependencies
Sep 3, 2020
81c5501
paremeters for create/update article
Sep 3, 2020
03e7fed
import FontAwesomeModule icons
Sep 3, 2020
831dca5
delete article
Sep 3, 2020
f187cb5
parameters changes
Sep 6, 2020
d4aad95
update article
Sep 6, 2020
fe90884
correction in article deletion
Sep 6, 2020
7056962
addition of parameter page
Sep 6, 2020
8225b47
Merge pull request #4 from OscarDorronzoro/abm-article
OscarDorronzoro Sep 6, 2020
7a02cdf
create comment
blancoagustina Sep 8, 2020
20236d3
indent corretion
blancoagustina Sep 8, 2020
6fcd8f5
request http for crud comment
blancoagustina Sep 8, 2020
fea2c7f
create and delete comments
blancoagustina Sep 8, 2020
5512d64
Merge branch 'master' of https://github.com/OscarDorronzoro/ejercicio…
blancoagustina Sep 8, 2020
149ad38
corrections
blancoagustina Sep 11, 2020
e6f6909
Merge pull request #5 from blancoagustina/abc-comments
blancoagustina Sep 11, 2020
f3c8596
comment styles improved
Sep 13, 2020
5f8aea5
autocomplete tag field
Sep 13, 2020
00c0239
corrections
Sep 13, 2020
7e9ebb2
article saved in local storage
Sep 13, 2020
8d8820f
message when there are no items
Sep 13, 2020
9c7ab32
corrected redirection
Sep 13, 2020
4c3eb06
login when registering, visual improvements, errors handling
Sep 13, 2020
c2a6746
visual improvements
Sep 13, 2020
cd68493
Merge pull request #6 from OscarDorronzoro/comments-styles
OscarDorronzoro Sep 13, 2020
a63742b
Merge pull request #7 from OscarDorronzoro/final-adjustments
OscarDorronzoro Sep 13, 2020
bef3123
linting test passed
blancoagustina Sep 14, 2020
054609d
Merge pull request #8 from blancoagustina/linting
blancoagustina Sep 14, 2020
00d97af
unsubscribe observables on destroy, other corrections
Sep 14, 2020
960f2bc
Merge pull request #9 from OscarDorronzoro/optimization
OscarDorronzoro Sep 14, 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
7 changes: 5 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"src/assets"
],
"styles": [
"./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
"src/styles.scss"
],
"scripts": []
Expand Down Expand Up @@ -92,6 +93,7 @@
"src/assets"
],
"styles": [
"./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
"src/styles.scss"
],
"scripts": []
Expand Down Expand Up @@ -123,6 +125,7 @@
}
}
}
}},
}
},
"defaultProject": "ng-peti"
}
}
414 changes: 329 additions & 85 deletions package-lock.json

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,24 @@
"private": true,
"dependencies": {
"@angular/animations": "~9.1.1",
"@angular/cdk": "^9.2.4",
"@angular/common": "~9.1.1",
"@angular/compiler": "~9.1.1",
"@angular/core": "~9.1.1",
"@angular/forms": "~9.1.1",
"@angular/localize": "~9.1.1",
"@angular/material": "^9.2.4",
"@angular/platform-browser": "~9.1.1",
"@angular/platform-browser-dynamic": "~9.1.1",
"@angular/router": "~9.1.1",
"@fortawesome/angular-fontawesome": "^0.7.0",
"@fortawesome/fontawesome-svg-core": "^1.2.30",
"@fortawesome/free-brands-svg-icons": "^5.14.0",
"@fortawesome/free-regular-svg-icons": "^5.14.0",
"@fortawesome/free-solid-svg-icons": "^5.14.0",
"@ng-bootstrap/ng-bootstrap": "^6.2.0",
"bootstrap": "^4.5.2",
"ngx-webstorage-service": "^4.1.0",
"rxjs": "~6.5.4",
"tslib": "^1.10.0",
"zone.js": "~0.10.2"
Expand Down
17 changes: 16 additions & 1 deletion src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { HomePageComponent } from './home-page/home-page.component';
import { SigninComponent } from './signin/signin.component';
import { SignupComponent } from './signup/signup.component';
import { ErrorPageComponent } from './error-page/error-page.component';
import { ArticleFormComponent } from './article-form/article-form.component';
import { ArticlePageComponent } from './article-page/article-page.component';


const routes: Routes = [];
const routes: Routes = [
{path: '', component: HomePageComponent},
{path: 'home/:articlesMode/:page', component: HomePageComponent},
{path: 'home', component: HomePageComponent},
{path: 'login', component: SigninComponent},
{path: 'register', component: SignupComponent},
{path: 'editor/:mode', component: ArticleFormComponent},
{path: 'article', component: ArticlePageComponent},
{path: '**', component: ErrorPageComponent}
];

@NgModule({
imports: [RouterModule.forRoot(routes)],
Expand Down
Loading