Skip to content

Commit

Permalink
Merge pull request #787 from fey/fix-versioning-files
Browse files Browse the repository at this point in the history
add static files hashnames
  • Loading branch information
fey committed Apr 24, 2021
2 parents 00ce2bc + 73fede4 commit 676ee26
Show file tree
Hide file tree
Showing 36 changed files with 13,617 additions and 96 deletions.
13,580 changes: 13,552 additions & 28 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"jquery": "^3.6.0",
"jquery-ujs": "^1.2.2",
"laravel-mix": "^6.0.13",
"laravel-mix-make-file-hash": "^2.2.0",
"lodash": "^4.17.21",
"popper.js": "^1.16.1",
"resolve-url-loader": "^3.1.2",
Expand Down
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/1_29.blade.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<p>{{ __('exercises/1_29.description.1') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/1_29.gif') }}" alt="1.29">
<img class="img-fluid" src="{{ mix('img/exercises/1_29.gif') }}" alt="1.29">
<p>{{ __('exercises/1_29.description.2') }}</p>
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/2_24.blade.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<p>{{ __('exercises/2_24.description.1') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/2_24.gif') }}" alt="2.24">
<img class="img-fluid" src="{{ mix('img/exercises/2_24.gif') }}" alt="2.24">
<p>{{ __('exercises/2_24.description.2') }}</p>
4 changes: 2 additions & 2 deletions resources/views/exercise/listing/2_34.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<p>{{ __('exercises/2_34.description.1') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/2_34_1.gif') }}" alt="2.34.1">
<img class="img-fluid" src="{{ mix('img/exercises/2_34_1.gif') }}" alt="2.34.1">
<p>{{ __('exercises/2_34.description.2') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/2_34_2.gif') }}" alt="2.34.2">
<img class="img-fluid" src="{{ mix('img/exercises/2_34_2.gif') }}" alt="2.34.2">
<p>{{ __('exercises/2_34.description.3') }}</p>
<pre><code>(define (horner-eval x coefficient-sequence)
(accumulate (lambda (this-coeff higher-terms) &lt;??&gt;)
Expand Down
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/2_37.blade.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p>{{ __('exercises/2_37.description.1') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/2_37.gif') }}" alt="2.37">
<img class="img-fluid" src="{{ mix('img/exercises/2_37.gif') }}" alt="2.37">
<p>{{ __('exercises/2_37.description.2') }}</p>
<p>{{ __('exercises/2_37.description.3') }}</p>
<p>{{ __('exercises/2_37.description.4') }}</p>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/exercise/listing/2_42.blade.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<img class="img-fluid" src="{{ asset('img/exercises/2_42.gif') }}" alt="2.42">
<img class="img-fluid" src="{{ mix('img/exercises/2_42.gif') }}" alt="2.42">
<p>{{ __('exercises/2_42.description.1') }}</p>
<p>{{ __('exercises/2_42.description.2') }}</p>
<p>{{ __('exercises/2_42.description.3') }}</p>
<pre><code>(define (queens board-size)
(define (queen-cols k)
(define (queen-cols k)
(if (= k 0)
(list empty-board)
(filter
Expand Down
4 changes: 2 additions & 2 deletions resources/views/exercise/listing/2_52.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
{{ __('exercises/2_52.description.3') }}</p>
<p>{{ __('exercises/2_52.description.4') }}</p>
<p>{{ __('exercises/2_52.description.5') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/2_52_1.gif') }}" alt="2.52_1">
<img class="img-fluid" src="{{ asset('img/exercises/2_52_2.gif') }}" alt="2.52_2">
<img class="img-fluid" src="{{ mix('img/exercises/2_52_1.gif') }}" alt="2.52_1">
<img class="img-fluid" src="{{ mix('img/exercises/2_52_2.gif') }}" alt="2.52_2">
<p>{{ __('exercises/2_52.description.6') }}</p>
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/2_56.blade.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<p>{{ __('exercises/2_56.description.1') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/2_56.gif') }}" alt="2.56">
<img class="img-fluid" src="{{ mix('img/exercises/2_56.gif') }}" alt="2.56">
<p>{{ __('exercises/2_56.description.2') }}</p>
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/2_63.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
</code></pre>
<p>{{ __('exercises/2_63.description.2') }}</p>
<p>{{ __('exercises/2_63.description.3') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/2_63.gif') }}" alt="2.63">
<img class="img-fluid" src="{{ mix('img/exercises/2_63.gif') }}" alt="2.63">
<p>{{ __('exercises/2_63.description.4') }}</p>
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/2_77.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
(put 'angle '(complex) angle)
</code></pre>
<p>{{ __('exercises/2_77.description.2') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/2_77.gif') }}" alt="2.77">
<img class="img-fluid" src="{{ mix('img/exercises/2_77.gif') }}" alt="2.77">
<p>{{ __('exercises/2_77.description.3') }}</p>
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/2_83.blade.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<p>{{ __('exercises/2_83.description.1') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/2_83.gif') }}" alt="2.83">
<img class="img-fluid" src="{{ mix('img/exercises/2_83.gif') }}" alt="2.83">
<p>{{ __('exercises/2_83.description.2') }}</p>
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/2_91.blade.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p>{{ __('exercises/2_91.description.1') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/2_91.gif') }}" alt="2.91">
<img class="img-fluid" src="{{ mix('img/exercises/2_91.gif') }}" alt="2.91">
<p>{{ __('exercises/2_91.description.2') }}</p>
<p>{{ __('exercises/2_91.description.3') }}</p>
<p>{{ __('exercises/2_91.description.4') }}</p>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/3_30.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
{{ __('exercises/3_30.description.1') }}
<code>riple-carry-adder</code>{{ __('exercises/3_30.description.2') }}
</p>
<img class="img-fluid" src="{{ asset('img/exercises/3_30.gif') }}" alt="3.30">
<img class="img-fluid" src="{{ mix('img/exercises/3_30.gif') }}" alt="3.30">
<p>{{ __('exercises/3_30.description.3') }}</p>
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/3_38.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
</code></pre>
<p>{{ __('exercises/3_38.description.2') }}</p>
<p>{{ __('exercises/3_38.description.3') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/3_38.gif') }}" alt="3.38">
<img class="img-fluid" src="{{ mix('img/exercises/3_38.gif') }}" alt="3.38">
<p>{{ __('exercises/3_38.description.4') }}</p>
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/3_43.blade.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<p>{{ __('exercises/3_43.description.1') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/3_38.gif') }}" alt="3.43">
<img class="img-fluid" src="{{ mix('img/exercises/3_38.gif') }}" alt="3.43">
<p>{{ __('exercises/3_43.description.2') }}</p>
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/3_46.blade.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<p>{{ __('exercises/3_46.description.1') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/3_38.gif') }}" alt="3.46">
<img class="img-fluid" src="{{ mix('img/exercises/3_38.gif') }}" alt="3.46">
<p>{{ __('exercises/3_46.description.2') }}</p>
4 changes: 2 additions & 2 deletions resources/views/exercise/listing/3_59.blade.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<p>{{ __('exercises/3_59.description.1') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/3_59_1.gif') }}" alt="3.59_1">
<img class="img-fluid" src="{{ mix('img/exercises/3_59_1.gif') }}" alt="3.59_1">
<p>{{ __('exercises/3_59.description.2') }}</p>
<p>{{ __('exercises/3_59.description.3') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/3_59_2.gif') }}" alt="3.59_2">
<img class="img-fluid" src="{{ mix('img/exercises/3_59_2.gif') }}" alt="3.59_2">
<p>{{ __('exercises/3_59.description.4') }}</p>
<p>{{ __('exercises/3_59.description.5') }}</p>
<pre><code>(define exp-series
Expand Down
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/3_61.blade.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<p>{{ __('exercises/3_61.description.1') }}<a href="{{ route('exercises.show', getExercise('3.59')) }}">3.59</a>
{{ __('exercises/3_61.description.2') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/3_61.gif') }}" alt="3.61">
<img class="img-fluid" src="{{ mix('img/exercises/3_61.gif') }}" alt="3.61">
<p>{{ __('exercises/3_61.description.3') }}<a href="{{ route('exercises.show', getExercise('3.60')) }}">3.60</a></p>
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/3_65.blade.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<p>{{ __('exercises/3_65.description.1') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/3_65.gif') }}" alt="3.65">
<img class="img-fluid" src="{{ mix('img/exercises/3_65.gif') }}" alt="3.65">
<p>{{ __('exercises/3_65.description.2') }}</p>
4 changes: 2 additions & 2 deletions resources/views/exercise/listing/3_73.blade.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<img class="img-fluid" src="{{ asset('img/exercises/3_73_1.gif') }}" alt="3.73_1">
<img class="img-fluid" src="{{ asset('img/exercises/3_73_2.gif') }}" alt="3.73_2">
<img class="img-fluid" src="{{ mix('img/exercises/3_73_1.gif') }}" alt="3.73_1">
<img class="img-fluid" src="{{ mix('img/exercises/3_73_2.gif') }}" alt="3.73_2">
<p>{{ __('exercises/3_73.description.1') }}</p>
<p>{{ __('exercises/3_73.description.2') }}</p>
<p>{{ __('exercises/3_73.description.3') }}</p>
4 changes: 2 additions & 2 deletions resources/views/exercise/listing/3_78.blade.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<img class="img-fluid" src="{{ asset('img/exercises/3_78_1.gif') }}" alt="3.78_1">
<img class="img-fluid" src="{{ mix('img/exercises/3_78_1.gif') }}" alt="3.78_1">
<p>{{ __('exercises/3_78.description.1') }}</p>
<p>{{ __('exercises/3_78.description.2') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/3_78_2.gif') }}" alt="3.78_2">
<img class="img-fluid" src="{{ mix('img/exercises/3_78_2.gif') }}" alt="3.78_2">
<p>{{ __('exercises/3_78.description.3') }}</p>
10 changes: 5 additions & 5 deletions resources/views/exercise/listing/3_80.blade.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<p>{{ __('exercises/3_80.description.1') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/3_80_1.gif') }}" alt="3.80_1">
<img class="img-fluid" src="{{ mix('img/exercises/3_80_1.gif') }}" alt="3.80_1">
<p>{{ __('exercises/3_80.description.2') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/3_80_2.gif') }}" alt="3.80_2">
<img class="img-fluid" src="{{ mix('img/exercises/3_80_2.gif') }}" alt="3.80_2">
<p>{{ __('exercises/3_80.description.3') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/3_80_3.gif') }}" alt="3.80_3">
<img class="img-fluid" src="{{ mix('img/exercises/3_80_3.gif') }}" alt="3.80_3">
<p>{{ __('exercises/3_80.description.4') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/3_80_4.gif') }}" alt="3.80_4">
<img class="img-fluid" src="{{ mix('img/exercises/3_80_4.gif') }}" alt="3.80_4">
<p>{{ __('exercises/3_80.description.5') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/3_80_5.gif') }}" alt="3.80_5">
<img class="img-fluid" src="{{ mix('img/exercises/3_80_5.gif') }}" alt="3.80_5">
<p>{{ __('exercises/3_80.description.6') }}</p>
<p>{{ __('exercises/3_80.description.7') }}<a href="{{ route('exercises.show', getExercise('3.73')) }}">3.73</a>
{{ __('exercises/3_80.description.8') }}</p>
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/4_76.blade.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<p>{{ __('exercises/4_76.description.1') }}</p>
<p>{{ __('exercises/4_76.description.2') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/4_76.gif') }}" alt="4.76">
<img class="img-fluid" src="{{ mix('img/exercises/4_76.gif') }}" alt="4.76">
<p>{{ __('exercises/4_76.description.3') }}</p>
4 changes: 2 additions & 2 deletions resources/views/exercise/listing/5_12.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<li>{{ __('exercises/5_12.description.5') }}</li>
</ul>
<p>{{ __('exercises/5_12.description.6') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/5_12.gif') }}" alt="5.12">
<img class="img-fluid" src="{{ mix('img/exercises/5_12.gif') }}" alt="5.12">
<pre><code>(controller
(assign continue (label fact-done)) ; set up final return address
fact-loop
Expand Down Expand Up @@ -56,7 +56,7 @@
(restore val) ; val now contains Fib(n - 1)
(restore continue)
(assign val ; Fib(n - 1) + Fib(n - 2)
(op +) (reg val) (reg n))
(op +) (reg val) (reg n))
(goto (reg continue)) ; return to caller, answer is in val
immediate-answer
(assign val (reg n)) ; base case: Fib(n) = n
Expand Down
4 changes: 2 additions & 2 deletions resources/views/exercise/listing/5_14.blade.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p>{{ __('exercises/5_14.description.1') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/5_14.gif') }}" alt="5.14">
<img class="img-fluid" src="{{ mix('img/exercises/5_14.gif') }}" alt="5.14">
<pre><code>(controller
gcd-loop
(assign a (op read))
Expand All @@ -16,7 +16,7 @@
(goto (label gcd-loop)))
</code></pre>
<p>{{ __('exercises/5_14.description.2') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/5_12.gif') }}" alt="5.12">
<img class="img-fluid" src="{{ mix('img/exercises/5_12.gif') }}" alt="5.12">
<pre><code>(controller
(assign continue (label fact-done)) ; set up final return address
fact-loop
Expand Down
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/5_20.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
(define y (list x x))
</code></pre>
<p>{{ __('exercises/5_20.description.2') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/5_20.gif') }}" alt="5.20">
<img class="img-fluid" src="{{ mix('img/exercises/5_20.gif') }}" alt="5.20">
<p>{{ __('exercises/5_20.description.3') }}</p>
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/5_27.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
(* (factorial (- n 1)) n)))
</code></pre>
<p>{{ __('exercises/5_27.description.3') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/5_27.gif') }}" alt="5.27">
<img class="img-fluid" src="{{ mix('img/exercises/5_27.gif') }}" alt="5.27">
<p>{{ __('exercises/5_27.description.4') }}</p>
2 changes: 1 addition & 1 deletion resources/views/exercise/listing/5_45.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<p>{{ __('exercises/5_45.description.5') }}</p>
<p>{{ __('exercises/5_45.description.6') }}</p>
<p>{{ __('exercises/5_45.description.7') }}</p>
<img class="img-fluid" src="{{ asset('img/exercises/5_12.gif') }}" alt="5.12">
<img class="img-fluid" src="{{ mix('img/exercises/5_12.gif') }}" alt="5.12">
<pre><code>(controller
(assign continue (label fact-done)) ; set up final return address
fact-loop
Expand Down
2 changes: 1 addition & 1 deletion resources/views/landing.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="sicp-carousel-caption text-left text-secondary">
<div class="float-lg-right w-25 d-none d-sm-block">
<img class="img-fluid"
src="{{ asset('img/Patchouli_Gives_SICP.png') }}"
src="{{ mix('img/Patchouli_Gives_SICP.png') }}"
alt="{{ __('landing.start_learning') }}">
</div>
<div>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/layouts/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<title>{{ __('layout.nav.name') }}</title>

<!-- Scripts -->
<script src="{{ asset('js/app.js') }}" defer></script>
<script src="{{ mix('js/app.js') }}" defer></script>
@livewireStyles
@if (config('app.env') == 'production')
@include('layouts.deps._gtm_head')
Expand All @@ -24,7 +24,7 @@
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">

<!-- Styles -->
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
<link href="{{ mix('css/app.css') }}" rel="stylesheet">
</head>

<body class="min-vh-100 d-flex flex-column">
Expand All @@ -42,7 +42,7 @@
</div>
@include('layouts._footer')
@livewireScripts
<script src="{{ asset('js/hljs.js')}}"></script>
<script src="{{ mix('js/hljs.js')}}"></script>
</body>

</html>
4 changes: 2 additions & 2 deletions resources/views/layouts/land.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<title>{{ __('layout.nav.name') }}</title>

<!-- Scripts -->
<script src="{{ asset('js/app.js') }}" defer></script>
<script src="{{ mix('js/app.js') }}" defer></script>
@if (config('app.env') == 'production')
@include('layouts.deps._gtm_head')
@endif
Expand All @@ -23,7 +23,7 @@
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">

<!-- Styles -->
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
<link href="{{ mix('css/app.css') }}" rel="stylesheet">
</head>

<body class="min-vh-100 d-flex flex-column">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/layouts/landing.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<title>{{ __('layout.nav.name') }}</title>

<!-- Scripts -->
<script src="{{ asset('js/app.js') }}" defer></script>
<script src="{{ mix('js/app.js') }}" defer></script>
@if (config('app.env') == 'production')
@include('layouts.deps._gtm_head')
@endif
Expand All @@ -23,7 +23,7 @@
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">

<!-- Styles -->
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
<link href="{{ mix('css/app.css') }}" rel="stylesheet">
</head>

<body class="min-vh-100 d-flex flex-column pt-5">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/user/show.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
@if ($user->hexlet_nickname)
<span>
<a class="x-link-without-decoration mr-2 text-dark" target="_blank" rel="noopener noreferrer" href="https://ru.hexlet.io/u/{{ $user->hexlet_nickname }}">
<img class="mb-3" src={{ asset('img/hexlet_logo.png') }} width="20" height="30" alt="Hexlet logo" >
<img class="mb-3" src={{ mix('img/hexlet_logo.png') }} width="20" height="30" alt="Hexlet logo" >
</a>
</span>
@endif
Expand Down
4 changes: 2 additions & 2 deletions resources/views/welcome.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<div class="col-md-8">
<a href="https://mitpress.mit.edu/sites/default/files/sicp/index.html">
@if(rand(0, 10) === 0)
<img class="img-fluid" src="{{ asset('img/advice_dog.jpg') }}" alt="Начать изучать sicp">
<img class="img-fluid" src="{{ mix('img/advice_dog.jpg') }}" alt="Начать изучать sicp">
@else
<img class="img-fluid" src="{{ asset('img/Patchouli_Gives_SICP.png') }}" alt="Начать изучать sicp">
<img class="img-fluid" src="{{ mix('img/Patchouli_Gives_SICP.png') }}" alt="Начать изучать sicp">
@endif
</a>
</div>
Expand Down
32 changes: 14 additions & 18 deletions webpack.mix.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
const mix = require('laravel-mix');

/*
|--------------------------------------------------------------------------
| Mix Asset Management
|--------------------------------------------------------------------------
|
| Mix provides a clean, fluent API for defining some Webpack build steps
| for your Laravel application. By default, we are compiling the Sass
| file for the application as well as bundling up all the JS files.
|
*/

if (mix.inProduction()) {
mix.version();
}
mix.js('resources/js/app.js', 'public/js/app.js')
.js('resources/js/hljs.js', 'public/js/hljs.js')
.sass('resources/sass/app.scss', 'public/css')
.copyDirectory('resources/assets/img', 'public/img');
mix
.version()
.js('resources/js/app.js', 'public/js/app.js')
.js('resources/js/hljs.js', 'public/js/hljs.js')
.sass('resources/sass/app.scss', 'public/css')
.copyDirectory('resources/assets/img', 'public/img')
.copyDirectory('resources/assets/img/exercises', 'public/img/exercises')
.then(() => {
const convertToFileHash = require("laravel-mix-make-file-hash");
convertToFileHash({
publicPath: "public",
manifestFilePath: "public/mix-manifest.json"
});
});

0 comments on commit 676ee26

Please sign in to comment.