Skip to content

Commit

Permalink
Merge pull request #127 from szepeviktor/typos
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
pxpm committed Apr 28, 2024
2 parents 83d5c25 + ffe7422 commit b8784c1
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Contributions are welcome and will be fully credited.

Contributions are accepted via Pull Requests on [Github](https://github.com/Laravel-Backpack/basset).
Contributions are accepted via Pull Requests on [GitHub](https://github.com/Laravel-Backpack/basset).

# Things you could do
If you want to contribute but do not know where to start, this list provides some starting points.
Expand Down
6 changes: 3 additions & 3 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ That's all you need to do. **Basset will download the file to `storage/app/publi
Using Basset, you easily internalize and use:
- files from external URLs (like CDNs)
- files from internal, but non-public URLs (like the vendor directory)
- entire archives from external URLs (like Github)
- entire archives from external URLs (like GitHub)
- entire directories from local, non-public paths (like other local projects)

No more publishing package files. No more using NPM just to download some files. It's a simple yet effective solution in the age of `HTTP/2` and `HTTP/3`.
Expand All @@ -42,7 +42,7 @@ php artisan vendor:publish --provider="Backpack\Basset\BassetServiceProvider"
> Basset is disabled by default on local environment. If you want to change it, please set `BASSET_DEV_MODE=false` in your env file.
#### Storage Symlink
Basset uses the `public` disk to store cached assets in a directory that is publicly-accesible. So it needs you to run `php artisan storage:link` to create the symlink. The installation command will create ask to run that, and to add that command to your `composer.json`. That will most likely make it work on your development/staging/production servers. If that's not the case, make sure you create the links manually wherever you need them, with the command `php artisan storage:link`.
Basset uses the `public` disk to store cached assets in a directory that is publicly-accessible. So it needs you to run `php artisan storage:link` to create the symlink. The installation command will create ask to run that, and to add that command to your `composer.json`. That will most likely make it work on your development/staging/production servers. If that's not the case, make sure you create the links manually wherever you need them, with the command `php artisan storage:link`.

#### Disk
By default Basset uses the `public` disk. If you're having trouble with the assets not showing up on page, you might have an old Laravel configuration for it. Please make sure your disk is properly setup on `config/filsystems.php` - it should look like [the default one](https://github.com/laravel/laravel/blob/10.x/config/filesystems.php#L39-L45).
Expand Down Expand Up @@ -198,7 +198,7 @@ BASSET_DISK=s3
BASSET_CACHE_MAP=false
```

(optional) Before you deploy to Vapor, you might want to set up S3 on localhost to test that it's working. If you do, [the steps here](https://github.com/Laravel-Backpack/basset/pull/58#issuecomment-1622125991) might help. If you encounter problems with deployment on Vapor (particularly through Github actions) there are some [tips here](https://github.com/Laravel-Backpack/basset/pull/58#issuecomment-1622125991).
(optional) Before you deploy to Vapor, you might want to set up S3 on localhost to test that it's working. If you do, [the steps here](https://github.com/Laravel-Backpack/basset/pull/58#issuecomment-1622125991) might help. If you encounter problems with deployment on Vapor (particularly through GitHub actions) there are some [tips here](https://github.com/Laravel-Backpack/basset/pull/58#issuecomment-1622125991).

### FTP / SFTP / ZIP

Expand Down
2 changes: 1 addition & 1 deletion src/BassetServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public function terminate(): void
$totalCalls = $basset->loader->getTotalCalls();
$loadingTime = $basset->loader->getLoadingTime();

Log::info("Basset run $totalCalls times, with an exeuction time of $loadingTime");
Log::info("Basset run $totalCalls times, with an execution time of $loadingTime");
}

// Save the cache map
Expand Down
2 changes: 1 addition & 1 deletion src/Helpers/LoadingTime.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function finish(StatusEnum $result): StatusEnum
}

/**
* Get total time measured in miliseconds.
* Get total time measured in milliseconds.
*
* @return float
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/BassetBlockTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@

$path = bassetInstance()->getPathHashed($asset, $codeBlock);

// validate the ouput content
// validate the output content
expect(getStub("$asset.output"))->toBe(disk()->get($path));
})->with('codeBlock');
2 changes: 1 addition & 1 deletion tests/Feature/BassetTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
$this->expectOutputString('');
})->with('cdn');

it('retreives from cache when available', function ($asset) {
it('retrieves from cache when available', function ($asset) {
// store the stub in disk
$generatedPath = bassetInstance()->getPath($asset);
disk()->put($generatedPath, getStub($asset));
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/ConsoleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
it('clears basset folder via console command', function () {
$path = config('backpack.basset.path');

// polute with a sample file
// pollute with a sample file
disk()->put("$path/sample.js", 'sample');

$this->artisan('basset:clear')->assertExitCode(0);
Expand Down

0 comments on commit b8784c1

Please sign in to comment.