Skip to content

Commit

Permalink
Merge pull request #151 from hydephp/143-change-resourcesfrontend-to-…
Browse files Browse the repository at this point in the history
…resourcesmedia

Change resources/frontend to resources/assets
  • Loading branch information
caendesilva authored Apr 21, 2022
2 parents bb84e8c + f3cef73 commit 8dd638a
Show file tree
Hide file tree
Showing 23 changed files with 11 additions and 873 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update-hydefront.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
env:
API_TOKEN_GITHUB: ${{ secrets.PAT }}
with:
source_folder: 'resources/frontend/.'
source_folder: 'resources/assets/.'
destination_folder: '/'
destination_repo: 'hydephp/hydefront'
destination_base_branch: 'master'
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
phpDocumentor.phar
phpstan.phar

resources/frontend/.github/
resources/assets/.github/
1 change: 1 addition & 0 deletions resources/assets
Submodule assets added at 860ab5
2 changes: 1 addition & 1 deletion resources/data/filecacheGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
$filecache = [];

$bladeFiles = glob(__DIR__.'/../../resources/views/**/*.blade.php');
$frontendFiles = glob(__DIR__.'/../../resources/frontend/*.{css,scss,js}', GLOB_BRACE);
$frontendFiles = glob(__DIR__.'/../../resources/assets/*.{css,scss,js}', GLOB_BRACE);

$files = array_merge($bladeFiles, $frontendFiles);

Expand Down
70 changes: 0 additions & 70 deletions resources/frontend/.github/workflows/codeql.yml

This file was deleted.

20 changes: 0 additions & 20 deletions resources/frontend/.github/workflows/dependency-review.yml

This file was deleted.

34 changes: 0 additions & 34 deletions resources/frontend/.github/workflows/devskim.yml

This file was deleted.

1 change: 0 additions & 1 deletion resources/frontend/.gitignore

This file was deleted.

45 changes: 0 additions & 45 deletions resources/frontend/README.md

This file was deleted.

7 changes: 0 additions & 7 deletions resources/frontend/app.css

This file was deleted.

145 changes: 0 additions & 145 deletions resources/frontend/dist/hyde.css

This file was deleted.

1 change: 0 additions & 1 deletion resources/frontend/dist/hyde.css.map

This file was deleted.

Loading

0 comments on commit 8dd638a

Please sign in to comment.