diff --git a/current-preview.PNG b/current-preview.PNG index 4461186..4802191 100644 Binary files a/current-preview.PNG and b/current-preview.PNG differ diff --git a/package.json b/package.json index 657547a..b96d82f 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "cyb3r-youtube-downloader", - "productName": "cyb3r-youtube-downloader", + "name": "cyb3r-downloader", + "productName": "cyb3r-downloader", "version": "1.5.0", - "description": "Cyb3r Downloader", + "description": "Cyb3r_Downloader", "main": "src/main.js", "scripts": { "start": "electron-forge start", @@ -30,16 +30,16 @@ "electronPackagerConfig": { "packageManager": "npm", "win32metadata": { - "ProductName": "Cyb3r Downloader", + "ProductName": "Cyb3r_Downloader", "CompanyName": "Thee.moe" }, "version-string": { - "ProductName": "Cyb3r Downloader", + "ProductName": "Cyb3r_Downloader", "CompanyName": "Thee.moe" } }, "electronWinstallerConfig": { - "name": "Cyb3r Downloader", + "name": "Cyb3r_Downloader", "packageName": "Cyb3r_Downloader", "icon": "app.ico" }, @@ -50,8 +50,8 @@ "name": "https://git.tooru.thee.moe/theenoro/electron-simple-youtube-downloader" }, "windowsStoreConfig": { - "packageName": "Cyb3r Downloader", - "name": "Cyb3r Downloader" + "packageName": "Cyb3r_Downloader", + "name": "Cyb3r_Downloader" } } }, diff --git a/src/app/js/app.js b/src/app/js/app.js index d9a8512..1f3a2a8 100644 --- a/src/app/js/app.js +++ b/src/app/js/app.js @@ -41,7 +41,7 @@ $(function() { ipcRenderer.on('watchr_file', function(event, arg) { arg.file = encodeURI(arg.file) if (arg.type === "add") { - $('#watchr_files').append('
' + arg.file + '
') + $('#watchr_files').append('
' + decodeURI(arg.file) + '
') } else if (arg.type === "remove") { $('.file[data-file="' + arg.file + '"]').remove(); } @@ -61,7 +61,7 @@ $(function() { console.log('DOWNLOADED') console.log(arg); // prints "pong" - $('.media-out-' + arg.id).html(''); + $('.media-out-' + arg.id).html(''); //var video = document.getElementById('video'); //$('#body-' + arg.id).append('
`).prependTo('#output'); ipcRenderer.send('start-download', { @@ -165,14 +167,17 @@ $(function() { height: 104px; background-size: 189px; background-position: 0px -18px; - "> + "> +
+
` + YT.title + `
Author: ` + YT.author_name + `
-
` diff --git a/src/app/style/player-controls.css b/src/app/style/player-controls.css new file mode 100644 index 0000000..be007da --- /dev/null +++ b/src/app/style/player-controls.css @@ -0,0 +1,42 @@ +#time span, #volume span { + background-color: #ffffff; + position: absolute; + top: 0; + left: 0; + height: 10px; + width: 0px; +} +#time { + cursor: pointer; + height: 10px; + margin-bottom: 10px; + outline: thin solid #ffffff; + overflow: hidden; + position: relative; + width: 100%; + vertical-align: -webkit-baseline-middle; + line-height: 1.42857143; + height: 9px; + display: inline-block; + top: 13px; +} +#volume { + cursor: pointer; + height: 10px; + margin-bottom: 10px; + outline: thin solid #ffffff; + overflow: hidden; + position: relative; + width: 200px; + vertical-align: -webkit-baseline-middle; + line-height: 1.42857143; + height: 9px; + display: inline-block; + top: 13px; +} +.btn-success { + color: #fff; + background-color: #f8f8f8; + border-color: #111; + transition: all .3s; +} diff --git a/src/app/style/style.css b/src/app/style/style.css index 0c712d2..8362c2f 100644 --- a/src/app/style/style.css +++ b/src/app/style/style.css @@ -1 +1 @@ -body{margin:0;margin-top:70px}.navbar{background:#111!important;color:#f8f8f8}.btn-success{color:#111;background-color:#f8f8f8;border-color:#111;transition:all .3s}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.dropdown-toggle:active,.dropdown-toggle:focus,.open>.dropdown-toggle.btn-success{color:#f8f8f8!important;background-color:#111!important;border-color:#111!important;transition:all .3s}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{text-decoration:none;color:#111;background-color:#f8f8f8}.dropdown-menu{background-color:#f8f8f8}span.input-group-btn.open>ul>li>a{background-image:none}.media:first-child{margin-top:15px}.media{box-shadow:0 0 12px 1px rgba(105,105,105,.28);margin-top:14px}.sidebar-nav{padding:10px}.nav.nav-list a{padding:5px 10px}.nav-header{font-weight:700}.scroll{overflow-y:scroll;height:calc(100vh - 96px)}.left-playlist{box-shadow:0 0 6px 1px #111;height:calc(100vh - 20vw - 30px)}.row-flex{word-break:break-all;width:100%;display:flex}.row-flex .flex-btn{width:50px}.row-flex .cont{width:100%}*{border-radius:0!important} \ No newline at end of file +body{margin:0;margin-top:70px}.navbar{background:#111!important;color:#f8f8f8}.btn-success{color:#111;background-color:#f8f8f8;border-color:#111;transition:all .3s}.btn-success.active,.btn-success:active,.btn-success:focus,.btn-success:hover,.dropdown-toggle:active,.dropdown-toggle:focus,.open>.dropdown-toggle.btn-success{color:#f8f8f8!important;background-color:#111!important;border-color:#111!important;transition:all .3s}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{text-decoration:none;color:#111;background-color:#f8f8f8}.dropdown-menu{background-color:#f8f8f8}span.input-group-btn.open>ul>li>a{background-image:none}.media:first-child{margin-top:15px}.media{box-shadow:0 0 12px 1px rgba(105,105,105,.28);margin-top:14px}.sidebar-nav{padding:10px}.nav.nav-list a{padding:5px 10px}.nav-header{font-weight:700}.scroll{overflow-y:scroll;height:calc(100vh - 387px)}.left-playlist{box-shadow:0 0 6px 1px #111;height:calc(100vh - 20vw - 30px)}.row-flex{word-break:break-all;width:100%;display:flex}.row-flex .flex-btn{width:50px}.row-flex .cont{width:100%}*{border-radius:0!important} \ No newline at end of file diff --git a/src/app/style/style.less b/src/app/style/style.less index ea60d02..e05c10d 100644 --- a/src/app/style/style.less +++ b/src/app/style/style.less @@ -69,12 +69,11 @@ span.input-group-btn.open > ul > li> a{ } .nav-header { - font-weight: bold; } .scroll{ overflow-y: scroll; - height: ~"calc( 100vh - 96px)"; + height: ~"calc(100vh - 387px)"; } .left-playlist{ diff --git a/src/app/view/layout.html b/src/app/view/layout.html index 740ce0c..4e49841 100644 --- a/src/app/view/layout.html +++ b/src/app/view/layout.html @@ -42,7 +42,23 @@ -
+
+
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+
@@ -98,25 +114,12 @@
-
-
- -
-
- -
- -
- -
- -
- -
+
diff --git a/src/app/view/pot.html b/src/app/view/pot.html index 78e0938..3e5354f 100644 --- a/src/app/view/pot.html +++ b/src/app/view/pot.html @@ -20,6 +20,7 @@ +