Skip to content

Commit

Permalink
Resolution for Issues nukeop#1044 & nukeop#1007 (nukeop#1057)
Browse files Browse the repository at this point in the history
Co-authored-by: Jacob Netwal <jnetwal@msudenver.edu>
Co-authored-by: jreiser1 <47801590+jreiser1@users.noreply.github.com>
Co-authored-by: Hardik <55993168+Hardik-hi@users.noreply.github.com>
Co-authored-by: Felix <hdcompany123@gmail.com>
Co-authored-by: Jacob Reiser <jreiser1@msudenver.edu>
  • Loading branch information
6 people authored Sep 30, 2021
1 parent 0f0d417 commit f549166
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
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');

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

0 comments on commit f549166

Please sign in to comment.