Skip to content

Commit 812d1ed

Browse files
natalie-natsunatalie-natsu
committed
Ajout de vidéos #10
- uploads
1 parent 636d5bc commit 812d1ed

File tree

34 files changed

+203
-878
lines changed

34 files changed

+203
-878
lines changed

‎.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
.idea
2-
.meteor/local
3-
.meteor/meteorite
42
tests/core/__pycache__/
53
tests/worker/__pycache__/
64
scripts/core/__pycache__/

‎meteor/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.meteor/local
2+
node_modules
3+
.uploads

‎meteor/.meteor/.finished-upgraders

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ notices-for-facebook-graph-api-2
1010
1.2.0-meteor-platform-split
1111
1.2.0-cordova-changes
1212
1.2.0-breaking-changes
13+
1.3.0-split-minifiers-package

‎meteor/.meteor/packages

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,31 @@ blaze-html-templates # Compile .html files into Meteor Blaze views
1111
session # Client-side reactive dictionary for your app
1212
jquery # Helpful client-side library
1313
tracker # Meteor's client-side reactive programming library
14-
15-
standard-minifiers # JS/CSS minifiers run for production mode
1614
es5-shim # ECMAScript 5 compatibility for older browsers.
1715
ecmascript # Enable ECMAScript2015+ syntax in app code
1816

19-
meteorhacks:npm
20-
npm-container
21-
2217
accounts-facebook
2318
accounts-google
2419
accounts-password
25-
aldeed:autoform
26-
aldeed:collection2
27-
cfs:autoform
28-
cfs:filesystem
29-
cfs:standard-packages
20+
less
21+
standard-minifier-css
22+
standard-minifier-js
23+
random
24+
reactive-var
25+
26+
aldeed:tabular
3027
chrismbeckett:toastr
3128
fortawesome:fontawesome
3229
ian:accounts-ui-bootstrap-3
3330
iron:router
34-
less
3531
matb33:collection-hooks
3632
meteorhacks:cluster
3733
mrgalaxy:stripe
3834
natestrauser:animate-css
3935
nemo64:bootstrap
4036
ongoworks:security
41-
reactive-var
4237
smaltcreation:alert-i18n
4338
tap:i18n
4439
tomi:upload-server
4540
tomi:upload-jquery
46-
transcode:autoform-files
4741
underscorestring:underscore.string

‎meteor/.meteor/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@1.2.1
1+
METEOR@1.3.2.4

‎meteor/.meteor/versions

