Skip to content

Commit e8e272f

Browse files
kphuakphua
committed
Merge pull request #140 from nus-mtp/develop
Merge develop to master for Final Release
2 parents ffce8cd + e6b93f0 commit e8e272f

84 files changed

Lines changed: 1841 additions & 2978 deletions

Some content is hidden

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

‎.eslintrc.json‎

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
{
2+
"env": {
3+
"browser": true
4+
},
5+
"globals": {
6+
"angular": 1,
7+
"$": 1,
8+
"Whammy": 1,
9+
"h337": 1
10+
},
11+
"extends": "eslint:recommended",
12+
"rules": {
13+
"accessor-pairs": "error",
14+
"array-bracket-spacing": [
15+
"error",
16+
"never"
17+
],
18+
"array-callback-return": "error",
19+
"arrow-body-style": "error",
20+
"arrow-parens": "error",
21+
"arrow-spacing": "error",
22+
"block-scoped-var": "off",
23+
"block-spacing": "off",
24+
"brace-style": "off",
25+
"callback-return": "off",
26+
"camelcase": "off",
27+
"comma-spacing": "off",
28+
"comma-style": "off",
29+
"complexity": "off",
30+
"computed-property-spacing": [
31+
"error",
32+
"never"
33+
],
34+
"consistent-return": "off",
35+
"consistent-this": "off",
36+
"curly": "off",
37+
"default-case": "off",
38+
"dot-location": [
39+
"error",
40+
"property"
41+
],
42+
"dot-notation": "off",
43+
"eol-last": "off",
44+
"eqeqeq": "off",
45+
"func-names": "off",
46+
"func-style": "off",
47+
"generator-star-spacing": "error",
48+
"global-require": "off",
49+
"guard-for-in": "off",
50+
"handle-callback-err": "off",
51+
"id-blacklist": "error",
52+
"id-length": "off",
53+
"id-match": "error",
54+
"indent": "off",
55+
"init-declarations": "off",
56+
"jsx-quotes": "error",
57+
"key-spacing": "off",
58+
"keyword-spacing": "off",
59+
"linebreak-style": [
60+
"error",
61+
"unix"
62+
],
63+
"lines-around-comment": "off",
64+
"max-depth": "off",
65+
"max-len": "off",
66+
"max-nested-callbacks": "error",
67+
"max-params": "off",
68+
"max-statements": "off",
69+
"new-parens": "off",
70+
"newline-after-var": "off",
71+
"newline-before-return": "off",
72+
"newline-per-chained-call": "off",
73+
"no-alert": "error",
74+
"no-array-constructor": "error",
75+
"no-bitwise": "off",
76+
"no-caller": "error",
77+
"no-catch-shadow": "error",
78+
"no-confusing-arrow": "error",
79+
"no-continue": "off",
80+
"no-div-regex": "error",
81+
"no-else-return": "off",
82+
"no-empty-function": "off",
83+
"no-eq-null": "off",
84+
"no-eval": "error",
85+
"no-extend-native": "error",
86+
"no-extra-bind": "error",
87+
"no-extra-label": "error",
88+
"no-extra-parens": "off",
89+
"no-floating-decimal": "off",
90+
"no-implicit-coercion": [
91+
"error",
92+
{
93+
"boolean": false,
94+
"number": false,
95+
"string": false
96+
}
97+
],
98+
"no-implicit-globals": "off",
99+
"no-implied-eval": "error",
100+
"no-inline-comments": "off",
101+
"no-invalid-this": "off",
102+
"no-iterator": "error",
103+
"no-label-var": "error",
104+
"no-labels": "error",
105+
"no-lone-blocks": "error",
106+
"no-lonely-if": "off",
107+
"no-loop-func": "off",
108+
"no-magic-numbers": "off",
109+
"no-mixed-requires": "error",
110+
"no-multi-spaces": "off",
111+
"no-multi-str": "error",
112+
"no-multiple-empty-lines": "off",
113+
"no-native-reassign": "error",
114+
"no-negated-condition": "off",
115+
"no-nested-ternary": "off",
116+
"no-new": "error",
117+
"no-new-func": "off",
118+
"no-new-object": "error",
119+
"no-new-require": "error",
120+
"no-new-wrappers": "off",
121+
"no-octal-escape": "error",
122+
"no-param-reassign": "off",
123+
"no-path-concat": "error",
124+
"no-plusplus": "off",
125+
"no-process-env": "error",
126+
"no-process-exit": "error",
127+
"no-proto": "off",
128+
"no-restricted-globals": "error",
129+
"no-restricted-imports": "error",
130+
"no-restricted-modules": "error",
131+
"no-restricted-syntax": "error",
132+
"no-return-assign": "off",
133+
"no-script-url": "off",
134+
"no-self-compare": "error",
135+
"no-sequences": "off",
136+
"no-shadow": "off",
137+
"no-shadow-restricted-names": "error",
138+
"no-spaced-func": "error",
139+
"no-sync": "error",
140+
"no-ternary": "off",
141+
"no-throw-literal": "error",
142+
"no-trailing-spaces": "off",
143+
"no-undef-init": "error",
144+
"no-undefined": "off",
145+
"no-underscore-dangle": "off",
146+
"no-unmodified-loop-condition": "error",
147+
"no-unneeded-ternary": [
148+
"error",
149+
{
150+
"defaultAssignment": true
151+
}
152+
],
153+
"no-unused-expressions": "off",
154+
"no-use-before-define": "off",
155+
"no-useless-call": "error",
156+
"no-useless-concat": "off",
157+
"no-useless-constructor": "error",
158+
"no-var": "off",
159+
"no-void": "off",
160+
"no-warning-comments": "off",
161+
"no-whitespace-before-property": "error",
162+
"no-with": "error",
163+
"object-curly-spacing": "off",
164+
"object-shorthand": "off",
165+
"one-var": "off",
166+
"one-var-declaration-per-line": "off",
167+
"operator-assignment": "off",
168+
"operator-linebreak": "off",
169+
"padded-blocks": "off",
170+
"prefer-arrow-callback": "off",
171+
"prefer-const": "error",
172+
"prefer-reflect": "off",
173+
"prefer-rest-params": "off",
174+
"prefer-spread": "off",
175+
"prefer-template": "off",
176+
"quote-props": "off",
177+
"quotes": ["error", "single"],
178+
"radix": "off",
179+
"require-jsdoc": "off",
180+
"require-yield": "error",
181+
"semi": "off",
182+
"semi-spacing": "off",
183+
"sort-imports": "error",
184+
"sort-vars": "off",
185+
"space-before-blocks": "off",
186+
"space-before-function-paren": "off",
187+
"space-in-parens": "off",
188+
"space-infix-ops": "off",
189+
"space-unary-ops": "off",
190+
"spaced-comment": "off",
191+
"strict": "off",
192+
"template-curly-spacing": "error",
193+
"valid-jsdoc": "off",
194+
"vars-on-top": "off",
195+
"wrap-iife": "off",
196+
"wrap-regex": "off",
197+
"yield-star-spacing": "error",
198+
"yoda": "off"
199+
}
200+
}

