More accurate outlines of Campus Map

.envTEMPLATE

@@ -0,0 +1,7 @@
+NODE_ENV = development
+
+PORT = 3000
+
+# Database Info
+DB_USER = <username>
+DB_PASS = <password>

.eslintrc.json

@@ -0,0 +1,38 @@
+{
+    "env": {
+        "browser": true,
+        "es6": true,
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly"
+    },
+    "parserOptions": {
+        "ecmaVersion": 2015,
+        "sourceType": "module"
+    },
+    "rules": {
+        "comma-dangle": [
+            "error",
+            "always"
+        ],
+        "indent": [
+            "error",
+            2
+        ],
+        "linebreak-style": [
+            "error",
+            "windows"
+        ],
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ]
+    }
+}

.github/pull_request_template.md

@@ -0,0 +1,20 @@
+## Description
+(Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.)
+
+Fixes #(issue name)
+
+## Solution
+(What did you do to fix this issue?)
+
+## Known Issues
+(Are there any knew issues caused or exposed by your changes, or things you would like clarified before merging?)
+
+## Testing Procedures
+(What should reviewers do to validate your changes? What steps should be taken and what is the expected outcome?)
+
+## Checklist for author
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation (if any)
+- [ ] My changes generate no new warnings

.gitignore

@@ -1,8 +1,9 @@
+screenshots/
+
 # Ignore the node modules. They will be installed through 'npm install'
 node_modules/
 
 # Ignore .env file, to be kept locally on machine running the server for security
 .env
-.envTEMPLATE
 RPI Campus Map Project Proposal Summer 19.pdf
 RPI Campus Map Project Proposal Fall 19.pdf

README.md

@@ -9,38 +9,55 @@ We are currently in the middle of a large refactor, but heavy construction will
 
 ### Current Contributors:
 * Justin Gaskins
+* Jon-Pierre Antoine
+* Darrian Gardea
+* Aidan Duane		
+* Cody Messina
+* Kristina Adams      
+
+### Project Managers:
+* Spring 2020: Jon-Pierre Antoine
+* Fall 2019: Justin Gaskins
 
 ### Founders:
 * Justin Gaskins
 * Christopher Pence
 * Sebastien Boulas
 
 ### Version History:
