Compare commits
1 Commits
2b3325af91
...
bot/depend
| Author | SHA1 | Date | |
|---|---|---|---|
|
43abc6d1c6 |
@@ -1,24 +0,0 @@
|
|||||||
name: renovate
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
schedule:
|
|
||||||
- cron: "@daily"
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
renovate:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
container: ghcr.io/renovatebot/renovate:43.2.4
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- run: renovate
|
|
||||||
working-directory: ${{ gitea.workspace }}
|
|
||||||
env:
|
|
||||||
RENOVATE_CONFIG_FILE: "renovate-config.json"
|
|
||||||
LOG_LEVEL: "info"
|
|
||||||
RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
|
|
||||||
|
|
||||||
15
.github/dependabot.yml
vendored
Normal file
15
.github/dependabot.yml
vendored
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
# To get started with Dependabot version updates, you'll need to specify which
|
||||||
|
# package ecosystems to update and where the package manifests are located.
|
||||||
|
# Please see the documentation for all configuration options:
|
||||||
|
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
|
||||||
|
|
||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: "npm"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "daily"
|
||||||
|
- package-ecosystem: "composer"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "daily"
|
||||||
55
.github/workflows/dependency-update.yml
vendored
Normal file
55
.github/workflows/dependency-update.yml
vendored
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
name: Dependency Update
|
||||||
|
|
||||||
|
on:
|
||||||
|
schedule:
|
||||||
|
- cron: "0 20 * * 1" # Mondays 20:00 UTC
|
||||||
|
workflow_dispatch: {}
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
update:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: 20
|
||||||
|
cache: npm
|
||||||
|
|
||||||
|
- uses: shivammathur/setup-php@v2
|
||||||
|
with:
|
||||||
|
php-version: "8.4"
|
||||||
|
tools: composer:v2
|
||||||
|
|
||||||
|
- name: Install current deps
|
||||||
|
run: |
|
||||||
|
npm ci
|
||||||
|
composer install --no-interaction --no-progress
|
||||||
|
|
||||||
|
- name: Update deps
|
||||||
|
run: |
|
||||||
|
npm update
|
||||||
|
composer update --no-interaction --no-progress
|
||||||
|
|
||||||
|
- name: Detect changes
|
||||||
|
id: changes
|
||||||
|
run: |
|
||||||
|
if git diff --quiet; then
|
||||||
|
echo "changed=false" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "changed=true" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Create PR
|
||||||
|
if: steps.changes.outputs.changed == 'true'
|
||||||
|
uses: peter-evans/create-pull-request@v6
|
||||||
|
with:
|
||||||
|
commit-message: "Dependency update"
|
||||||
|
title: "Dependency update"
|
||||||
|
body: "Automated dependency update."
|
||||||
|
branch: "bot/dependency-update"
|
||||||
|
delete-branch: true
|
||||||
@@ -3,55 +3,40 @@ name: Laravel
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: ["main"]
|
branches: ["main"]
|
||||||
pull_request:
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
laravel-tests:
|
laravel-tests:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- uses: shivammathur/setup-php@v2
|
- uses: shivammathur/setup-php@v2
|
||||||
with:
|
with:
|
||||||
php-version: "8.4"
|
php-version: "8.2"
|
||||||
|
- uses: actions/checkout@v3
|
||||||
- name: Copy .env
|
- name: Copy .env
|
||||||
run: php -r "file_exists('.env') || copy('.env.example', '.env');"
|
run: php -r "file_exists('.env') || copy('.env.example', '.env');"
|
||||||
|
- name: Install Dependencies
|
||||||
- name: Install PHP Dependencies
|
|
||||||
run: composer install -q --no-interaction --no-progress --prefer-dist
|
run: composer install -q --no-interaction --no-progress --prefer-dist
|
||||||
|
|
||||||
- name: Generate key
|
- name: Generate key
|
||||||
run: php artisan key:generate
|
run: php artisan key:generate
|
||||||
|
|
||||||
- name: Directory Permissions
|
- name: Directory Permissions
|
||||||
run: chmod -R 777 storage bootstrap/cache
|
run: chmod -R 777 storage bootstrap/cache
|
||||||
|
|
||||||
- name: Create Database
|
- name: Create Database
|
||||||
run: |
|
run: |
|
||||||
mkdir -p database
|
mkdir -p database
|
||||||
touch database/database.sqlite
|
touch database/database.sqlite
|
||||||
|
- name: Execute tests (Unit and Feature tests) via PHPUnit
|
||||||
- name: Install Node.js
|
|
||||||
uses: actions/setup-node@v2
|
|
||||||
with:
|
|
||||||
node-version: "20"
|
|
||||||
|
|
||||||
- name: Install Node dependencies
|
|
||||||
run: npm ci
|
|
||||||
|
|
||||||
- name: Build frontend
|
|
||||||
run: npm run build
|
|
||||||
|
|
||||||
- name: Run migrations
|
|
||||||
env:
|
|
||||||
DB_CONNECTION: sqlite
|
|
||||||
DB_DATABASE: database/database.sqlite
|
|
||||||
run: php artisan migrate --force
|
|
||||||
|
|
||||||
- name: Run PHPUnit
|
|
||||||
env:
|
env:
|
||||||
DB_CONNECTION: sqlite
|
DB_CONNECTION: sqlite
|
||||||
DB_DATABASE: database/database.sqlite
|
DB_DATABASE: database/database.sqlite
|
||||||
run: vendor/bin/phpunit
|
run: vendor/bin/phpunit
|
||||||
|
- name: Install Node.js
|
||||||
|
uses: actions/setup-node@v2
|
||||||
|
with:
|
||||||
|
node-version: "16.x"
|
||||||
|
- name: Install dependencies
|
||||||
|
run: npm ci
|
||||||
|
- name: Run Vue tests
|
||||||
|
env:
|
||||||
|
LARAVEL_BYPASS_ENV_CHECK: "1"
|
||||||
|
run: npm run test
|
||||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -260,5 +260,3 @@ phpcbf.phar
|
|||||||
### PHPStorm ###
|
### PHPStorm ###
|
||||||
.idea/
|
.idea/
|
||||||
|
|
||||||
### Deployment ###
|
|
||||||
/deploy.sh
|
|
||||||
|
|||||||
18
README.md
18
README.md
@@ -49,24 +49,6 @@ We would like to extend our thanks to the following sponsors for funding Laravel
|
|||||||
- **[byte5](https://byte5.de)**
|
- **[byte5](https://byte5.de)**
|
||||||
- **[OP.GG](https://op.gg)**
|
- **[OP.GG](https://op.gg)**
|
||||||
|
|
||||||
## Code Style
|
|
||||||
|
|
||||||
This project uses [Laravel Pint](https://laravel.com/docs/pint) for code styling. Pint is an opinionated PHP code style fixer for minimalists, built on top of PHP-CS-Fixer.
|
|
||||||
|
|
||||||
To automatically fix code style issues, run:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
composer pint
|
|
||||||
```
|
|
||||||
|
|
||||||
To check for code style issues without fixing them:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
composer pint-test
|
|
||||||
```
|
|
||||||
|
|
||||||
The code style configuration can be found in `pint.json`.
|
|
||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
||||||
Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
|
Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
|
||||||
|
|||||||
@@ -9,11 +9,11 @@ class HomeController extends Controller
|
|||||||
{
|
{
|
||||||
public function index()
|
public function index()
|
||||||
{
|
{
|
||||||
// $posts = Post::query()->orderBy('created_at', 'desc')->limit(4)->get();
|
$posts = Post::query()->orderBy('created_at', 'desc')->limit(4)->get();
|
||||||
$workshops = Workshop::query()->where('starts_at', '>', now())->where('status', '!=', 'private')->orderBy('starts_at', 'asc')->limit(4)->get();
|
$workshops = Workshop::query()->where('starts_at', '>', now())->where('status', '!=', 'private')->orderBy('starts_at', 'asc')->limit(4)->get();
|
||||||
|
|
||||||
return view('home', [
|
return view('home', [
|
||||||
// 'posts' => $posts,
|
'posts' => $posts,
|
||||||
'workshops' => $workshops,
|
'workshops' => $workshops,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -111,17 +111,15 @@ class MediaController extends Controller
|
|||||||
public function admin_store(Request $request)
|
public function admin_store(Request $request)
|
||||||
{
|
{
|
||||||
$file = null;
|
$file = null;
|
||||||
$cleanupPath = null;
|
|
||||||
|
|
||||||
// Check if the endpoint received a file...
|
// Check if the endpoint received a file...
|
||||||
if($request->hasFile('file')) {
|
if($request->hasFile('file')) {
|
||||||
try {
|
try {
|
||||||
$file = $this->upload($request);
|
$file = $this->upload($request);
|
||||||
|
|
||||||
if(is_array($file) && !empty($file['chunk'])) {
|
if($file === true) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'message' => 'Chunk stored',
|
'message' => 'Chunk stored',
|
||||||
'upload_token' => $file['token'] ?? null,
|
|
||||||
]);
|
]);
|
||||||
} else if(!$file) {
|
} else if(!$file) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
@@ -152,20 +150,8 @@ class MediaController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
// else check if it received a file name of a previous upload...
|
// else check if it received a file name of a previous upload...
|
||||||
} else if($request->has('upload_token') || $request->has('file')) {
|
} else if($request->has('file')) {
|
||||||
$uploadToken = $request->input('upload_token', $request->input('file'));
|
$tempFileName = sys_get_temp_dir() . '/chunk-' . Auth::id() . '-' . $request->file;
|
||||||
$chunkUploads = session()->get('chunk_uploads', []);
|
|
||||||
|
|
||||||
if(!is_string($uploadToken) || !isset($chunkUploads[$uploadToken])) {
|
|
||||||
return response()->json([
|
|
||||||
'message' => 'Could not find the referenced file on the server.',
|
|
||||||
'errors' => [
|
|
||||||
'file' => 'Could not find the referenced file on the server.'
|
|
||||||
]
|
|
||||||
], 422);
|
|
||||||
}
|
|
||||||
|
|
||||||
$tempFileName = $chunkUploads[$uploadToken];
|
|
||||||
if(!file_exists($tempFileName)) {
|
if(!file_exists($tempFileName)) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'message' => 'Could not find the referenced file on the server.',
|
'message' => 'Could not find the referenced file on the server.',
|
||||||
@@ -179,16 +165,7 @@ class MediaController extends Controller
|
|||||||
if($fileMime === false) {
|
if($fileMime === false) {
|
||||||
$fileMime = 'application/octet-stream';
|
$fileMime = 'application/octet-stream';
|
||||||
}
|
}
|
||||||
$fileName = $request->input('filename', 'upload');
|
$file = new UploadedFile($tempFileName, $request->file, $fileMime, null, true);
|
||||||
$fileName = Helpers::cleanFileName($fileName);
|
|
||||||
if ($fileName === '') {
|
|
||||||
$fileName = 'upload';
|
|
||||||
}
|
|
||||||
|
|
||||||
$file = new UploadedFile($tempFileName, $fileName, $fileMime, null, true);
|
|
||||||
$cleanupPath = $tempFileName;
|
|
||||||
unset($chunkUploads[$uploadToken]);
|
|
||||||
session()->put('chunk_uploads', $chunkUploads);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check there is an actual file
|
// Check there is an actual file
|
||||||
@@ -265,13 +242,7 @@ class MediaController extends Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_string($cleanupPath)) {
|
unlink($file->getRealPath());
|
||||||
$realPath = realpath($cleanupPath);
|
|
||||||
$tempDir = realpath(sys_get_temp_dir());
|
|
||||||
if($realPath !== false && $tempDir !== false && str_starts_with($realPath, $tempDir . DIRECTORY_SEPARATOR)) {
|
|
||||||
@unlink($realPath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if($request->wantsJson()) {
|
if($request->wantsJson()) {
|
||||||
return response()->json([
|
return response()->json([
|
||||||
@@ -415,10 +386,6 @@ class MediaController extends Controller
|
|||||||
|
|
||||||
$fileName = $request->input('filename', $file->getClientOriginalName());
|
$fileName = $request->input('filename', $file->getClientOriginalName());
|
||||||
$fileName = Helpers::cleanFileName($fileName);
|
$fileName = Helpers::cleanFileName($fileName);
|
||||||
if ($fileName === '') {
|
|
||||||
$extension = strtolower($file->getClientOriginalExtension());
|
|
||||||
$fileName = 'upload' . ($extension !== '' ? '.' . $extension : '');
|
|
||||||
}
|
|
||||||
|
|
||||||
if(($request->has('filestart') || $request->has('fileappend')) && $request->has('filesize')) {
|
if(($request->has('filestart') || $request->has('fileappend')) && $request->has('filesize')) {
|
||||||
$fileSize = $request->get('filesize');
|
$fileSize = $request->get('filesize');
|
||||||
@@ -427,25 +394,7 @@ class MediaController extends Controller
|
|||||||
throw new FileTooLargeException('The file is larger than the maximum size allowed of ' . Helpers::bytesToString($max_size));
|
throw new FileTooLargeException('The file is larger than the maximum size allowed of ' . Helpers::bytesToString($max_size));
|
||||||
}
|
}
|
||||||
|
|
||||||
$chunkUploads = session()->get('chunk_uploads', []);
|
$tempFilePath = sys_get_temp_dir() . '/chunk-' . Auth::id() . '-' . $fileName;
|
||||||
$uploadToken = $request->input('upload_token');
|
|
||||||
|
|
||||||
if($request->has('filestart')) {
|
|
||||||
$uploadToken = bin2hex(random_bytes(16));
|
|
||||||
$tempFilePath = tempnam(sys_get_temp_dir(), 'chunk-' . Auth::id() . '-');
|
|
||||||
if($tempFilePath === false) {
|
|
||||||
throw new FileInvalidException('Unable to create a temporary upload file.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$chunkUploads[$uploadToken] = $tempFilePath;
|
|
||||||
session()->put('chunk_uploads', $chunkUploads);
|
|
||||||
} else {
|
|
||||||
if(!is_string($uploadToken) || !isset($chunkUploads[$uploadToken])) {
|
|
||||||
throw new FileInvalidException('Invalid upload token.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$tempFilePath = $chunkUploads[$uploadToken];
|
|
||||||
}
|
|
||||||
|
|
||||||
$filemode = 'a';
|
$filemode = 'a';
|
||||||
if($request->has('filestart')) {
|
if($request->has('filestart')) {
|
||||||
@@ -466,17 +415,9 @@ class MediaController extends Controller
|
|||||||
$fileMime = 'application/octet-stream';
|
$fileMime = 'application/octet-stream';
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_string($uploadToken) && isset($chunkUploads[$uploadToken])) {
|
|
||||||
unset($chunkUploads[$uploadToken]);
|
|
||||||
session()->put('chunk_uploads', $chunkUploads);
|
|
||||||
}
|
|
||||||
|
|
||||||
return new UploadedFile($tempFilePath, $fileName, $fileMime, null, true);
|
return new UploadedFile($tempFilePath, $fileName, $fileMime, null, true);
|
||||||
} else {
|
} else {
|
||||||
return [
|
return true;
|
||||||
'chunk' => true,
|
|
||||||
'token' => $uploadToken,
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,14 +5,14 @@
|
|||||||
"keywords": ["laravel", "framework"],
|
"keywords": ["laravel", "framework"],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^8.4",
|
"php": "^8.2",
|
||||||
"ext-imagick": "*",
|
"ext-imagick": "*",
|
||||||
"chillerlan/php-qrcode": "^5.0",
|
"chillerlan/php-qrcode": "^5.0",
|
||||||
"gehrisandro/tailwind-merge-laravel": "^1.2",
|
"gehrisandro/tailwind-merge-laravel": "^1.2",
|
||||||
"intervention/image": "^3.5",
|
"intervention/image": "^3.5",
|
||||||
"laravel/framework": "^12.0",
|
"laravel/framework": "^12.0",
|
||||||
"laravel/tinker": "^2.9",
|
"laravel/tinker": "^2.9",
|
||||||
"livewire/livewire": "^4.1",
|
"livewire/livewire": "^3.4",
|
||||||
"php-ffmpeg/php-ffmpeg": "^1.2",
|
"php-ffmpeg/php-ffmpeg": "^1.2",
|
||||||
"robthree/twofactorauth": "^3.0"
|
"robthree/twofactorauth": "^3.0"
|
||||||
},
|
},
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
"laravel/pint": "^1.13",
|
"laravel/pint": "^1.13",
|
||||||
"laravel/sail": "^1.26",
|
"laravel/sail": "^1.26",
|
||||||
"mockery/mockery": "^1.6",
|
"mockery/mockery": "^1.6",
|
||||||
"phpunit/phpunit": "^12.5",
|
"phpunit/phpunit": "^10.5",
|
||||||
"spatie/laravel-ignition": "^2.4"
|
"spatie/laravel-ignition": "^2.4"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@@ -52,12 +52,6 @@
|
|||||||
"@php artisan key:generate --ansi",
|
"@php artisan key:generate --ansi",
|
||||||
"@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"",
|
"@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"",
|
||||||
"@php artisan migrate --graceful --ansi"
|
"@php artisan migrate --graceful --ansi"
|
||||||
],
|
|
||||||
"pint": [
|
|
||||||
"./vendor/bin/pint"
|
|
||||||
],
|
|
||||||
"pint-test": [
|
|
||||||
"./vendor/bin/pint --test"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"extra": {
|
"extra": {
|
||||||
@@ -66,9 +60,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
"platform": {
|
|
||||||
"php": "8.4.17"
|
|
||||||
},
|
|
||||||
"optimize-autoloader": true,
|
"optimize-autoloader": true,
|
||||||
"preferred-install": "dist",
|
"preferred-install": "dist",
|
||||||
"sort-packages": true,
|
"sort-packages": true,
|
||||||
|
|||||||
1363
composer.lock
generated
1363
composer.lock
generated
File diff suppressed because it is too large
Load Diff
925
package-lock.json
generated
925
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
33
package.json
33
package.json
@@ -3,29 +3,28 @@
|
|||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "vite build",
|
"build": "vite build"
|
||||||
"snyk:test": "snyk test --all-projects --exclude=vendor"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@tailwindcss/vite": "^4.1.17",
|
"@tailwindcss/vite": "^4.1.17",
|
||||||
"autoprefixer": "^10.4.24",
|
"autoprefixer": "^10.4.19",
|
||||||
"axios": "^1.13.4",
|
"axios": "^1.6.4",
|
||||||
"laravel-vite-plugin": "^2.0.1",
|
"laravel-vite-plugin": "^1.0",
|
||||||
"postcss": "^8.4.38",
|
"postcss": "^8.4.38",
|
||||||
"vite": "^7.3.0"
|
"vite": "^6.4"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tiptap/core": "^3.10.7",
|
"@tiptap/core": "^2.3.0",
|
||||||
"@tiptap/extension-highlight": "^3.18.0",
|
"@tiptap/extension-highlight": "^2.3.0",
|
||||||
"@tiptap/extension-image": "^3.18.0",
|
"@tiptap/extension-image": "^2.3.0",
|
||||||
"@tiptap/extension-link": "^3.18.0",
|
"@tiptap/extension-link": "^2.3.0",
|
||||||
"@tiptap/extension-subscript": "^3.18.0",
|
"@tiptap/extension-subscript": "^2.3.0",
|
||||||
"@tiptap/extension-superscript": "^3.18.0",
|
"@tiptap/extension-superscript": "^2.3.0",
|
||||||
"@tiptap/extension-text-align": "^3.18.0",
|
"@tiptap/extension-text-align": "^2.3.0",
|
||||||
"@tiptap/extension-typography": "^3.18.0",
|
"@tiptap/extension-typography": "^2.3.0",
|
||||||
"@tiptap/extension-underline": "^3.18.0",
|
"@tiptap/extension-underline": "^2.3.0",
|
||||||
"@tiptap/pm": "^3.10.7",
|
"@tiptap/pm": "^2.3.0",
|
||||||
"@tiptap/starter-kit": "^3.18.0",
|
"@tiptap/starter-kit": "^2.3.0",
|
||||||
"tailwindcss": "^4.1.17"
|
"tailwindcss": "^4.1.17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"preset": "laravel",
|
|
||||||
"rules": {
|
|
||||||
"simplified_null_return": true,
|
|
||||||
"new_with_braces": true,
|
|
||||||
"no_unused_imports": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,26 +1,4 @@
|
|||||||
let SM = {
|
let SM = {
|
||||||
redirectIfSafe: (target) => {
|
|
||||||
if (typeof target !== 'string' || target === '') {
|
|
||||||
window.location.assign('/');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let url;
|
|
||||||
try {
|
|
||||||
url = new URL(target, window.location.origin);
|
|
||||||
} catch (error) {
|
|
||||||
window.location.assign('/');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (url.origin !== window.location.origin) {
|
|
||||||
window.location.assign('/');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
window.location.assign(url.href);
|
|
||||||
},
|
|
||||||
|
|
||||||
alert: (title, text, type = 'info') =>{
|
alert: (title, text, type = 'info') =>{
|
||||||
const data = {
|
const data = {
|
||||||
position: 'top-end',
|
position: 'top-end',
|
||||||
@@ -106,7 +84,7 @@ let SM = {
|
|||||||
axios.delete(url)
|
axios.delete(url)
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
if(response.data.success){
|
if(response.data.success){
|
||||||
SM.redirectIfSafe(response.data.redirect);
|
window.location.href = response.data.redirect;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
@@ -158,7 +136,7 @@ let SM = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const uploadFile = (file, start, title, idx, count, uploadToken = null) => {
|
const uploadFile = (file, start, title, idx, count) => {
|
||||||
const showPercentDecimals = (file.size > (1024 * 1024 * 40));
|
const showPercentDecimals = (file.size > (1024 * 1024 * 40));
|
||||||
const chunkSize = 1024 * 1024 * 2;
|
const chunkSize = 1024 * 1024 * 2;
|
||||||
const end = Math.min(file.size, start + chunkSize);
|
const end = Math.min(file.size, start + chunkSize);
|
||||||
@@ -168,9 +146,6 @@ let SM = {
|
|||||||
formData.append('file', chunk);
|
formData.append('file', chunk);
|
||||||
formData.append('filename', file.name);
|
formData.append('filename', file.name);
|
||||||
formData.append('filesize', file.size);
|
formData.append('filesize', file.size);
|
||||||
if (uploadToken) {
|
|
||||||
formData.append('upload_token', uploadToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (start === 0) {
|
if (start === 0) {
|
||||||
formData.append('filestart', 'true');
|
formData.append('filestart', 'true');
|
||||||
@@ -208,10 +183,6 @@ let SM = {
|
|||||||
}
|
}
|
||||||
}).then((response) => {
|
}).then((response) => {
|
||||||
if (response.status === 200) {
|
if (response.status === 200) {
|
||||||
if (response.data && response.data.upload_token) {
|
|
||||||
uploadToken = response.data.upload_token;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (end >= file.size) {
|
if (end >= file.size) {
|
||||||
uploadedFiles.push({ file: file, title: title, data: response.data });
|
uploadedFiles.push({ file: file, title: title, data: response.data });
|
||||||
|
|
||||||
@@ -234,13 +205,12 @@ let SM = {
|
|||||||
} else {
|
} else {
|
||||||
start = 0;
|
start = 0;
|
||||||
idx += 1;
|
idx += 1;
|
||||||
uploadToken = null;
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
start = end;
|
start = end;
|
||||||
}
|
}
|
||||||
|
|
||||||
uploadFile(files[idx], start, titles[idx] || '', idx, files.length, uploadToken);
|
uploadFile(files[idx], start, titles[idx] || '', idx, files.length);
|
||||||
} else {
|
} else {
|
||||||
showError(response.data.message);
|
showError(response.data.message);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"endpoint": "https://git.stemmechanics.com.au/api/v1",
|
|
||||||
"gitAuthor": "Renovate Bot <renovate-bot@stemmechanics.com.au>",
|
|
||||||
"platform": "gitea",
|
|
||||||
"onboardingConfigFileName": "renovate.json",
|
|
||||||
"autodiscover": true,
|
|
||||||
"optimizeForDisabled": true
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
|
||||||
"extends": [
|
|
||||||
"config:recommended"
|
|
||||||
],
|
|
||||||
"automerge": true,
|
|
||||||
"platformAutomerge": true,
|
|
||||||
"ignoreTests": true,
|
|
||||||
"packageRules": [
|
|
||||||
{
|
|
||||||
"matchUpdateTypes": [
|
|
||||||
"patch"
|
|
||||||
],
|
|
||||||
"automerge": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"matchUpdateTypes": [
|
|
||||||
"minor",
|
|
||||||
"major"
|
|
||||||
],
|
|
||||||
"automerge": false
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
import Link from "@tiptap/extension-link";
|
import Link from "@tiptap/extension-link";
|
||||||
import {Editor} from "@tiptap/core";
|
import {Editor} from "@tiptap/core";
|
||||||
import StarterKit from "@tiptap/starter-kit";
|
import StarterKit from "@tiptap/starter-kit";
|
||||||
import Underline from "@tiptap/extension-underline";
|
|
||||||
import Highlight from "@tiptap/extension-highlight";
|
import Highlight from "@tiptap/extension-highlight";
|
||||||
import TextAlign from "@tiptap/extension-text-align";
|
import TextAlign from "@tiptap/extension-text-align";
|
||||||
import Typography from "@tiptap/extension-typography";
|
import Typography from "@tiptap/extension-typography";
|
||||||
@@ -50,16 +49,12 @@ document.addEventListener('alpine:init', () => {
|
|||||||
editor = new Editor({
|
editor = new Editor({
|
||||||
element: this.$refs.element,
|
element: this.$refs.element,
|
||||||
extensions: [
|
extensions: [
|
||||||
StarterKit.configure({
|
StarterKit,
|
||||||
link: false,
|
|
||||||
underline: false,
|
|
||||||
}),
|
|
||||||
Highlight,
|
Highlight,
|
||||||
CustomLink.configure({
|
CustomLink.configure({
|
||||||
rel: 'noopener noreferrer',
|
rel: 'noopener noreferrer',
|
||||||
openOnClick: 'whenNotEditable',
|
openOnClick: 'whenNotEditable',
|
||||||
}),
|
}),
|
||||||
Underline,
|
|
||||||
TextAlign.configure({
|
TextAlign.configure({
|
||||||
types: ['heading', 'paragraph', 'small', 'extraSmall'],
|
types: ['heading', 'paragraph', 'small', 'extraSmall'],
|
||||||
}),
|
}),
|
||||||
@@ -70,11 +65,6 @@ document.addEventListener('alpine:init', () => {
|
|||||||
ExtraSmall,
|
ExtraSmall,
|
||||||
Box
|
Box
|
||||||
],
|
],
|
||||||
editorProps: {
|
|
||||||
attributes: {
|
|
||||||
class: 'tiptap content',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
content: content,
|
content: content,
|
||||||
onCreate({/* editor */}) {
|
onCreate({/* editor */}) {
|
||||||
_this.updatedAt = Date.now()
|
_this.updatedAt = Date.now()
|
||||||
@@ -151,9 +141,6 @@ document.addEventListener('alpine:init', () => {
|
|||||||
unsetAllMarks() {
|
unsetAllMarks() {
|
||||||
editor.chain().focus().unsetAllMarks().run()
|
editor.chain().focus().unsetAllMarks().run()
|
||||||
},
|
},
|
||||||
clearNodes() {
|
|
||||||
editor.chain().focus().clearNodes().run()
|
|
||||||
},
|
|
||||||
clearNotes() {
|
clearNotes() {
|
||||||
editor.chain().focus().clearNodes().run()
|
editor.chain().focus().clearNodes().run()
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
@props(['item' => 'results', 'search', 'message', 'title'])
|
|
||||||
|
|
||||||
@php
|
|
||||||
if(!isset($message)) {
|
|
||||||
if(!isset($search) || $search == '')
|
|
||||||
$message = "We couldn't find any $item";
|
|
||||||
else
|
|
||||||
$message = "We couldn't find any $item matching \"$search\"";
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!isset($title)) {
|
|
||||||
$title = "No results found";
|
|
||||||
}
|
|
||||||
@endphp
|
|
||||||
|
|
||||||
<div class="flex flex-col items-center my-8 w-full">
|
|
||||||
<i class="text-gray-300 mb-6 text-8xl fa-solid fa-cat"></i>
|
|
||||||
<p class="text-gray-500 mt-2">No workshops coming up. We’re on a short break, mostly by playing with the cat.</p>
|
|
||||||
</div>
|
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
imgElement.src = details.thumbnail;
|
imgElement.src = details.thumbnail;
|
||||||
|
|
||||||
imgElement.classList.remove('hidden');
|
imgElement.classList.remove('hidden');
|
||||||
placeholderElement.classList.add('hidden!');
|
placeholderElement.classList.add('hidden');
|
||||||
|
|
||||||
document.getElementById(name).value = value;
|
document.getElementById(name).value = value;
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<x-container>
|
<x-container>
|
||||||
<h2 class="text-2xl font-bold mb-6">Upcoming workshops</h2>
|
<h2 class="text-2xl font-bold mb-6">Upcoming workshops</h2>
|
||||||
@if($workshops->isEmpty())
|
@if($workshops->isEmpty())
|
||||||
<x-on-holiday />
|
<x-none-found item="workshops" message="No workshops have been scheduled at this time" title="" />
|
||||||
@else
|
@else
|
||||||
<div class="grid md:grid-cols-2 lg:grid-cols-3 gap-8 w-full">
|
<div class="grid md:grid-cols-2 lg:grid-cols-3 gap-8 w-full">
|
||||||
@foreach($workshops as $index => $workshop)
|
@foreach($workshops as $index => $workshop)
|
||||||
|
|||||||
Reference in New Issue
Block a user