Skip to content

Commit 5520216

Browse files
dpslwkdpslwk
committed
Frontend: Moving to FontAwesome 5 pro via npm
update all icons
1 parent f32639d commit 5520216

32 files changed

+90
-75
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Thumbs.db
2828

2929
/public/css
3030
/public/js
31+
/public/fonts/vendor
3132
mixwatch.log
3233
/public/mix-manifest.json
3334
/storage/proxies

‎.npmrc

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@fortawesome:registry=https://npm.fontawesome.com/
2+
//npm.fontawesome.com/:_authToken=${FONTAWESOME_TOKEN}

‎dev/vagrant-config/scripts/mix.sh

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ echo "Laravel Mix"
88
echo "running as user $_user ($_uid)"
99
echo " "
1010

11+
export FONTAWESOME_TOKEN='33A0AFE9-91DD-4DA1-9862-D8A2F021D74E'
12+
echo "export FONTAWESOME_TOKEN=$FONTAWESOME_TOKEN" >> ~/.bashrc
13+
1114
# move to the share folder and use yarn to install deps
1215
mkdir ~/hms2/
1316
cp /vagrant/package.json ~/hms2/

‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
1111
},
1212
"devDependencies": {
13+
"@fortawesome/fontawesome-pro": "^5.6.3",
1314
"axios": "^0.18",
1415
"bootstrap": "^4.0.0",
1516
"bootstrap-confirmation2": "^4.0.2",

‎resources/sass/app.scss

+7
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
@import '~select2/dist/css/select2';
88
@import '~select2-theme-bootstrap4/dist/select2-bootstrap';
99

10+
// Fontawesome
11+
@import '~@fortawesome/fontawesome-pro/scss/fontawesome';
12+
@import '~@fortawesome/fontawesome-pro/scss/regular';
13+
@import '~@fortawesome/fontawesome-pro/scss/solid';
14+
@import '~@fortawesome/fontawesome-pro/scss/light';
15+
@import '~@fortawesome/fontawesome-pro/scss/brands';
16+
1017
/* HMS Custom CSS */
1118
.card-container.card {
1219
max-width: 350px;

‎resources/views/bankTransactions/edit.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</div>
3838
<br>
3939
<div class="card">
40-
<button type="submit" class="btn btn-success">Match Transaction</button>
40+
<button type="submit" class="btn btn-success"><i class="fas fa-check fa-lg" aria-hidden="true"></i> Match Transaction</button>
4141
</div>
4242
</form>
4343
</div>

‎resources/views/bankTransactions/listUnmatched.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<td>{{ $bankTransaction->getDescription() }}</td>
2525
<td>{{ $bankTransaction->getAmount() }}</td>
2626
<td>{{ $bankTransaction->getBank()->getName() }}</td>
27-
<td><a class="btn btn-primary" href="{{ route('bank-transactions.edit', $bankTransaction->getId()) }}"><i class="fa fa-edit fa-lg" aria-hidden="true"></i> Reconcile</a></td>
27+
<td><a class="btn btn-primary" href="{{ route('bank-transactions.edit', $bankTransaction->getId()) }}"><i class="fas fa-search-dollar fa-lg" aria-hidden="true"></i> Reconcile</a></td>
2828
</tr>
2929
@endforeach
3030
</tbody>

‎resources/views/gateKeeper/rfidTags/index.blade.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{{ method_field('PATCH') }}
2525
{{ csrf_field() }}
2626
</form>
27-
<i class="fa fa-refresh fa-lg" aria-hidden="true"></i> Reactivate pin for enrolment
27+
<i class="fas fa-sync-alt fa-lg" aria-hidden="true"></i> Reactivate pin for enrolment
2828
</a>
2929
</div>
3030
@endcan
@@ -60,15 +60,15 @@
6060
<td>{{ $rfidTag->getStateString() }}</td>
6161
<td>
6262
@can('rfidTags.edit.self')
63-
<a href="{{ route('rfid-tags.edit', $rfidTag->getId()) }}" class="btn btn-primary btn-sm btn-sm-spacing"><i class="fa fa-edit fa-lg" aria-hidden="true"></i> Edit</a><br>
63+
<a href="{{ route('rfid-tags.edit', $rfidTag->getId()) }}" class="btn btn-primary btn-sm btn-sm-spacing"><i class="fas fa-pencil fa-lg" aria-hidden="true"></i> Edit</a><br>
6464
@endcan
6565
@can('rfidTags.destroy')
6666
<a href="javascript:void(0);" onclick="$(this).find('form').submit();" class="btn btn-danger btn-sm btn-sm-spacing">
6767
<form action="{{ route('rfid-tags.destroy', $rfidTag->getId()) }}" method="POST" style="display: none">
6868
{{ method_field('DELETE') }}
6969
{{ csrf_field() }}
7070
</form>
71-
<i class="fa fa-trash fa-lg" aria-hidden="true"></i> Remove
71+
<i class="fas fa-trash fa-lg" aria-hidden="true"></i> Remove
7272
</a>
7373
@endcan
7474
</td>

‎resources/views/home.blade.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<div class="card-deck">
1414
<div class="card text-white bg-info">
1515
<div class="card-header icon-card-body">
16-
<div class="icon-card-icon"><i class="fa fa-key" aria-hidden="true"></i>
16+
<div class="icon-card-icon"><i class="fas fa-key" aria-hidden="true"></i>
1717
</div>
1818
<div class="icon-card-content">
1919
<h3>Hackspace</h3>
@@ -29,7 +29,7 @@
2929

3030
<div class="card text-white bg-warning">
3131
<div class="card-header icon-card-body">
32-
<div class="icon-card-icon"><i class="fa fa-newspaper-o" aria-hidden="true"></i>
32+
<div class="icon-card-icon"><i class="fal fa-newspaper" aria-hidden="true"></i>
3333
</div>
3434
<div class="icon-card-content">
3535
<h3>Notice</h3>
@@ -46,7 +46,7 @@
4646
@if($user->getProfile() !== Null)
4747
<div class="card text-white bg-dark">
4848
<div class="card-header icon-card-body">
49-
<div class="icon-card-icon"><i class="fa fa-money" aria-hidden="true"></i>
49+
<div class="icon-card-icon"><i class="far fa-money-bill" aria-hidden="true"></i>
5050
</div>
5151
<div class="icon-card-content">
5252
<h3>Balance</h3>
@@ -63,7 +63,7 @@
6363

6464
<div class="card text-white bg-secondary">
6565
<div class="card-header icon-card-body">
66-
<div class="icon-card-icon"><i class="fa fa-wrench" aria-hidden="true"></i>
66+
<div class="icon-card-icon"><i class="fas fa-wrench" aria-hidden="true"></i>
6767
</div>
6868
<div class="icon-card-content">
6969
<h3>Active Projects</h3>

‎resources/views/labelTemplates/index.blade.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@
2121

2222
<td>
2323
@can('labelTemplate.edit')
24-
<a class="btn btn-primary btn-sm btn-sm-spacing" href="{{ route('labels.show', $labelTemplate->getTemplateName()) }}"><i class="fa fa-eye" aria-hidden="true"></i> View</a>
25-
<a class="btn btn-primary btn-sm btn-sm-spacing" href="{{ route('labels.edit', $labelTemplate->getTemplateName()) }}"><i class="fa fa-edit fa-lg" aria-hidden="true"></i> Edit</a>
24+
<a class="btn btn-primary btn-sm btn-sm-spacing" href="{{ route('labels.show', $labelTemplate->getTemplateName()) }}"><i class="far fa-eye" aria-hidden="true"></i> View</a>
25+
<a class="btn btn-primary btn-sm btn-sm-spacing" href="{{ route('labels.edit', $labelTemplate->getTemplateName()) }}"><i class="fas fa-pencil fa-lg" aria-hidden="true"></i> Edit</a>
2626
<a class="btn btn-danger btn-sm btn-sm-spacing" href="javascript:void(0);" onclick="$(this).find('form').submit();">
2727
<form action="{{ route('labels.destroy', $labelTemplate->getTemplateName()) }}" method="POST" style="display: inline">
2828
{{ method_field('DELETE') }}
2929
{{ csrf_field() }}
3030
</form>
31-
<i class="fa fa-trash fa-lg" aria-hidden="true"></i> Remove
31+
<i class="fas fa-trash fa-lg" aria-hidden="true"></i> Remove
3232
</a>
3333
@endcan
3434
@if (SiteVisitor::inTheSpace())
3535
@can('labelTemplate.print')
36-
<a class="btn btn-primary btn-sm btn-sm-spacing" href="{{ route('labels.showPrint', $labelTemplate->getTemplateName()) }}"><i class="fa fa-print" aria-hidden="true"></i> Print</a>
36+
<a class="btn btn-primary btn-sm btn-sm-spacing" href="{{ route('labels.showPrint', $labelTemplate->getTemplateName()) }}"><i class="fas fa-print" aria-hidden="true"></i> Print</a>
3737
@endcan
3838
@endif
3939
</td>
@@ -44,7 +44,7 @@
4444
</div>
4545
@can('labelTemplate.create')
4646
<div class="card">
47-
<a class="btn btn-primary" href="{{ route('labels.create') }}" class="button"><i class="fa fa-plus" aria-hidden="true"></i> Add new template</a>
47+
<a class="btn btn-primary" href="{{ route('labels.create') }}" class="button"><i class="fas fa-plus" aria-hidden="true"></i> Add new template</a>
4848
</div>
4949
@endcan
5050
<div classs="pagination-links">

‎resources/views/labelTemplates/print.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</div>
4141
<hr>
4242
<div class="card">
43-
<button type="submit" class="btn btn-success"><i class="fa fa-print" aria-hidden="true"></i> Print</button>
43+
<button type="submit" class="btn btn-success"><i class="fas fa-print" aria-hidden="true"></i> Print</button>
4444
</div>
4545
@else
4646
<div class="row">

‎resources/views/labelTemplates/show.blade.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
</div>
1212
<div class="card-footer">
1313
@can('labelTemplate.edit')
14-
<a class="btn btn-primary btn-sm btn-sm-spacing" href="{{ route('labels.edit', $templateName) }}" class="button"><i class="fa fa-edit fa-lg" aria-hidden="true"></i> Edit</a>
14+
<a class="btn btn-primary btn-sm btn-sm-spacing" href="{{ route('labels.edit', $templateName) }}" class="button"><i class="fas fa-pencil fa-lg" aria-hidden="true"></i> Edit</a>
1515
<a class="btn btn-danger btn-sm btn-sm-spacing" href="javascript:void(0);" onclick="$(this).find('form').submit();" class="alert button">
1616
<form action="{{ route('labels.destroy', $templateName) }}" method="POST" style="display: inline">
1717
{{ method_field('DELETE') }}
1818
{{ csrf_field() }}
1919
</form>
20-
<i class="fa fa-trash fa-lg" aria-hidden="true"></i> Remove
20+
<i class="fas fa-trash fa-lg" aria-hidden="true"></i> Remove
2121
</a>
2222
@endcan
2323
@if (SiteVisitor::inTheSpace())
2424
@can('labelTemplate.print')
25-
<a class="btn btn-primary btn-sm btn-sm-spacing" href="{{ route('labels.showPrint', $templateName) }}" class="button"><i class="fa fa-print" aria-hidden="true"></i> Print</a>
25+
<a class="btn btn-primary btn-sm btn-sm-spacing" href="{{ route('labels.showPrint', $templateName) }}" class="button"><i class="fas fa-print" aria-hidden="true"></i> Print</a>
2626
@endcan
2727
@endif
2828
</div>

‎resources/views/layouts/app.blade.php

-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
<script src="{{ mix('/js/vendor.js') }}" defer></script>
1919
<script src="{{ mix('/js/app.js') }}" defer></script>
2020

21-
<!-- Font Awesome -->
22-
<script src="https://use.fontawesome.com/5fd8ad5172.js"></script>
23-
2421
<!-- fav icons -->
2522
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
2623
<link rel="apple-touch-icon" href="/apple-touch-icon.png" />

‎resources/views/layouts/footer.blade.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
<div class="container">
4444
<div class="footer">
4545
<div class="social-networks">
46-
<a href="#" class="twitter"><i class="fa fa-twitter"></i></a>
47-
<a href="#" class="facebook"><i class="fa fa-facebook-official"></i></a>
48-
<a href="#" class="google"><i class="fa fa-google-plus"></i></a>
49-
<a href="#" class="flickr"><i class="fa fa-flickr"></i></a>
50-
<a href="#" class="youtube"><i class="fa fa-youtube"></i></a>
46+
<a href="#" class="twitter"><i class="fab fa-twitter"></i></a>
47+
<a href="#" class="facebook"><i class="fab fa-facebook"></i></a>
48+
<a href="#" class="google"><i class="fab fa-google-plus-g"></i></a>
49+
<a href="#" class="flickr"><i class="fab fa-flickr"></i></a>
50+
<a href="#" class="youtube"><i class="fab fa-youtube"></i></a>
5151
</div>
5252
</div>
5353
</div>

‎resources/views/layouts/navbar.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@if (!Auth::guest() and isset($mainNav) )
44
{{-- build the nav toggler --}}
55
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
6-
<i class="fa fa-bars"></i>&nbsp;Menu
6+
<i class="fas fa-bars"></i>&nbsp;Menu
77
</button>
88
{{-- build the nav --}}
99
<div class="collapse navbar-collapse" id="navbarSupportedContent">

‎resources/views/links/index.blade.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
@can('link.create')
1111
<div class="navbar navbar-light bg-secondary">
12-
<a href="{{ route('links.create') }}" class="nav-link btn btn-primary"><i class="fa fa-plus" aria-hidden="true"></i> Add new link</a>
12+
<a href="{{ route('links.create') }}" class="nav-link btn btn-primary"><i class="fas fa-plus" aria-hidden="true"></i> Add new link</a>
1313
</div>
1414
<br>
1515
@endcan
@@ -29,13 +29,13 @@
2929
@endif
3030
@can('link.edit')
3131
<div class="card-footer">
32-
<a href="{{ route('links.edit', $link->getId()) }}" class="btn btn-primary"><i class="fa fa-edit" aria-hidden="true"></i> Edit</a>
32+
<a href="{{ route('links.edit', $link->getId()) }}" class="btn btn-primary"><i class="fas fa-pencil" aria-hidden="true"></i> Edit</a>
3333
<a href="javascript:void(0);" onclick="$(this).find('form').submit();" class="btn btn-danger">
3434
<form action="{{ route('links.destroy', $link->getId()) }}" method="POST" style="display: none">
3535
{{ method_field('DELETE') }}
3636
{{ csrf_field() }}
3737
</form>
38-
<i class="fa fa-trash" aria-hidden="true"></i> Remove
38+
<i class="fas fa-trash" aria-hidden="true"></i> Remove
3939
</a>
4040
</div>
4141
@endcan

‎resources/views/members/box/buy.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{{ method_field('POST') }}
1313
{{ csrf_field() }}
1414
</form>
15-
<i class="fa fa-check" aria-hidden="true"></i> Confirm buy box
15+
<i class="fas fa-check" aria-hidden="true"></i> Confirm buy box
1616
</a>
1717
</div>
1818
@endsection

‎resources/views/members/box/index.blade.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
@can('box.buy.self')
1919
<div class="container">
2020
<div class="card">
21-
<a href="{{ route('boxes.create') }}" class="btn btn-primary"><i class="fa fa-shopping-cart" aria-hidden="true"></i> Buy new box</a>
21+
<a href="{{ route('boxes.create') }}" class="btn btn-primary"><i class="fas fa-shopping-cart" aria-hidden="true"></i> Buy new box</a>
2222
</div>
2323
</div>
2424
@endcan
2525
@else
2626
@can('box.issue.all')
2727
<div class="container">
2828
<div class="card">
29-
<a href="{{ route('user.boxes.issue', $user->getId()) }}" class="btn btn-primary"><i class="fa fa-plus" aria-hidden="true"></i> Issue new box</a>
29+
<a href="{{ route('user.boxes.issue', $user->getId()) }}" class="btn btn-primary"><i class="fas fa-plus" aria-hidden="true"></i> Issue new box</a>
3030
</div>
3131
</div>
3232
@endcan
@@ -55,7 +55,7 @@
5555
<td>
5656
@can('box.printLabel.self')
5757
@if (SiteVisitor::inTheSpace() && $box->getState() == \HMS\Entities\Members\BoxState::INUSE)
58-
<a href="{{ route('boxes.print', $box->getId()) }}" class="btn btn-primary btn-sm btn-sm-spacing"><i class="fa fa-print" aria-hidden="true"></i> Print Box Label</a><br>
58+
<a href="{{ route('boxes.print', $box->getId()) }}" class="btn btn-primary btn-sm btn-sm-spacing"><i class="fas fa-print" aria-hidden="true"></i> Print Box Label</a><br>
5959
@endif
6060
@endcan
6161
@can('box.edit.self')
@@ -66,15 +66,15 @@
6666
{{ method_field('PATCH') }}
6767
{{ csrf_field() }}
6868
</form>
69-
<i class="fa fa-minus-circle" aria-hidden="true"></i> Mark Removed
69+
<i class="fas fa-minus-circle" aria-hidden="true"></i> Mark Removed
7070
</a>
7171
@else
7272
<a href="javascript:void(0);" onclick="$(this).find('form').submit();" class="btn btn-primary btn-sm btn-sm-spacing">
7373
<form action="{{ route('boxes.markAbandoned', $box->getId()) }}" method="POST" style="display: none">
7474
{{ method_field('PATCH') }}
7575
{{ csrf_field() }}
7676
</form>
77-
<i class="fa fa-frown-o" aria-hidden="true"></i> Mark Abandoned
77+
<i class="far fa-frown" aria-hidden="true"></i> Mark Abandoned
7878
</a><br>
7979
@endif
8080
@endif
@@ -84,7 +84,7 @@
8484
{{ method_field('PATCH') }}
8585
{{ csrf_field() }}
8686
</form>
87-
<i class="fa fa-play" aria-hidden="true"></i> Mark In Use
87+
<i class="fal fa-play" aria-hidden="true"></i> Mark In Use
8888
</a>
8989
@endif
9090
@endcan

‎resources/views/members/box/issue.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{{ csrf_field() }}
1414
<input type="hidden" name="boxUser" value="{{ $boxUser->getId() }}">
1515
</form>
16-
<i class="fa fa-check" aria-hidden="true"></i> Confirm issue box
16+
<i class="fas fa-check" aria-hidden="true"></i> Confirm issue box
1717
</a>
1818
</div>
1919
@endsection

‎resources/views/members/project/index.blade.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@can('project.create.self')
99
<div class="container">
1010
<div class="card">
11-
<a href="{{ route('projects.create') }}" class="btn btn-primary"><i class="fa fa-plus" aria-hidden="true"></i> Add new project</a>
11+
<a href="{{ route('projects.create') }}" class="btn btn-primary"><i class="fas fa-plus" aria-hidden="true"></i> Add new project</a>
1212
</div>
1313
</div>
1414
@endcan
@@ -37,11 +37,11 @@
3737
<td>{{ $project->getStateString() }}</td>
3838
<td>
3939
@can('project.view.self')
40-
<a href="{{ route('projects.show', $project->getId()) }}" class="btn btn-primary btn-sm btn-sm-spacing"><i class="fa fa-eye" aria-hidden="true"></i> View Project</a><br>
40+
<a href="{{ route('projects.show', $project->getId()) }}" class="btn btn-primary btn-sm btn-sm-spacing"><i class="far fa-eye" aria-hidden="true"></i> View Project</a><br>
4141
@endcan
4242
@can('project.printLabel.self')
4343
@if (SiteVisitor::inTheSpace() && $project->getState() == \HMS\Entities\Members\ProjectState::ACTIVE)
44-
<a href="{{ route('projects.print', $project->getId()) }}" class="btn btn-primary btn-sm btn-sm-spacing"><i class="fa fa-print" aria-hidden="true"></i> Print Do-Not-Hack Label</a><br>
44+
<a href="{{ route('projects.print', $project->getId()) }}" class="btn btn-primary btn-sm btn-sm-spacing"><i class="fas fa-print" aria-hidden="true"></i> Print Do-Not-Hack Label</a><br>
4545
@endif
4646
@endcan
4747
@can('project.edit.self')
@@ -52,15 +52,15 @@
5252
{{ method_field('PATCH') }}
5353
{{ csrf_field() }}
5454
</form>
55-
<i class="fa fa-check" aria-hidden="true"></i> Mark Complete
55+
<i class="fas fa-check" aria-hidden="true"></i> Mark Complete
5656
</a>
5757
@else
5858
<a href="javascript:void(0);" onclick="$(this).find('form').submit();" class="btn btn-primary btn-sm btn-sm-spacing">
5959
<form action="{{ route('projects.markAbandoned', $project->getId()) }}" method="POST" style="display: none">
6060
{{ method_field('PATCH') }}
6161
{{ csrf_field() }}
6262
</form>
63-
<i class="fa fa-frown-o" aria-hidden="true"></i> Mark Abandoned
63+
<i class="far fa-frown" aria-hidden="true"></i> Mark Abandoned
6464
</a><br>
6565
@endif
6666
@endif
@@ -70,7 +70,7 @@
7070
{{ method_field('PATCH') }}
7171
{{ csrf_field() }}
7272
</form>
73-
<i class="fa fa-play" aria-hidden="true"></i> Resume Project
73+
<i class="fal fa-play" aria-hidden="true"></i> Resume Project
7474
</a>
7575
@endif
7676
@endcan

0 commit comments

Comments
 (0)