Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/43 lineawesome icons missing #45

Merged
merged 3 commits into from
Dec 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions files/website/_media/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion files/website/_media/app.js

Large diffs are not rendered by default.

Binary file not shown.
1,660 changes: 1,660 additions & 0 deletions files/website/_media/fonts/vendor/boxicons/boxicons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified files/website/_media/hero_background.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 1 addition & 21 deletions files/website/_media/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,4 @@
{
"/app.js": "/app.js",
"/app.css": "/app.css",
"/_site/app.css": "/_site/app.css",
"/_site/app.js": "/_site/app.js",
"/_site/la-brands-400.eot": "/_site/la-brands-400.eot",
"/_site/la-brands-400.svg": "/_site/la-brands-400.svg",
"/_site/la-brands-400.ttf": "/_site/la-brands-400.ttf",
"/_site/la-brands-400.woff": "/_site/la-brands-400.woff",
"/_site/la-brands-400.woff2": "/_site/la-brands-400.woff2",
"/_site/la-regular-400.eot": "/_site/la-regular-400.eot",
"/_site/la-regular-400.svg": "/_site/la-regular-400.svg",
"/_site/la-regular-400.ttf": "/_site/la-regular-400.ttf",
"/_site/la-regular-400.woff": "/_site/la-regular-400.woff",
"/_site/la-regular-400.woff2": "/_site/la-regular-400.woff2",
"/_site/la-solid-900.eot": "/_site/la-solid-900.eot",
"/_site/la-solid-900.svg": "/_site/la-solid-900.svg",
"/_site/la-solid-900.ttf": "/_site/la-solid-900.ttf",
"/_site/la-solid-900.woff": "/_site/la-solid-900.woff",
"/_site/la-solid-900.woff2": "/_site/la-solid-900.woff2",
"/_site/hero_background.jpg": "/_site/hero_background.jpg",
"/_site/mix-manifest.json": "/_site/mix-manifest.json",
"/_site/moodle_logo.svg": "/_site/moodle_logo.svg"
"/app.css": "/app.css"
}
4 changes: 2 additions & 2 deletions files/website/_pages/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class="flex flex-col items-center justify-center space-x-3 text-3xl font-bold md
href="/moodle-{{ config('hyde.moodle.versions')->first() }}">
Try newest
<span class="badge badge-primary">{{ config('hyde.moodle.versions')->first() }}</span>
<i class="las la-arrow-right text-xl"></i>
<i class="bx bx-right-arrow-alt text-xl"></i>
</a>

@if (config('hyde.moodle.versions')->count() > 1)
Expand All @@ -52,7 +52,7 @@ class="flex flex-col items-center justify-center space-x-3 text-3xl font-bold md
<a href="/moodle-{{ $moodleVersion }}">
Try version
<span class="badge badge-secondary">{{ $moodleVersion }}</span>
<i class="las la-arrow-right text-xl"></i>
<i class="bx bx-right-arrow-alt text-xl"></i>
</a>
</li>
@endforeach
Expand Down
268 changes: 251 additions & 17 deletions files/website/package-lock.json

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions files/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,10 @@
"devDependencies": {
"@tailwindcss/typography": "^0.5.2",
"autoprefixer": "^10.4.5",
"boxicons": "^2.1.4",
"daisyui": "^4.4.19",
"hydefront": "^3.3.0",
"laravel-mix": "^6.0.49",
"laravel-mix-serve": "^2.2.2",
"line-awesome": "^1.3.0",
"postcss": "^8.4.31",
"prettier": "2.6.0",
"tailwindcss": "^3.0.24"
Expand Down
6 changes: 4 additions & 2 deletions files/website/resources/assets/app.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* This file is loaded into your Hyde/Hyde installation and is used to generate the styles for your project.
* This file is loaded into your Hyde/Hyde installation and is used to generate the styles for your project.
* You can use this file to customize your TailwindCSS or to add new classes.
*
* The HydeFront package contains some base styles to make your site look even more amazing.
* The HydeFront package contains some base styles to make your site look even more amazing.
*
* The compiled result of this file is shipped with HydePHP and is found at _media/app.css,
* so you don't need to compile this file unless you're making changes.
Expand All @@ -18,3 +18,5 @@
@tailwind utilities;

[x-cloak] { display: none !important; }

@import '~boxicons/css/boxicons.css'
2 changes: 1 addition & 1 deletion files/website/resources/assets/app.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
* This is the main JavaScript used by webpack to build the the app.js file.
*/
import 'line-awesome/dist/line-awesome/css/line-awesome.min.css';
import 'boxicons'
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
$informationCards = collect([
[
'title' => 'Credentials',
'icon' => 'user-lock',
'icon' => 'key',
'description' => '
Log in as the site administration with:
<ul>
<li class="flex flex-wrap justify-between"><span class="font-bold"><i class="las la-user"></i> Username</span> <span>moodler</span></li>
<li class="flex flex-wrap justify-between"><span class="font-bold"><i class="las la-lock"></i> Password</span> <span>N3verstople@rning</span></li>
<li class="flex flex-wrap justify-between"><span class="font-bold"><i class="bx bx-user"></i> Username</span> <span>moodler</span></li>
<li class="flex flex-wrap justify-between"><span class="font-bold"><i class="bx bx-lock"></i> Password</span> <span>N3verstople@rning</span></li>
</ul>
',
],
[
'title' => 'Disclaimer',
'icon' => 'exclamation-circle',
'icon' => 'error',
'description' => 'Learning Sandbox Online is not affiliated with <a href="https://moodle.com">Moodle HQ</a>',
],
[
'title' => 'Automatic Reset',
'icon' => 'hourglass-half',
'icon' => 'hourglass',
'description' => 'Every hour, at 30 minutes past the hour, each Moodle instance is reset to default content and
configuration.',
],
[
'title' => 'Additional Plugins',
'icon' => 'puzzle-piece',
'icon' => 'plug',
'description' => 'The installation of additional plugins are disabled in order to make the automatic upgrade possible.',
],
[
Expand All @@ -45,7 +45,7 @@
<div class="prose-invert card h-full border-2 border-secondary">
<div class="card-body p-4 md:p-8">
<h2 class="card-title text-primary">
<i class="las la-{{ $informationCard->icon }}"></i>
<i class="bx bx-{{ $informationCard->icon }}"></i>
{{ $informationCard->title }}
</h2>
<p>{!! $informationCard->description !!}</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<a class="flex items-center space-x-2 px-4 font-bold"
href="{{ Routes::get('index') }}"
aria-label="Home page">
<i class="las la-graduation-cap text-4xl"></i> <span>{{ config('hyde.name', 'Learning Sandbox Online') }}</span>
<i class="bx bx-eraser text-4xl"></i> <span>{{ config('hyde.name', 'Learning Sandbox Online') }}</span>
</a>
11 changes: 5 additions & 6 deletions files/website/webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
// compile the assets. See https://hydephp.com/docs/1.x/managing-assets.html.

let mix = require('laravel-mix');
require('laravel-mix-serve');

mix.js('resources/assets/app.js', 'app.js')
mix
.js('resources/assets/app.js', 'app.js')
.postCss('resources/assets/app.css', 'app.css', [
require('tailwindcss'),
require('autoprefixer'),
]).setPublicPath('_media')
.copy('_media/**/*', '_site');

mix.serve('php hyde serve', { hook: 'beforeCompile', dev: false });
])
.setPublicPath('_site/media')
.copyDirectory('_site/media', '_media');
Loading