Move resources/assets content to resources to match upstream laravel

This commit is contained in:
Kevin MacMartin 2019-11-14 21:14:53 -05:00
parent 8b6f1e5111
commit e3dcafc623
39 changed files with 31 additions and 31 deletions

16
gulpfile.js vendored
View file

@ -38,10 +38,10 @@ if (!isProduction) {
const sassOutputStyle = isProduction ? "compressed" : "expanded", const sassOutputStyle = isProduction ? "compressed" : "expanded",
sassPaths = [ "bower_components", "node_modules" ], sassPaths = [ "bower_components", "node_modules" ],
autoprefixerSettings = { remove: false, cascade: false }, autoprefixerSettings = { remove: false, cascade: false },
vuePaths = [ "./bower_components", "./node_modules", "./resources/components", "./resources/assets/js" ]; vuePaths = [ "./bower_components", "./node_modules", "./resources/components", "./resources/js" ];
// Javascript files for the public site // Javascript files for the public site
const jsPublic = "resources/assets/js/app.js"; const jsPublic = "resources/js/app.js";
// Javascript libraries for the public site // Javascript libraries for the public site
const jsPublicLibs = [ const jsPublicLibs = [
@ -52,7 +52,7 @@ const jsPublicLibs = [
// Javascript files for the dashboard // Javascript files for the dashboard
const jsDashboard = [ const jsDashboard = [
"resources/assets/js/dashboard.js" "resources/js/dashboard.js"
]; ];
// Javascript libraries for the dashboard // Javascript libraries for the dashboard
@ -75,7 +75,7 @@ const cssDashboardLibs = [
// Paths to folders containing fonts that should be copied to public/fonts/ // Paths to folders containing fonts that should be copied to public/fonts/
const fontPaths = [ const fontPaths = [
"resources/assets/fonts/**" "resources/fonts/**"
]; ];
// Handle errors // Handle errors
@ -86,7 +86,7 @@ function handleError(err) {
// Process sass // Process sass
function processSass(filename) { function processSass(filename) {
const css = gulp.src(`resources/assets/sass/${filename}.scss`) const css = gulp.src(`resources/sass/${filename}.scss`)
.pipe(plumber(handleError)) .pipe(plumber(handleError))
.pipe(sassGlob()) .pipe(sassGlob())
.pipe(sass({ outputStyle: sassOutputStyle, includePaths: sassPaths })) .pipe(sass({ outputStyle: sassOutputStyle, includePaths: sassPaths }))
@ -243,9 +243,9 @@ gulp.task("watch", () => {
}); });
gulp.watch([ "app/**/*.php", "routes/**/*.php", "resources/views/**/*.blade.php" ], gulp.series(browserSyncReload)); gulp.watch([ "app/**/*.php", "routes/**/*.php", "resources/views/**/*.blade.php" ], gulp.series(browserSyncReload));
gulp.watch([ "resources/assets/js/**/app.js", "resources/assets/js/mixins/**/*.js", "resources/components/**/*.vue" ], gulp.series("js-public", browserSyncReload)); gulp.watch([ "resources/js/**/app.js", "resources/js/mixins/**/*.js", "resources/components/**/*.vue" ], gulp.series("js-public", browserSyncReload));
gulp.watch("resources/assets/js/**/dashboard.js", gulp.series("js-dashboard", browserSyncReload)); gulp.watch("resources/js/**/dashboard.js", gulp.series("js-dashboard", browserSyncReload));
gulp.watch("resources/assets/sass/**/*.scss", gulp.parallel("sass-public", "sass-dashboard", "sass-error")); gulp.watch("resources/sass/**/*.scss", gulp.parallel("sass-public", "sass-dashboard", "sass-error"));
}); });
// Task to run non-development tasks // Task to run non-development tasks

View file

@ -74,22 +74,22 @@ The following list of files and directories are where various pieces of the publ
* `resources/views/templates/base.blade.php`: The outer template for the entire website * `resources/views/templates/base.blade.php`: The outer template for the entire website
* `resources/views/templates/public.blade.php`: The inner template for the public site * `resources/views/templates/public.blade.php`: The inner template for the public site
* `resources/assets/fonts`: The folder containing website fonts (these get loaded into `public/fonts/` by the gulpfile) * `resources/fonts`: The folder containing website fonts (these get loaded into `public/fonts/` by the gulpfile)
* `resources/assets/js/app.js`: The main javascript file that loads the public site * `resources/js/app.js`: The main javascript file that loads the public site
* `resources/assets/js/mixins`: The folder containing Vue.js mixins that can be applied globally in `resources/assets/js/app.js` or in individual components * `resources/js/mixins`: The folder containing Vue.js mixins that can be applied globally in `resources/js/app.js` or in individual components
* `resources/assets/js/mixins/base-page.js`: The base-page mixin with page functionality that should be imported into all page components * `resources/js/mixins/base-page.js`: The base-page mixin with page functionality that should be imported into all page components
* `resources/components`: The folder containing Vue.js components * `resources/components`: The folder containing Vue.js components
* `resources/components/pages`: Page components that should be imported into vue-router in `resources/assets/js/app.js` * `resources/components/pages`: Page components that should be imported into vue-router in `resources/js/app.js`
* `resources/components/sections`: Section components (single-use per page) that should be imported into mixins or page components * `resources/components/sections`: Section components (single-use per page) that should be imported into mixins or page components
* `resources/components/partials`: Partial components (multi-use per page or section) that should be imported into mixins and/or page and section components * `resources/components/partials`: Partial components (multi-use per page or section) that should be imported into mixins and/or page and section components
* `resources/assets/sass/app.scss`: The main sass file for the public site * `resources/sass/app.scss`: The main sass file for the public site
* `resources/assets/sass/_fonts.scss`: Stylesheet containing font declarations and mixins declared to use those fonts in other stylesheets * `resources/sass/_fonts.scss`: Stylesheet containing font declarations and mixins declared to use those fonts in other stylesheets
* `resources/assets/sass/_var.scss`: Stylesheet containing variables to be used in other stylesheets * `resources/sass/_var.scss`: Stylesheet containing variables to be used in other stylesheets
* `resources/assets/sass/pages`: Stylesheets for page-specific styles wrapped in the respective page component class * `resources/sass/pages`: Stylesheets for page-specific styles wrapped in the respective page component class
* `resources/assets/sass/sections`: Stylesheets for section-specific styles wrapped in the respective section component class * `resources/sass/sections`: Stylesheets for section-specific styles wrapped in the respective section component class
* `resources/assets/sass/partials`: Stylessheets for partial-specific styles wrapped in the respective partial component class * `resources/sass/partials`: Stylessheets for partial-specific styles wrapped in the respective partial component class
* `resources/assets/sass/classes`: General stylesheets for classes that can be used anywhere * `resources/sass/classes`: General stylesheets for classes that can be used anywhere
* `resources/assets/sass/mixins`: Stylesheets declaring SCSS mixins for use in other stylesheets * `resources/sass/mixins`: Stylesheets declaring SCSS mixins for use in other stylesheets
Dependencies can be included with bower or npm and loaded either into the `jsPublicLibs` array in the gulpfile or imported in the javascript. Dependencies can be included with bower or npm and loaded either into the `jsPublicLibs` array in the gulpfile or imported in the javascript.

View file

@ -34,11 +34,11 @@ const sassOutputStyle = isProduction ? "compressed" : "expanded",
// Javascript files for the public site // Javascript files for the public site
const jsPublic = [ const jsPublic = [
"resources/assets/js/site-vars.js", "resources/js/site-vars.js",
"resources/assets/js/nav.js", "resources/js/nav.js",
"resources/assets/js/contact.js", "resources/js/contact.js",
"resources/assets/js/subscription.js", "resources/js/subscription.js",
"resources/assets/js/app.js" "resources/js/app.js"
]; ];
// Javascript libraries for the public site // Javascript libraries for the public site
@ -50,7 +50,7 @@ const jsPublicLibs = [
// Javascript files for the dashboard // Javascript files for the dashboard
const jsDashboard = [ const jsDashboard = [
"resources/assets/js/dashboard.js" "resources/js/dashboard.js"
]; ];
// Javascript libraries for the dashboard // Javascript libraries for the dashboard
@ -73,7 +73,7 @@ const cssDashboardLibs = [
// Paths to folders containing fonts that should be copied to public/fonts/ // Paths to folders containing fonts that should be copied to public/fonts/
const fontPaths = [ const fontPaths = [
"resources/assets/fonts/**" "resources/fonts/**"
]; ];
// Handle errors // Handle errors
@ -84,7 +84,7 @@ function handleError(err) {
// Process sass // Process sass
function processSass(filename) { function processSass(filename) {
const css = gulp.src(`resources/assets/sass/${filename}.scss`) const css = gulp.src(`resources/sass/${filename}.scss`)
.pipe(plumber(handleError)) .pipe(plumber(handleError))
.pipe(sassGlob()) .pipe(sassGlob())
.pipe(sass({ outputStyle: sassOutputStyle, includePaths: sassPaths })) .pipe(sass({ outputStyle: sassOutputStyle, includePaths: sassPaths }))
@ -201,8 +201,8 @@ gulp.task("watch", () => {
}); });
gulp.watch([ "app/**/*.php", "routes/**/*.php", "resources/views/**/*.blade.php" ], gulp.series(browserSyncReload)); gulp.watch([ "app/**/*.php", "routes/**/*.php", "resources/views/**/*.blade.php" ], gulp.series(browserSyncReload));
gulp.watch("resources/assets/js/**/*.js", gulp.series(gulp.parallel("js-public", "js-dashboard"), browserSyncReload)); gulp.watch("resources/js/**/*.js", gulp.series(gulp.parallel("js-public", "js-dashboard"), browserSyncReload));
gulp.watch("resources/assets/sass/**/*.scss", gulp.parallel("sass-public", "sass-dashboard", "sass-error")); gulp.watch("resources/sass/**/*.scss", gulp.parallel("sass-public", "sass-dashboard", "sass-error"));
}); });
// Task to run non-development tasks // Task to run non-development tasks