systemetric / shepherd

👨‍🌾 Shepherd is the code management system used on the RoboCon brains
Other
2 stars 1 forks source link

Remove the fontawesome API keys and modules #30

Closed Minion3665 closed 2 years ago

Minion3665 commented 2 years ago

This PR resolves #21

Minion3665 commented 2 years ago

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.

shardros commented 2 years ago

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

shardros commented 2 years ago

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

shardros commented 2 years ago

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

casheww commented 2 years ago

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 commented 2 years ago

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 commented 2 years ago

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

Minion3665 commented 2 years ago

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

Minion3665 commented 2 years ago

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

casheww commented 2 years ago

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

shardros commented 2 years ago

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.

Minion3665 commented 2 years ago

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 commented 2 years ago

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?