lasers
/
FreeTube
mirror of https://github.com/FreeTubeApp/FreeTube
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change "Default" profile to "All Channels" and other small changes

This commit is contained in:
PrestonN 2019-08-01 14:42:36 -04:00
parent 7bb97d3aca
commit 62b956f1b4
10 changed files with 195 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/images/defaultBanner.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.8 KiB

4
src/js/channels.js
View File

@ -85,6 +85,10 @@ function goToChannel(channelId) {
data.latestVideos.forEach((video) => {
displayVideo(video, 'channel');
});
if (typeof(channelView.banner) === 'undefined') {
window.setTimeout(() => {$('.channelViewBanner').get(0).height = 200;}, 50);
}
}, (errorData) => {
showToast(errorData.responseJSON.error);
loadingView.seen = false;

48
src/js/init.js
View File

@ -68,8 +68,6 @@ let init = function () {
//let winHeight = 800;
win = new BrowserWindow({
width: 1200,
height: 800,
autoHideMenuBar: true,
webPreferences: {
nodeIntegration: true,
@ -77,25 +75,7 @@ let init = function () {
icon: path.join(__dirname, '..', 'icons', 'iconColor.png')
});
settingsDb.findOne({
_id: 'bounds'
}, function (err, doc) {
if (typeof doc !== "object" || typeof doc.value !== "object") {
return;
}
const {maximized, ...bounds} = doc.value;
const allDisplaysSummaryWidth = screen
.getAllDisplays()
.reduce((accumulator, {size: {width}}) => accumulator + width, 0);
if (allDisplaysSummaryWidth >= bounds.x) {
win.setBounds(bounds);
}
if (maximized) {
win.maximize();
}
});
win.setBounds({width: 1200, height: 800});
settingsDb.findOne({
_id: 'useTor'
@ -132,7 +112,7 @@ let init = function () {
});
if (process.env = 'development') {
//win.webContents.openDevTools();
win.webContents.openDevTools();
}
win.on('closed', () => {
@ -225,6 +205,30 @@ let init = function () {
const menu = Menu.buildFromTemplate(template);
Menu.setApplicationMenu(menu);
settingsDb.findOne({
_id: 'bounds'
}, function (err, doc) {
if (doc === null) {
return;
}
if (typeof doc !== "object" || typeof doc.value !== "object") {
return;
}
const {maximized, ...bounds} = doc.value;
const allDisplaysSummaryWidth = screen
.getAllDisplays()
.reduce((accumulator, {size: {width}}) => accumulator + width, 0);
if (allDisplaysSummaryWidth >= bounds.x) {
win.setBounds({"x":bounds.x,"y":bounds.y,"width":bounds.width,"height":bounds.height});
}
if (maximized) {
win.maximize();
}
});
/**
* Sets proxy when setProxy event is sent from renderer
*

14
src/js/settings.js
View File

@ -180,11 +180,13 @@ function checkDefaultSettings() {
'distractionFreeMode': false,
'hideWatchedSubs': false,
'videoView': 'grid',
'profileList': [{
name: 'Default',
'profileList': [
{
name: 'All Channels',
color: randomColor
}, ],
'defaultProfile': 'Default',
},
],
'defaultProfile': 'All Channels',
};
ft.log(settingDefaults);
@ -221,7 +223,7 @@ function checkDefaultSettings() {
}, {
$set: {
profile: [{
value: 'Default'
value: 'All Channels'
}]
}
}, {}, (err, newDoc) => {
@ -856,7 +858,7 @@ function importSubscriptions() {
let colorPaletteKeys = Object.keys(colorPalette);
let randomColor = colorPalette[colorPaletteKeys[colorPaletteKeys.length * Math.random() << 0]];
editProfileView.isNewProfile = true;
editProfileView.newProfileColor = randomColor;
editProfileView.newProfileColorText = randomColor;
editProfileView.newProfileName = profile.value;
editProfileView.updateProfile(false);
}

42
src/js/subscriptions.js
View File

@ -84,23 +84,25 @@ function addSubscription(data, useToast = true, profile = '') {
*
* @return {Void}
*/
function removeSubscription(channelId) {
function removeSubscription(channelId, profile = profileSelectView.activeProfile.name, displayToast = true) {
subDb.find({
channelId: channelId
}, (err, docs) => {
if (docs[0].profile.length > 1) {
if (docs[0].profile.length > 1 && profile !== 'All Profiles') {
subDb.update({
channelId: channelId,
}, {
$pull: {
profile: {
value: profileSelectView.activeProfile.name
value: profile
}
}
}, (err, numAdded) => {
}, { multi: true },(err, numRemoved) => {
// Refresh the list of subscriptions on the side navigation bar.
displaySubs();
showToast('Removed channel from subscriptions.');
if (displayToast) {
showToast('Removed channel from subscriptions.');
}
});
} else {
subDb.remove({
@ -108,7 +110,9 @@ function removeSubscription(channelId) {
}, {}, (err, numRemoved) => {
// Refresh the list of subscriptions on the side navigation bar.
displaySubs();
showToast('Removed channel from subscriptions.');
if (displayToast) {
showToast('Removed channel from subscriptions.');
}
});
}
});
@ -198,9 +202,11 @@ function addSubsToView(videoList) {
});
}
videoList = videoList.filter(a => {
if (profileSelectView.activeProfile.name !== 'All Channels') {
videoList = videoList.filter(a => {
return a.profile.map(x => x.value).indexOf(profileSelectView.activeProfile.name) !== -1
});
});
}
videoList.sort((a, b) => {
return b.published - a.published;
@ -278,16 +284,20 @@ function displaySubs() {
subList.innerHTML = '';
// Sort alphabetically
subDb.find({
profile: {
$elemMatch: {
value: profileSelectView.activeProfile.name
}
}
}).sort({
subDb.find().sort({
channelName: 1
}).exec((err, subs) => {
subs.forEach((channel) => {
let subFilter;
if (profileSelectView.activeProfile.name === 'All Channels' || typeof(profileSelectView.activeProfile.name) === 'undefined') {
subFilter = subs;
}
else {
subFilter = subs.filter(a => {
return a.profile.find((name) => {return name.value === profileSelectView.activeProfile.name });
});
}
subFilter.forEach((channel) => {
// Grab subscriptions.html to be used as a template.
const subsTemplate = require('./templates/subscriptions.html')
mustache.parse(subsTemplate);

102
src/js/templates.js
View File

@ -923,15 +923,32 @@ let subscriptionManagerView = new Vue({
if (isNewProfile) {
editProfileView.profileName = '';
editProfileView.profileColor = '';
editProfileView.newProfileName = '';
editProfileView.newProfileColor = '';
editProfileView.newProfileName = 'Profile ' + (this.profileList.length + 1);
let colorPaletteKeys = Object.keys(editProfileView.colorPalette);
let randomColor = colorPalette[colorPaletteKeys[colorPaletteKeys.length * Math.random() << 0]];
editProfileView.newProfileColorText = randomColor;
editProfileView.subscriptionList = [];
} else {
editProfileView.profileName = this.profileList[index].name;
editProfileView.profileColor = this.profileList[index].color;
editProfileView.newProfileName = this.profileList[index].name;
editProfileView.newProfileColor = this.profileList[index].color;
// Sort alphabetically
editProfileView.newProfileColorText = this.profileList[index].color;
if (this.profileList[index].name === 'All Channels') {
// Sort alphabetically
subDb.find({
}).sort({
channelName: 1
}).exec((err, subs) => {
let list = [];
subs.forEach((sub) => {
sub.checked = false;
list.push(sub);
});
editProfileView.subscriptionList = list;
});
}
else {
// Sort alphabetically
subDb.find({
profile: {
$elemMatch: {
@ -948,8 +965,10 @@ let subscriptionManagerView = new Vue({
});
editProfileView.subscriptionList = list;
});
}
}
editProfileView.seen = true;
loadingView.seen = false;
//backButtonView.lastView = subscriptionManagerView;
}
},
@ -976,7 +995,7 @@ let editProfileView = new Vue({
profileName: '',
profileColor: '',
newProfileName: '',
newProfileColor: '',
newProfileColorText: '',
selectedProfile: '',
colorPalette: {
red: '#d50000',
@ -999,7 +1018,7 @@ let editProfileView = new Vue({
},
methods: {
changeProfileColor: function (value) {
this.newProfileColor = value;
this.newProfileColorText = value;
},
selectAll: function () {
this.subscriptionList.forEach(channel => {
@ -1012,6 +1031,11 @@ let editProfileView = new Vue({
});
},
defaultProfile: function () {
if (editProfileView.profileName === settingsView.defaultProfile) {
showToast('This profile is already set as your default.');
return;
}
settingsDb.update({
_id: 'defaultProfile'
}, {
@ -1087,6 +1111,11 @@ let editProfileView = new Vue({
});
},
updateProfile: function (updateView = true) {
if (this.newProfileName === '') {
showToast('Profile name cannot be blank.');
return;
}
let patt = new RegExp("^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$");
if (patt.test(this.newProfileColor)) {
if (this.isNewProfile) {
@ -1121,7 +1150,7 @@ let editProfileView = new Vue({
if (updateView) {
hideViews();
subscriptionManagerView.seen = true;
showToast('The' + newProfile.name + ' profile has been added!');
showToast('The ' + newProfile.name + ' profile has been added!');
}
});
}
@ -1244,7 +1273,11 @@ let editProfileView = new Vue({
showToast('Select a profile other than the one being edited.');
return;
}
let confirmString = 'Would you like to move the selected channels to the ' + this.selectedProfile + ' profile?';
if (this.selectedProfile === 'All Channels') {
showToast('There is no need to move channels to "All Channels".');
return;
}
let confirmString = 'Would you like to move the selected channel(s) to the ' + this.selectedProfile + ' profile?';
confirmFunction(confirmString, () => {
let amountRemoved = 0;
this.subscriptionList.forEach(channel => {
@ -1318,7 +1351,11 @@ let editProfileView = new Vue({
showToast('Select a profile other than the one being edited.');
return;
}
let confirmString = 'Would you like to copy the selected channels to the ' + this.selectedProfile + ' profile?';
if (this.selectedProfile === 'All Channels') {
showToast('There is no need to copy channels to "All Channels".');
return;
}
let confirmString = 'Would you like to copy the selected channel(s) to the ' + this.selectedProfile + ' profile?';
confirmFunction(confirmString, () => {
let amountCopied = 0;
this.subscriptionList.forEach(channel => {
@ -1369,52 +1406,55 @@ let editProfileView = new Vue({
});
},
deleteChannel: function () {
let confirmString = 'Are you sure you want to delete the selected channels from this profile?';
let confirmString = 'Are you sure you want to delete the selected channel(s) from this profile?';
let amountDeleted = 0;
if (this.amountSelected === 0) {
showToast('A channel must be selected before it can be deleted.');
return;
}
confirmFunction(confirmString, () => {
this.subscriptionList.forEach((channel, index) => {
console.log(channel);
if (channel.checked) {
subDb.update({
channelId: channel.channelId,
}, {
$pull: {
profile: {
value: editProfileView.profileName
}
}
}, {
multi: true
}, (err, numRemoved) => {
if (err) {
console.log(err);
}
removeSubscription(channel.channelId, editProfileView.profileName, false);
let subMap = subscriptionView.fullVideoList.map(x => x.author === channel.channelName);
for (let i = 0; i < subMap.length; i++) {
if (subMap[i]) {
let subViewListMap = subscriptionView.fullVideoList.map(x => x.author === channel.channelName);
for (let i = 0; i < subViewListMap.length; i++) {
if (subViewListMap[i]) {
let subProfileIndex = subscriptionView.fullVideoList[i].profile.findIndex(x => x.value === editProfileView.profileName);
subscriptionView.fullVideoList[i].profile.splice(subProfileIndex, 1);
}
}
editProfileView.subscriptionList.splice(index, 1);
});
amountDeleted++;
amountDeleted++;
}
});
window.setTimeout(() => {
// Refresh the list of subscriptions on the side navigation bar and subscriptions view.
displaySubs();
addSubsToView(subscriptionView.fullVideoList);
showToast(amountDeleted + ' channel(s) have been deleted from this profile.');
this.subscriptionList = this.subscriptionList.filter(a => {
return !a.checked;
});
}, 500);
});
},
},
computed: {
newProfileColor: function () {
if (this.newProfileColorText[0] === '#') {
return this.newProfileColorText;
}
else {
return '#' + this.newProfileColorText;
}
},
isDefaultProfile: function () {
return settingsView.defaultProfile === this.profileName;
},

7
src/style/channel.css
View File

@ -15,10 +15,17 @@
along with FreeTube. If not, see <http://www.gnu.org/licenses/>.
*/
.channelDefaultBanner {
width: 100%;
height: 200px;
}
.channelViewBanner {
width: 100%;
max-height: 200px;
margin-bottom: 30px;
background-color: black;
background-image: url('../images/defaultBanner.png');
}
.channelViewImage {

34
src/style/main.css
View File

@ -322,13 +322,13 @@ a {
.searchBar {
position: absolute;
right: -75px;
left: 40%;
top: 0;
width: 750px;
width: 650px;
}
.searchBar input {
width: 75%;
width: 94%;
color: black;
}
@ -558,21 +558,25 @@ a {
#confirmFunction {
position: fixed;
margin-left: 250px;
margin-right: auto;
left: 4%;
right: 4%;
top: 50%;
left: 30%;
width: 800px;
height: 65px;
font-weight: bold;
line-height: 65px;
visibility: hidden;
height: 45px;
line-height: 45px;
padding: 10px;
z-index: 1;
-webkit-box-shadow: 5px 5px 15px -5px rgba(0, 0, 0, 0.75);
-moz-box-shadow: 5px 5px 15px -5px rgba(0, 0, 0, 0.75);
box-shadow: 5px 5px 15px -5px rgba(0, 0, 0, 0.75);
visibility: hidden;
-webkit-box-shadow: 4px -2px 51px -6px rgba(0, 0, 0, 0.75);
-webkit-transition: opacity 0.4s ease-in-out;
-moz-transition: opacity 0.4s ease-in-out;
-ms-transition: opacity 0.4s ease-in-out;
-o-transition: opacity 0.4s ease-in-out;
}
#confirmMessage {
margin-left: 15px;
font-weight: bold;
}
.confirmButton {
@ -583,11 +587,15 @@ a {
#confirmYes {
right: 90px;
line-height: 65px;
font-weight: bold;
color: #2196f3;
}
#confirmNo {
right: 20px;
line-height: 65px;
font-weight: bold;
}
#getNextPage {

52
src/templates/editProfileView.html
View File

@ -1,5 +1,10 @@
<div v-if='seen'>
<div v-if='!isNewProfile' class='card'>
<div v-if="subscriptionList.length === 0" >
<h2>Subscription List for {{profileName}} Profile</h2>
<h4>This profile is empty. Add subscriptions to this profile to manage them.</h4>
</div>
<div v-else >
<h2>Subscription List for {{profileName}} Profile</h2>
<h3>{{amountSelected}} Selected</h3>
<br />
@ -10,6 +15,24 @@
<div class='profileEditName'><span>{{channel.channelName}}</span></div>
</div>
<br /><br /><br />
<div class='center'>
<div v-on:click='selectAll' class='settingsButton'>
SELECT ALL
</div>
<div v-on:click='selectNone' class='settingsButton'>
SELECT NONE
</div>
<div v-if="profileName !== 'All Channels'" v-on:click='move' class='settingsButton'>
MOVE SELECTED TO
</div>
<div v-on:click='copy' class='settingsButton'>
COPY SELECTED TO
</div>
<div v-on:click='deleteChannel' style='color: #f44336' class='settingsButton'>
DELETE SELECTED
</div>
</div>
<br />
<div class="select center">
<select id="profileListSelect" class="select-text" v-model='selectedProfile' required>
<option v-for='profile in profileList' :value='profile.name'>{{profile.name}}</option>
@ -18,29 +41,15 @@
<span class="select-bar"></span>
<label class="select-label">Profile Select</label>
</div>
<div class='center'>
<div v-on:click='selectAll' class='settingsButton'>
SELECT ALL
</div>
<div v-on:click='selectNone' class='settingsButton'>
SELECT NONE
</div>
<div v-on:click='move' class='settingsButton'>
MOVE SELECTED
</div>
<div v-on:click='copy' class='settingsButton'>
COPY SELECTED
</div>
<div v-on:click='deleteChannel' style='color: #f44336' class='settingsButton'>
DELETE SELECTED
</div>
</div>
<h4 v-if="profileName === 'All Channels'">NOTE: Deleting a channel from the "All Channels" profile will also delete the channel from all other profiles.</h4>
</div>
</div>
<div class='card'>
<h2 v-if='isNewProfile'>Add New Profile</h2>
<h2 v-if='!isNewProfile'>Edit Profile Attributes</h2>
<div class="input-text-settings">
<input type="text" placeholder='Profile Name' name="set-name" v-model='newProfileName' />
<input v-if="profileName !== 'All Channels'" type="text" placeholder='Profile Name' name="set-name" v-model='newProfileName' />
<input v-if="profileName === 'All Channels'" type="text" placeholder='Profile Name' name="set-name" v-model='newProfileName' disabled />
</div>
<h3>Color Picker</h3>
<div class='colorPickerPadding' v-for='(value, key) in colorPalette'>
@ -48,10 +57,11 @@
</div>
<br />
<div class="input-text-settings">
<input type="text" placeholder='HEX Color' name="set-name" v-model='newProfileColor' />
<input type="text" placeholder='HEX Color' name="set-name" v-model='newProfileColorText' />
</div>
<br />
<h3>New Profile Color</h3>
<h3 v-if='!isNewProfile'>New Profile Color</h3>
<h3 v-if='isNewProfile'>Selected Profile Color</h3>
<div class='colorPickerPadding'>
<div class='colorPicker' :style='{ backgroundColor: newProfileColor }'></div>
</div>
@ -66,7 +76,7 @@
<div v-on:click='defaultProfile' class='settingsButton'>
MAKE DEFAULT PROFILE
</div>
<div v-on:click='deleteProfile' style='color: #f44336' class='settingsButton'>
<div v-if="profileName !== 'All Channels'" v-on:click='deleteProfile' style='color: #f44336' class='settingsButton'>
DELETE PROFILE
</div>
</div>

2
src/templates/subscriptionManagerView.html
View File

@ -10,7 +10,7 @@
</div>
<div class='profileEditPadding' v-on:click='editProfile(true, -1)'>
<div class='profileEdit' style='background-color: #9E9E9E; cursor: pointer;'>
<i class='profileEditInitial fas fa-plus' style='color: #000000; top: 14px;'></i>
<i class='profileEditInitial fas fa-plus' style='color: #000000; top: 14px; left: 0.4px;'></i>
</div>
<div class='profileEditName'><span>Add New Profile</span></div>
</div>