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

Conversation

1lluzi0nzz
Copy link
Contributor

Hello, I think this PR should close out a couple issues in the project as well as present albums in a cleaner way:

Tray & Taskbar Icons:
pr1

Album Year Display:
pr2

Full Notes:

Jacob Netwal and others added 30 commits September 6, 2021 14:43
njs 12.14.1
Merge with main project master branch
Travis

Travis

Build

build

Windows

Tests

No cache

npm install

Linux
njs 12.14.1

build

build

travis

windows

build

linux

test

export

export

node

windows

travis_wait linux

tests

javascript

sudo

script

local_dir

commit

commit
@1lluzi0nzz 1lluzi0nzz changed the title Resolution for Issues Resolution for Issues #1044 & #1007 Sep 28, 2021
@jreiser1
Copy link
Contributor

There's a ton of commits mainly because we were messing with our configuration stuff, setting up our own CI, and making sure that our changes wouldn't interfere with your configuration. We would be happy to squash these down if you would like.

@nukeop
Copy link
Owner

nukeop commented Sep 28, 2021

Thanks for contributing. Don't worry about the number of commits, I'll just squash them. I'll run the CI now and will review it soon.

.gitignore Outdated

#package-lock
package-lock.json
Copy link
Owner

Choose a reason for hiding this comment

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

Please don't commit these (package-lock and package.json) as they need to be update if we install new packages.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

These lines have been taken out of .gitignore, should be tracked again.

Thanks!

@@ -39,7 +39,8 @@ 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' : '../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.

@codecov
Copy link

codecov bot commented Sep 29, 2021

Codecov Report

Merging #1057 (aadd9ae) into master (ee6b1f8) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

❗ Current head aadd9ae differs from pull request most recent head 6f63d8c. Consider uploading reports for the commit 6f63d8c to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1057      +/-   ##
==========================================
- Coverage   61.43%   61.42%   -0.01%     
==========================================
  Files         280      280              
  Lines        5002     5001       -1     
  Branches      318      318              
==========================================
- Hits         3073     3072       -1     
  Misses       1662     1662              
  Partials      267      267              
Impacted Files Coverage Δ
packages/app/app/components/AlbumView/index.tsx 100.00% <100.00%> (ø)
packages/app/app/reducers/equalizer.js 53.65% <100.00%> (ø)
packages/ui/lib/components/Loader/index.js
packages/ui/lib/components/Loader/index.tsx 50.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ee6b1f8...6f63d8c. Read the comment docs.

package & package-lock will be tracked.
Removing commented line.
@nukeop
Copy link
Owner

nukeop commented Sep 30, 2021

Thanks for solving this!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants