Moved files around to work with nodejs static routes.

configManager.js

@@ -28,6 +28,11 @@ module.exports=
         getClientSecret: function()
         {
             return config.clientSecret;
+        },
+
+        getSessionSecret: function()
+        {
+            return config.sessionSecret;
         }
 
     };

js/friendsGraph.js

@@ -1,179 +0,0 @@
-
-var nodes;
-
-var edges;
-
-
-const options = {
-    nodes: {
-        borderWidth:4,
-        size:30,
-        color: {
-            border: '#222222',
-            background: '#666666'
-        },
-        font:{color:'#eeeeee'}
-    },
-    edges: {
-        color: 'lightgray'
-    }
-};
-
-function alreadyInGraph(userID)
-{
-    for(var i = 0; i < nodes.length; i++)
-    {
-        if(nodes[i].id === userID)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-
-function addPersonToGraph(profileData)
-{
-    nodes.push(
-        {
-            id:profileData.id,
-            name:profileData.login,
-            shape: 'circularImage',
-            image:profileData.avatar_url
-        });
-}
-
-function addFriends(username, apiPath)
-{
-    return new Promise(function(resolve, reject)
-    {
-        queryAPIByUser(apiPath, username, function(data)
-        {
-            for(var i = 0; i < data.length; i++)
-            {
-                if(!alreadyInGraph(data[i].id))
-                {
-                    addPersonToGraph(data[i]);
-                }
-            }
-            resolve();
-        },
-        function(error)
-        {
-            reject(error);
-        })
-    });
-}
-
-
-
-function addConnection(person1, person2)
-{
-    edges.push(
-        {
-            from: person1.id,
-            to: person2.id
-        });
-}
-
-
-function processUserConnections(userName)
-{
-    return new Promise(function(resolve, reject)
-    {
-        queryAPIByUser(API_FOLLOWING, userName,
-            function(data)
-            {
-                for(var i = 0; i < data.length; i++)
-                {
-
-                }
-
-                queryAPIByUser(API_FOLLOWERS, userName, function(data2)
-                    {
-                        for(var i = 0; i < data2.length; i++)
-                        {
-
-                        }
-                        resolve();
-                    },
-                    function(error)
-                    {
-                        reject(error);
-                    });
-            },
-            function(error)
-            {
-                reject(error);
-            })
-    });
-}
-
-function createConnections()
-{
-    return new Promise(function(resolve, reject)
-    {
-        var prom = [];
-        for(var i = 0; i < nodes.length; i++)
-        {
-            prom.push(processUserConnections(nodes[i].name));
-        }
-
-        Promise.all(prom).then(function()
-        {
-            resolve();
-        }).catch(function(error)
-        {
-            reject(error);
-        });
-    });
-}
-
-
-function addSelfToGraph(username)
-{
-    return new Promise(function(resolve, reject)
-    {
-        queryAPIByUser("", username, function(data)
-        {
-            addPersonToGraph(data);
-            resolve();
-        },
-        function(error)
-        {
-           reject(error);
-        });
-
-    });
-}
-
-
-
-function createFriendsGraph(username, containerName, graphsTitle)
-{
-    nodes = [];
-    edges = [];
-    addSelfToGraph(username).then(function()
-    {
-        addFriends(username, API_FOLLOWERS).then(function()
-        {
-            addFriends(username, API_FOLLOWING).then(function()
-            {
-                createConnections().then(function()
-                {
-                    var container = document.getElementById(containerName);
-                    var data =
-                        {
-                            nodes: nodes,
-                            edges: edges
-                        };
-                    var network = new vis.Network(container, data, options);
-                });
-            });
-        })
-    }).catch(function(error)
-    {
-        console.log(error);
-        $("#" + graphsTitle).html("Error Fetching Data From API");
-    });
-}

js/githubAPI.js

@@ -1,44 +0,0 @@
-/**
- * Simple file which uses jQuery's ajax
- * calls to make it easier to get data
- * from the github api.
- *
- * @author Jeffery Russell 2-16-19
- */
-
-
-const APIROOT = "https://api.github.com";
-
-const API_USER_PATH = "/users/";
-
-const API_FOLLOWING = "/following";
-
-const API_FOLLOWERS = "/followers";
-
-const API_REPOSITORIES = "/repos";
-
-const API_ORGANIZATIONS = "/orgs";
-
-
-/**
- * Builds a query for the github rest api and
- * allows you to get at the data using a
- * callback which gives you a json object.
- *
- * @param apiPath the path on the github api ie API_FOLLOWING
- * @param user the username to query
- * @param successCallBack callback to complete when data is returned
- * @param errorCallBack callback which is invoked on error
- */
-function queryAPIByUser(apiPath, user, successCallBack, errorCallBack) {
-    const urlpath = APIROOT + API_USER_PATH + user + apiPath;
-    console.log(urlpath);
-    $.ajax({
-        type:'GET',
-        url: urlpath,
-        crossDomain: true,
-        dataType: "json",
-        success: successCallBack,
-        error:errorCallBack
-    });
-}

js/profileGen.js

@@ -1,27 +0,0 @@
-function profileGen(username, container) {
-    queryAPIByUser("", username, (data) => {
-        console.log(data);
-        html = 
-        "<div> \
-            <img src=\""+data.avatar_url+"\"></img> \
-            <h1>"+data.name+"</h1> \
-            <h2>"+data.login+"</h2> \
-            <p>Followers: "+data.followers+"</p> \
-            <p>Following: "+data.following+"</p> \
-            <p>"+(data.bio != null ? "Bio: "+data.bio : "")+"</p> \
-            <p>"+(data.location != null ? "Location: "+data.location : "")+"</p> \
-            <p>"+(data.email != null ? "Email: "+data.email : "")+"</p> \
-            <p>"+(data.blog != null ? "Site: "+data.blog : "")+"</p> \
-            <p>"+(data.company != null ? "Company: "+data.company : "")+"</p> \
-            <a href=\""+data.html_url+"\">"+data.html_url+"</h2> \
-            <h2></h2> \
-        </div>"
-        $("#"+container).html(html);
-    }, () => {
-        console.log("error");
-    });
-}
-
-function parseOrgs(oranization_url) {
-    
-}

server.js

@@ -11,7 +11,7 @@ const app = express();
 
 /**Initializes sessions for login */
 app.use(session(
-    { secret: configLoader.getConfiguration().sessionSecret,
+    { secret: configLoader.getSessionSecret(),
         cookie: { maxAge: 6000000 }}
 ));
 
@@ -19,11 +19,7 @@ app.use(session(
 app.use(express.urlencoded()); //for easy retrieval of post and get data
 app.use(express.json());
 
-app.use(express.static(__dirname,'css'));
-app.use(express.static(__dirname, 'js'));
-app.use(express.static(__dirname, 'img'));
-app.use(express.static('html'));
-app.use(express.static(__dirname, 'fonts'));
+app.use(express.static('public'));
 
 
 const routes = require('./routes');
@@ -32,5 +28,5 @@ app.use('/', routes);
 
 
 app.listen(configLoader.getConfiguration().port, () =>
-    console.log(`App listening on port ${configLoader.getConfiguration().port}!`)
+    console.log(`App listening on port ${configLoader.getPort()}!`)
 );