Update 1.0.0 Merge

.gitignore

@@ -1,3 +1,5 @@
+package-lock.json
+
 # compiled output
 /dist
 /tmp

.travis.yml

@@ -1,14 +1,15 @@
 language: node_js
 node_js:
-  - "7"
+  - "8"
 
 branches:
   only:
     - master
+    - develop
+    - travis-fix
 
 before_script:
   - npm install -g firebase-tools
-  - npm install -g @angular/cli
 
 script:
   - ng build --prod --output-hashing=bundles

CONTRIBUTING.md

@@ -0,0 +1,48 @@
+# Contributing
+
+We love contributions from everyone, regardless of your skill level!
+If you need any help getting started contributing to an open source project, don't hesistate to contact us at [contact@enumc.com][email]!
+
+This project uses [Semantic Versioning][semver] and abides by the [Contributor Covenant 1.4][covenant].
+If you're not familiar with these, please take a moment to skim through them, just to get an idea of the guidelines we follow.
+
+[semver]:http://semver.org/
+[covenant]:https://www.contributor-covenant.org/version/1/4/code-of-conduct/
+[email]:mailto:contact@enumc.com
+
+We reserve the right to refuse your contribution if you do not follow the above terms.
+
+If you need any assistance, either create a new issue or [join our Discord server.][discord]
+
+[discord]:https://discord.gg/FnvQ6MG
+
+## Contributing Code
+
+### Initialization Checklist
+1. Fork the repository.
+2. Switch to the **develop** branch. If you work in the master branch, we **will** reject your pull request!
+3. If you haven't already, run `npm install`. Make sure that `node_modules` is not tracked by Git.
+
+### Writing Checklist
+1. Follow the [Google JavaScript style guide][style]. This isn't strictly enforced, but we may ask you to reformat your code if deemed necessary.
+(We're also guilty of illegal formatting. If you catch something that is formatted incorrectly, please create an issue explaining the problem.
+2. Document your code using the [JSDoc format][jsdoc]. Again, if you find something documented improperly, please create an issue.
+3. If you need extra dependencies, import them at the highest level possible. (From high to low: Current component -> Current module -> Any parent module(s) -> app.module.ts)
+If you feel that you absolutely need to import a dependency into `app.module.ts`, [contact us first.][email]
+4. When committing, make a descriptive but concise message. We don't expect essays, but `add stuff` just seems a bit inadequate, don't you think?
+
+### Submission Checklist
+1. Before submitting, make sure that all of your dependencies match `package.json` and the production build throws no errors (neither compilation nor runtime).
+2. Create a pull request to the **develop** branch.
+3. Write a good description, and don't forget to add a label and milestone!
+4. Make sure that the TravisCI checks pass on your PR. If not, go back to step 1. 
+5. Wait for your contribution to be approved! We may contact you with any questions or concerns.
+
+### After Approval
+Remember to update the [API Documentation][api] for any new methods, classes, or behaviors! 
+
+[style]: https://google.github.io/styleguide/jsguide.html
+[jsdoc]: http://usejsdoc.org/about-getting-started.html
+[api]: https://github.com/dbqeo/ElectroTab/wiki
+
+#### Thanks for helping ElectroTab!

README.md

@@ -1,18 +1,26 @@
-Travis Build Status [Master]: [![Build Status](https://travis-ci.org/dbqeo/ElectroTab.svg?branch=master)](https://travis-ci.org/dbqeo/ElectroTab)
-
 # ElectroTab: The electrifying new tab experience!
 
-## Built with [Angular](https://angular.io/) and [Firebase](https://firebase.google.com/) with styles and components from [MaterializeCSS](http://materializecss.com/). Cross Platform support for Windows, Mac OS X, and Linux.
+![Favicon](src/assets/images/favicon.png)
+
+## Built with [Angular](https://angular.io/) and [Firebase](https://firebase.google.com/) with styles and components from [MaterializeCSS](http://materializecss.com/). Current support for Chrome and Chromium.
+
+**Build Status:** [![Build Status](https://travis-ci.org/dbqeo/ElectroTab.svg?branch=master)](https://travis-ci.org/dbqeo/ElectroTab)
+
+## Discord Server
+We use **Discord** for realtime collaboration (it's not just for gaming!) Our invite code is https://discord.gg/FnvQ6MG. **Everyone is welcome to join!**
+
+## API Reference
+Need help? View the documentation for the [ElectroTab API](https://github.com/dbqeo/ElectroTab/wiki).
 
 ## Current Features
  - **Support for Google Chrome/Chromium.** View the `chrome-extension` branch for the extension's source code.
  - **Modularity** New features can be added without disrupting any other modules! Users can easily enable and disable modules.
- - **Drag and Drop Interface** Widgets can be rearranged, resized,added, and removed. All changes are automatically synced with the Firebase database.
+ - **Drag and Drop Interface** Widgets can be rearranged, resized, added, and removed. All changes are automatically synced with the Firebase database.
  - **Themes:** Change the color scheme! (That's about it for now, kind of sad.)
- - **Accounts:** Sign in with your Google account, or make one using your email! All of your settings are saved with your account, no matter what device you use.
+ - **Accounts:** Sign in with your Google or GitHub account, or make one using your email! All of your settings are saved with your account, no matter what device you use.
 
 ## Planned Features
- - **Support for Safari, Firefox, and Edge.** Shouldn't be too hard. 
+ - **Support for Safari, Firefox, and Edge.** Shouldn't be too hard.
  - **Better Theme System** Customize everything, from fonts to icons. Save your themes and share them with your friends!
  - **Custom Widgets** Design your own widgets using HTML, CSS, and JavaScript! Submit them to a database where others can use your creations!
 
@@ -23,12 +31,16 @@ Travis Build Status [Master]: [![Build Status](https://travis-ci.org/dbqeo/Elect
  4. Run `npm start`. This will serve the app to localhost:4200.
  5. Open your web browser (hopefully Chromium/Chrome) to localhost:4200. Enjoy :)
 
-## Deploy Guide 
- 1. Run `ng build --prod --output-hashing=bundles` -> Start new build with partial hashing and uglifyJS. This will ensure that the cache will be refreshed quickly with new updates.
+## Deploy Guide
+ 1. Run `ng build --prod --output-hashing=bundles --no-aot` -> Start new build with partial hashing and uglifyJS. This will ensure that the cache will be refreshed quickly with new updates. 
+ **Note:** The `--no-aot` flag is a temporary workaround that will be removed in the next update.
  2. Run `firebase deploy` -> Deploy new build to Firebase
 
  If you do not have access to our Firebase database, you can still deploy the build on your own website to test.
-
+
+## Contributing
+Please read our [Contribution Guide](CONTRIBUTING.md) for step-by-step instructions on how to contribute to ElectroTab.
+
 ## Branches
  - **master:** This is the release branch. Please do not submit any pull requests directly to master. This branch will frequently be built and deployed directly to all of our users.
  - **develop** This is the branch containing the latest semi-stable changes. Commits should not be directly created to develop. Instead, create a new branch or fork the repository.
@@ -39,4 +51,9 @@ Travis Build Status [Master]: [![Build Status](https://travis-ci.org/dbqeo/Elect
  1. Run `git fetch --all`
  2. Run `git reset --hard origin/master`
 
+ ## Want To Combine Commits(Squashing)?
+  1. Run `git reset --soft HEAD~xxx` <- Replace xxx with an int of how many commits you want to squash
+  2. Run `git commit -m "New message for the combined commit"`
+  3. Run `git push origin +name-of-branch` <- BE CAREFUL. MAKE SURE you are pushing to the desired branch!!!
+
 #### This project adheres to [Semantic Versioning](http://semver.org/).

angular-cli.json

@@ -19,12 +19,12 @@
       "mobile": false,
       "styles": [
         "styles.css",
-        "../node_modules/materialize-css/dist/css/materialize.css"
+        "../node_modules/materialize-css/dist/css/materialize.min.css"
       ],
       "scripts": [
-        "../node_modules/jquery/dist/jquery.js",
-        "../node_modules/hammerjs/hammer.js",
-        "../node_modules/materialize-css/dist/js/materialize.js"
+        "../node_modules/jquery/dist/jquery.min.js",
+        "../node_modules/hammerjs/hammer.min.js",
+        "../node_modules/materialize-css/dist/js/materialize.min.js"
       ],
       "environmentSource": "environments/environment.ts",
       "environments": {

firebase.json

@@ -0,0 +1,11 @@
+{
+    "hosting": {
+        "public": "dist",
+        "rewrites": [
+            {
+                "source": "**",
+                "destination": "/index.html"
+            }
+        ]
+    }
+}

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "angular2-starter-template",
+  "name": "ElectroTab",
   "version": "1.0.0",
   "license": "GPL-3.0",
   "angular-cli": {},
@@ -10,58 +10,62 @@
   "private": true,
   "dependencies": {
     "@angular/animations": "^4.3.3",
-    "@angular/cdk": "^2.0.0-beta.8",
-    "@angular/common": "4.3.3",
-    "@angular/compiler": "4.3.3",
-    "@angular/core": "4.3.3",
-    "@angular/forms": "4.3.3",
-    "@angular/http": "4.3.3",
-    "@angular/material": "^2.0.0-beta.8",
-    "@angular/platform-browser": "4.3.3",
-    "@angular/platform-browser-dynamic": "4.3.3",
-    "@angular/router": "4.3.3",
+    "@angular/cdk": "^2.0.0-beta.10",
+    "@angular/common": "4.3.6",
+    "@angular/compiler": "4.3.6",
+    "@angular/core": "4.3.6",
+    "@angular/forms": "4.3.6",
+    "@angular/http": "4.3.6",
+    "@angular/material": "^2.0.0-beta.10",
+    "@angular/platform-browser": "4.3.6",
+    "@angular/platform-browser-dynamic": "4.3.6",
+    "@angular/router": "4.3.6",
     "@ngtools/json-schema": "^1.1.0",
-    "@ngtools/webpack": "^1.5.0",
+    "angular-gridster2": "^3.12.0",
     "angular2-materialize": "^15.0.4",
+    "angularfire2": "^4.0.0-rc.2",
     "bootstrap": "3.3.7",
     "common-tags": "^1.4.0",
-    "core-js": "2.4.1",
+    "core-js": "^2.5.1",
     "denodeify": "^1.2.1",
     "ember-cli-string-utils": "^1.1.0",
     "firebase": "^4.1.3",
-    "firebase-tools": "^3.9.2",
+    "firebase-tools": "^3.10.0",
     "fs-extra": "^4.0.1",
     "get-caller-file": "^1.0.2",
+    "lodash": "^4.17.4",
     "materialize-css": "^0.100.1",
     "moment": "^2.18.1",
+    "ng2-page-scroll": "^4.0.0-beta.11",
     "ngx-bootstrap": "^2.0.0-beta.3",
     "node-modules-path": "^1.0.1",
     "nopt": "^4.0.1",
+    "p3x-angular-compile": "^4.3.78-117",
     "portfinder": "^1.0.13",
-    "rsvp": "^3.6.1",
+    "rsvp": "^4.0.1",
     "rxjs": "^5.4.2",
     "silent-error": "^1.1.0",
     "temp": "^0.8.3",
     "ts-helpers": "1.1.2",
-    "zone.js": "0.8.16"
+    "zone.js": "0.8.17"
   },
   "devDependencies": {
     "@angular/cli": "^1.2.0",
-    "@angular/compiler-cli": "4.3.3",
-    "@types/node": "^8.0.19",
+    "@angular/compiler-cli": "4.3.6",
+    "@types/node": "^8.0.26",
     "codelyzer": "3.1.2",
     "ts-node": "3.3.0",
-    "tslint": "5.5.0",
+    "tslint": "5.7.0",
     "typescript": "~2.3.2"
   },
-  "description": "Starter Template for Angular2",
+  "description": "An Electrifying New Tabs Replacement",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/dbqeo/angular2-starter-template"
+    "url": "git+https://github.com/dbqeo/ElectroTab"
   },
-  "author": "Eric Q",
+  "author": "Ben Cuan, Vikram Peddinti, Eric Qian",
   "bugs": {
-    "url": "https://github.com/dbqeo/angular2-starter-template/issues"
+    "url": "https://github.com/dbqeo/ElectroTab/issues"
   },
-  "homepage": "https://github.com/dbqeo/angular2-starter-template/ProtoTab#readme"
+  "homepage": "https://github.com/dbqeo/ElectroTab/ElectroTab#readme"
 }

src/404.html

@@ -3,31 +3,13 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Page Not Found</title>
-
-    <style media="screen">
-      body { background: #ECEFF1; color: rgba(0,0,0,0.87); font-family: Roboto, Helvetica, Arial, sans-serif; margin: 0; padding: 0; }
-      #message { background: white; max-width: 360px; margin: 100px auto 16px; padding: 32px 24px 16px; border-radius: 3px; }
-      #message h3 { color: #888; font-weight: normal; font-size: 16px; margin: 16px 0 12px; }
-      #message h2 { color: #ffa100; font-weight: bold; font-size: 16px; margin: 0 0 8px; }
-      #message h1 { font-size: 22px; font-weight: 300; color: rgba(0,0,0,0.6); margin: 0 0 16px;}
-      #message p { line-height: 140%; margin: 16px 0 24px; font-size: 14px; }
-      #message a { display: block; text-align: center; background: #039be5; text-transform: uppercase; text-decoration: none; color: white; padding: 16px; border-radius: 4px; }
-      #message, #message a { box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); }
-      #load { color: rgba(0,0,0,0.4); text-align: center; font-size: 13px; }
-      @media (max-width: 600px) {
-        body, #message { margin-top: 0; background: white; box-shadow: none; }
-        body { border-top: 16px solid #ffa100; }
-      }
-    </style>
+    <title>ElectroTab - FATAL ERROR</title>
   </head>
+
   <body>
     <div id="message">
-      <h2>404</h2>
-      <h1>Page Not Found</h1>
-      <p>The specified file was not found on this website. Please check the URL for mistakes and try again.</p>
-      <h3>Why am I seeing this?</h3>
-      <p>This page was generated by the Firebase Command-Line Interface. To modify it, edit the <code>404.html</code> file in your project's configured <code>public</code> directory.</p>
+      <h2>This shouldn't be here.</h2>
+      <p>Please <a href="https://electrotab-project.firebaseapp.com/info/support">contact us right away</a> with details about what happened!</p>
     </div>
   </body>
 </html>

src/app/account/account.module.ts

@@ -0,0 +1,35 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterModule } from '@angular/router';
+import { LoginPageComponent } from 'app/account/login-page/login-page.component';
+import { RegisterPageComponent } from 'app/account/register-page/register-page.component';
+import { LoginUserComponent } from 'app/account/login-user/login-user.component';
+import { RegisterUserComponent } from 'app/account/register-user/register-user.component';
+import { ResetPasswordComponent } from 'app/account/reset-password/reset-password.component';
+import { FormsModule, ReactiveFormsModule } from "@angular/forms";
+
+@NgModule({
+    declarations: [
+        LoginPageComponent,
+        RegisterPageComponent,
+        LoginUserComponent,
+        RegisterUserComponent,
+        ResetPasswordComponent
+    ],
+    imports: [
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+
+        RouterModule.forChild([
+            { path: 'login', component: LoginPageComponent },
+            { path: 'register', component: RegisterPageComponent },
+            { path: 'reset-password', component: ResetPasswordComponent },
+        ]),
+    ],
+    exports: [
+        RouterModule
+    ]
+})
+export class AccountModule {
+} 

src/app/account/login-page/login-page.component.css

@@ -0,0 +1,3 @@
+a {
+	cursor: pointer;
+}

src/app/account/login-page/login-page.component.html

@@ -0,0 +1,43 @@
+<div class="container">
+    <div class="row">
+        <div *ngIf="!(isLoggedIn|async)" class="col s6 m12">
+          <div *ngIf="(errorLogin)" class="col s6 m12">
+          <h5 class="red-text">The email and password combination you have entered is incorrect. Please check your password and try again. If you are sure your email and password combination are correct and you are getting an error during registration, please email contact@enumc.com</h5>
+              <!-- <app-reset-password></app-reset-password> -->
+          </div>
+            <app-login-user (onSuccess)="navigateToHome()" (onError)="showError()"></app-login-user>
+          <div *ngIf="(errorLogin)" class="col s6 m12">
+          <h5 class="red-text">The email and password combination you have entered is incorrect. Please check your password and try again. If you are sure your email and password combination are correct and you are getting an error during registration, please email contact@enumc.com</h5>
+              <!-- <app-reset-password></app-reset-password> -->
+          </div>
+        </div>
+
+        <div *ngIf="isLoggedIn|async">
+            <div class="{{navigateToHome()}}"></div>
+        </div>
+
+    </div>
+
+	<div class="row">
+		 <div class="divider"></div>
+    </div>
+
+	<div class="row">
+		 <div class="col s6 m12">
+		 	No account? <a [routerLink]="['../register']">Register here</a>
+		</div>
+    </div>
+
+	<div class="row">
+		<div class="col s6 m12">
+		 <a [routerLink]="['../reset-password']"> Forgot password?</a>
+	    </div>
+    </div>
+
+    <div class="row">
+        <div *ngIf="(register|async)" class="col s6 m12">
+			  <app-register-user></app-register-user>
+            <!-- <app-reset-password></app-reset-password> -->
+        </div>
+    </div>
+</div>