Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b99355a3
authored
Feb 03, 2017
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
ping with version
parent
40d8ad95
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
sails/src/api/controllers/ServerController.js
sails/src/config/pictogram.js
sails/src/api/controllers/ServerController.js
View file @
b99355a3
...
@@ -11,7 +11,9 @@ module.exports = {
...
@@ -11,7 +11,9 @@ module.exports = {
* @param {response} res {}
* @param {response} res {}
*/
*/
ping
:
function
(
req
,
res
)
{
ping
:
function
(
req
,
res
)
{
res
.
ok
();
res
.
ok
({
version
:
sails
.
config
.
pictogram
});
},
},
/**
/**
...
@@ -21,6 +23,8 @@ module.exports = {
...
@@ -21,6 +23,8 @@ module.exports = {
* @param {response} res {}
* @param {response} res {}
*/
*/
ping_session
:
function
(
req
,
res
)
{
ping_session
:
function
(
req
,
res
)
{
res
.
ok
();
res
.
ok
({
version
:
sails
.
config
.
pictogram
});
}
}
};
};
sails/src/config/pictogram.js
View file @
b99355a3
...
@@ -5,6 +5,7 @@ var ASSETS_PATH = path.join(__dirname, '..', 'assets');
...
@@ -5,6 +5,7 @@ var ASSETS_PATH = path.join(__dirname, '..', 'assets');
var
UPLOAD_PATH
=
path
.
join
(
__dirname
,
'..'
,
'..'
,
'upload'
);
var
UPLOAD_PATH
=
path
.
join
(
__dirname
,
'..'
,
'..'
,
'upload'
);
module
.
exports
.
pictogram
=
{
module
.
exports
.
pictogram
=
{
version
:
"0.1"
,
// actual version of the server, to be checked by the client
admin
:
{
admin
:
{
email
:
'amontejo@ujaen.es'
,
email
:
'amontejo@ujaen.es'
,
password
:
'$2a$06$flEEOc15SerMeYWARrN9w.KSpJuM.jDsaTgrtD0ESzbxKHPl0f/zq'
//y00ttaa!!
password
:
'$2a$06$flEEOc15SerMeYWARrN9w.KSpJuM.jDsaTgrtD0ESzbxKHPl0f/zq'
//y00ttaa!!
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment