Skip to content

Commit

Permalink
Merge pull request #3685 from HDInnovations/7.x.x
Browse files Browse the repository at this point in the history
(Release) v8.0.0
  • Loading branch information
HDVinnie committed Mar 27, 2024
2 parents 07e1fa6 + b982162 commit 58f6119
Show file tree
Hide file tree
Showing 800 changed files with 29,306 additions and 21,951 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ APP_DEBUG=false
APP_LOG_LEVEL=debug
APP_URL=http://localhost

MIX_ECHO_ADDRESS=http://localhost:8443
VITE_ECHO_ADDRESS=http://localhost:8443

LOG_CHANNEL=daily

Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.lockb binary diff=lockb
36 changes: 29 additions & 7 deletions .github/workflows/compile-assets-test.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,39 @@
name: Compile Assets (Mix)
name: Compile Assets (Vite)
on: [push, pull_request]
jobs:
build-assets:
strategy:
matrix:
operating-system:
- ubuntu-22.04
php-version:
- '8.3'
name: ${{ matrix.operating-system }}
runs-on: ${{ matrix.operating-system }}
steps:
- uses: actions/checkout@v1
- name: Start NPM
run: |
npm install
npx mix -p
cat public/mix-manifest.json # See asset versions in log
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup PHP 8.3
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
extensions: curl, dom, gd, libxml, mbstring, zip, mysql, xml, intl, bcmath, redis-phpredis/phpredis@6.0.1
ini-values: error_reporting=E_ALL
coverage: pcov
tools: composer:v2
env:
REDIS_CONFIGURE_OPTS: --enable-redis
- name: Configure Bun
uses: oven-sh/setup-bun@v1
with:
bun-version: latest
- name: Install Composer Dependencies
env:
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --optimize-autoloader
- name: Install JS Dependencies
run: bun install
- name: Compile Assets (Vite)
run: bun run build
4 changes: 3 additions & 1 deletion .github/workflows/larastan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ jobs:
runs-on: ${{ matrix.operating-system }}
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup PHP 8.2
uses: shivammathur/setup-php@v2
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
name: ${{ matrix.operating-system }}
runs-on: ${{ matrix.operating-system }}
steps:
- name: Code Checkout
uses: actions/checkout@v3
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 2
fetch-depth: 0
- name: Run Pint
uses: aglipanci/laravel-pint-action@2.0.0
with:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/phpunit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup PHP 8.2
- name: Setup PHP 8.3
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
Expand All @@ -46,18 +46,18 @@ jobs:
REDIS_CONFIGURE_OPTS: --enable-redis
- name: Prepare The Laravel Environment
run: cp .env.example .env
- name: Configure NPM
uses: actions/setup-node@v1
- name: Configure Bun
uses: oven-sh/setup-bun@v1
with:
node-version: '18.x'
bun-version: latest
- name: Install Composer Dependencies
env:
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist --optimize-autoloader
- name: Install NPM Dependencies
run: npm install
- name: Build Assets Via Mix
run: npx mix -p
- name: Install JS Dependencies
run: bun install
- name: Compile Assets (Vite)
run: bun run build
- name: Generate Application Key
run: php artisan key:generate
- name: Clear Application Cache
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/prettier-blade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ jobs:
name: ${{ matrix.operating-system }}
runs-on: ${{ matrix.operating-system }}
steps:
- name: Code Checkout
uses: actions/checkout@v3
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Configure NPM
uses: actions/setup-node@v2
fetch-depth: 0
- name: Configure Bun
uses: oven-sh/setup-bun@v1
with:
node-version: '18.x'
- name: Install NPM Dependencies
run: npm install
bun-version: latest
- name: Install JS Dependencies
run: bun install
- name: Run Prettier
run: ./node_modules/.bin/prettier -w *
run: bunx prettier -w *
- name: Commit Changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ npm-debug.log
laravel-echo-server.json
laravel-echo-server.lock

# Vite
/public/build

# OS X
.DS_store

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing

Contributions are **welcome**. Please make all pull requests agaist the development branch (currently 7.x.x) and NOT master which is only for releases.
Contributions are **welcome**. Please make all pull requests agaist the development branch (currently 8.x.x) and NOT master which is only for releases.

We accept contributions via Pull Requests on [Github](https://github.com/HDInnovations/UNIT3D).

Expand Down
20 changes: 12 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<p align="center">
<a href="http://laravel.com"><img src="https://img.shields.io/badge/Laravel-10-f4645f.svg" /></a>
<a href="https://github.com/HDInnovations/UNIT3D/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-AGPL%20v3.0-yellow.svg" /></a>
<a href="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/lint.yml/badge.svg?branch=7.x.x"><img src="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/lint.yml/badge.svg?branch=7.x.x" /></a>
<a href="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/phpunit-test.yml/badge.svg?branch=7.x.x"><img src="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/phpunit-test.yml/badge.svg?branch=7.x.x" /></a>
<a href="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/compile-assets-test.yml/badge.svg?branch=7.x.x"><img src="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/compile-assets-test.yml/badge.svg?branch=7.x.x" /></a>
<a href="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/larastan.yml/badge.svg?branch=7.x.x"><img src="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/larastan.yml/badge.svg?branch=7.x.x" /></a>
<a href="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/prettier-blade.yml/badge.svg?branch=7.x.x"><img src="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/prettier-blade.yml/badge.svg?branch=7.x.x" /></a>
<a href="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/lint.yml/badge.svg?branch=master"><img src="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/lint.yml/badge.svg?branch=master" /></a>
<a href="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/phpunit-test.yml/badge.svg?branch=master"><img src="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/phpunit-test.yml/badge.svg?branch=master" /></a>
<a href="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/compile-assets-test.yml/badge.svg?branch=master"><img src="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/compile-assets-test.yml/badge.svg?branch=master" /></a>
<a href="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/larastan.yml/badge.svg?branch=master"><img src="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/larastan.yml/badge.svg?branch=master" /></a>
<a href="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/prettier-blade.yml/badge.svg?branch=master"><img src="https://github.com/HDInnovations/UNIT3D-Community-Edition/actions/workflows/prettier-blade.yml/badge.svg?branch=master" /></a>
<a href="https://polar.sh/HDInnovations"><img src="https://polar.sh/embed/seeks-funding-shield.svg?org=HDInnovations" /></a>
</p>

Expand All @@ -20,9 +20,10 @@
1. [Introduction](#introduction)
2. [Installation](#installation)
3. [Updating](#updating)
4. [Support UNIT3D](#support)
5. [Funding Issues/Requests](#funding)
6. [Special Thanks](#thanks)
4. [Demo Site](#demo)
5. [Support UNIT3D](#support)
6. [Funding Issues/Requests](#funding)
7. [Special Thanks](#thanks)


## <a name="introduction"></a> 🧐 Introduction
Expand All @@ -42,6 +43,9 @@ Use this command to generate demo users and torrents for testing purposes in a d
## <a name="updating"></a> 🖥️ Updating
`php artisan git:update`

## <a name="demo"></a> 🖥️ Demo Site
https://unit3d.dev

## <a name="support"></a> ✨ Support UNIT3D

You can support our work if you are enjoying UNIT3D. Sponsors will recieve an email with a Discord invite link to UNIT3Ds Discord server which is used for support and more.
Expand Down
3 changes: 2 additions & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

Version | Status | PHP Version Required
:------------|:-------------------------|:------------
7.x.x | Active Support :rocket: | >= 8.2
8.x.x | Active Support :rocket: | >= 8.3
7.x.x | End Of Life :skull: | >= 8.2
6.x.x | End Of Life :skull: | >= 8.1
5.x.x | End Of Life :skull: | >= 8.0
4.x.x | End Of Life :skull: | >= 7.4
Expand Down
11 changes: 11 additions & 0 deletions app/Achievements/UserUploaded1000Subtitles.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<?php
/**
* NOTICE OF LICENSE.
*
* UNIT3D Community Edition is open-sourced software licensed under the GNU Affero General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D Community Edition
*
* @author HDVinnie <hdinnovations@protonmail.com>
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
*/

namespace App\Achievements;

Expand Down
11 changes: 11 additions & 0 deletions app/Achievements/UserUploaded100Subtitles.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<?php
/**
* NOTICE OF LICENSE.
*
* UNIT3D Community Edition is open-sourced software licensed under the GNU Affero General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D Community Edition
*
* @author HDVinnie <hdinnovations@protonmail.com>
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
*/

namespace App\Achievements;

Expand Down
11 changes: 11 additions & 0 deletions app/Achievements/UserUploaded200Subtitles.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<?php
/**
* NOTICE OF LICENSE.
*
* UNIT3D Community Edition is open-sourced software licensed under the GNU Affero General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D Community Edition
*
* @author HDVinnie <hdinnovations@protonmail.com>
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
*/

namespace App\Achievements;

Expand Down
11 changes: 11 additions & 0 deletions app/Achievements/UserUploaded25Subtitles.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<?php
/**
* NOTICE OF LICENSE.
*
* UNIT3D Community Edition is open-sourced software licensed under the GNU Affero General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D Community Edition
*
* @author HDVinnie <hdinnovations@protonmail.com>
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
*/

namespace App\Achievements;

Expand Down
11 changes: 11 additions & 0 deletions app/Achievements/UserUploaded300Subtitles.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<?php
/**
* NOTICE OF LICENSE.
*
* UNIT3D Community Edition is open-sourced software licensed under the GNU Affero General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D Community Edition
*
* @author HDVinnie <hdinnovations@protonmail.com>
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
*/

namespace App\Achievements;

Expand Down
11 changes: 11 additions & 0 deletions app/Achievements/UserUploaded400Subtitles.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<?php
/**
* NOTICE OF LICENSE.
*
* UNIT3D Community Edition is open-sourced software licensed under the GNU Affero General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D Community Edition
*
* @author HDVinnie <hdinnovations@protonmail.com>
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
*/

namespace App\Achievements;

Expand Down
11 changes: 11 additions & 0 deletions app/Achievements/UserUploaded500Subtitles.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<?php
/**
* NOTICE OF LICENSE.
*
* UNIT3D Community Edition is open-sourced software licensed under the GNU Affero General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D Community Edition
*
* @author HDVinnie <hdinnovations@protonmail.com>
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
*/

namespace App\Achievements;

Expand Down
11 changes: 11 additions & 0 deletions app/Achievements/UserUploaded50Subtitles.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<?php
/**
* NOTICE OF LICENSE.
*
* UNIT3D Community Edition is open-sourced software licensed under the GNU Affero General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D Community Edition
*
* @author HDVinnie <hdinnovations@protonmail.com>
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
*/

namespace App\Achievements;

Expand Down
11 changes: 11 additions & 0 deletions app/Achievements/UserUploaded600Subtitles.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<?php
/**
* NOTICE OF LICENSE.
*
* UNIT3D Community Edition is open-sourced software licensed under the GNU Affero General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D Community Edition
*
* @author HDVinnie <hdinnovations@protonmail.com>
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
*/

namespace App\Achievements;

Expand Down
11 changes: 11 additions & 0 deletions app/Achievements/UserUploaded700Subtitles.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<?php
/**
* NOTICE OF LICENSE.
*
* UNIT3D Community Edition is open-sourced software licensed under the GNU Affero General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D Community Edition
*
* @author HDVinnie <hdinnovations@protonmail.com>
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
*/

namespace App\Achievements;

Expand Down
11 changes: 11 additions & 0 deletions app/Achievements/UserUploaded800Subtitles.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<?php
/**
* NOTICE OF LICENSE.
*
* UNIT3D Community Edition is open-sourced software licensed under the GNU Affero General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D Community Edition
*
* @author HDVinnie <hdinnovations@protonmail.com>
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
*/

namespace App\Achievements;

Expand Down
Loading

0 comments on commit 58f6119

Please sign in to comment.