').attr('id', 'progress').append($bar)
-
- var $input_submit = $('
').addClass('btn btn-default').attr({
- type: 'button',
- value: 'Upload'
- })
-
- // JQuery plugin
- var $form_video = $('
').append([ $video_block, $button, $progress_bar, $description, $input_submit ])
- $form_video.fileupload({
- singleFileUploads: true,
- multipart: true,
- url: '/api/v1/videos',
- autoupload: false,
- add: function (e, data) {
- var $text = $('
').addClass('name_file').text(data['files'][0]['name'])
- $text.insertAfter($button)
- $input_submit.off('click').on('click', function () {
- $bar.css('display', 'block')
- data.formData = $form_video.serializeArray()
- data.submit()
- })
- },
- progressall: function (e, data) {
- $bar.attr({
- value: data.loaded,
- max: data.total
- })
- },
- done: function (e, data) {
- // Print all the videos once it's finished
- getVideos()
- }
- })
-
- $content.empty()
- $content.append([ $title, $form_video ])
- }
-
- // Print the list of all the videos
- function getVideos () {
- $.ajax({
- url: '/api/v1/videos/',
- dataType: 'json',
- type: 'GET',
- success: function (videos) {
- printVideos(videos)
- }
- })
- }
-
- function removeVideo (video) {
- $.ajax({
- url: '/api/v1/videos/' + video._id,
- type: 'DELETE',
- success: function (response, status) {
- getVideos()
- }
- })
- }
-
- // Get the video: add the torrent file and stream it into a video tag
- function getVideo (video) {
- var $waiting = $('
![]()
').addClass('center-block loading').attr('src', '/images/loading.gif')
- $content.empty()
- $content.append($waiting)
-
- console.log('Getting ' + video)
- client.add(video.magnetUri, function (torrent) {
- var $embed = $('
').addClass('embed-responsive embed-responsive-16by9')
-
- $content.empty()
- $content.append($embed)
-
- // Got torrent metadata!
- console.log('Torrent info hash:', torrent.infoHash)
-
- // Let's say the first file is a webm (vp8) or mp4 (h264) video...
- var file = torrent.files[0]
-
- file.appendTo($embed.get(0), function (err) {
- if (err) {
- alert('Cannot append the file.')
- console.error(err)
- }
- })
- })
- }
-
- getVideos()
-})()
diff --git a/client/app/main.ts b/client/app/main.ts
new file mode 100644
index 000000000..034c15573
--- /dev/null
+++ b/client/app/main.ts
@@ -0,0 +1,4 @@
+import {bootstrap} from 'angular2/platform/browser'
+import {AppComponent} from './app.component'
+
+bootstrap(AppComponent);
diff --git a/client/app/images/favicon.png b/client/images/favicon.png
similarity index 100%
rename from client/app/images/favicon.png
rename to client/images/favicon.png
diff --git a/client/app/images/loading.gif b/client/images/loading.gif
similarity index 100%
rename from client/app/images/loading.gif
rename to client/images/loading.gif
diff --git a/client/index.html b/client/index.html
new file mode 100644
index 000000000..15ccedb74
--- /dev/null
+++ b/client/index.html
@@ -0,0 +1,40 @@
+
+
+
Angular 2 QuickStart
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Loading...
+
+
diff --git a/client/package.json b/client/package.json
new file mode 100644
index 000000000..171c39edf
--- /dev/null
+++ b/client/package.json
@@ -0,0 +1,37 @@
+{
+ "name": "peertube-client",
+ "version": "0.0.1",
+ "private": true,
+ "licence": "GPLv3",
+ "author": {
+ "name": "Florian Bigard",
+ "email": "florian.bigard@gmail.com",
+ "url": "http://github.com/Chocobozzz"
+ },
+ "repository": {
+ "type": "git",
+ "url": "git://github.com/Chocobozzz/PeerTube.git"
+ },
+ "scripts": {
+ "tsc": "tsc",
+ "tsc:w": "tsc -w",
+ "typings": "typings",
+ "postinstall": "typings install"
+ },
+ "license": "ISC",
+ "dependencies": {
+ "angular2": "2.0.0-beta.8",
+ "systemjs": "0.19.22",
+ "es6-promise": "^3.0.2",
+ "es6-shim": "^0.33.3",
+ "reflect-metadata": "0.1.2",
+ "rxjs": "5.0.0-beta.2",
+ "zone.js": "0.5.15"
+ },
+ "devDependencies": {
+ "concurrently": "^2.0.0",
+ "lite-server": "^2.1.0",
+ "typescript": "^1.8.2",
+ "typings":"^0.6.8"
+ }
+}
diff --git a/client/app/stylesheets/application.scss b/client/stylesheets/application.scss
similarity index 100%
rename from client/app/stylesheets/application.scss
rename to client/stylesheets/application.scss
diff --git a/client/app/stylesheets/base.scss b/client/stylesheets/base.scss
similarity index 100%
rename from client/app/stylesheets/base.scss
rename to client/stylesheets/base.scss
diff --git a/client/app/stylesheets/bootstrap-variables.scss b/client/stylesheets/bootstrap-variables.scss
similarity index 100%
rename from client/app/stylesheets/bootstrap-variables.scss
rename to client/stylesheets/bootstrap-variables.scss
diff --git a/client/app/stylesheets/index.scss b/client/stylesheets/index.scss
similarity index 100%
rename from client/app/stylesheets/index.scss
rename to client/stylesheets/index.scss
diff --git a/client/tsconfig.json b/client/tsconfig.json
new file mode 100644
index 000000000..ca58ddb89
--- /dev/null
+++ b/client/tsconfig.json
@@ -0,0 +1,18 @@
+{
+ "compilerOptions": {
+ "target": "es5",
+ "module": "system",
+ "moduleResolution": "node",
+ "sourceMap": true,
+ "emitDecoratorMetadata": true,
+ "experimentalDecorators": true,
+ "removeComments": false,
+ "noImplicitAny": false
+ },
+ "exclude": [
+ "node_modules",
+ "typings/main",
+ "typings/main.d.ts"
+ ],
+ "compileOnSave": false
+}
diff --git a/client/typings.json b/client/typings.json
new file mode 100644
index 000000000..f10b7c541
--- /dev/null
+++ b/client/typings.json
@@ -0,0 +1,6 @@
+{
+ "ambientDependencies": {
+ "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
+ "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#bc92442c075929849ec41d28ab618892ba493504"
+ }
+}
diff --git a/server.js b/server.js
index 5f474a196..72c2e7cd1 100644
--- a/server.js
+++ b/server.js
@@ -67,14 +67,16 @@ app.use(require('connect-livereload')({
require('segfault-handler').registerHandler()
// Static files
-app.use(express.static(path.join(__dirname, '/app'), { maxAge: 0 }))
+app.use(express.static(path.join(__dirname, '/client'), { maxAge: 0 }))
// API routes
var api_route = '/api/' + constants.API_VERSION
app.use(api_route, routes.api)
-// Views routes
-app.use('/', routes.views)
+// Client application
+app.use('/*', function (req, res, next) {
+ res.sendFile(path.join(__dirname, 'client/index.html'))
+})
// ----------- Tracker -----------
@@ -108,26 +110,10 @@ app.use(function (req, res, next) {
next(err)
})
-// Prod : no stacktraces leaked to user
-if (process.env.NODE_ENV === 'production') {
- app.use(function (err, req, res, next) {
- logger.error(err)
- res.status(err.status || 500)
- res.render('error', {
- message: err.message,
- error: {}
- })
- })
-} else {
- app.use(function (err, req, res, next) {
- logger.error(err)
- res.status(err.status || 500)
- res.render('error', {
- message: err.message,
- error: err
- })
- })
-}
+app.use(function (err, req, res, next) {
+ logger.error(err)
+ res.sendStatus(err.status || 500)
+})
// ----------- Create the certificates if they don't already exist -----------
peertubeCrypto.createCertsIfNotExist(function (err) {
diff --git a/server/controllers/index.js b/server/controllers/index.js
index 858f493da..7b0288dbb 100644
--- a/server/controllers/index.js
+++ b/server/controllers/index.js
@@ -3,9 +3,7 @@
var constants = require('../initializers/constants')
var apiController = require('./api/' + constants.API_VERSION)
-var viewsController = require('./views')
module.exports = {
- api: apiController,
- views: viewsController
+ api: apiController
}
diff --git a/server/controllers/views.js b/server/controllers/views.js
deleted file mode 100644
index aa9718079..000000000
--- a/server/controllers/views.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict'
-
-var express = require('express')
-
-var cacheMiddleware = require('../middlewares').cache
-
-var router = express.Router()
-
-router.get(/^\/(index)?$/, cacheMiddleware.cache(), getIndex)
-router.get('/partials/:directory/:name', cacheMiddleware.cache(), getPartial)
-
-// ---------------------------------------------------------------------------
-
-module.exports = router
-
-// ---------------------------------------------------------------------------
-
-function getIndex (req, res) {
- res.render('index')
-}
-
-function getPartial (req, res) {
- var directory = req.params.directory
- var name = req.params.name
-
- res.render('partials/' + directory + '/' + name)
-}
diff --git a/server/lib/videos.js b/server/lib/videos.js
index 2d7d9500d..1e0a83b8b 100644
--- a/server/lib/videos.js
+++ b/server/lib/videos.js
@@ -2,6 +2,7 @@
var async = require('async')
var config = require('config')
+// TODO
var path = require('path')
var webtorrent = require('../lib/webtorrent')