a

Author: JLRR2019

frontend/src/app/app.module.ts

@@ -30,7 +30,7 @@ import { VideogameRecommendedComponent } from './components/videogame-recommende
 
 
 @NgModule({
-  declarations: [AppComponent, LoginComponent, HeadComponent, NewsComponent, NavBarComponent, FooterComponent, NewsTemplateComponent,VideogameCatalogComponent, ShowNewsComponent, HomeComponent, UserProfile,VideogameCardComponent, VideogameCatalogComponent, CarouselComponent, EditNewComponent, EditNewFormComponent],
+  declarations: [AppComponent, LoginComponent, HeadComponent, NewsComponent, NavBarComponent, FooterComponent, NewsTemplateComponent,VideogameCatalogComponent, ShowNewsComponent, HomeComponent, UserProfile,VideogameCardComponent, VideogameCatalogComponent, CarouselComponent, EditNewComponent, EditNewFormComponent, AboutComponent, VideogameRecommendedComponent],
   imports: [BrowserModule, FormsModule, HttpClientModule, routing, FormsModule,RouterModule, NgbModule],
   bootstrap: [AppComponent]
 })

frontend/src/app/app.routing.ts

@@ -6,14 +6,11 @@ import { HomeComponent } from './components/home/home.component';
 import { NewsComponent } from './components/news/news.component';
 import { ShowNewsComponent } from './components/news/showNews.component';
 import { UserProfile } from './components/user/userProfile.component';
-<<<<<<< HEAD
 import { EditNewComponent } from './components/Admin/editNew.component';
-=======
 import { AboutComponent } from './components/about/about.component';
 import { LoginComponent } from './components/login/login.component';
 import { SignUpComponent } from './components/login/signUp.component';
 import { VideogameRecommendedComponent } from './components/videogame-recommended/videogame-recommended.component';
->>>>>>> 5326ceb9b76e8cf80fe1ecdf216c811dd535b8e5
 
 //aquí tenemos que completar todo lo que queremos que se vaya cargando en el router-outlet
 //ojo, el template no debe llamar al servicio, hay que hacerlo a través del componente
@@ -25,17 +22,13 @@ const appRoutes = [
     { path: 'userProfile', component: UserProfile},
     { path: 'videogamecatalog', component: VideogameCatalogComponent },
     { path: 'videogame/:id', component: VideogameDetailComponent },
-<<<<<<< HEAD
     { path: 'new/edit/:id', component: EditNewComponent },
-    { path: '', redirectTo: 'home', pathMatch: 'full' }
-=======
     { path: 'about', component: AboutComponent },
     { path: 'login', component: LoginComponent },
     { path: 'signUp', component: SignUpComponent },
     { path: 'videogameRecommended', component: VideogameRecommendedComponent },
     { path: '', redirectTo: 'home', pathMatch: 'full' },
     { path: '**', redirectTo: 'home' }
->>>>>>> 5326ceb9b76e8cf80fe1ecdf216c811dd535b8e5
 
 ]
 

frontend/src/app/components/Admin/editNewForm.component.html

@@ -76,7 +76,7 @@ <h2 style="text-align: center; padding-top: 2%;">Edit New Form</h2>
       <!--<input type="hidden" name="_csrf" value="{{token}}" />-->
 
       <p style="text-align: center;" >
-        <input #file class="btn btn-primary" type="submit" value="Save" />
+        <input #file class="btn btn-primary" type="submit" value="Save"/>
         <!--Boton que ejecutara la función ajax-->
         <button class="btn btn-outline-light" style="color: black; border-color: black;"
           onclick="location.href='/'; return false;" (click)="save()">Cancel</button>