‎.gitignore‎

Lines changed: 10 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -27,117 +27,13 @@ libs/
2727

2828
# User-defined
2929
.tmp
30-
testvids/squirrel_video.mp3
31-
testvids/squirrel_video.png
32-
testvids/squirrel_video_1080p.mp4
33-
testvids/squirrel_video_1080p_R1C1.mp4
34-
testvids/squirrel_video_1080p_R1C1_track1_dashinit.mp4
35-
testvids/squirrel_video_1080p_R1C2.mp4
36-
testvids/squirrel_video_1080p_R1C2_track1_dashinit.mp4
37-
testvids/squirrel_video_1080p_R1C3.mp4
38-
testvids/squirrel_video_1080p_R1C3_track1_dashinit.mp4
39-
testvids/squirrel_video_1080p_R1C4.mp4
40-
testvids/squirrel_video_1080p_R1C4_track1_dashinit.mp4
41-
testvids/squirrel_video_1080p_R2C1.mp4
42-
testvids/squirrel_video_1080p_R2C1_track1_dashinit.mp4
43-
testvids/squirrel_video_1080p_R2C2.mp4
44-
testvids/squirrel_video_1080p_R2C2_track1_dashinit.mp4
45-
testvids/squirrel_video_1080p_R2C3.mp4
46-
testvids/squirrel_video_1080p_R2C3_track1_dashinit.mp4
47-
testvids/squirrel_video_1080p_R2C4.mp4
48-
testvids/squirrel_video_1080p_R2C4_track1_dashinit.mp4
49-
testvids/squirrel_video_1080p_R3C1.mp4
50-
testvids/squirrel_video_1080p_R3C1_track1_dashinit.mp4
51-
testvids/squirrel_video_1080p_R3C2.mp4
52-
testvids/squirrel_video_1080p_R3C2_track1_dashinit.mp4
53-
testvids/squirrel_video_1080p_R3C3.mp4
54-
testvids/squirrel_video_1080p_R3C3_track1_dashinit.mp4
55-
testvids/squirrel_video_1080p_R3C4.mp4
56-
testvids/squirrel_video_1080p_R3C4_track1_dashinit.mp4
57-
testvids/squirrel_video_360p.mp4
58-
testvids/squirrel_video_360p_R1C1.mp4
59-
testvids/squirrel_video_360p_R1C1_track1_dashinit.mp4
60-
testvids/squirrel_video_360p_R1C2.mp4
61-
testvids/squirrel_video_360p_R1C2_track1_dashinit.mp4
62-
testvids/squirrel_video_360p_R1C3.mp4
63-
testvids/squirrel_video_360p_R1C3_track1_dashinit.mp4
64-
testvids/squirrel_video_360p_R1C4.mp4
65-
testvids/squirrel_video_360p_R1C4_track1_dashinit.mp4
66-
testvids/squirrel_video_360p_R2C1.mp4
67-
testvids/squirrel_video_360p_R2C1_track1_dashinit.mp4
68-
testvids/squirrel_video_360p_R2C2.mp4
69-
testvids/squirrel_video_360p_R2C2_track1_dashinit.mp4
70-
testvids/squirrel_video_360p_R2C3.mp4
71-
testvids/squirrel_video_360p_R2C3_track1_dashinit.mp4
72-
testvids/squirrel_video_360p_R2C4.mp4
73-
testvids/squirrel_video_360p_R2C4_track1_dashinit.mp4
74-
testvids/squirrel_video_360p_R3C1.mp4
75-
testvids/squirrel_video_360p_R3C1_track1_dashinit.mp4
76-
testvids/squirrel_video_360p_R3C2.mp4
77-
testvids/squirrel_video_360p_R3C2_track1_dashinit.mp4
78-
testvids/squirrel_video_360p_R3C3.mp4
79-
testvids/squirrel_video_360p_R3C3_track1_dashinit.mp4
80-
testvids/squirrel_video_360p_R3C4.mp4
81-
testvids/squirrel_video_360p_R3C4_track1_dashinit.mp4
82-
testvids/squirrel_video_480p.mp4
83-
testvids/squirrel_video_480p_R1C1.mp4
84-
testvids/squirrel_video_480p_R1C1_track1_dashinit.mp4
85-
testvids/squirrel_video_480p_R1C2.mp4
86-
testvids/squirrel_video_480p_R1C2_track1_dashinit.mp4
87-
testvids/squirrel_video_480p_R1C3.mp4
88-
testvids/squirrel_video_480p_R1C3_track1_dashinit.mp4
89-
testvids/squirrel_video_480p_R1C4.mp4
90-
testvids/squirrel_video_480p_R1C4_track1_dashinit.mp4
91-
testvids/squirrel_video_480p_R2C1.mp4
92-
testvids/squirrel_video_480p_R2C1_track1_dashinit.mp4
93-
testvids/squirrel_video_480p_R2C2.mp4
94-
testvids/squirrel_video_480p_R2C2_track1_dashinit.mp4
95-
testvids/squirrel_video_480p_R2C3.mp4
96-
testvids/squirrel_video_480p_R2C3_track1_dashinit.mp4
97-
testvids/squirrel_video_480p_R2C4.mp4
98-
testvids/squirrel_video_480p_R2C4_track1_dashinit.mp4
99-
testvids/squirrel_video_480p_R3C1.mp4
100-
testvids/squirrel_video_480p_R3C1_track1_dashinit.mp4
101-
testvids/squirrel_video_480p_R3C2.mp4
102-
testvids/squirrel_video_480p_R3C2_track1_dashinit.mp4
103-
testvids/squirrel_video_480p_R3C3.mp4
104-
testvids/squirrel_video_480p_R3C3_track1_dashinit.mp4
105-
testvids/squirrel_video_480p_R3C4.mp4
106-
testvids/squirrel_video_480p_R3C4_track1_dashinit.mp4
107-
testvids/squirrel_video_720p.mp4
108-
testvids/squirrel_video_720p_R1C1.mp4
109-
testvids/squirrel_video_720p_R1C1_track1_dashinit.mp4
110-
testvids/squirrel_video_720p_R1C2.mp4
111-
testvids/squirrel_video_720p_R1C2_track1_dashinit.mp4
112-
testvids/squirrel_video_720p_R1C3.mp4
113-
testvids/squirrel_video_720p_R1C3_track1_dashinit.mp4
114-
testvids/squirrel_video_720p_R1C4.mp4
115-
testvids/squirrel_video_720p_R1C4_track1_dashinit.mp4
116-
testvids/squirrel_video_720p_R2C1.mp4
117-
testvids/squirrel_video_720p_R2C1_track1_dashinit.mp4
118-
testvids/squirrel_video_720p_R2C2.mp4
119-
testvids/squirrel_video_720p_R2C2_track1_dashinit.mp4
120-
testvids/squirrel_video_720p_R2C3.mp4
121-
testvids/squirrel_video_720p_R2C3_track1_dashinit.mp4
122-
testvids/squirrel_video_720p_R2C4.mp4
123-
testvids/squirrel_video_720p_R2C4_track1_dashinit.mp4
124-
testvids/squirrel_video_720p_R3C1.mp4
125-
testvids/squirrel_video_720p_R3C1_track1_dashinit.mp4
126-
testvids/squirrel_video_720p_R3C2.mp4
127-
testvids/squirrel_video_720p_R3C2_track1_dashinit.mp4
128-
testvids/squirrel_video_720p_R3C3.mp4
129-
testvids/squirrel_video_720p_R3C3_track1_dashinit.mp4
130-
testvids/squirrel_video_720p_R3C4.mp4
131-
testvids/squirrel_video_720p_R3C4_track1_dashinit.mp4
132-
testvids/squirrel_video_mpd_R1C1.mpd
133-
testvids/squirrel_video_mpd_R1C2.mpd
134-
testvids/squirrel_video_mpd_R1C3.mpd
135-
testvids/squirrel_video_mpd_R1C4.mpd
136-
testvids/squirrel_video_mpd_R2C1.mpd
137-
testvids/squirrel_video_mpd_R2C2.mpd
138-
testvids/squirrel_video_mpd_R2C3.mpd
139-
testvids/squirrel_video_mpd_R2C4.mpd
140-
testvids/squirrel_video_mpd_R3C1.mpd
141-
testvids/squirrel_video_mpd_R3C2.mpd
142-
testvids/squirrel_video_mpd_R3C3.mpd
143-
testvids/squirrel_video_mpd_R3C4.mpd
30+
31+
# local config
32+
config/local.js
33+
config/env/ssl
34+
35+
# Coverage results
36+
coverage
37+
38+
# Automatically generated views
39+
views/layout.ejs

