From ded660b2c405a8b54f7feb4733ad18a384bd5577 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 20 Apr 2024 00:55:21 -0600 Subject: [PATCH 1/2] Update webpack config --- webpack.mix.js | 54 ++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/webpack.mix.js b/webpack.mix.js index 8d78b82c8..aadcac397 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -1,8 +1,10 @@ let mix = require('laravel-mix'); const fs = require("fs"); +const path = require("path"); mix.before(() => { - fs.rmSync('public/js', { recursive: true, force: true }); + fs.rmSync('public/css', { recursive: true, force: true }); + fs.rmSync('public/js', { recursive: true, force: true }); }); @@ -46,31 +48,35 @@ mix.version(); const TerserPlugin = require('terser-webpack-plugin'); mix.options({ - processCssUrls: false, - terser: { - parallel: true, - terserOptions: { - compress: true, - output: { - comments: false - } - } - } + processCssUrls: false, + terser: { + parallel: true, + terserOptions: { + compress: true, + output: { + comments: false + } + } + } }) +mix.alias({ + '@': path.join(__dirname, 'resources/assets/components'), + '~': path.join(__dirname, 'resources/assets/js/components'), +}); mix.webpackConfig({ - optimization: { - providedExports: false, - sideEffects: false, - usedExports: false, - minimize: true, - minimizer: [ new TerserPlugin({ - extractComments: false, - })] - }, - output: { - chunkFilename: 'js/[name].[chunkhash].js', - } + optimization: { + providedExports: false, + sideEffects: false, + usedExports: false, + minimize: true, + minimizer: [ new TerserPlugin({ + extractComments: false, + })] + }, + output: { + chunkFilename: 'js/[name].[chunkhash].js', + } }); mix.autoload({ - jquery: ['$', 'jQuery', 'window.jQuery'] + jquery: ['$', 'jQuery', 'window.jQuery'] }); From 87ee0633fe652621d7fc200a87f5f426eececb97 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 20 Apr 2024 01:26:51 -0600 Subject: [PATCH 2/2] Update assets, move presenters --- .../components/partials/post/PostContent.vue | 2 +- .../presenter/MixedAlbumPresenter.vue | 75 +++++++ .../presenter/PhotoAlbumPresenter.vue | 188 ++++++++++++++++++ .../components/presenter/PhotoPresenter.vue | 160 +++++++++++++++ .../presenter/VideoAlbumPresenter.vue | 44 ++++ .../components/presenter/VideoPresenter.vue | 90 +++++++++ resources/assets/js/landing.js | 10 +- resources/assets/js/profile.js | 10 +- resources/assets/js/spa.js | 10 +- resources/assets/js/status.js | 20 +- resources/assets/js/timeline.js | 12 +- 11 files changed, 594 insertions(+), 27 deletions(-) create mode 100644 resources/assets/components/presenter/MixedAlbumPresenter.vue create mode 100644 resources/assets/components/presenter/PhotoAlbumPresenter.vue create mode 100644 resources/assets/components/presenter/PhotoPresenter.vue create mode 100644 resources/assets/components/presenter/VideoAlbumPresenter.vue create mode 100644 resources/assets/components/presenter/VideoPresenter.vue diff --git a/resources/assets/components/partials/post/PostContent.vue b/resources/assets/components/partials/post/PostContent.vue index 0a88acb19..9672d52e9 100644 --- a/resources/assets/components/partials/post/PostContent.vue +++ b/resources/assets/components/partials/post/PostContent.vue @@ -169,7 +169,7 @@ diff --git a/resources/assets/components/presenter/PhotoAlbumPresenter.vue b/resources/assets/components/presenter/PhotoAlbumPresenter.vue new file mode 100644 index 000000000..3adda10df --- /dev/null +++ b/resources/assets/components/presenter/PhotoAlbumPresenter.vue @@ -0,0 +1,188 @@ + + + + + + diff --git a/resources/assets/components/presenter/PhotoPresenter.vue b/resources/assets/components/presenter/PhotoPresenter.vue new file mode 100644 index 000000000..eca896b0f --- /dev/null +++ b/resources/assets/components/presenter/PhotoPresenter.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/resources/assets/components/presenter/VideoAlbumPresenter.vue b/resources/assets/components/presenter/VideoAlbumPresenter.vue new file mode 100644 index 000000000..97285b158 --- /dev/null +++ b/resources/assets/components/presenter/VideoAlbumPresenter.vue @@ -0,0 +1,44 @@ + + + diff --git a/resources/assets/components/presenter/VideoPresenter.vue b/resources/assets/components/presenter/VideoPresenter.vue new file mode 100644 index 000000000..217dbb3de --- /dev/null +++ b/resources/assets/components/presenter/VideoPresenter.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/resources/assets/js/landing.js b/resources/assets/js/landing.js index 6d903bcb5..cdaf0233b 100644 --- a/resources/assets/js/landing.js +++ b/resources/assets/js/landing.js @@ -48,27 +48,27 @@ Vue.use(VueTimeago, { Vue.component( 'photo-presenter', - require('./components/presenter/PhotoPresenter.vue').default + require('./../components/presenter/PhotoPresenter.vue').default ); Vue.component( 'video-presenter', - require('./components/presenter/VideoPresenter.vue').default + require('./../components/presenter/VideoPresenter.vue').default ); Vue.component( 'photo-album-presenter', - require('./components/presenter/PhotoAlbumPresenter.vue').default + require('./../components/presenter/PhotoAlbumPresenter.vue').default ); Vue.component( 'video-album-presenter', - require('./components/presenter/VideoAlbumPresenter.vue').default + require('./../components/presenter/VideoAlbumPresenter.vue').default ); Vue.component( 'mixed-album-presenter', - require('./components/presenter/MixedAlbumPresenter.vue').default + require('./../components/presenter/MixedAlbumPresenter.vue').default ); Vue.component( diff --git a/resources/assets/js/profile.js b/resources/assets/js/profile.js index 452445ed6..ab72c974e 100644 --- a/resources/assets/js/profile.js +++ b/resources/assets/js/profile.js @@ -1,26 +1,26 @@ Vue.component( 'photo-presenter', - require('./components/presenter/PhotoPresenter.vue').default + require('./../components/presenter/PhotoPresenter.vue').default ); Vue.component( 'video-presenter', - require('./components/presenter/VideoPresenter.vue').default + require('./../components/presenter/VideoPresenter.vue').default ); Vue.component( 'photo-album-presenter', - require('./components/presenter/PhotoAlbumPresenter.vue').default + require('./../components/presenter/PhotoAlbumPresenter.vue').default ); Vue.component( 'video-album-presenter', - require('./components/presenter/VideoAlbumPresenter.vue').default + require('./../components/presenter/VideoAlbumPresenter.vue').default ); Vue.component( 'mixed-album-presenter', - require('./components/presenter/MixedAlbumPresenter.vue').default + require('./../components/presenter/MixedAlbumPresenter.vue').default ); Vue.component( diff --git a/resources/assets/js/spa.js b/resources/assets/js/spa.js index be31b5371..c99763170 100644 --- a/resources/assets/js/spa.js +++ b/resources/assets/js/spa.js @@ -60,27 +60,27 @@ Vue.component( Vue.component( 'photo-presenter', - require('./components/presenter/PhotoPresenter.vue').default + require('./../components/presenter/PhotoPresenter.vue').default ); Vue.component( 'video-presenter', - require('./components/presenter/VideoPresenter.vue').default + require('./../components/presenter/VideoPresenter.vue').default ); Vue.component( 'photo-album-presenter', - require('./components/presenter/PhotoAlbumPresenter.vue').default + require('./../components/presenter/PhotoAlbumPresenter.vue').default ); Vue.component( 'video-album-presenter', - require('./components/presenter/VideoAlbumPresenter.vue').default + require('./../components/presenter/VideoAlbumPresenter.vue').default ); Vue.component( 'mixed-album-presenter', - require('./components/presenter/MixedAlbumPresenter.vue').default + require('./../components/presenter/MixedAlbumPresenter.vue').default ); Vue.component( diff --git a/resources/assets/js/status.js b/resources/assets/js/status.js index ddd29a4ef..43a1a76ae 100644 --- a/resources/assets/js/status.js +++ b/resources/assets/js/status.js @@ -1,26 +1,26 @@ Vue.component( 'photo-presenter', - require('./components/presenter/PhotoPresenter.vue').default + require('./../components/presenter/PhotoPresenter.vue').default ); Vue.component( 'video-presenter', - require('./components/presenter/VideoPresenter.vue').default + require('./../components/presenter/VideoPresenter.vue').default ); Vue.component( 'photo-album-presenter', - require('./components/presenter/PhotoAlbumPresenter.vue').default + require('./../components/presenter/PhotoAlbumPresenter.vue').default ); Vue.component( 'video-album-presenter', - require('./components/presenter/VideoAlbumPresenter.vue').default + require('./../components/presenter/VideoAlbumPresenter.vue').default ); Vue.component( 'mixed-album-presenter', - require('./components/presenter/MixedAlbumPresenter.vue').default + require('./../components/presenter/MixedAlbumPresenter.vue').default ); Vue.component( @@ -32,3 +32,13 @@ Vue.component( 'post-component', require('./components/PostComponent.vue').default ); + +// Vue.component( +// 'post-next', +// require('./components/PostNext.vue').default +// ); + +// Vue.component( +// 'video-component', +// require('./components/VideoComponent.vue').default +// ); diff --git a/resources/assets/js/timeline.js b/resources/assets/js/timeline.js index 5858ac8e3..8858c3691 100644 --- a/resources/assets/js/timeline.js +++ b/resources/assets/js/timeline.js @@ -5,27 +5,27 @@ Vue.component( Vue.component( 'photo-presenter', - require('./components/presenter/PhotoPresenter.vue').default + require('./../components/presenter/PhotoPresenter.vue').default ); Vue.component( 'video-presenter', - require('./components/presenter/VideoPresenter.vue').default + require('./../components/presenter/VideoPresenter.vue').default ); Vue.component( 'photo-album-presenter', - require('./components/presenter/PhotoAlbumPresenter.vue').default + require('./../components/presenter/PhotoAlbumPresenter.vue').default ); Vue.component( 'video-album-presenter', - require('./components/presenter/VideoAlbumPresenter.vue').default + require('./../components/presenter/VideoAlbumPresenter.vue').default ); Vue.component( 'mixed-album-presenter', - require('./components/presenter/MixedAlbumPresenter.vue').default + require('./../components/presenter/MixedAlbumPresenter.vue').default ); Vue.component( @@ -46,4 +46,4 @@ Vue.component( Vue.component( 'story-component', require('./components/StoryTimelineComponent.vue').default -); \ No newline at end of file +);