Skip to content

Commit

Permalink
finish update to https, update packages and libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
fooey committed Jan 8, 2017
1 parent 83e7722 commit a47a1f0
Show file tree
Hide file tree
Showing 5 changed files with 4,117 additions and 17 deletions.
2 changes: 1 addition & 1 deletion lib/emblem/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function getSVG(emblem, opts, fnCallback) {

const emblemSvg = [
`<svg width="${outputSize}" height="${outputSize}" viewBox="0 0 ${outputSize} ${outputSize}" shape-rendering="geometricPrecision" version="1.1" xmlns="http://www.w3.org/2000/svg">`,
'<desc>Created by http://guilds.gw2w2w.com/</desc>',
'<desc>Created by https://guilds.gw2w2w.com/</desc>',
`<rect x="0" y="0" width="${outputSize}" height="${outputSize}" fill="${bgColor}" stroke="none" />`,
background,
foreground,
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,46 @@
"description": "node-gw2guilds",
"version": "0.0.1",
"scripts": {
"start": "node server.js",
"dev": "grunt"
"start": "node server.js",
"dev": "grunt"
},
"repository": {
"type": "git",
"url": "git://github.com/fooey/node-gw2guilds.git"
},
"license": "ISC",
"dependencies": {
"app-module-path": "^1.1.0",
"app-module-path": "^2.2.0",
"babel": "^6.5.2",
"babel-preset-es2015": "^6.9.0",
"babel-preset-stage-0": "^6.5.0",
"babel-register": "^6.9.0",
"bluebird": "^3.4.1",
"cookie-parser": "^1.4.3",
"cors": "^2.7.1",
"dotenv": "^2.0.0",
"dotenv": "^4.0.0",
"errorhandler": "^1.4.3",
"express": "^4.14.0",
"fs-extra": "^0.30.0",
"fs-extra": "^1.0.0",
"lodash": "^4.13.1",
"lru-cache": "^4.0.1",
"morgan": "^1.6.1",
"newrelic": "^1.28.1",
"object-hash": "^1.1.2",
"pg-promise": "^4.8.1",
"pg-promise": "^5.5.0",
"pug": "^2.0.0-beta3",
"request": "^2.72.0",
"request-promise": "^3.0.0",
"request-promise": "^4.1.1",
"serve-favicon": "^2.3.0",
"serve-static": "^1.11.1",
"universal-analytics": "^0.3.9"
"universal-analytics": "^0.4.8"
},
"devDependencies": {
"babelify": "^7.3.0",
"grunt": "^1.0.1",
"grunt-browserify": "^5.0.0",
"grunt-concurrent": "^2.0.3",
"grunt-contrib-uglify": "^1.0.1",
"grunt-contrib-uglify": "^2.0.0",
"grunt-contrib-watch": "^1.0.0",
"grunt-nodemon": "^0.4.0"
}
Expand Down
6 changes: 3 additions & 3 deletions routes/stressTest.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

import _ from 'lodash';

const guildList = require('data/guilds/guilds-index');
const guildNames = Object.keys(guildList);
const sampleSize = 128; // guildList.length;
// const guildList = require('data/guilds/guilds-index');
// const guildNames = Object.keys(guildList);
// const sampleSize = 128; // guildList.length;


module.exports = function(req, res) {
Expand Down
8 changes: 4 additions & 4 deletions views/layout.pug
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ html(itemscope, itemtype="http://schema.org/WebPage")

meta(name="viewport", content="width=device-width, initial-scale=1.0")

link(href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css", rel="stylesheet")
link(href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css", rel="stylesheet")
link(href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css", rel="stylesheet")
link(href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css", rel="stylesheet")

link(href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,100,300,500,700,100italic,400italic,500italic,700italic|Roboto+Condensed:300italic,400italic,700italic,400,300,700|Roboto:400,100,300,500,700,900,100italic,300italic,400italic,500italic,700italic,900italic", rel='stylesheet')

link(href='/css/style.css', rel='stylesheet')
script(src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0/jquery.min.js")
script(src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.10.1/lodash.js")
script(src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js")
script(src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.4/lodash.min.js")

block headClose

Expand Down
Loading

0 comments on commit a47a1f0

Please sign in to comment.