+* 2/16/2020 - v0.4.0 Login and registration implemented. Messages are flashed on error state i.e. invalid email,
+user not found, login to see admin page etc. New welcome page also added (page before map access). Code has been rebased making it more modular. All html converted to ejs and views used (modularity).
 * 5/27/2019 - v0.3.0 All basic map functionality is now restored! You can show a location on the map from the info page, search for locations, or go to the information page from the location on the map.
 * 3/26/2019 - v0.2.0 Began refactor and translation from XAMPP to MEAN Stack!
 * 1/25/2019 - v0.1.0 Initial stages of functionality are complete! More locations and authorization will be added for the release of v1.0.
 
 ### Getting Started
 This project uses the MEAN stack (MongoDB, Express.JS, AngularJS 1.7, Node.js). You will need a working installation of [Node.js](https://nodejs.org/en/) (LTS version recommended), and a [MongoDB Atlas Cloud account](https://www.mongodb.com/cloud/atlas) (free is fine).
 
-Once you have that taken care of, there are a few more steps before you can begin work.
+Once you have that taken care of, there are a few more steps to take before you can begin work.
 1. Install the nodemon package by running `npm install -g nodemon` in your node configured shell.
 2. Clone the repository by either running `git clone https://github.com/gaskij/rpicampusmap.git` in a terminal shell with Git installed, or using your preferred Git UI. Change to the newly downloaded folder using `cd rpicampusmap`
 3. Run `npm install` to download the required Node packages.
-4. Open the ".envTEMPLATE" file in your preferred text editor. Change the <username> and <password> fields to match your Mongo Atlas account information. Don't worry, this file will only be saved on your local machine, so nobody will see it! Save the file as ".env"
+4. Make a copy of the ".envTEMPLATE" file and open it in your preferred text editor. Change the <username> and <password> fields to match your Mongo Atlas account information. Don't worry, this file will only be saved on your local machine, so nobody will see it! Save the file as ".env"
 5. Run `git status` to make sure you are up to date with the current branch. If so, you can begin!
 
 ### Running the Server
 To start the server, run `npm start` to have the server auto-restart if you make any changes, or `node server.js` if you would rather manually restart in case of changes.
 
-### Contributing to RPI Machines Map
-RPI Machines Map is a separate project that branches from RPI Campus Map. While it has many of the same features, it has additional features that allow users to easily find machine shops on campus, and the contents of those shops. To contribute to this project, use `git checkout forgemill` to access the stable project branch, and `git checkout forgemill-dev` to access the developer's branch, where we are working to build and improve the Machine Map. Also, check out the README in those branches for more information.
-
-### Project Guidelines
-* We use JavaScript ES6 syntax for defining variables (const, let)
-  * You can use Arrow functions or more conventional ES5 functions.
-* Try to use [template literals](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals) instead of string concatenation when possible.
-* Please do not attempt to commit directly to master! Commit instead to the branch for the feature currently being worked on.
+### Project Contribution Guidelines
+* DO **NOT** attempt to push directly to `master`! Instead, follow this basic workflow:
+  1. Create a new branch dedicated only to the task at hand. Give it a name starting with the type of work it pertains to. For example, `hotfix/broken_github_link` or `feature/create_new_page`
+  2. Commit and push your changes to the branch for the feature currently being worked on.
+  3. When you believe you are finished making changes, open a Pull Request to have your changes merged into `master`.
+  4. While you're there, why not give someone else's pull request a review, too?
   * You can switch branches with the command `git checkout [branch]`
+* When writing code, adhere to the RPI CampusMap [Style Guide](https://github.com/gaskij/rpicampusmap/wiki/Style-Guide). The most important/basic rules are:
+  * We use [JavaScript ES6 syntax](https://www.freecodecamp.org/news/write-less-do-more-with-javascript-es6-5fd4a8e50ee2/) for many aspects of the code, like defining variables (const, let)
+  * Use [Arrow functions](https://javascript.info/arrow-functions-basics) instead of conventional ES5 functions when possible.
+  * Use [template literals](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals) instead of string concatenation when possible.
+  * Use 2 spaces (not tabs) for indentation. Most IDEs and editors can be configured to use tab-width of 2 and use spaces instead of tabs.
+
+### Contributing to RPI Machines Map
+RPI Machines Map is a separate project that branches from RPI Campus Map. While it has many of the same features, it has additional features that allow users to easily find machine shops on campus, and the contents of those shops. To contribute to that project, see the [RPI Machines repo](https://github.com/gwild37/RPI-Machines).
 
 Have fun making a big impact on campus!

app.js

@@ -0,0 +1,65 @@
+const http = require('http');
+const express = require('express');
+const bodyParser = require('body-parser');
+const expressLayouts = require('express-ejs-layouts');
+const passport = require('passport');
+const flash = require('connect-flash');
+const session = require('express-session');
+const geolocations = require('./geolocations.json');
+const Location = require('./models/Locations');
+const database = require('./scripts/database');
+const assert = require('assert');
+
+const app = express();
+
+
+//  Passport Config
+require('./config/passport')(passport);
+
+//adding locations for first run
+let db = database._connect();
+Location.collection.insertMany(geolocations, {ordered: false})
+.then(() => console.log("DONE Loading"))
+.catch((err) => console.log(err));
+
+// EJS 
+app.use(expressLayouts);
+app.set('view engine', 'ejs');
+//app.use(express.static(__dirname)).use(bodyParser.urlencoded({extended: true})).use(bodyParser.json());
+
+//  Bodyparser
+app.use(express.urlencoded({ extended: false}));
+app.use(bodyParser.json())
+
+//  Express Session
+app.use(session({
+    secret: 'secret',
+    resave: true,
+    saveUninitialized: true,
+    //cookie: { secure: true }
+}));
+
+//  Passport middleware
+app.use(passport.initialize());
+app.use(passport.session());
+
+// Connect Flash
+app.use(flash());
+
+// Global vars
+app.use((req, res, next) => {
+    res.locals.success_msg = req.flash('success_msg');
+    res.locals.error_msg = req.flash('err_msg');
+    res.locals.error = req.flash('error');
+    next();
+});
+
+// Routers
+app.use('/', require('./scripts/routes/index'));
+app.use('/user', require('./scripts/routes/user'));
+app.use(express.static(__dirname));
+
+
+const PORT = process.env.PORT || 3000;
+
+app.listen(PORT, console.log(`Server started on port ${PORT}`));    

campusmap.sql

@@ -108,6 +108,7 @@ INSERT INTO `images` (`location`, `link`) VALUES
 ('Nugent Hall', 'http://www.rpi.edu/dept/cct/apps/reslife/images/pictures/nugent1.jpg'),
 ('Experimental Media and Performing Arts Center at Rensselaer', 'http://empac.rpi.edu/sites/default/files/styles/empac_cms_slideshow__default/public/ESTO_AaronEsto_50.jpg?itok=9rVzDof9');
 
+
 -- --------------------------------------------------------
 
 --
@@ -130,14 +131,19 @@ INSERT INTO `main` (`location`, `description`, `address`, `phone`) VALUES
 ('Academy Hall', 'Home to the Student Health Center, Bursar, and registrar. This building also includes an auditorium.', '110 8th St, Troy, NY 12180', 518),
 ('Admissions', 'This is where the admissions department is located at RPI.', '110 8th St, Troy, NY 12180', 518),
 ('Amos Eaton Hall', 'Home of the Mathematics Department and part of the Computer Science Department. Many Math and Computer science courses are taught inside. It is names after Amos Eaton, Co-Founder of RPI.', 'Amos Eaton Hall, 110 8th Street, Troy, NY, 12180', NULL),
+('Anderson Field', 'Sports field on campus. Many other sports play here besides rugby', 'Sage Ave, Troy, NY 12180', NULL),
 ('Barton Hall', 'One of the residence halls on campus. Located on freshman hill.', '1999 Burdett Ave, Troy, NY 12180', NULL),
 ('Blitman Commons', 'Campus residence hall. Includes various ammenities such as a dining hall.', '1800 6th Ave, Troy, NY 12180', NULL),
 ('Bray Hall', 'One of the residence halls on campus. Located on freshman hill.', '1999 Burdett Ave, Troy, NY 12180', NULL),
+('Cary Hall', 'One of the residence halls on campus. Located on freshman hill.', '1999 Burdett Ave, Troy, NY 12180', NULL),
 ('Carnegie Building', 'Academic building on campus.', '110 8th St, Troy, NY 12180', NULL),
 ('Center for Biotechnology and Interdisciplinary Studies', 'Research facility on campus. This is a popular destination for guest speakers on campus.', '1623 15th St, Troy, NY 12180', 518),
 ('Cogswell Laboratory', 'A chemistry-biology research center on campus. Recieves government funding from the National Science Foundation as well as the New York State Dormitory Authority.', '110 8th St, Troy, NY 12180', NULL),
 ('Commons Dining Hall', 'One of the main dining hills on campus. Located on freshman hill. The mailing center is also located in this building.', '1999 Burdett Ave, Troy, NY 12180', 518),
+('Crockett Hall', 'One of the residence halls on campus. Located on freshman hill.', '1999 Burdett Ave, Troy, NY 12180', NULL),
 ('Darrin Communications Center', 'Main lecture hall on campus. Also where the CCPD has their office. This is the building where most large lectures are held.', '110 8th Street, Troy, NY, 12180', NULL),
+('Davison Hall', 'One of the residence halls on campus. Located on freshman hill.', '1999 Burdett Ave, Troy, NY 12180', NULL),
+('E-Complex', 'One of the residence halls on campus. Located on Sage Ave.', '110 8th St, Troy, NY 12180', NULL),
 ('Experimental Media and Performing Arts Center at Rensselaer', 'Alot of extracurricular activities happen here. The building includes a 1,200 seat concert hall and a 400 seat theater.', '44 8th St, Troy, NY 12180', 518),
 ('Folsom Library', 'The main library on campus. 4 floors of study spaces, bookshelves and even a cafe. A great place to study quietly.', '110 8th St, Troy, NY 12180', NULL),
 ('Greene Building', 'Academic building on campus. Home to the School of Architecture.', '110 8th St, Troy, NY 12180', NULL),
@@ -150,12 +156,13 @@ INSERT INTO `main` (`location`, `description`, `address`, `phone`) VALUES
 ('Low Center for Industrial Innovation', 'Commonly known as the CII. Acadmic building on campus that has a number of larger academic buildings and auditoriums.', '110 8th St, Troy, NY 12180', NULL),
 ('Mueller Center', 'Fitness and wellness center on campus. This building has a gym that extends for two floors with various yoga and wellness classes offered on the third floor. This building also includes the armory and the campus swimming pools.', '110 8th St, Troy, NY 12180', 518),
 ('Nason Hall', 'One of the residence halls on campus. Located on freshman hill.', '1999 Burdett Ave, Troy, NY 12180', NULL),
+('North Hall', 'One of the residence halls on campus. Located on Sage Ave.', '110 8th St, Troy, NY 12180', NULL),
 ('Nugent Hall', 'One of the residence halls on campus. Located on freshman hill.', '1999 Burdett Ave, Troy, NY 12180', NULL),
 ('Pittsburgh Building', 'Academic building on campus. Home of the Lally School of Management.', '110 8th St, Troy, NY 12180', 518),
 ('Public Safety', 'Home to the campus police.', '110 8th St, Troy, NY 12180', NULL),
 ('Rensselaer Union', 'Home to a number of different recreation centers, food courts, study rooms, and the campus store.', '110 8th St, Troy, NY 12180', 518),
 ('Rickets Building', 'Academic building on campus. Home to the Chemical Engineering Department.', '110 8th St, Troy, NY 12180', NULL),
-('Rugby Field', 'Sports field on campus. Many other sports play here besides rugby', 'Sage Ave, Troy, NY 12180', NULL),
+('Robinson Field', 'Sports field on campus. Mainly used for baseball', 'Eagle St, Troy, NY 12180', NULL),
 ('Russell Sage Laboratory', 'Academic building on campus. Home of the School of Humanities, Arts, and Social Sciences.', '110 8th St, Troy, NY 12180', NULL),
 ('Sage Dining Hall', 'One of the main dining halls on campus', '110 8th St, Troy, NY 12180', NULL),
 ('Sigma Phi Epsilon', 'Worst frat on campus, don\'t join!', '2005 15th St, Troy, NY 12180', NULL),

config/auth.js

@@ -0,0 +1,12 @@
+//  check if user trying to access the admin panel is already loged in
+//  if the are not it redirects them to the login page
+module.exports = {
+    ensureAuthenticated: function(req, res, next) {
+        if(req.isAuthenticated()){
+            console.log("checking auth");
+            return next();
+        }
+        req.flash('error_msg', 'Please log in to view this resource');
+        res.redirect('/user/login');
+    }
+}

config/keys.js

@@ -0,0 +1,13 @@
+
+const path = require('path');
+require('dotenv').config({ path: path.resolve(__dirname, '../.env') });
+
+
+const user = process.env.DB_USER;
+const pass = process.env.DB_PASS;
+const uri = `mongodb+srv://${user}:${pass}@rpicampusmap-fwvzb.gcp.mongodb.net/test?retryWrites=true`;
+const options = {useNewUrlParser: true};
+
+module.exports = { 
+    MongoURI: uri
+}

config/passport.js

@@ -0,0 +1,45 @@
+const LocalStrategy = require('passport-local').Strategy;
+const mogoose = require('mongoose');
+const bcrypt = require('bcryptjs');
+
+
+//  Local user model
+const User = require('../models/User');
+
+module.exports = function(passport) {
+    passport.use(
+        new LocalStrategy({ usernameField: 'email'}, (email, password, done) => {
+            //Match User
+            User.findOne({email: email})
+                .then(user => {
+                    if(!user){
+                        return done(null, false, {message: 'That email is not registered'});
+                    }
+                    // Match password
+                    bcrypt.compare(password, user.password, (err, isMatch) =>{
+                        if(err)throw(err);
+
+                        if(isMatch){
+                            return done(null, user);
+                        } else {
+                            return done(null, false, { message: 'Password Incorrect'})
+                        }
+                    });
+                })
+                .catch(err => {
+                    console.log("error in auth");
+                    console.log(err);
+                })
+        })
+    );
+
+    passport.serializeUser((user, done) => {
+        done(null, user.id);
+    });
+
+    passport.deserializeUser((id, done) => {
+        User.findById(id, (err, user) => {
+          done(err, user);
+        });
+    });
+}

css/admin.css

@@ -0,0 +1,5 @@
+html, body{
+    height: 100%;
+    width: 100%;
+    padding: 0%;
+}

public/style/homepage.css → css/homepage.css

@@ -1,33 +1,47 @@
 body {
    background-color: #000000;
    height: 100%;
+   width: 100%;
    margin: 0;
    padding: 0;
 }
 
 a {
-  text-decoration: none;
+   text-decoration: none;
+}
+
+footer a {
+  text-decoration: underline;
+  color: inherit;
 }
 
 #mapPopup {
    background-color: #ffffff;
-   min-height: 88%;
+   min-height: 85%;
    width: 80%;
    margin: auto;
 }
 
 #mapPopupInfo {
    background-color: #ffffff;
-   min-height: 88%;
+   min-height: 85%;
    width: 100%;
    margin: auto;
 }
 
-/* Always set the map height explicitly to define the size of the div
- * element that contains the map. */
+map-page {
+   height: 100%;
+   position: absolute;
+   min-height: 100%;
+   top: 0;
+   bottom: 0;
+   left: 0;
+   right: 0;
+}
+
 #mapContainer {
-   height: 85%;
-   width: 100%;
+   height: 100%;
+   min-height: 100%;
 }
 
 .popup:hover {