From 6c6bbb48610afb4a665b13dbfefdbddf3f3094e1 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Tue, 16 May 2017 16:42:06 +0800 Subject: [PATCH] home view data load --- config/env/torrents.js | 1 + .../controllers/home.client.controller.js | 20 +- modules/core/client/less/mt.less | 176 ++++++++++++++---- .../core/client/views/home.client.view.html | 121 ++++++++---- .../client/img/default_backdrop_300.jpg | Bin 0 -> 7050 bytes .../client/views/movie-list.client.view.html | 42 +++-- .../controllers/torrents.server.controller.js | 12 +- 7 files changed, 293 insertions(+), 79 deletions(-) create mode 100644 modules/torrents/client/img/default_backdrop_300.jpg diff --git a/config/env/torrents.js b/config/env/torrents.js index d8e9e955..6d2098a0 100644 --- a/config/env/torrents.js +++ b/config/env/torrents.js @@ -94,6 +94,7 @@ module.exports = { //please change it to your api key from themoviedb.org key: '7888f0042a366f63289ff571b68b7ce0', backdrop_img_base_url: 'http://image.tmdb.org/t/p/w1280', + backdrop_img_base_url_300: 'http://image.tmdb.org/t/p/w300', poster_img_base_url: 'http://image.tmdb.org/t/p/w500', poster_list_base_url: 'http://image.tmdb.org/t/p/w92', cast_img_base_url: 'http://image.tmdb.org/t/p/w132_and_h132_bestv2' diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js index 2562e7f4..30797bdc 100644 --- a/modules/core/client/controllers/home.client.controller.js +++ b/modules/core/client/controllers/home.client.controller.js @@ -10,7 +10,9 @@ function HomeController($scope, $state, $translate, Authentication, TorrentsService, Notification, MeanTorrentConfig, getStorageLangService) { var vm = this; vm.tmdbConfig = MeanTorrentConfig.meanTorrentConfig.tmdbConfig; + vm.movieTopList = undefined; + vm.movieNewList = undefined; vm.info_is_ready = false; @@ -57,7 +59,9 @@ */ vm.getMovieTopInfo = function () { vm.moviesInfo = TorrentsService.get({ - limit: 16 + torrent_status: 'reviewed', + torrent_type: 'movie', + limit: 8 }, function (items) { vm.movieTopList = items.rows; }, function (err) { @@ -65,6 +69,20 @@ message: ' ' + $translate.instant('TOP_MOVIE_INFO_ERROR') }); }); + + vm.moviesInfo = TorrentsService.get({ + torrent_status: 'reviewed', + torrent_type: 'movie', + newest: true, + limit: 10 + }, function (items) { + vm.movieNewList = items.rows; + console.log(vm.movieNewList); + }, function (err) { + Notification.error({ + message: ' ' + $translate.instant('TOP_MOVIE_INFO_ERROR') + }); + }); }; /** diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index f3aa5d23..990d70c8 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -88,26 +88,27 @@ body { &:hover { background-color: #efefef; background-color: rgba(224, 224, 224, .3); + .torrent-user-info { + opacity: 1; + color: #fff; + } + .torrent-tmdb-info { + opacity: 1; + color: #fff; + } + > img { + opacity: 1; + } } > img { opacity: 0.8; - &:hover { - opacity: 1; - + .torrent-user-info { - opacity: 1; - color: #fff; - } - } } .caption { - padding: 5px 3px; + padding: 5px 3px 2px; ul { margin-bottom: 0; } } - .release-date { - color: #000; - } } .torrent-votes { @@ -125,26 +126,56 @@ body { } } -.torrent-user-info { +.col-small-padding { + padding: 0 5px; +} + +.col-no-padding { + padding: 0; +} + +.torrent-tmdb-info { display: table-cell; position: absolute; - top: 4px; - left: 20px; - right: 20px; - padding: 8px 0; + bottom: 52px; + left: 10px; + right: 10px; + padding: 6px 5px; background-color: @mt-body-background-color; background-color: rgba(0, 0, 0, .7); color: #ddd; opacity: 0.8; - &:hover { - opacity: 1; - color: #fff; - } > ul { margin-left: 0; margin-bottom: 0; } + .release-date { + color: #ccc; + } +} + +.torrent-user-info { + font-size: 12px; + display: table-cell; + position: absolute; + top: 5px; + left: 10px; + right: 10px; + padding: 6px 5px; + + background-color: @mt-body-background-color; + background-color: rgba(0, 0, 0, .7); + color: #ddd; + opacity: 0.8; + table { + width: 100%; + tr { + td { + width: auto; + } + } + } .torrent-up { color: #33CC00; } @@ -152,18 +183,7 @@ body { color: #FF3300; } .torrent-finished { - color: #33FFFF; - } - - &.small-info { - @media (min-width: @screen-md-min) { - padding: 5px 0; - font-size: 12px; - .list-inline > li { - padding-left: 1px; - padding-right: 1px; - } - } + color: #0366d6; } } @@ -179,6 +199,98 @@ body { } } +.panel-newest-list { + @media (max-width: @screen-md-min) { + display: none; + } + .h5, + h5 { + margin-top: 0; + margin-bottom: 0; + } + table { + width: 100%; + tr { + &.show-big { + .newest-item-big { + display: block; + } + .newest-item-small { + display: none; + } + } + &.hide-big { + .newest-item-big { + display: none; + } + .newest-item-small { + display: block; + } + } + td { + cursor: pointer; + max-width: 0; + &:hover { + .newest-info { + color: #fff; + opacity: 1; + } + .newest-user-info { + color: #fff; + opacity: 1; + } + } + } + } + } + .newest-item-small { + padding: 0 5px; + } + .newest-item-big { + position: relative; + img { + width: 100%; + } + .newest-info { + position: absolute; + bottom: 32px; + left: 0; + right: 0; + margin-bottom: -32px; + padding: 6px 5px; + + background-color: @mt-body-background-color; + background-color: rgba(0, 0, 0, .7); + color: #ddd; + opacity: 0.8; + } + .newest-user-info { + font-size: 12px; + position: absolute; + top: 0; + left: 0; + right: 0; + margin-bottom: -32px; + padding: 6px 5px; + + background-color: @mt-body-background-color; + background-color: rgba(0, 0, 0, .7); + color: #ddd; + opacity: 0.8; + + .torrent-up { + color: #33CC00; + } + .torrent-down { + color: #FF3300; + } + .torrent-finished { + color: #0366d6; + } + } + } +} + .btn-tag { width: 100px; &, diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html index 4f4c7394..ec66e782 100644 --- a/modules/core/client/views/home.client.view.html +++ b/modules/core/client/views/home.client.view.html @@ -111,45 +111,102 @@
-
- -
+
+
+
+
+
+
+
+
+ {{item.torrent_title}} -
-
-
-
-
-
-
-
- {{item.torrent_title}} + - +
+
    +
  • + {{item.torrent_release}} + IMDB {{item.torrent_imdb_votes}} +
    • +
+
-
-
    -
  • - {{item.torrent_title}} -
  • {{item.torrent_release}} - IMDB {{item.torrent_imdb_votes}}
    • -
-
+
+
    +
  • + {{item.torrent_title}} +
    • +
+ +
+ +
+
+
Newest Movie Torrents
+ + + + +
+
+ + + + +
+
+ {{$index + 1}}. {{nt.torrent_title}} +
+
+
+ +
+ {{$index + 1}}. {{nt.torrent_title}} +
+
+
diff --git a/modules/torrents/client/img/default_backdrop_300.jpg b/modules/torrents/client/img/default_backdrop_300.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2237bc752c8d505794d1dfbcd1f59fd56285fb1a GIT binary patch literal 7050 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 -
+
+
-
+
{{item.torrent_title}} - diff --git a/modules/torrents/server/controllers/torrents.server.controller.js b/modules/torrents/server/controllers/torrents.server.controller.js index c1944518..6e73a4a6 100644 --- a/modules/torrents/server/controllers/torrents.server.controller.js +++ b/modules/torrents/server/controllers/torrents.server.controller.js @@ -406,10 +406,13 @@ exports.list = function (req, res) { var status = 'reviewed'; var rlevel = 'none'; var stype = 'movie'; + var newest = false; var release = undefined; var tagsA = []; var keysA = []; + var sort = 'torrent_recommended -createdat'; + if (req.query.skip !== undefined) { skip = parseInt(req.query.skip, 10); } @@ -428,6 +431,10 @@ exports.list = function (req, res) { if (req.query.torrent_release !== undefined) { release = req.query.torrent_release; } + if (req.query.newest !== undefined) { + newest = (req.query.newest === 'true'); + } + if (req.query.torrent_tags !== undefined) { var tagsS = req.query.torrent_tags + ''; var tagsT = tagsS.split(','); @@ -479,6 +486,9 @@ exports.list = function (req, res) { console.log(JSON.stringify(condition)); + if (newest) { + sort = '-createdat'; + } var countQuery = function (callback) { Torrent.count(condition, function (err, count) { @@ -492,7 +502,7 @@ exports.list = function (req, res) { var findQuery = function (callback) { Torrent.find(condition) - .sort('torrent_recommended -createdat') + .sort(sort) .populate('user', 'displayName') .skip(skip) .limit(limit)