Skip to content

GitLab

Commit 8c73b0d5 authored by a001188's avatar a001188
Browse files

Some functions work

parent a801d319
Hide whitespace changes
Inline Side-by-side
_favicon.ico 0 → 100644
View file @ 8c73b0d5
_favicon.ico

198 Bytes

app.js
View file @ 8c73b0d5
......@@ -5,15 +5,16 @@ var logger = require('morgan');
var cookieParser = require('cookie-parser');
var bodyParser = require('body-parser');
var lessMiddleware = require('less-middleware');
var $ = require("jquery");
var index = require('./routes/index');
var organisation = require('./routes/organisation');
var structure = require('./routes/structure');
var users = require('./routes/users');
var app = express();
// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'jade');
app.set('view engine', 'pug');
// uncomment after placing your favicon in /public
//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
......@@ -23,11 +24,13 @@ app.use(bodyParser.urlencoded({ extended: false }));
app.use(cookieParser());
app.use(lessMiddleware(path.join(__dirname, 'public')));
app.use(express.static(path.join(__dirname, 'public')));
app.use(express.static(path.join(__dirname, 'public')));
//app.use(express.static(path.join(__dirname, 'public')));
app.use('/', index);
app.use('/view', index);
app.use('/users', users);
app.use('/cmdb/api/v1/organisation', organisation);
app.use('/cmdb/api/v1/structure', structure);
// catch 404 and forward to error handler
app.use(function(req, res, next) {
......
nbproject/project.properties
View file @ 8c73b0d5
......@@ -3,7 +3,9 @@ auxiliary.org-netbeans-modules-javascript-nodejs.run_2e_enabled=true
auxiliary.org-netbeans-modules-javascript-nodejs.run_2e_restart=true
auxiliary.org-netbeans-modules-javascript-nodejs.start_2e_args=
auxiliary.org-netbeans-modules-javascript-nodejs.start_2e_file=bin/www
browser.autorefresh.Chrome=true
browser.autorefresh.Chrome.INTEGRATED=true
browser.highlightselection.Chrome=true
browser.highlightselection.Chrome.INTEGRATED=true
browser.run=true
file.reference.cmdb-gui-public=public
......
package-lock.json
View file @ 8c73b0d5
......@@ -344,6 +344,11 @@
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
},
"doctypes": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz",
"integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk="
},
"ecc-jsbn": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
......@@ -493,6 +498,11 @@
"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
},
"function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
},
"generic-pool": {
"version": "2.4.3",
"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.3.tgz",
......@@ -547,6 +557,14 @@
"har-schema": "1.0.5"
}
},
"has": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
"integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
"requires": {
"function-bind": "1.1.1"
}
},
"hawk": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
......@@ -617,11 +635,35 @@
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
},
"is-expression": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz",
"integrity": "sha1-Oayqa+f9HzRx3ELHQW5hwkMXrJ8=",
"requires": {
"acorn": "4.0.13",
"object-assign": "4.1.0"
},
"dependencies": {
"acorn": {
"version": "4.0.13",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
}
}
},
"is-promise": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
},
"is-regex": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
"requires": {
"has": "1.0.1"
}
},
"is-typedarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
......@@ -661,6 +703,11 @@
"resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz",
"integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8="
},
"js-stringify": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz",
"integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds="
},
"jsbn": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
......@@ -927,6 +974,11 @@
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
},
"path-parse": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
"integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
},
"path-to-regexp": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
......@@ -1091,6 +1143,185 @@
"integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",
"optional": true
},
"pug": {
"version": "2.0.0-rc.4",
"resolved": "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.4.tgz",
"integrity": "sha512-SL7xovj6E2Loq9N0UgV6ynjMLW4urTFY/L/Fprhvz13Xc5vjzkjZjI1QHKq31200+6PSD8PyU6MqrtCTJj6/XA==",
"requires": {
"pug-code-gen": "2.0.0",
"pug-filters": "2.1.5",
"pug-lexer": "3.1.0",
"pug-linker": "3.0.3",
"pug-load": "2.0.9",
"pug-parser": "4.0.0",
"pug-runtime": "2.0.3",
"pug-strip-comments": "1.0.2"
}
},
"pug-attrs": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.2.tgz",
"integrity": "sha1-i+KyIlVo/6ddG4Zpgr/59BEa/8s=",
"requires": {
"constantinople": "3.0.2",
"js-stringify": "1.0.2",
"pug-runtime": "2.0.3"
}
},
"pug-code-gen": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.0.tgz",
"integrity": "sha512-E4oiJT+Jn5tyEIloj8dIJQognbiNNp0i0cAJmYtQTFS0soJ917nlIuFtqVss3IXMEyQKUew3F4gIkBpn18KbVg==",
"requires": {
"constantinople": "3.0.2",
"doctypes": "1.1.0",
"js-stringify": "1.0.2",
"pug-attrs": "2.0.2",
"pug-error": "1.3.2",
"pug-runtime": "2.0.3",
"void-elements": "2.0.1",
"with": "5.1.1"
},
"dependencies": {
"acorn": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
"integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
},
"acorn-globals": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz",
"integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=",
"requires": {
"acorn": "4.0.13"
},
"dependencies": {
"acorn": {
"version": "4.0.13",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
}
}
},
"with": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/with/-/with-5.1.1.tgz",
"integrity": "sha1-+k2qktrzLE6pTtRTyB8EaGtXXf4=",
"requires": {
"acorn": "3.3.0",
"acorn-globals": "3.1.0"
}
}
}
},
"pug-error": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.2.tgz",
"integrity": "sha1-U659nSm7A89WRJOgJhCfVMR/XyY="
},
"pug-filters": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-2.1.5.tgz",
"integrity": "sha512-xkw71KtrC4sxleKiq+cUlQzsiLn8pM5+vCgkChW2E6oNOzaqTSIBKIQ5cl4oheuDzvJYCTSYzRaVinMUrV4YLQ==",
"requires": {
"clean-css": "3.4.28",
"constantinople": "3.0.2",
"jstransformer": "1.0.0",
"pug-error": "1.3.2",
"pug-walk": "1.1.5",
"resolve": "1.5.0",
"uglify-js": "2.8.29"
},
"dependencies": {
"asap": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
"integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
},
"jstransformer": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz",
"integrity": "sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=",
"requires": {
"is-promise": "2.1.0",
"promise": "7.3.1"
}
},
"promise": {
"version": "7.3.1",
"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
"integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
"requires": {
"asap": "2.0.6"
}
}
}
},
"pug-lexer": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-3.1.0.tgz",
"integrity": "sha1-/QhzdtSmdbT1n4/vQiiDQ06VgaI=",
"requires": {
"character-parser": "2.2.0",
"is-expression": "3.0.0",
"pug-error": "1.3.2"
},
"dependencies": {
"character-parser": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
"integrity": "sha1-x84o821LzZdE5f/CxfzeHHMmH8A=",
"requires": {
"is-regex": "1.0.4"
}
}
}
},
"pug-linker": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.3.tgz",
"integrity": "sha512-DCKczglCXOzJ1lr4xUj/lVHYvS+lGmR2+KTCjZjtIpdwaN7lNOoX2SW6KFX5X4ElvW+6ThwB+acSUg08UJFN5A==",
"requires": {
"pug-error": "1.3.2",
"pug-walk": "1.1.5"
}
},
"pug-load": {
"version": "2.0.9",
"resolved": "https://registry.npmjs.org/pug-load/-/pug-load-2.0.9.tgz",
"integrity": "sha512-BDdZOCru4mg+1MiZwRQZh25+NTRo/R6/qArrdWIf308rHtWA5N9kpoUskRe4H6FslaQujC+DigH9LqlBA4gf6Q==",
"requires": {
"object-assign": "4.1.0",
"pug-walk": "1.1.5"
}
},
"pug-parser": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-4.0.0.tgz",
"integrity": "sha512-ocEUFPdLG9awwFj0sqi1uiZLNvfoodCMULZzkRqILryIWc/UUlDlxqrKhKjAIIGPX/1SNsvxy63+ayEGocGhQg==",
"requires": {
"pug-error": "1.3.2",
"token-stream": "0.0.1"
}
},
"pug-runtime": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.3.tgz",
"integrity": "sha1-mBYmB7D86eJU1CfzOYelrucWi9o="
},
"pug-strip-comments": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz",
"integrity": "sha1-0xOvoBvMN0mA4TmeI+vy65vchRM=",
"requires": {
"pug-error": "1.3.2"
}
},
"pug-walk": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.5.tgz",
"integrity": "sha512-rJlH1lXerCIAtImXBze3dtKq/ykZMA4rpO9FnPcIgsWcxZLOvd8zltaoeOVFyBSSqCkhhJWbEbTMga8UxWUUSA=="
},
"punycode": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
......@@ -1161,6 +1392,14 @@
}
}
},
"resolve": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
"integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
"requires": {
"path-parse": "1.0.5"
}
},
"right-align": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
......@@ -1304,6 +1543,11 @@
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
},
"token-stream": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz",
"integrity": "sha1-zu78cXp2xDFvEm0LnbqlXX598Bo="
},
"tough-cookie": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
......
package.json
View file @ 8c73b0d5
......@@ -18,6 +18,7 @@
"morgan": "~1.9.0",
"pg": "^7.4.0",
"pg-promise": "^5.9.7",
"pug": "^2.0.0-rc.4",
"serve-favicon": "~2.4.5",
"vis": "^4.21.0"
}
......
routes/index.js
View file @ 8c73b0d5
......@@ -8,7 +8,18 @@ const connectionString = process.env.DATABASE_URL || 'postgres://jasper:a001188@
/* GET home page. */
router.get('/', function(req, res, next) {
res.render('index', { title: 'CMDB' });
console.log = ("index" );
res.render('index', { title: 'Hem'});
});
router.get('/view/:id', function(req, res, next) {
var id = req.params['id'];
var id_table = id + '_table';
var id_net = id + '_net';
res.render('index', { title: id, id_table: id_table, id_net: id_net});
});
module.exports = router;
routes/organisation.js
View file @ 8c73b0d5
......@@ -23,7 +23,7 @@ router.post('/class/:id', (req, res, next) => {
// SQL Query > Select Data
var sql = "select display_name as \"DisplayText\", id as \"Value\" from cmdb.ci_class where id = $1;";
var parameter = [id];
var parameter = req.params['id'];
client.query(sql, [parameter], function(err, result){
done();
if (err){
......
views/index.pug
View file @ 8c73b0d5
......@@ -2,5 +2,10 @@ extends menu
block content
h1= title
p Welcome to #{title}
<p class='cmdbguiSmallText'>Visar: #{title}</p>
table
tr
td(id='left')
<p class='cmdbguiSmallText'>Tabell #{id_table}</p>
td(id='right')
<p class='cmdbguiSmallText'>Relationer #{id_net}</p>
views/layout.pug
View file @ 8c73b0d5
doctype html
html
head
title= title
link(rel='stylesheet', href='/stylesheets/style.css')
link(rel='stylesheet', href='/stylesheets/cmdbgui.css')
script('type'='text/javascript', 'src'='/javascripts/menu.js')
body
block menu
block content
head
title= title
link(rel='stylesheet', href='/stylesheets/cmdbgui.css')
link(rel='stylesheet', href='/stylesheets/network-graph.css')
link(rel='stylesheet', href='/javascripts/jtable/themes/lightcolor/blue/jtable.min.css')
link(rel='stylesheet', href='//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css')
link(rel='stylesheet', href='/javascripts/vis/dist/vis.css')
script('type'='text/javascript', 'src'='//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js')
script('type'='text/javascript', 'src'='//cdnjs.cloudflare.com/ajax/libs/jquery-form-validator/2.1.47/jquery.form-validator.min.js')
script('type'='text/javascript', '//code.jquery.com/jquery-1.10.2.js')
script('type'='text/javascript', '//code.jquery.com/ui/1.10.4/jquery-ui.js')
script('type'='text/javascript', 'src'='/javascripts/menu.js')
script('type'='text/javascript', 'src'='/javascripts/dashlets/structure-table.js')
//script('type'='text/javascript', 'src'='/javascripts/dashlets/structure-graph.js')
script('type'='text/javascript', 'src'='/javascripts/jtable/jquery.jtable.min.js')
script('type'='text/javascript', 'src'='/javascripts/jtable/jquery.jtable.js')
script('type'='text/javascript', 'src'='/javascripts/jtable/localization/jquery.jtable.se.js')
body
block menu
block content
views/menu.pug
View file @ 8c73b0d5
......@@ -4,19 +4,40 @@ extends layout
block menu
table(class='cmdbguiSmallText')
tr
td peter
td lundin
div(class='navigation')
td(style='text-align: left') CMDB-Viewer
td(style='text-align: right') a001188 Peter Lundin
nav
ul(class='nav')
li
ul
li a(href='/cmdb/structure/api/v1/') Hem
a(href="#") Hem
li
a(href="#") Organisation
ul
li a(href='/cmdb/structure/api/v1/') Linjeorganisation
li a(href='/cmdb/structure/api/v1/') Förvaltningsorganisation
li a(href='/cmdb/structure/api/v1/') Projektorganisation
ul Struktur
li a(href='/cmdb/structure/api/v1/') Familjer och Klasser
li
a(href="/view/Linjeorganisation") Linjeorganisation
li
a(href="/view/Förvaltningsorganisation") Förvaltningsorganisation
li
a(href="/view/13") Projektorganisation
li
a(href="#") Struktur
ul
li
a(href="/view/21") Familjer och Klasser
li
a(href="/view/22") Kontoplan
li
a(href="/view/23") Siter och Lokaler
li
a(href="#") Teknik
ul
li
a(href="/view/31") IT-tjänster
li
a(href="/view/32") Förvaltningsorganisation
li
a(href="/view/33") Infrastruktur
li
a(href="#") Logout
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment