Skip to content

Commit

Permalink
Remove the fontawesome API keys and modules (#30)
Browse files Browse the repository at this point in the history
* Remove the fontawesome API keys and modules

* Replace fontawesome icons with the free versions of their icon (in all but 1 case) and a different but similar icon (in that final case)

* Fix up the fontawesome index file & install the free icons; test using mock-shepherd (it seems to work fine)

* Add shepherd/blueprints/staticroutes/editor, as this was initially inadvertently deleted. My issue before was using updatebuild rather than build which seems to commit images to the repo too
  • Loading branch information
Minion3665 authored Apr 18, 2022
1 parent af55169 commit 2847350
Show file tree
Hide file tree
Showing 12 changed files with 1,113 additions and 6,818 deletions.
2 changes: 0 additions & 2 deletions sheepsrc/.npmrc

This file was deleted.

2 changes: 1 addition & 1 deletion sheepsrc/app/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<DeleteProjectDialog :project="deleteProject" @close="deleteOpen = false" v-show="deleteOpen"/>
</template>
<div v-else class="empty-state">
<FontAwesomeIcon :icon="['far', 'exclamation-triangle']" size="10x"/>
<FontAwesomeIcon :icon="['fas', 'exclamation-triangle']" size="10x"/>
<h2>Unable to connect to Shepherd!</h2>
</div>
<Messages/>
Expand Down
2 changes: 1 addition & 1 deletion sheepsrc/app/components/Messages.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="messages">
<transition-group name="message">
<div class="message" v-for="message in messages" :key="message.id">
<FontAwesomeIcon :icon="['far', message.icon]" fixed-width></FontAwesomeIcon>
<FontAwesomeIcon :icon="['fas', message.icon]" fixed-width></FontAwesomeIcon>
<p>{{message.message}}</p>
<a title="Dismiss" class="close" @click="dismiss(message.id)"></a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion sheepsrc/app/components/sidebar/Sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<IconButton
@click="toggle"
tooltip="Toggle">
<FontAwesomeIcon :icon="['far', 'arrow-alt-from-right']" :rotation="iconRotation"/>
<FontAwesomeIcon :icon="['fas', 'chevron-left']" :rotation="iconRotation"/>
</IconButton>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion sheepsrc/app/components/sidebar/logs/Logs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="logs">
<ProjectTab name="Logs" :header="true">
<IconButton v-if="currentProject && !currentProject.filename.endsWith('.json')" @click="run" :class="{disabled: running}" tooltip="Run (F5)">
<FontAwesomeIcon :icon="running ? ['far', 'sync-alt'] : ['fas', 'play']" :spin="running" class="run-button"/>
<FontAwesomeIcon :icon="running ? ['fas', 'sync-alt'] : ['fas', 'play']" :spin="running" class="run-button"/>
</IconButton>
<IconButton @click="stop" tooltip="Stop (CTRL-F5)">
<FontAwesomeIcon :icon="['fas', 'stop']" class="stop-button"/>
Expand Down
10 changes: 5 additions & 5 deletions sheepsrc/app/components/sidebar/projects/ProjectList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<div>
<ProjectTab key="header" name="Projects" :header="true">
<IconButton v-if="saving" class="disabled" tooltip="Saving...">
<FontAwesomeIcon :icon="['far', 'sync-alt']" spin/>
<FontAwesomeIcon :icon="['fas', 'sync-alt']" spin/>
</IconButton>
<input type="file" ref="file" multiple accept=".py,.xml" style="display: none" @change="filesChanged">
<IconButton @click="selectFiles" tooltip="Upload (CTRL-U)">
<FontAwesomeIcon :icon="['far', 'upload']"/>
<FontAwesomeIcon :icon="['fas', 'upload']"/>
</IconButton>
<IconButton @click="$emit('create')" tooltip="New Project (CTRL-ALT-N)">
<FontAwesomeIcon :icon="['far', 'plus']"/>
<FontAwesomeIcon :icon="['fas', 'plus']"/>
</IconButton>
</ProjectTab>
<ProjectTab
Expand All @@ -20,13 +20,13 @@
<IconButton
@click="$emit('download', project)"
tooltip="Download">
<FontAwesomeIcon :icon="['far', 'download']"/>
<FontAwesomeIcon :icon="['fas', 'download']"/>
</IconButton>
<IconButton
v-if="!project.filename.endsWith('.json')"
@click="$emit('delete', project)"
tooltip="Delete">
<FontAwesomeIcon :icon="['far', 'trash']"/>
<FontAwesomeIcon :icon="['fas', 'trash']"/>
</IconButton>
</ProjectTab>
</div>
Expand Down
20 changes: 11 additions & 9 deletions sheepsrc/app/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import store, {
} from "./store";

import { library } from "@fortawesome/fontawesome-svg-core";
import { faPlay, faStop } from "@fortawesome/pro-solid-svg-icons";

import {
faPlus,
faTrash,
Expand All @@ -22,22 +22,24 @@ import {
faDownload,
faInfoCircle,
faExclamationCircle,
faArrowAltFromRight
} from "@fortawesome/pro-regular-svg-icons";

library.add(
faChevronLeft,
faPlay,
faStop,
} from '@fortawesome/free-solid-svg-icons'

library.add(
faPlus,
faTrash,
faSyncAlt,
faInfoCircle,
faExclamationTriangle,
faExclamationCircle,
faUpload,
faDownload,
faArrowAltFromRight
);
faInfoCircle,
faExclamationCircle,
faChevronLeft,
faPlay,
faStop
)

import App from "./App.vue";

Expand Down
Loading

0 comments on commit 2847350

Please sign in to comment.