Skip to content

Commit

Permalink
Merge pull request #457 from devicons/develop
Browse files Browse the repository at this point in the history
Release v2.8.2
  • Loading branch information
amacado authored Jan 4, 2021
2 parents 8df40ca + 00b6cc8 commit c5378d6
Show file tree
Hide file tree
Showing 3 changed files with 138 additions and 55 deletions.
109 changes: 109 additions & 0 deletions .github/scripts/build_assets/drafts/peek_icons imgur.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
name: Peek Icons
on:
pull_request:
types: [labeled]
jobs:
build:
name: Get Fonts From Icomoon
if: contains(github.event.pull_request.labels.*.name, 'bot:peek')
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
- name: Setup Python v3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r ./.github/scripts/requirements.txt
- name: Run icomoon_peek.py
env:
PR_TITLE: ${{ github.event.pull_request.title }}
shell: cmd
run: >
python ./.github/scripts/icomoon_peek.py
./.github/scripts/build_assets/geckodriver-v0.27.0-win64/geckodriver.exe ./icomoon.json
./devicon.json ./icons ./ --headless --pr_title "%PR_TITLE%"
- name: Upload geckodriver.log for debugging purposes
uses: actions/upload-artifact@v2
if: failure()
with:
name: geckodriver-log
path: ./geckodriver.log
- name: Upload screenshot of the newly made icons
id: icons_overview_img_step
uses: devicons/[email protected]
if: success()
with:
path: ./screenshots/new_icons.png
client_id: ${{secrets.IMGUR_CLIENT_ID}}
- name: Upload zoomed in screenshot of the newly made icons
id: icons_detailed_img_step
uses: devicons/[email protected]
if: success()
with:
path: ./screenshots/screenshot_*.png
client_id: ${{secrets.IMGUR_CLIENT_ID}}
- name: Generate the markdowns for the screenshot and put it in the DETAILED_IMGS_MARKDOWN env var
if: success()
env:
IMG_URLS: ${{ steps.icons_detailed_img_step.outputs.imgur_urls }}
run: |
echo 'DETAILED_IMGS_MARKDOWN<<EOF' >> $GITHUB_ENV
python ./.github/scripts/generate_screenshot_markdown.py >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
shell: bash
- name: Comment on the PR about the result
if: success()
uses: github-actions-up-and-running/[email protected]
env:
OVERVIEW_IMG_URL: ${{ fromJSON(steps.icons_overview_img_step.outputs.imgur_urls)[0] }}
MESSAGE: |
Hi!
I'm Devicons' Peek Bot and I just peeked at the icons that you wanted to add using [icomoon.io](https://icomoon.io/app/#/select).
Here is the result below:
![Peeked Icons (top left)]({0})
Here are the zoomed-in screenshots of the added icons:
{1}
Note: If the images don't show up, it's probably because it has been autodeleted by Imgur after 6 months due to our API choice.
The maintainers will now take a look at it and decide whether to merge your PR.
Thank you for contributing to Devicon! I hope everything works out and your icons are accepted into the repo.
Cheers :),
Peek Bot
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
message: ${{format(env.MESSAGE, env.OVERVIEW_IMG_URL, env.DETAILED_IMGS_MARKDOWN)}}
- name: Comment on the PR about the result
if: failure()
uses: github-actions-up-and-running/[email protected]
env:
MESSAGE: |
Hi!
I'm Devicons' Peek Bot and it seems we've ran into a problem. I'm supposed to check your svgs but I couldn't do my task due to an issue.
Can you please double check and fix the possible issues below:
- Your svgs are named and added correctly to the /icons folder as seen [here](https://github.com/devicons/devicon/blob/master/CONTRIBUTING.md#orgGuidelines).
- Your icon information has been added to the `devicon.json` as seen [here](https://github.com/devicons/devicon/blob/master/CONTRIBUTING.md#updateDevicon)
- Your PR title follows the format seen [here](https://github.com/devicons/devicon/blob/master/CONTRIBUTING.md#overview)
Once everything is fixed, the maintainers will try again. If I still fail, the maintainers will investigate what cause this problem.
Thank you for your help :smile:
Cheers :),
Peek Bot
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
message: ${{env.MESSAGE}}
57 changes: 6 additions & 51 deletions .github/workflows/peek_icons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,63 +25,18 @@ jobs:
python ./.github/scripts/icomoon_peek.py
./.github/scripts/build_assets/geckodriver-v0.27.0-win64/geckodriver.exe ./icomoon.json
./devicon.json ./icons ./ --headless --pr_title "%PR_TITLE%"
- name: Upload screenshots for comments
uses: actions/upload-artifact@v2
if: success()
with:
name: screenshots
path: ./screenshots/*.png
- name: Upload geckodriver.log for debugging purposes
uses: actions/upload-artifact@v2
if: failure()
with:
name: geckodriver-log
path: ./geckodriver.log
- name: Upload screenshot of the newly made icons
id: icons_overview_img_step
uses: devicons/[email protected]
if: success()
with:
path: ./screenshots/new_icons.png
client_id: ${{secrets.IMGUR_CLIENT_ID}}
- name: Upload zoomed in screenshot of the newly made icons
id: icons_detailed_img_step
uses: devicons/[email protected]
if: success()
with:
path: ./screenshots/screenshot_*.png
client_id: ${{secrets.IMGUR_CLIENT_ID}}
- name: Generate the markdowns for the screenshot and put it in the DETAILED_IMGS_MARKDOWN env var
if: success()
env:
IMG_URLS: ${{ steps.icons_detailed_img_step.outputs.imgur_urls }}
run: |
echo 'DETAILED_IMGS_MARKDOWN<<EOF' >> $GITHUB_ENV
python ./.github/scripts/generate_screenshot_markdown.py >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
shell: bash
- name: Comment on the PR about the result
if: success()
uses: github-actions-up-and-running/[email protected]
env:
OVERVIEW_IMG_URL: ${{ fromJSON(steps.icons_overview_img_step.outputs.imgur_urls)[0] }}
MESSAGE: |
Hi!
I'm Devicons' Peek Bot and I just peeked at the icons that you wanted to add using [icomoon.io](https://icomoon.io/app/#/select).
Here is the result below:
![Peeked Icons (top left)]({0})
Here are the zoomed-in screenshots of the added icons:
{1}
Note: If the images don't show up, it's probably because it has been autodeleted by Imgur after 6 months due to our API choice.
The maintainers will now take a look at it and decide whether to merge your PR.
Thank you for contributing to Devicon! I hope everything works out and your icons are accepted into the repo.
Cheers :),
Peek Bot
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
message: ${{format(env.MESSAGE, env.OVERVIEW_IMG_URL, env.DETAILED_IMGS_MARKDOWN)}}
- name: Comment on the PR about the result
if: failure()
uses: github-actions-up-and-running/[email protected]
Expand Down
27 changes: 23 additions & 4 deletions docs/assets/js/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,30 @@ devicon.controller('IconListCtrl', function($scope, $http, $compile) {

$http.get(baseUrl + '/icons/' + $scope.selectedIcon.name + '/' + $scope.selectedIcon.name + '-' + svgVersion + '.svg').success(function(data){

var svg = angular.element(data);
var innerSVG = (svg[0].innerHTML);
var svgElement = angular.element(data);
var innerSvgElement = null;

/**
* Loop trough svg image to find
* the actual svg content (not any comments or stuff
* we don't care for).
* See https://github.com/devicons/devicon/issues/444#issuecomment-753699913
*/
for (const [key, value] of Object.entries(svgElement)) {
/** [object SVGSVGElement] ensures we have the actual svg content */
if(value.toString() == '[object SVGSVGElement]') {
innerSvgElement = value;
break;
}
}

$scope.selectedSvgIcon = innerSVG;
$scope.selectedSvgIndex = index;
if(innerSvgElement === null) {
console.error('Could not find content of given SVG.')
} else {
var innerSVG = (innerSvgElement.innerHTML);
$scope.selectedSvgIcon = innerSVG;
$scope.selectedSvgIndex = index;
}
});
}
/*---- End of "Change selected svg icon" ----*/
Expand Down

0 comments on commit c5378d6

Please sign in to comment.