Lines changed: 93 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,142 +1,120 @@
1-
[email protected].2
2-
[email protected].6
3-
[email protected].6
4-
[email protected].8
5-
[email protected].4
6-
aldeed:[email protected]
7-
aldeed:[email protected]
8-
aldeed:simple-schema@1.3.3
1+
[email protected].7
2+
[email protected].9
3+
[email protected].9
4+
[email protected].12
5+
[email protected].8
6+
aldeed:[email protected]
7+
aldeed:[email protected]
8+
allow-deny@1.0.4
99
anti:[email protected]
10-
[email protected]
11-
[email protected]_1
12-
[email protected]
13-
[email protected]
14-
[email protected]
15-
[email protected]
16-
[email protected]
17-
[email protected]
18-
[email protected]
19-
[email protected]
20-
[email protected]
21-
[email protected]
22-
cfs:[email protected]
23-
cfs:[email protected]
24-
cfs:[email protected]
25-
cfs:[email protected]
26-
cfs:[email protected]
27-
cfs:[email protected]
28-
cfs:[email protected]
29-
cfs:[email protected]
10+
[email protected]
11+
[email protected]
12+
[email protected]
13+
[email protected]
14+
[email protected]
15+
[email protected]
16+
[email protected]
17+
[email protected]
18+
[email protected]
19+
[email protected]
20+
[email protected]
21+
[email protected]
3022
cfs:[email protected]
31-
cfs:[email protected]
32-
cfs:[email protected]
33-
cfs:[email protected]
34-
cfs:[email protected]
35-
cfs:[email protected]
36-
cfs:[email protected]
37-
cfs:[email protected]
38-
cfs:[email protected]
39-
cfs:[email protected]
40-
[email protected]
23+
[email protected]
4124
chrismbeckett:[email protected]_1
42-
[email protected]
43-
cosmos:[email protected]
44-
[email protected]
45-
[email protected]
46-
[email protected]
47-
[email protected]
48-
[email protected]
49-
[email protected]
50-
[email protected]
51-
[email protected]
52-
[email protected]
53-
[email protected]
54-
[email protected]
55-
[email protected]
56-
[email protected]
57-
[email protected]
25+
[email protected]
26+
[email protected]
27+
[email protected]
28+
[email protected]
29+
[email protected]
30+
[email protected]
31+
[email protected]
32+
[email protected]
33+
[email protected]
34+
[email protected]
35+
[email protected]
36+
[email protected]
37+
[email protected]
38+
[email protected]
39+
[email protected]
5840
fortawesome:[email protected]
59-
[email protected].4
60-
[email protected].7
61-
[email protected].0
62-
[email protected].5
63-
[email protected].5
64-
[email protected].1
41+
[email protected].8
42+
[email protected].11
43+
[email protected].4
44+
[email protected].9
45+
[email protected].9
46+
[email protected].5
6547
ian:[email protected]
66-
[email protected].4
48+
[email protected].7
6749
iron:[email protected]
6850
iron:[email protected]
6951
iron:[email protected]
7052
iron:[email protected]
7153
iron:[email protected]
72-
iron:middleware-stack@1.0.11
54+
iron:middleware-stack@1.1.0
7355
iron:[email protected]
7456
iron:[email protected]
75-
isotope:[email protected]_1
76-
[email protected]
57+
[email protected]
7758
kevohagan:[email protected]
78-
[email protected].4
79-
less@2.5.1
80-
[email protected].15
81-
[email protected].5
82-
[email protected].8
59+
[email protected].11
60+
less@2.6.0
61+
[email protected].18
62+
[email protected].9
63+
[email protected].12
8364
matb33:[email protected]
84-
[email protected]
85-
meteor-base@1.0.1
86-
meteorhacks:async@1.0.0
65+
mdg:[email protected]
66+
meteor@1.1.14
67+
meteor-base@1.0.4
8768
meteorhacks:[email protected]
88-
meteorhacks:[email protected]
8969
meteorspark:[email protected]
90-
[email protected]
91-
[email protected]
92-
[email protected]
93-
[email protected]
94-
momentjs:[email protected]
95-
[email protected]
96-
[email protected]
97-
[email protected]
70+
[email protected]
71+
[email protected]
72+
[email protected]
73+
[email protected]
74+
[email protected]
75+
[email protected]
76+
[email protected]
77+
[email protected]
78+
[email protected]
9879
mrgalaxy:[email protected]
9980
natestrauser:[email protected]
10081
nemo64:[email protected]_2
10182
nemo64:[email protected]
102-
[email protected]_2
103-
[email protected]
104-
[email protected]_1
105-
[email protected]
106-
[email protected]
107-
[email protected]
83+
[email protected]
84+
[email protected]
85+
[email protected]
86+
[email protected]
87+
[email protected]
10888
ongoworks:[email protected]
109-
[email protected].4
110-
promise@0.5.1
89+
[email protected].7
90+
promise@0.6.7
11191
raix:[email protected]
112-
raix:[email protected]
113-
[email protected]
114-
[email protected]
115-
[email protected]
116-
[email protected]
117-
[email protected]
118-
[email protected]
119-
[email protected]
120-
[email protected]
121-
[email protected]
122-
[email protected]
92+
[email protected]
93+
[email protected]
94+
[email protected]
95+
[email protected]
96+
[email protected]
97+
[email protected]
98+
[email protected]
99+
[email protected]
100+
[email protected]
101+
[email protected]
123102
smaltcreation:[email protected]
124-
smaltcreation:imagesloaded@4.1.0
125-
[email protected].7
126-
spacebars-compiler@1.0.7
127-
srp@1.0.4
128-
standard-minifiers@1.0.2
129-
[email protected].1
103+
spacebars@1.0.11
104+
spacebars-compiler@1.0.11
105+
srp@1.0.8
106+
standard-minifier-css@1.0.6
107+
standard-minifier-js@1.0.6
108+
[email protected].5
130109
tap:[email protected]
131-
[email protected].5
132-
[email protected].0
110+
[email protected].9
111+
[email protected].4
133112
tomi:[email protected]
134113
tomi:[email protected]
135-
[email protected]
136-
transcode:[email protected]
137-
[email protected]
138-
[email protected]
114+
[email protected]
115+
[email protected]
116+
[email protected]
139117
underscorestring:[email protected]
140-
[email protected].5
141-
[email protected].3
142-
[email protected].5
118+
[email protected].9
119+
[email protected].8
120+
[email protected].9

