Skip to content

Commit

Permalink
Add the missing fonts
Browse files Browse the repository at this point in the history
  • Loading branch information
nabeelio committed Dec 30, 2017
1 parent 5e5a9e1 commit 92dfea4
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 18 deletions.
4 changes: 4 additions & 0 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ Options -Indexes

RewriteEngine On

# Handle Authorization Header
RewriteCond %{HTTP:Authorization} ^(.*)
RewriteRule .* - [e=HTTP_AUTHORIZATION:%1]

# Deny all these files/folders
RedirectMatch 403 ^/.git/.*?$
RedirectMatch 403 ^/.travis/.*?$
Expand Down
20 changes: 3 additions & 17 deletions public/.htaccess
Original file line number Diff line number Diff line change
@@ -1,30 +1,16 @@
# Disable index view
Options -Indexes

# Hide a specific file
<Files .env>
Order allow,deny
Deny from all
</Files>

<Files env.php>
Order allow,deny
Deny from all
</Files>

# Hide a specific file
<Files storage>
Order allow,deny
Deny from all
</Files>

<IfModule mod_rewrite.c>
<IfModule mod_negotiation.c>
Options -MultiViews
</IfModule>

RewriteEngine On

RewriteCond %{HTTP:Authorization} ^(.*)
RewriteRule .* - [e=HTTP_AUTHORIZATION:%1]

# Redirect Trailing Slashes If Not A Folder...
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)/$ /$1 [L,R=301]
Expand Down
Binary file not shown.
1 change: 1 addition & 0 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=58ec3dc768f07fee143a",
"/assets/system/js/jquery.js": "/assets/system/js/jquery.js?id=09dd64a64ba840c31a81",
"/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=b5b5055c6d812c0f9f0d",
"/assets/admin/fonts/glyphicons-halflings-regular.woff2": "/assets/admin/fonts/glyphicons-halflings-regular.woff2?id=b5b5055c6d812c0f9f0d",
"/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=b7f27b62f5cf3ebb7a65",
"/assets/admin/js/vendor.js": "/assets/admin/js/vendor.js?id=2831a0e25aded202c08c",
"/assets/admin/css/blue.png": "/assets/admin/css/blue.png?id=753a3c0dec86d3a38d9c",
Expand Down
1 change: 1 addition & 0 deletions resources/views/admin/subfleets/script.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
$(document).on('submit', 'form.rm_fare', function(event) {
event.preventDefault();
console.log(event);
$.pjax.submit(event, '#aircraft_fares_wrapper', {push: false});
});
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ abstract class TestCase extends Illuminate\Foundation\Testing\TestCase
protected $connectionsToTransact = ['testing'];

protected static $auth_headers = [
'Authorization' => 'testadminapikey'
'x-api-key' => 'testadminapikey'
];

public function apiHeaders()
Expand Down
1 change: 1 addition & 0 deletions webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ mix.webpackConfig({

mix.copy('node_modules/jquery/dist/jquery.js', 'public/assets/system/js/');
mix.copy('node_modules/bootstrap3/fonts/*.woff2', 'public/assets/fonts/');
mix.copy('node_modules/bootstrap3/fonts/*.woff2', 'public/assets/admin/fonts/');

/**
* ADMIN REQUIRED FILES
Expand Down

0 comments on commit 92dfea4

Please sign in to comment.