Skip to content
This repository was archived by the owner on May 7, 2024. It is now read-only.

Commit cca4522

Browse files
pantselpantsel
committed
Merge branch 'dev'
2 parents 4299675 + 75b60b7 commit cca4522

File tree

324 files changed

+4086
-1809
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

324 files changed

+4086
-1809
lines changed

‎.bowerrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"directory": "assets/bower_components"
3+
}

‎.dockerignore‎

Lines changed: 116 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,122 @@
1+
################################################
2+
############### .gitignore ##################
3+
################################################
4+
#
5+
# This file is only relevant if you are using git.
6+
#
7+
# Files which match the splat patterns below will
8+
# be ignored by git. This keeps random crap and
9+
# sensitive credentials from being uploaded to
10+
# your repository. It allows you to configure your
11+
# app for your machine without accidentally
12+
# committing settings which will smash the local
13+
# settings of other developers on your team.
14+
#
15+
# Some reasonable defaults are included below,
16+
# but, of course, you should modify/extend/prune
17+
# to fit your needs!
18+
################################################
119

20+
21+
22+
23+
################################################
24+
# Local Configuration
25+
#
26+
# Explicitly ignore files which contain:
27+
#
28+
# 1. Sensitive information you'd rather not push to
29+
# your git repository.
30+
# e.g., your personal API keys or passwords.
31+
#
32+
# 2. Environment-specific configuration
33+
# Basically, anything that would be annoying
34+
# to have to change every time you do a
35+
# `git pull`
36+
# e.g., your local development database, or
37+
# the S3 bucket you're using for file uploads
38+
# development.
39+
#
40+
################################################
41+
42+
config/local.js
43+
44+
45+
46+
47+
48+
################################################
49+
# Dependencies
50+
#
51+
# When releasing a production app, you may
52+
# consider including your node_modules and
53+
# bower_components directory in your git repo,
54+
# but during development, its best to exclude it,
55+
# since different developers may be working on
56+
# different kernels, where dependencies would
57+
# need to be recompiled anyway.
58+
#
59+
# More on that here about node_modules dir:
60+
# http://www.futurealoof.com/posts/nodemodules-in-git.html
61+
# (credit Mikeal Rogers, @mikeal)
62+
#
63+
# About bower_components dir, you can see this:
64+
# http://addyosmani.com/blog/checking-in-front-end-dependencies/
65+
# (credit Addy Osmani, @addyosmani)
66+
#
67+
################################################
68+
69+
node_modules
70+
bower_components
71+
72+
73+
74+
75+
################################################
76+
# Sails.js / Waterline / Grunt
77+
#
78+
# Files generated by Sails and Grunt, or related
79+
# tasks and adapters.
80+
################################################
81+
.tmp
82+
dump.rdb
83+
84+
85+
86+
87+
88+
################################################
89+
# Node.js / NPM
90+
#
91+
# Common files generated by Node, NPM, and the
92+
# related ecosystem.
93+
################################################
94+
lib-cov
95+
*.seed
96+
*.log
97+
*.out
98+
*.pid
99+
npm-debug.log
100+
101+
102+
103+
104+
105+
################################################
106+
# Miscellaneous
107+
#
108+
# Common files generated by text editors,
109+
# operating systems, file systems, etc.
110+
################################################
111+
112+
*~
113+
*#
2114
.DS_STORE
3115
.netbeans
4116
nbproject
5117
.idea
6118
.node_history
7-
frontend/.tmp
8-
frontend/node_modules
9-
backend/.tmp
10-
backend/node_modules
11-
backend/config/local.js
12-
node_modules
13-
npm-debug.log
14-
frontend/npm-debug.log
15-
_README.md
16-
frontend/config/config.json
17-
backend/api/services/remote/credentials/google-spreadsheets
18-
frontend/bower_components/
19-
screenshots/
20-
bin/
119+
/logs/*
120+
!/logs/.gitkeep
121+
/config/mssqlconfig.js
122+
/www/

‎.gitignore‎

Lines changed: 92 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,102 @@
66
#
77
# Files which match the splat patterns below will
88
# be ignored by git. This keeps random crap and
9-
# and sensitive credentials from being uploaded to
9+
# sensitive credentials from being uploaded to
1010
# your repository. It allows you to configure your
1111
# app for your machine without accidentally
12-
# committing settings which will smash the local
13-
# settings of other developers on your team.
12+
# committing settings which will smash the local
13+
# settings of other developers on your team.
1414
#
1515
# Some reasonable defaults are included below,
1616
# but, of course, you should modify/extend/prune
1717
# to fit your needs!
1818
################################################
1919

20+
21+
22+
23+
################################################
24+
# Local Configuration
25+
#
26+
# Explicitly ignore files which contain:
27+
#
28+
# 1. Sensitive information you'd rather not push to
29+
# your git repository.
30+
# e.g., your personal API keys or passwords.
31+
#
32+
# 2. Environment-specific configuration
33+
# Basically, anything that would be annoying
34+
# to have to change every time you do a
35+
# `git pull`
36+
# e.g., your local development database, or
37+
# the S3 bucket you're using for file uploads
38+
# development.
39+
#
40+
################################################
41+
42+
config/local.js
43+
44+
45+
46+
47+
48+
################################################
49+
# Dependencies
50+
#
51+
# When releasing a production app, you may
52+
# consider including your node_modules and
53+
# bower_components directory in your git repo,
54+
# but during development, its best to exclude it,
55+
# since different developers may be working on
56+
# different kernels, where dependencies would
57+
# need to be recompiled anyway.
58+
#
59+
# More on that here about node_modules dir:
60+
# http://www.futurealoof.com/posts/nodemodules-in-git.html
61+
# (credit Mikeal Rogers, @mikeal)
62+
#
63+
# About bower_components dir, you can see this:
64+
# http://addyosmani.com/blog/checking-in-front-end-dependencies/
65+
# (credit Addy Osmani, @addyosmani)
66+
#
67+
################################################
68+
69+
node_modules
70+
bower_components
71+
72+
73+
74+
75+
################################################
76+
# Sails.js / Waterline / Grunt
77+
#
78+
# Files generated by Sails and Grunt, or related
79+
# tasks and adapters.
80+
################################################
81+
.tmp
82+
dump.rdb
83+
84+
85+
86+
87+
88+
################################################
89+
# Node.js / NPM
90+
#
91+
# Common files generated by Node, NPM, and the
92+
# related ecosystem.
93+
################################################
94+
lib-cov
95+
*.seed
96+
*.log
97+
*.out
98+
*.pid
99+
npm-debug.log
100+
101+
102+
103+
104+
20105
################################################
21106
# Miscellaneous
22107
#
@@ -31,17 +116,7 @@
31116
nbproject
32117
.idea
33118
.node_history
34-
/frontend/bower_components/
35-
/frontend/.tmp/
36-
/frontend/dist/
37-
/frontend/node_modules/
38-
/backend/.tmp/
39-
/backend/node_modules/
40-
frontend/dist/
41-
/backend/config/local.js
42-
node_modules/
43-
/npm-debug.log
44-
/frontend/npm-debug.log
45-
/_README.md
46-
/frontend/config/config.json
47-
/backend/api/services/remote/credentials/google-spreadsheets/
119+
/logs/*
120+
!/logs/.gitkeep
121+
/config/mssqlconfig.js
122+
/www/

‎.sailsrc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"generators": {
3+
"modules": {
4+
5+
}
6+
},
7+
"hooks": {
8+
"session" : false
9+
}
10+
}

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ COPY . /app
1616

1717
RUN npm --unsafe-perm --verbose install --production
1818

19-
EXPOSE 3000 1338
19+
EXPOSE 1338
2020

2121
RUN chmod 777 ./start.sh
2222

‎Gruntfile.js‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
/**
2+
* Gruntfile
3+
*
4+
* This Node script is executed when you run `grunt` or `sails lift`.
5+
* It's purpose is to load the Grunt tasks in your project's `tasks`
6+
* folder, and allow you to add and remove tasks as you see fit.
7+
* For more information on how this works, check out the `README.md`
8+
* file that was generated in your `tasks` folder.
9+
*
10+
* WARNING:
11+
* Unless you know what you're doing, you shouldn't change this file.
12+
* Check out the `tasks` directory instead.
13+
*/
14+
15+
module.exports = function(grunt) {
16+
17+
18+
// Load the include-all library in order to require all of our grunt
19+
// configurations and task registrations dynamically.
20+
var includeAll;
21+
try {
22+
includeAll = require('include-all');
23+
} catch (e0) {
24+
try {
25+
includeAll = require('sails/node_modules/include-all');
26+
} catch (e1) {
27+
console.error('Could not find `include-all` module.');
28+
console.error('Skipping grunt tasks...');
29+
console.error('To fix this, please run:');
30+
console.error('npm install include-all --save`');
31+
console.error();
32+
33+
grunt.registerTask('default', []);
34+
return;
35+
}
36+
}
37+
38+
39+
/**
40+
* Loads Grunt configuration modules from the specified
41+
* relative path. These modules should export a function
42+
* that, when run, should either load/configure or register
43+
* a Grunt task.
44+
*/
45+
function loadTasks(relPath) {
46+
return includeAll({
47+
dirname: require('path').resolve(__dirname, relPath),
48+
filter: /(.+)\.js$/,
49+
excludeDirs: /^\.(git|svn)$/
50+
}) || {};
51+
}
52+
53+
/**
54+
* Invokes the function from a Grunt configuration module with
55+
* a single argument - the `grunt` object.
56+
*/
57+
function invokeConfigFn(tasks) {
58+
for (var taskName in tasks) {
59+
if (tasks.hasOwnProperty(taskName)) {
60+
tasks[taskName](grunt);
61+
}
62+
}
63+
}
64+
65+
66+
67+
// Load task functions
68+
var taskConfigurations = loadTasks('./tasks/config'),
69+
registerDefinitions = loadTasks('./tasks/register');
70+
71+
// (ensure that a default task exists)
72+
if (!registerDefinitions.default) {
73+
registerDefinitions.default = function(grunt) {
74+
grunt.registerTask('default', []);
75+
};
76+
}
77+
78+
// Run task functions to configure Grunt.
79+
invokeConfigFn(taskConfigurations);
80+
invokeConfigFn(registerDefinitions);
81+
82+
};

0 commit comments

Comments
 (0)