‎meteor/client/pages/profile/file/actions.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<template name="profileFileActions">
2+
<button class="btn btn-xs btn-primary convert">Convert</button>
3+
</template>

‎meteor/client/pages/profile/profile.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ <h2>
1111
<div class="container">
1212
<div class="row">
1313
<div id="videos" class="col-sm-8">
14-
{{#autoForm collection="Collection.Tasks" id="insert-task-form" type="insert"}}
15-
{{> afQuickField name='file'}}
16-
<button type="submit" class="btn btn-primary">Submit file</button>
17-
{{/autoForm}}
14+
{{> upload_bootstrap}}
15+
{{> tabular table=TabularTables.Files class="table table-striped table-bordered table-condensed"}}
1816
</div>
1917
<div id="offer" class="col-sm-4">
2018
{{> offer offerOptions}}

‎meteor/lib/collections/collections.js

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,5 @@
11
Collection = {
22
Tasks: new Mongo.Collection('tasks'),
3+
Files: new Mongo.Collection('files'),
34
Charges: new Meteor.Collection('charges')
45
};
5-
6-
Files = new FS.Collection("files", {
7-
stores: [new FS.Store.FileSystem("files"/*, {path: Meteor.settings.data}*/)]
8-
});
9-
10-
Collection.Tasks.attachSchema(new SimpleSchema({
11-
file: {
12-
type: String,
13-
autoform: {
14-
type: 'smalt-file',
15-
collection: Files,
16-
automaticUpload: true,
17-
automaticRemove: true,
18-
multiple: false,
19-
subscription: 'schema.task.file',
20-
accept: 'video/*,audio/*'
21-
}
22-
},
23-
createdBy: {
24-
type: String
25-
}
26-
}));

‎meteor/lib/routes/file.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import fs from 'fs';
2+
3+
if (Meteor.isServer) {
4+
const fail = response => {
5+
response.statusCode = 404;
6+
response.end('<h1>404 - File not found</h1>');
7+
};
8+
9+
const dataFile = function() {
10+
const file = `${Meteor.settings.data}/${this.params.name}`;
11+
12+
let stat = null;
13+
try {
14+
stat = fs.statSync(file);
15+
} catch (error) {
16+
return fail(this.response);
17+
}
18+
19+
this.response.writeHead(200, {
20+
'Content-Type': stat.type,
21+
'Content-Disposition': `attachment; filename=${this.params.name}`,
22+
'Content-Length': stat.size
23+
});
24+
25+
fs.createReadStream(file).pipe(this.response);
26+
};
27+
28+
Router.route('/file/:name', dataFile, {where: 'server'});
29+
}

0 commit comments

Comments
 (0)