Skip to content

Commit

Permalink
Update frontend dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
driftingly committed Apr 26, 2023
1 parent 9b13425 commit 72bc692
Show file tree
Hide file tree
Showing 10 changed files with 1,274 additions and 2,860 deletions.
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx --no-install lint-staged
3,900 changes: 1,180 additions & 2,720 deletions package-lock.json

Large diffs are not rendered by default.

34 changes: 18 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@
"build": "vite build"
},
"devDependencies": {
"autoprefixer": "^10.2.4",
"@tailwindcss/typography": "^0.5.9",
"@vitejs/plugin-vue": "^4.1.0",
"autoprefixer": "^10.4.14",
"axios": "^0.25",
"laravel-vite-plugin": "^0.6.0",
"laravel-vite-plugin": "^0.7.4",
"lodash": "^4.17.21",
"postcss": "^8.2.6",
"postcss": "^8.4.22",
"resolve-url-loader": "^5.0.0",
"tailwindcss": "^2.0.3",
"vite": "^3.0.2",
"vue": "^2.6.12",
"vue-loader": "^15.9.6",
"tailwindcss": "^3.3.1",
"vite": "^4.2.2",
"vue": "^3.2.47",
"vue-loader": "^17.0.1",
"vue-template-compiler": "^2.6.12"
},
"prettier": {
Expand All @@ -24,18 +26,18 @@
"printWidth": 80
},
"dependencies": {
"@tailwindcss/typography": "^0.4.1",
"@vitejs/plugin-vue2": "^1.1.2",
"husky": "^4.3.8",
"lint-staged": "^10.5.4",
"prettier": "^2.2.1",
"stylelint": "^13.11.0",
"stylelint-config-standard": "^20.0.0",
"vue": "^2.7.0"
"husky": "^8.0.3",
"lint-staged": "^13.2.1",
"prettier": "^2.8.7",
"stylelint": "^15.5.0",
"stylelint-config-standard": "^33.0.0"
},
"lint-staged": {
"**/*.php*": [
"vendor/bin/duster lint"
],
"*.(css|scss)": [
"stylelint"
"stylelint --config=node_modules/stylelint-config-standard/index.js"
],
"resources/**/*.(js|ts|tsx|css|vue)": [
"node_modules/.bin/prettier --write"
Expand Down
1 change: 0 additions & 1 deletion public/css/app.css.map

This file was deleted.

29 changes: 5 additions & 24 deletions resources/js/app.js
Original file line number Diff line number Diff line change
@@ -1,29 +1,10 @@
/**
* First we will load all of this project's JavaScript dependencies which
* includes Vue and other libraries. It is a great starting point when
* building robust, powerful web applications using Vue and Laravel.
*/

import './bootstrap';

import Vue from 'vue';

import { createApp } from 'vue';
import OutsideClick from './directives/OutsideClick';
import LanguageSelect from './components/LanguageSelect.vue';

/**
* Directives
*/
Vue.directive('outside-click', OutsideClick);
const app = createApp({});

/**
* Components
*/
Vue.component('language-select', LanguageSelect);
app.component('language-select', LanguageSelect);
app.directive('outside-click', OutsideClick);

/**
* Application instance
*/
const app = new Vue({
el: '#app',
});
app.mount('#app');
30 changes: 0 additions & 30 deletions resources/js/bootstrap.js

This file was deleted.

39 changes: 22 additions & 17 deletions resources/js/components/LanguageSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,30 +60,35 @@
</template>

<script>
import { ref, onMounted } from 'vue';
export default {
props: ['languages', 'currentLanguage'],
mounted() {
this.selected = this.currentLanguage;
},
setup(props) {
const isOpen = ref(false);
const selected = ref(null);
data() {
return {
isOpen: false,
selected: null,
};
},
onMounted(() => {
selected.value = props.currentLanguage;
});
methods: {
handleSelect(languageObject) {
this.selected = languageObject.language_name_native;
const handleSelect = (languageObject) => {
selected.value = languageObject.language_name_native;
window.location.href = languageObject.language_url;
this.isOpen = false;
},
isOpen.value = false;
};
const hide = () => {
isOpen.value = false;
};
hide() {
this.isOpen = false;
},
return {
isOpen,
selected,
handleSelect,
hide,
};
},
};
</script>
21 changes: 11 additions & 10 deletions resources/js/directives/OutsideClick.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
export default {
bind(el, binding, vnode) {
const outsideClickHandler = (e) => {
mounted(el, binding) {
el.clickOutsideEvent = (e) => {
const { handleClose, ignore } = binding.value;
let clickedIgnoredElement = false;

ignore.forEach((refName) => {
if (!clickedIgnoredElement) {
const ignoredElement = vnode.context.$refs[refName];
const ignoredElement = binding.instance.$refs[refName];
clickedIgnoredElement = ignoredElement.contains(e.target);
}
});

if (!el.contains(e.target) && !clickedIgnoredElement) {
vnode.context[handleClose]();
binding.instance[handleClose]();
}
};
document.addEventListener('click', outsideClickHandler);
document.addEventListener('touchstart', outsideClickHandler);
},

unbind() {
document.removeEventListener('click', outsideClickHandler);
document.removeEventListener('touchstart', outsideClickHandler);
document.addEventListener('click', el.clickOutsideEvent);
document.addEventListener('touchstart', el.clickOutsideEvent);
},
unmounted: function (el) {
document.removeEventListener('click', el.el.clickOutsideEvent);
document.removeEventListener('touchstart', el.clickOutsideEvent);
},
};
66 changes: 30 additions & 36 deletions tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,38 +1,32 @@
module.exports = {
purge: [
'./resources/**/*.blade.php',
'./resources/**/*.js',
'./resources/**/*.vue',
],
darkMode: false, // or 'media' or 'class'
theme: {
colors: {
'gray-50': '#FAFAFA',
'gray-100': '#F3F4F6',
'gray-200': '#E4E4E7',
'gray-500': '#71717A',
'gray-700': '#2E3036',
'red-300': '#DE8888',
'yellow-300': '#F2D987',
'green-300': '#5AC984',
'blue-300': '#75B5E2',
'blue-500': '#1381BE',
'blue-600': '#0D6A9B',
'white': '#FFFFFF',
content: [
'./resources/**/*.blade.php',
'./resources/**/*.js',
'./resources/**/*.vue',
],
theme: {
colors: {
'gray-50': '#FAFAFA',
'gray-100': '#F3F4F6',
'gray-200': '#E4E4E7',
'gray-500': '#71717A',
'gray-700': '#2E3036',
'red-300': '#DE8888',
'yellow-300': '#F2D987',
'green-300': '#5AC984',
'blue-300': '#75B5E2',
'blue-500': '#1381BE',
'blue-600': '#0D6A9B',
'white': '#FFFFFF',
},
fontSize: {
'4xl': '2.25rem',
'5xl': '2.5rem',
'xl': '1.3rem',
},
extend: {},
},
fontSize: {
'4xl': '2.25rem',
'5xl': '2.5rem',
'xl': '1.3rem',
},
extend: {},
},
variants: {
extend: {
fontWeight: ['hover', 'focus'],
},
},
plugins: [
require('@tailwindcss/typography'),
],
}
plugins: [
require('@tailwindcss/typography'),
],
}
10 changes: 4 additions & 6 deletions vite.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { defineConfig } from 'vite';
import laravel from 'laravel-vite-plugin';
import vue from '@vitejs/plugin-vue2';
import vue from '@vitejs/plugin-vue';

export default defineConfig(({command}) => ({
export default defineConfig({
plugins: [
laravel({
input: [
Expand All @@ -22,9 +22,7 @@ export default defineConfig(({command}) => ({
],
resolve: {
alias: {
vue: command === 'serve'
? 'node_modules/vue/dist/vue.esm.browser.js'
: 'node_modules/vue/dist/vue.esm.browser.min.js',
vue: 'vue/dist/vue.esm-bundler.js',
},
},
}));
});

0 comments on commit 72bc692

Please sign in to comment.