‎.istanbul.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
instrumentation:
2+
root: ./api
3+
excludes: ['**/responses/**', '**/services/**']

‎Dockerfile‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
# Pre-existing docker image with ffmpeg preloaded (Centos)
22
# To build: sudo docker build -t <your-username>/<repository-name> .
3-
# To run: sudo docker run -it -p 1337:1337 --entrypoint='bash' <yout-username>/<repository-name>
3+
# To run: sudo docker run -it -p 1337:1337 --entrypoint='bash' <your-username>/<repository-name>
44
FROM jrottenberg/ffmpeg
55

66
# install utilities
7-
RUN yum -y update && yum -y install curl make gcc gcc-c++ git
7+
RUN yum -y update && yum -y install curl make gcc gcc-c++ git bzip2
88

99
# install MP4Box (GPAC)
1010
RUN yum -y install \
1111
freetype-devel \
1212
SDL-devel \
1313
freeglut-devel
1414

15-
RUN curl -fsSL https://github.com/gpac/gpac/archive/v0.5.2.tar.gz -o gpac.tar.gz && \
16-
tar -xzf gpac.tar.gz && cd gpac-0.5.2/ && \
15+
ENV MP4Box_Version 0.6.0
16+
RUN curl -fsSL https://github.com/gpac/gpac/archive/v${MP4Box_Version}.tar.gz -o gpac.tar.gz && \
17+
tar -xzf gpac.tar.gz && cd gpac-${MP4Box_Version}/ && \
1718
./configure --static-mp4box --use-zlib=no && \
1819
make -j4 && make install && \
1920
ln -s /usr/local/bin/MP4Box /usr/bin/MP4Box && \
20-
cd .. && rm -rf gpac && rm gpac.tar.gz && rm -rf gpac-0.5.2
21+
cd .. && rm -rf gpac && rm gpac.tar.gz && rm -rf gpac-${MP4Box_Version}
2122

2223
# install nodejs (version 0.11.0)
2324
RUN curl -sL https://rpm.nodesource.com/setup | bash - && \
@@ -29,13 +30,18 @@ RUN npm --quiet -g install sails@0.11.0
2930
# install prerequisites
3031
RUN npm install --quiet -g install grunt-cli bower
3132

32-
# Set /zoomable as pwd and copy all files to this container's directory
33+
# Just add package.json to get the npm install cache
3334
WORKDIR /zoomable
34-
ADD . /zoomable
35+
ADD package.json /zoomable
36+
ADD bower.json /zoomable
37+
ADD .bowerrc /zoomable
3538

3639
# install npm packages
3740
RUN npm install && \
3841
bower install --quiet --allow-root --config.interactive=false
3942

43+
# Set /zoomable as pwd and copy all files to this container's directory
44+
ADD . /zoomable
45+
4046
# cleanup
4147
RUN npm cache clean

0 commit comments

Comments
 (0)