Angular build

Author: veroreinah

.gitignore

@@ -1 +1,2 @@
-.DS_Store
+.DS_Store
+script.sh

client/src/app/app.component.ts

@@ -9,7 +9,7 @@ import { Router, NavigationStart } from '../../node_modules/@angular/router';
 })
 export class AppComponent {
 
-  constructor(private sessionService: SessionService, private router: Router, private renderer: Renderer2) {
+  constructor(public sessionService: SessionService, public router: Router, public renderer: Renderer2) {
 
     this.router.events
       .subscribe((event) => {

client/src/app/app.module.ts

@@ -21,7 +21,7 @@ import { IsLoggedOutGuardService } from "../guards/isLoggedOut.guard";
 import { IsLoggedInGuardService } from "../guards/isLoggedIn.guard";
 import { RecordVideoComponent } from './record-video/record-video.component';
 import { NotfoundComponent } from './notfound/notfound.component';
-import { FileSelectDirective } from 'ng2-file-upload';
+import { FileUploadModule } from 'ng2-file-upload';
 import { PerformancesComponent } from './performances/performances.component';
 import { PerformanceDetailComponent } from './performance-detail/performance-detail.component';
 
@@ -36,13 +36,13 @@ import { PerformanceDetailComponent } from './performance-detail/performance-det
     FilterPipe,
     EntryFormComponent,
     LoadingComponent,
-    FileSelectDirective,
     RecordVideoComponent,
     NotfoundComponent,
     PerformancesComponent,
     PerformanceDetailComponent,
   ],
   imports: [
+    FileUploadModule,
     BrowserModule,
     RouterModule.forRoot(routes),
     FormsModule,

client/src/app/entry-form/entry-form.component.ts

@@ -15,6 +15,7 @@ export class EntryFormComponent implements OnInit {
   title: string = "";
   artist: string = "";
   youtube_url: string = "";
+  lyrics: string = "";
 
   redirect: boolean = false;
 

client/src/app/login/login.component.ts

@@ -9,7 +9,9 @@ import { Router } from "@angular/router";
 })
 export class LoginComponent implements OnInit {
   error: string;
-  constructor(private sessionService: SessionService, private router: Router) {}
+  username: string;
+  password: string;
+  constructor(public sessionService: SessionService, public router: Router) {}
 
   ngOnInit() {}
 

client/src/app/signup/signup.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { SessionService } from '../../services/session.service';
 import { Router } from '@angular/router';
 import { FileUploader } from 'ng2-file-upload';
+import { environment } from '../../environments/environment';
 
 @Component({
   selector: 'app-signup',
@@ -10,14 +11,17 @@ import { FileUploader } from 'ng2-file-upload';
 })
 export class SignupComponent implements OnInit {
   error: string;
+  username: string;
+  password: string;
+  file: string;
 
   url = '';
 
-  constructor(private sessionService: SessionService, private router: Router) { 
+  constructor(public sessionService: SessionService, public router: Router) { 
   }
 
   uploader: FileUploader = new FileUploader({
-    url: `http://localhost:3000/api/auth/signup`,
+    url: `${environment.BASEURL}/api/auth/signup`,
     method: 'POST'
   });
 

client/src/app/songs-list/songs-list.component.ts

@@ -9,6 +9,7 @@ import { SongsService } from '../../services/songs.service';
 })
 export class SongsListComponent implements OnInit {
   songs: Array<object>;
+  search: string;
 
   constructor(private songsService: SongsService) { }
 

server/app.js

@@ -3,7 +3,6 @@ require('dotenv').config();
 const bodyParser = require('body-parser');
 const cookieParser = require('cookie-parser');
 const express = require('express');
-const favicon = require('serve-favicon');
 const mongoose = require('mongoose');
 const logger = require('morgan');
 const path = require('path');
@@ -14,7 +13,7 @@ const cors = require('cors');
 const DBURL = process.env.MONGODB_URI;
 
 mongoose.Promise = Promise;
-mongoose.connect(DBURL, {useMongoClient: true})
+mongoose.connect(DBURL, { useNewUrlParser: true })
   .then(() => {
     console.log(`Connected to Mongo on ${DBURL}`)
   }).catch(err => {
@@ -72,8 +71,6 @@ app.set('view engine', 'hbs');
 app.use(express.static(path.join(__dirname, 'public')));
 app.use(express.static(path.join(__dirname, 'videos')));
 
-app.use(favicon(path.join(__dirname, 'public', 'images', 'favicon.ico')));
-
 require('./routes')(app);
 
 module.exports = app;