From c810d4d878b698138958f8cd7367fb8ed00d2b52 Mon Sep 17 00:00:00 2001 From: Isaac Abadi Date: Fri, 17 Jun 2022 15:35:06 -0400 Subject: [PATCH] Code cleanup --- backend/youtube-dl.js | 2 +- src/app/components/login/login.component.html | 14 ++-- .../unified-file-card.component.ts | 4 +- ...update-task-schedule-dialog.component.html | 2 +- src/styles.scss | 71 ++++++++++++++++++- 5 files changed, 81 insertions(+), 12 deletions(-) diff --git a/backend/youtube-dl.js b/backend/youtube-dl.js index 4e1c5ff..37c4c1c 100644 --- a/backend/youtube-dl.js +++ b/backend/youtube-dl.js @@ -90,7 +90,7 @@ exports.updateYoutubeDL = async (latest_update_version) => { exports.verifyBinaryExistsLinux = () => { const details_json = fs.readJSONSync(CONSTS.DETAILS_BIN_PATH); - if (!is_windows && details_json && details_json['path'] && details_json['path'].includes('.exe')) { + if (!is_windows && details_json && (details_json['path'].includes('.exe') || !details_json['path'])) { details_json['path'] = 'node_modules/youtube-dl/bin/youtube-dl'; details_json['exec'] = 'youtube-dl'; details_json['version'] = OUTDATED_VERSION; diff --git a/src/app/components/login/login.component.html b/src/app/components/login/login.component.html index 7ff151f..39987c5 100644 --- a/src/app/components/login/login.component.html +++ b/src/app/components/login/login.component.html @@ -1,31 +1,31 @@ - +
- +
- +
- +
- +
- +
- +
diff --git a/src/app/components/unified-file-card/unified-file-card.component.ts b/src/app/components/unified-file-card/unified-file-card.component.ts index 8c0295b..a9cc7c9 100644 --- a/src/app/components/unified-file-card/unified-file-card.component.ts +++ b/src/app/components/unified-file-card/unified-file-card.component.ts @@ -41,7 +41,7 @@ export class UnifiedFileCardComponent implements OnInit { // input/output @Input() loading = true; @Input() theme = null; - @Input() file_obj: DatabaseFile | Playlist = null; + @Input() file_obj = null; @Input() card_size = 'medium'; @Input() use_youtubedl_archive = false; @Input() is_playlist = false; @@ -51,7 +51,7 @@ export class UnifiedFileCardComponent implements OnInit { @Input() jwtString = null; @Input() availablePlaylists = null; @Output() goToFile = new EventEmitter(); - @Output() goToSubscription = new EventEmitter(); + @Output() goToSubscription = new EventEmitter(); @Output() deleteFile = new EventEmitter(); @Output() addFileToPlaylist = new EventEmitter(); @Output() editPlaylist = new EventEmitter(); diff --git a/src/app/dialogs/update-task-schedule-dialog/update-task-schedule-dialog.component.html b/src/app/dialogs/update-task-schedule-dialog/update-task-schedule-dialog.component.html index 7782e15..ee27b7c 100644 --- a/src/app/dialogs/update-task-schedule-dialog/update-task-schedule-dialog.component.html +++ b/src/app/dialogs/update-task-schedule-dialog/update-task-schedule-dialog.component.html @@ -19,7 +19,7 @@
- Choose a date + Choose a date diff --git a/src/styles.scss b/src/styles.scss index be060c8..9b31275 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -73,4 +73,73 @@ $light-theme: mat-light-theme($light-primary, $light-accent, $light-warn); margin: 0 auto; left: 50%; top: 50%; -} \ No newline at end of file +} + +/* cyrillic-ext */ +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(./assets/fonts/KFOmCnqEu92Fr1Mu72xKOzY.woff2) format("woff2"); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, + U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(./assets/fonts/KFOmCnqEu92Fr1Mu5mxKOzY.woff2) format("woff2"); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(./assets/fonts/KFOmCnqEu92Fr1Mu7mxKOzY.woff2) format("woff2"); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(./assets/fonts/KFOmCnqEu92Fr1Mu4WxKOzY.woff2) format("woff2"); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(./assets/fonts/KFOmCnqEu92Fr1Mu7WxKOzY.woff2) format("woff2"); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, + U+01AF-01B0, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(./assets/fonts/KFOmCnqEu92Fr1Mu7GxKOzY.woff2) format("woff2"); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, + U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: "Roboto"; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(./assets/fonts/KFOmCnqEu92Fr1Mu4mxK.woff2) format("woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, + U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, + U+FEFF, U+FFFD; +}