Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolution for Issues #1044 & #1007 #1057

Merged
merged 53 commits into from
Sep 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
2bd857c
Travis
Sep 6, 2021
dc9e5d3
Travis
Sep 6, 2021
ca7e4d0
Build
Sep 6, 2021
10d557f
build
Sep 6, 2021
e69e606
Windows
Sep 6, 2021
2795303
Tests
Sep 6, 2021
524bdf6
No cache
Sep 6, 2021
0b90ba2
npm install
Sep 6, 2021
c0d03df
Linux
Sep 7, 2021
cf41bc2
build
Sep 7, 2021
11d8e31
build
Sep 7, 2021
0aa17c1
travis
Sep 7, 2021
0c55278
windows
Sep 7, 2021
50dcb22
build
Sep 7, 2021
dd89746
linux
Sep 7, 2021
9d47b76
test
Sep 7, 2021
9a356ec
export
Sep 7, 2021
9b1b6b8
export
Sep 7, 2021
2980902
node
Sep 7, 2021
66591c5
windows
Sep 7, 2021
a8a4fc1
travis_wait linux
Sep 7, 2021
42ff4f3
tests
Sep 7, 2021
73abe93
javascript
Sep 7, 2021
466faae
sudo
Sep 7, 2021
61fca26
script
Sep 7, 2021
7f01d81
local_dir
Sep 7, 2021
7a9a14d
commit
Sep 9, 2021
88aaf8f
commit
Sep 9, 2021
271006f
Merge pull request #3 from nukeop/master
jreiser1 Sep 16, 2021
3afc999
Combining all Travis setup commits
Sep 6, 2021
4a2960c
Changed to TypeScript (#1039)
Hardik-hi Sep 11, 2021
cf9da46
Skip Sponsorblock setting options (#1047)
haidang666 Sep 11, 2021
e9c2b53
Increased z-index of plugin dropdown
Hardik-hi Sep 12, 2021
eeb2f2e
Merge branch 'master' of https://github.com/MSU-CS4360-Nuclear/nuclear
jreiser1 Sep 18, 2021
320722d
Fixed typo in Equalizer presets
jreiser1 Sep 18, 2021
bbeb014
Fixed incorrect album year display
jreiser1 Sep 19, 2021
c7c8f79
Copying Seekbar code to start on LivestreamSeekbar
jreiser1 Sep 19, 2021
678a8d1
Potential Resolution for Nuclear issues #1044 & #1007
Sep 21, 2021
39a44d6
commenting out boilerplate code
jreiser1 Sep 23, 2021
2fb1be0
Merge pull request #10 from MSU-CS4360-Nuclear/livestream-fix
1lluzi0nzz Sep 23, 2021
21ccac1
Removed boilerplate Livestream code and fixed album year implementation
jreiser1 Sep 28, 2021
b3b0ff5
update .gitignore
jreiser1 Sep 28, 2021
92f1e5e
deleting .vs directory
jreiser1 Sep 28, 2021
56dabcf
Delete package-lock.json
jreiser1 Sep 28, 2021
78d0128
Delete deeper package-lock.json
jreiser1 Sep 28, 2021
0610f55
updated .gitignore again
jreiser1 Sep 28, 2021
aa1a216
Merge branch 'master' of https://github.com/MSU-CS4360-Nuclear/nuclear
jreiser1 Sep 28, 2021
cc0e20f
Delete .travis.yml
jreiser1 Sep 28, 2021
6b06985
Update package.json
1lluzi0nzz Sep 28, 2021
2ed3afa
Fix package-lock.json
1lluzi0nzz Sep 28, 2021
aadd9ae
Re-adding old package-lock.json
jreiser1 Sep 28, 2021
bb780c9
Update .gitignore
1lluzi0nzz Sep 29, 2021
6f63d8c
Update index.ts
1lluzi0nzz Sep 29, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,8 @@ lerna-debug.log

#flatpak
.flatpak-builder
build-dir
build-dir

#Travis/IDE stuff
.travis.yml
.vs/
3 changes: 2 additions & 1 deletion packages/app/app/components/AlbumView/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export const AlbumView: React.FC<AlbumViewProps> = ({
addFavoriteAlbum
}) => {
const { t } = useTranslation('album');
const release_date: Date = new Date(album.year);
return <div className={styles.album_view_container}>
<Dimmer.Dimmable>
<Dimmer active={album?.loading}>
Expand Down Expand Up @@ -87,7 +88,7 @@ export const AlbumView: React.FC<AlbumViewProps> = ({
album.year &&
<div className={styles.album_year}>
<label>{t('year')}</label>
{album.year}
{release_date.getFullYear()}
</div>
}
<div className={styles.album_tracks}>
Expand Down
8 changes: 4 additions & 4 deletions packages/app/app/reducers/equalizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const getPresets = (custom) => [
preAmp: 0
},
{
label: 'Full trebble',
label: 'Full treble',
id: 'full-treble',
values: [-6, -6, -6, -6, -2, 2, 6, 8, 8, 9, 9],
preAmp: 0
Expand All @@ -72,8 +72,8 @@ const normalize = list => list.reduce(({ids, map}, item) => ({
const getSelected = (selected, presets) => {
if (selected.toLowerCase() === selected) {
return selected;
}
const legacySelected = presets.find(preset => preset.label === selected);
}
const legacySelected = presets.find(preset => preset.label === selected);
return legacySelected ? legacySelected.id : presets[0].id;
};

Expand All @@ -86,7 +86,7 @@ const getLegacyCustom = ({presets}) => {

const getSpectrumStatus = (otherConfig) => {
return _.get(otherConfig, 'enableSpectrum', false);
};
};

const getInitialState = () => {
const {custom, selected, ...other} = store.get('equalizer');
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/services/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Config {
this.youtubeSearch = 'https://www.googleapis.com/youtube/v3/search?part=id,snippet&type=video&maxResults=50&q=';
this.supportedFormats = _.uniq(pkg.build.fileAssociations.map(({ ext }) => ext));

const iconPath = path.resolve(__dirname, this.isProd() ? 'resources' : '../resources/media');
const iconPath = path.resolve(__dirname, this.isProd() ? '../../../resources/media' : '../resources/media');
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for getting to the bottom of this. Could you please delete the commented out line?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed that comment.

Thanks for reviewing this.


this.icon = path.resolve(iconPath, 'icon.png');
this.macIcon = path.resolve(iconPath, 'icon_apple.png');
Expand Down