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

[ADD] profile view #37

Open
wants to merge 111 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
2a98544
Initial commit
vsuber Sep 26, 2017
dcd179f
(install) socket.io
vsuber Sep 26, 2017
235f432
(implement) socket.io server-side
vsuber Sep 26, 2017
e8feffd
(implement) socket.io client side
vsuber Sep 26, 2017
1a366e9
(fix) minor syntax issue
vsuber Sep 26, 2017
e6bd03a
(begin) individual event view
vsuber Sep 26, 2017
6cd00df
(implement) individual event view
vsuber Sep 27, 2017
6db9ea4
(add) routing to test event view link
vsuber Sep 27, 2017
cc9171f
(update) individual event view test
vsuber Sep 27, 2017
643da3e
[Fix] facebook auth info: obtain profile picture, age range (21+ or n…
jakepepple Sep 27, 2017
7bcc1f9
Delete package-lock.json
jakepepple Sep 27, 2017
010f584
(add) restful api endpoints for getting events from database
vsuber Sep 27, 2017
b327bca
(add) event image display option
vsuber Sep 27, 2017
d6dd4b2
Merge pull request #3 from jakepepple/fix-facebook-info
Rmatheney7 Sep 27, 2017
95d0f55
[fix] adding duplicate events to DB
jakepepple Sep 27, 2017
7499d41
Merge pull request #4 from jakepepple/fix-duplicate-events
Rmatheney7 Sep 27, 2017
3ab50b3
[Add] profile view and route
Rmatheney7 Sep 27, 2017
a7a71c7
Connecting event service to profile component
Rmatheney7 Sep 27, 2017
54877c2
Merge pull request #11 from Rmatheney7/Profile-event-service
jakepepple Sep 27, 2017
22b36db
(implement) route params by id
vsuber Sep 27, 2017
67b7d4f
(implement) routing params by id
vsuber Sep 27, 2017
4f7965f
(start) implementation of links for events by id
vsuber Sep 27, 2017
7fe5fea
(add) new service to server
vsuber Sep 27, 2017
a4fb353
(implement) individual event view service
vsuber Sep 27, 2017
d3f43d9
(add) individual event view service
vsuber Sep 27, 2017
f8d888a
(add) minor changes
vsuber Sep 27, 2017
c106c63
(render) basic data on page
vsuber Sep 28, 2017
5242b44
(clean up) code
vsuber Sep 28, 2017
a2fcf49
(fix) minor issue with an <a> tag
vsuber Sep 28, 2017
c01191f
(begin) implementation of chat
vsuber Sep 28, 2017
a141fdd
Merge branch 'master' into render-event-data
jakepepple Sep 28, 2017
a102bef
Merge pull request #17 from violet-suber/render-event-data
jakepepple Sep 28, 2017
a28ed10
(fix) required fb fields throwing errors
jakepepple Sep 27, 2017
458bda3
(render) facebook name and image to profile view
jakepepple Sep 28, 2017
51d56d4
Merge pull request #18 from jakepepple/get-profile-info
Rmatheney7 Sep 28, 2017
6b039dd
(improve) add event form
vsuber Sep 28, 2017
c24ec55
(diable) auth temporarily for testing purposes
vsuber Sep 28, 2017
bcac272
(include) other properties of event schema to be saved in database
vsuber Sep 28, 2017
7ae1748
(add) minor change for testing purposes
vsuber Sep 28, 2017
1e5bd8b
(render) new event properties on page
vsuber Sep 28, 2017
762b744
(implement) submit date function
vsuber Sep 28, 2017
09a6f0f
(implement) location submit capability
vsuber Sep 28, 2017
2e67b8d
(render) submitted dates and locations on page
vsuber Sep 28, 2017
d07ab95
(style) entry views
vsuber Sep 28, 2017
473a100
(improve) organization of event view
vsuber Sep 28, 2017
69ea7f2
(add) minor styling changes
vsuber Sep 28, 2017
f3c4c75
Merge pull request #19 from violet-suber/render-event-data
jakepepple Sep 28, 2017
e62aba8
(add) array for attendees to events schema
vsuber Sep 28, 2017
ede2ae8
(fix) minor error from merge
vsuber Sep 28, 2017
9bbe617
(update) stylesheet
vsuber Sep 28, 2017
bcc940a
(update) dependencies
vsuber Sep 28, 2017
7359603
Merge pull request #22 from violet-suber/improve-events
jakepepple Sep 28, 2017
af65e18
[Create] setNotification function, in progress
jakepepple Sep 28, 2017
5c47057
[fix] set SMS notification timing properly, 5PM day before
jakepepple Sep 28, 2017
a1e197b
[Create] route to add user to attending list, first attempt
jakepepple Sep 28, 2017
ff454fa
[refactor] event controller, clean up
jakepepple Sep 28, 2017
a532c1f
Merge pull request #23 from jakepepple/add-to-attending
vsuber Sep 28, 2017
6d90bb0
(begin) post request to attending users endpoint
vsuber Sep 28, 2017
c172128
(fix) endpoint for adding user to event
vsuber Sep 28, 2017
8abe8a6
(fix) post request handler
vsuber Sep 28, 2017
032039a
(fix) http request to add users to event
vsuber Sep 28, 2017
47fbb69
Merge pull request #24 from violet-suber/improve-events
Rmatheney7 Sep 28, 2017
e28227e
(edit) handler to add user name to list instead of ID
vsuber Sep 28, 2017
4701da7
(improve) add to attending array function
vsuber Sep 28, 2017
3c5377c
(render) users attending list
vsuber Sep 29, 2017
ba69415
(fix) handler so user cannot be added more than once to event
vsuber Sep 29, 2017
b37c9e5
Merge pull request #25 from violet-suber/improve-events
Rmatheney7 Sep 29, 2017
5335c0d
(add) new files to gitignore
vsuber Sep 29, 2017
075d976
(fix) bug - only logged in users can add themselves to events
vsuber Sep 29, 2017
c7d9927
Changed event service method in profile
Rmatheney7 Sep 27, 2017
610c02d
[improve] Profile View
Rmatheney7 Sep 28, 2017
06a8664
[Add] Events populate on profile view
Rmatheney7 Sep 28, 2017
63e2dd1
Changed event service method in profile
Rmatheney7 Sep 27, 2017
5b88f5a
[improve] Profile View
Rmatheney7 Sep 28, 2017
ee89ef0
[add] profile showing only user events
Rmatheney7 Sep 28, 2017
b406379
[add] button for event notification
Rmatheney7 Sep 28, 2017
450b069
[fix] profile componenent
Rmatheney7 Sep 28, 2017
158a087
[update] searches for events by user name
Rmatheney7 Sep 28, 2017
28872c8
rebase continued
Rmatheney7 Sep 29, 2017
7569e9d
[fix] lost files on rebase
Rmatheney7 Sep 29, 2017
b348695
Merge pull request #26 from Rmatheney7/fixRebase
vsuber Sep 29, 2017
def5f53
[Create] message schema and table in database
jakepepple Sep 29, 2017
b4bf4da
[Fix] bug in creating multiple events when adding attendees
jakepepple Sep 29, 2017
669deba
Merge pull request #27 from jakepepple/implement-chat
vsuber Sep 29, 2017
1ee1be8
(implement) basic twilio tutorial code
vsuber Sep 29, 2017
d174c00
(fix) minor bug for appointments schema
vsuber Sep 29, 2017
ce564c6
Merge branch 'master' into basic-twilio
jakepepple Sep 29, 2017
6a6955b
Merge pull request #28 from violet-suber/basic-twilio
jakepepple Sep 29, 2017
b3a425f
(add) enable notifications form
vsuber Sep 29, 2017
4e67e54
(fix) html problem
vsuber Sep 29, 2017
e821738
Merge pull request #29 from violet-suber/notif-form
jakepepple Sep 29, 2017
79a0393
(add) basic functionality to the notificiation form
vsuber Sep 29, 2017
4efaace
Merge pull request #30 from violet-suber/notif-form
jakepepple Sep 29, 2017
7c13c64
[Create] message post on event page
jakepepple Sep 29, 2017
b9c054f
[Merge] changes from upstream
jakepepple Sep 29, 2017
dc6095e
[Fix] event submit form
jakepepple Sep 29, 2017
e8adde7
Merge pull request #31 from jakepepple/fix-event-creation
vsuber Sep 29, 2017
1297e80
(implement) twilio
vsuber Sep 29, 2017
c3802c0
(clean up unnecessary code)
vsuber Sep 29, 2017
dba858a
Merge pull request #32 from violet-suber/twilio-after-rebase
jakepepple Sep 29, 2017
7d12160
(complete) SMS notifications
vsuber Sep 29, 2017
d5a2dbf
Merge pull request #33 from violet-suber/twilio-after-rebase
jakepepple Sep 29, 2017
a025107
[Fix] div problem on event view
jakepepple Sep 29, 2017
d61026f
(add) style changes and render header on every page
vsuber Sep 30, 2017
20c9ccc
[Refactor] login, hide profile button if not logged in, vice versa fo…
jakepepple Sep 30, 2017
dcc6e05
[delete] set reminder button from profile events
jakepepple Sep 30, 2017
ae28d3e
Update README.md
jakepepple Sep 30, 2017
65e1a2d
Merge pull request #34 from jakepepple/code-cleanup
vsuber Sep 30, 2017
87f8ef5
(improve) profile page
vsuber Sep 30, 2017
3157490
Merge branch 'master' into fix-styling-after-rebase
jakepepple Sep 30, 2017
f218ea4
Merge pull request #35 from violet-suber/fix-styling-after-rebase
jakepepple Sep 30, 2017
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ client/rxjs-operators.js
client/rxjs-operators.js.map
client/datatypes/event.js
client/datatypes/event.js.map
client/eview.component.js
client/eview.component.js.map
client/profile.component.js
client/profile.component.js.map

### node etc ###
read.txt
Expand Down
18 changes: 13 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# NolaBored
# BoredInNola


## Team

- __Product Owner__: Daniel Glaser
- __Scrum Master__: Harvey Sanders
- __Development Team Members__: Daniel Glaser, Harvey Sanders
- __Product Owner__: Violet Suber
- __Scrum Master__: Jake Pepple
- __Development Team Members__: Violet Suber, Aaron Matheney, Jake Pepple

## Table of Contents

Expand Down Expand Up @@ -37,9 +37,17 @@ From within the root directory:
npm install
```

### Build

Compile and run server with:

```
npm start
```

### Roadmap

View the project roadmap [here](https://github.com/polarbasin/nolaBored/issues)
View the project roadmap [here](https://github.com/fuzzylobster/nolaBored/issues)


## Contributing
Expand Down
6 changes: 4 additions & 2 deletions client/app-layout.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { EventService } from './event.service';
template:
`<div><login-button></login-button></div>
<div><add-event-button></add-event-button></div>
<div><profile-button></profile-button></div>
<div class="col-md-12" id="header"><h1>BORED<span class="question">?</span></h1>
<h4 class="subtitle">A local event aggregator</h4>
</div>
Expand All @@ -17,10 +18,11 @@ import { EventService } from './event.service';
<div class="row">
<div class="col-md-4" id="event" *ngFor="let event of events; let i = index">
<div class="details">
<a target="_new" href="{{event.link}}">
<a target="_blank" href="{{event.link}}">
<h3>{{ event.title }}</h3>
</a>
<img src="{{ event.imgUrl }}">
<img src="{{ event.imgUrl }}"><br>
<a [routerLink]="['/eview/', event._id]">View this Event</a>
</div>
</div>
</div>
Expand Down
12 changes: 11 additions & 1 deletion client/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,37 @@
import { BrowserModule } from '@angular/platform-browser';
import { HttpModule, JsonpModule } from '@angular/http';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { AppComponent } from './app.component';
import { AppLayoutComponent } from './app-layout.component';
import { EventFormComponent } from './event-form.component';
import { LoginButtonComponent } from './login-button.component';
import { AddEventButtonComponent } from './add-event-button.component';
import { LoginComponent } from './login.component';
import { EviewComponent } from './eview.component';
import { APP_ROUTES_PROVIDER } from './app.routes';
import { ProfileComponent } from './profile.component';
import { ProfileButtonComponent } from './profile-button.component';

@NgModule({
imports: [
BrowserModule,
HttpModule,
JsonpModule,
FormsModule,
ReactiveFormsModule
],
declarations: [
AppComponent,
AppLayoutComponent,
EventFormComponent,
LoginComponent,
LoginButtonComponent,
AddEventButtonComponent
AddEventButtonComponent,
EviewComponent,
ProfileComponent,
ProfileButtonComponent,

],
providers: [
APP_ROUTES_PROVIDER
Expand Down
9 changes: 9 additions & 0 deletions client/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,19 @@ import { AppLayoutComponent } from './app-layout.component';
import { LoginComponent } from './login.component';
import { EventFormComponent } from './event-form.component';

import { EviewComponent} from './eview.component';

import { ProfileComponent } from './profile.component';


export const routes = [
{ path: '', component: AppLayoutComponent, terminal: true },
{ path: 'login', component: LoginComponent },
{ path: 'add-event', component: EventFormComponent },

{ path: 'eview/:id', component: EviewComponent },
{ path: 'profile', component: ProfileComponent },

];

export const APP_ROUTES_PROVIDER = provideRouter(routes);
Expand Down
133 changes: 90 additions & 43 deletions client/event-form.component.ts
Original file line number Diff line number Diff line change
@@ -1,70 +1,117 @@
// template for event-form. No functionality added to event services.
import { Component } from '@angular/core';
import { FormGroup, FormControl} from '@angular/forms';
import { EvindService } from './evind.service';
import { Router } from '@angular/router';

@Component({
selector: 'event-form',
providers: [EvindService],
template: `
<form class="form-horizontal" action="/api/events" method="post">
<fieldset>
<div class="container">
<div class="row">

</div>
<div class="row">
<form [formGroup]="form" (ngSubmit)="postEvent()" class="form-horizontal" action="/api/events" method="post">
<fieldset>

<!-- Form Name -->
<legend>Add your own event</legend>
<!-- Form Name -->
<legend>Add your own event</legend>


<!-- Text input-->
<div class="form-group">
<label class="col-md-4 control-label" for="title">Event Name</label>
<div class="col-md-5">
<input id="title" name="title" type="text" placeholder="My event" class="form-control input-md">
<!-- Text input-->
<div class="form-group">
<label class="col-md-4 control-label" for="title">Event Name</label>
<div class="col-md-5">
<input formControlName="title" id="title" name="title" type="text" placeholder="My event" class="form-control input-md">

</div>
</div>
</div>

<!-- Text input-->
<div class="form-group">
<label class="col-md-4 control-label" for="link">Event Link</label>
<div class="col-md-5">
<input id="link" name="link" type="text" placeholder="www.event.com" class="form-control input-md">
<!-- Text input-->
<div class="form-group">
<label class="col-md-4 control-label" for="eventDate">Event Date</label>
<div class="col-md-5">
<input formControlName="eventDate" id="eventDate" name="eventDate" type="date" placeholder="" class="form-control input-md">

</div>
</div>
</div>

<!-- Text input-->
<div class="form-group">
<label class="col-md-4 control-label" for="imgUrl">Image Link</label>
<div class="col-md-5">
<input id="imgUrl" name="imgUrl" type="text" placeholder="www.event.com/picture.jpg" class="form-control input-md">
<!-- Text input-->
<div class="form-group">
<label class="col-md-4 control-label" for="location">Event Location</label>
<div class="col-md-5">
<input formControlName="location" id="location" name="location" type="text" placeholder="Location" class="form-control input-md">

</div>
</div>
</div>

<!-- Textarea -->
<div class="form-group">
<label class="col-md-4 control-label" for="description">Description</label>
<div class="col-md-3">
<textarea class="form-control" id="description" placeholder="..." name="description"></textarea>
<!-- Textarea -->
<div class="form-group">
<label class="col-md-4 control-label" for="description">Description</label>
<div class="col-md-3">
<textarea formControlName="description" class="form-control" id="description" placeholder="..." name="description"></textarea>
</div>
</div>
</div>

<!-- Text input-->
<div class="form-group">
<label class="col-md-4 control-label" for="eventDate">Event Date</label>
<div class="col-md-5">
<input id="eventDate" name="eventDate" type="date" placeholder="" class="form-control input-md">
<!-- Text input-->
<div class="form-group">
<label class="col-md-4 control-label" for="link">Event Link</label>
<div class="col-md-5">
<input formControlName="link" id="link" name="link" type="text" placeholder="www.event.com" class="form-control input-md">

</div>
</div>
</div>

<!-- Button -->
<div class="form-group">
<label class="col-md-4 control-label" for="submit"></label>
<div class="col-md-4">
<button id="submit" name="submit" class="btn btn-primary">Submit</button>
<!-- Text input-->
<div class="form-group">
<label class="col-md-4 control-label" for="imgUrl">Image Link</label>
<div class="col-md-5">
<input formControlName="imgUrl" id="imgUrl" name="imgUrl" type="text" placeholder="www.event.com/picture.jpg" class="form-control input-md">

</div>
</div>


<!-- Button -->
<div class="form-group">
<label class="col-md-4 control-label" for="submit"></label>
<div class="col-md-4">
<button id="submit" name="submit" type="submit" class="btn btn-primary">Submit</button>
</div>
</div>
</div>

</fieldset>
</form>`
</fieldset>
</form>
</div>
</div> `
})

export class EventFormComponent { }
export class EventFormComponent {
form = new FormGroup({
title: new FormControl(),
location: new FormControl(),
link: new FormControl(),
eventDate: new FormControl(),
description: new FormControl(),
imgUrl: new FormControl(),
});
constructor(private _httpService: EvindService) {

}
postEvent() {
let eventToSend = {
title: this.form.value.title,
location: this.form.value.location,
link: this.form.value.link,
eventDate: this.form.value.eventDate,
description: this.form.value.description,
imgUrl: this.form.value.imgUrl
}
console.log(eventToSend);
this._httpService.postEvent(eventToSend).subscribe((res) => {
console.log('event posted');
})
}
}
11 changes: 10 additions & 1 deletion client/event.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,18 @@ import 'rxjs/add/operator/map';
export class EventService {
public eventsUrl = 'api/events'; // URL to web api
public events: any;
public profileUrl = 'profileInfo'; //URL to facebook api
public profile: any;

constructor(public http: Http) {
this.events = http.get(this.eventsUrl)
.map(response => response.json());

this.profile = http.get(this.profileUrl)
.map(response => response.json());

}
}


}

Loading