Skip to content
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
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1

MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

PRIVATE_EMAIL=""

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/node_modules
/public/hot
!/public/build
/public/storage
/storage/*.key
/vendor
Expand Down
569 changes: 370 additions & 199 deletions composer.lock

Large diffs are not rendered by default.

17,523 changes: 1,962 additions & 15,561 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 5 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
{
"private": true,
"scripts": {
"dev": "npm run development",
"development": "mix",
"watch": "mix watch",
"watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "mix watch --hot",
"prod": "npm run production",
"production": "mix --production"
"dev": "vite",
"build": "vite build"
},
"devDependencies": {
"@tailwindcss/forms": "^0.4.0",
"@tailwindcss/typography": "^0.5.0",
"alpinejs": "^2.7.3",
"autoprefixer": "^10.4.0",
"axios": "^0.25",
"laravel-mix": "^6.0.41",
"lodash": "^4.17.19",
"postcss": "^8.4.5",
"postcss-import": "^14.0.1",
"tailwindcss": "^3.0.6",
"tailwindcss-debug-screens": "^2.1.0"
"tailwindcss-debug-screens": "^2.1.0",
"vite": "^3.0.2",
"laravel-vite-plugin": "^0.6.0"
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.4",
Expand Down
6 changes: 6 additions & 0 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
}
10 changes: 10 additions & 0 deletions public/build/assets/app.3f4d551d.css

Large diffs are not rendered by default.

137 changes: 137 additions & 0 deletions public/build/assets/app.775f52d3.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/build/assets/app.a045f3e9.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions public/build/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"resources/js/app.js": {
"file": "assets/app.775f52d3.js",
"src": "resources/js/app.js",
"isEntry": true,
"css": [
"assets/app.a045f3e9.css"
]
},
"resources/js/app.css": {
"file": "assets/app.a045f3e9.css",
"src": "resources/js/app.css"
},
"resources/css/app.css": {
"file": "assets/app.3f4d551d.css",
"src": "resources/css/app.css",
"isEntry": true
}
}
6 changes: 3 additions & 3 deletions resources/js/app.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
require('./bootstrap');
import './bootstrap';

import Alpine from 'alpinejs';
window.Alpine = Alpine;
Alpine.start();

require('@fortawesome/fontawesome-free/js/all.js');
import '@fortawesome/fontawesome-free/js/all.js';

import flatpickr from "flatpickr";
require("flatpickr/dist/themes/dark.css");
import "flatpickr/dist/themes/dark.css";

flatpickr(".flatpickrSelector", {
enableTime: true,
Expand Down
10 changes: 6 additions & 4 deletions resources/js/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
window._ = require('lodash');
import _ from 'lodash';
window._ = _;

/**
* We'll load the axios HTTP library which allows us to easily issue requests
* to our Laravel back-end. This library automatically handles sending the
* CSRF token as a header based on the value of the "XSRF" token cookie.
*/

window.axios = require('axios');
import axios from 'axios';
window.axios = axios;

window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';

Expand All @@ -22,7 +24,7 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';

// window.Echo = new Echo({
// broadcaster: 'pusher',
// key: process.env.MIX_PUSHER_APP_KEY,
// cluster: process.env.MIX_PUSHER_APP_CLUSTER,
// key: import.meta.env.VITE_PUSHER_APP_KEY,
// cluster: import.meta.env.VITE_PUSHER_APP_CLUSTER,
// forceTLS: true
// });
4 changes: 2 additions & 2 deletions resources/views/layouts/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap">

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

<!-- FavIcon -->
<link rel="apple-touch-icon" sizes="180x180" href="{{ asset('favicon/apple-touch-icon.png') }}">
Expand All @@ -23,7 +23,7 @@
@livewireStyles

<!-- Scripts -->
<script src="{{ mix('js/app.js') }}" defer></script>
@vite('resources/js/app.js')
</head>
<body class="font-sans antialiased {{ env('APP_DEBUG') ? 'debug-screens' : '' }}">
<x-jet-banner />
Expand Down
Loading