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

Remove the fontawesome API keys and modules #30

Merged
merged 5 commits into from
Apr 18, 2022
Merged

Conversation

Minion3665
Copy link
Member

@Minion3665 Minion3665 commented Nov 8, 2021

  • Remove the API keys & uninstall modules
  • Change the source of the icons so it no longer uses fontawesome pro icons
    • Realize it's probably better to use fontawesome's free icon set rather than something completely different
    • Set up fontawesome's free icon set
  • Make sure it still builds, this can be done with the existing CI
  • Test using mock-shepherd

This PR resolves #21

@Minion3665 Minion3665 self-assigned this Nov 8, 2021
…l but 1 case) and a different but similar icon (in that final case)
@Minion3665
Copy link
Member Author

Please could someone review this pull request, I've (to the best of my ability) only used the free icons from the same iconset as before (which will mean that all our icons are filled in but won't change stuff much), however a switch did have to be made (I replaced the arrow that opens or closes the files pane with a chevron, as the arrow is pro only).

I've tested using https://github.com/systemetric/mock-shepherd, so I believe that everything works as before (excepting the minor visual changes), however it'd still be good to get someone else to look over this before merging.

@Minion3665 Minion3665 changed the title [WIP] Remove the fontawesome API keys and modules Remove the fontawesome API keys and modules Nov 9, 2021
@Minion3665 Minion3665 added needs testing sheep Pull requests which effect code or building of vue components labels Nov 10, 2021
@shardros shardros self-requested a review November 11, 2021 10:06
@shardros
Copy link
Member

I'll have a look at this tonight or tomorrow, thank you for the work :)

@shardros
Copy link
Member

shardros commented Nov 12, 2021

Thank you for this. This has been along time needed and I am glad someone has finally managed to do it :)

I am unable to test this PR. As of b246ade shepherd does not serve sheep?

Maybe I am doing something dumb?

I've just run:

git checkout origin/icon_source_change
sudo python3 app.py

No logs are printed to the console. Checking out master works.

image

Copy link
Member

@shardros shardros left a comment

Choose a reason for hiding this comment

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

Please make sure that sheep gets served.

@shardros
Copy link
Member

I'm no longer able to review this PR, please find another reviewer.

@Minion3665 Minion3665 dismissed shardros’s stale review November 25, 2021 11:55

Review out of date with HEAD & reviewer no longer available

@casheww casheww self-requested a review November 25, 2021 14:00
@casheww
Copy link
Contributor

casheww commented Nov 25, 2021

hmm... looks like you've pushed with the full website image files rather than the LFS pointers?
Not sure what the best way to sort this is now that it's on github

@Minion3665
Copy link
Member Author

hmm... looks like you've pushed with the full website image files rather than the LFS pointers? Not sure what the best way to sort this is now that it's on github

Ahh, my bad in that case; best course of action would probably be to revert back to before I pushed files that should be on LFS & make the commit without the incorrect files

@casheww
Copy link
Contributor

casheww commented Nov 25, 2021

revert or reset? I'm looking at them now but I'm not sure lol

@Minion3665
Copy link
Member Author

(it looks like I messed up my rebase and it didn't fix it, I'm going to revert that)

…advertently deleted. My issue before was using updatebuild rather than build which seems to commit images to the repo too
@Minion3665
Copy link
Member Author

Minion3665 commented Nov 25, 2021

hmm... looks like you've pushed with the full website image files rather than the LFS pointers? Not sure what the best way to sort this is now that it's on github

@casheww I've fixed that now (I was using 'npm run updatebuild' rather than 'npm run build' which seemed to get all the images and add them.) Thanks for pointing that out & being patient

Copy link
Contributor

@casheww casheww left a comment

Choose a reason for hiding this comment

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

This appears to work on the brain I have! Awesome job :)

@casheww
Copy link
Contributor

casheww commented Nov 25, 2021

I'm still a bit cautious about merging into shepherd:master though, so I will just tag in @WillMunns , and hopefully we can talk about this on Saturday? I'm sure he'll want to test it at some point

@Minion3665 Minion3665 requested a review from WillMunns November 25, 2021 22:27
Copy link
Member

@shardros shardros left a comment

Choose a reason for hiding this comment

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

LGTM, ty <3.

I think that this should be merged now that RoboCon 2022 is over and we are now in the pre-release-candidate window for 2023.

@shardros
Copy link
Member

Now that RoboCon has past I think that we should merge this so that #29 can become unblocked. There is no risk as the next release candidate for RoboCon-2023 will be after the summer.

@shardros shardros merged commit 2847350 into master Apr 18, 2022
@shardros shardros deleted the icon_source_change branch April 18, 2022 10:50
@Minion3665
Copy link
Member Author

Now that this PR is done, I presume we're good to make this repo public? @shardros can you confirm that you've invalidated the API keys as well as merging this PR, and if so I'll publicize the repo

@Minion3665
Copy link
Member Author

Now that this PR is done, I presume we're good to make this repo public? @shardros can you confirm that you've invalidated the API keys as well as merging this PR, and if so I'll publicize the repo

Actually, taking a look back at #21, it's @mrbbot who has the token. Please may you invalidate the token and tell me when you're done?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs testing sheep Pull requests which effect code or building of vue components
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Shepherd should not be private
3 participants