From 7c5808c8303d83c76cac72b96ad6c799b07444e7 Mon Sep 17 00:00:00 2001 From: Franck DAKIA Date: Fri, 26 Dec 2025 14:02:55 +0000 Subject: [PATCH] Refactoring --- app/Kernel.php | 1 - assets/css/app.css | 3 + assets/js/Example.jsx | 32 +- assets/js/app.js | 1 + config/mail.php | 9 +- config/queue.php | 2 +- .../Version20170407084225CreateUsersTable.php | 21 +- public/css/app.css | 585 +++++++++++++++++- tailwind.config.js | 15 +- vite.config.js | 57 +- 10 files changed, 666 insertions(+), 60 deletions(-) create mode 100644 assets/css/app.css diff --git a/app/Kernel.php b/app/Kernel.php index 3c44ab7e..c9907658 100644 --- a/app/Kernel.php +++ b/app/Kernel.php @@ -69,7 +69,6 @@ public function configurations(): array * Internal configuration of the framework */ \Bow\Configuration\LoggerConfiguration::class, - \Bow\Configuration\EnvConfiguration::class, \Bow\Cache\CacheConfiguration::class, \Bow\Mail\MailConfiguration::class, diff --git a/assets/css/app.css b/assets/css/app.css new file mode 100644 index 00000000..b5c61c95 --- /dev/null +++ b/assets/css/app.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/assets/js/Example.jsx b/assets/js/Example.jsx index 1c109a36..2c39c911 100644 --- a/assets/js/Example.jsx +++ b/assets/js/Example.jsx @@ -1,16 +1,16 @@ -import React, { Component } from 'react'; -import ReactDOM from 'react-dom'; - -export default class Example extends Component { - render() { - return ( -
- I'm an example React Component. -
- ); - } -} - -if (document.getElementById('main')) { - ReactDOM.render(, document.getElementById('main')); -} +import React, { Component } from 'react'; +import ReactDOM from 'react-dom'; + +export default class Example extends Component { + render() { + return ( +
+ I'm an example React Component. +
+ ); + } +} + +if (document.getElementById('main')) { + ReactDOM.render(, document.getElementById('main')); +} diff --git a/assets/js/app.js b/assets/js/app.js index a326af64..36f372c9 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -6,6 +6,7 @@ window.axios = require('axios'); window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; const token = document.querySelector('meta[name="csrf-token"]'); + if (token) { window.axios.defaults.headers.common['X-Csrf-Token'] = token.getAttribute('content'); } diff --git a/config/mail.php b/config/mail.php index f976fb46..703663c5 100644 --- a/config/mail.php +++ b/config/mail.php @@ -91,5 +91,12 @@ "username" => "Address information" ] ] - ] + ], + + /** + * Log driver configuration + */ + "log" => [ + "path" => sys_get_temp_dir() . '/bow/mails', + ], ]; diff --git a/config/queue.php b/config/queue.php index 1d9574c9..15e57da5 100644 --- a/config/queue.php +++ b/config/queue.php @@ -21,7 +21,7 @@ * The beanstalkd connexion */ "beanstalkd" => [ - "hostname" => "127.0.0.0", + "hostname" => "127.0.0.1", "port" => 11300, "timeout" => 10, "queue" => "default", diff --git a/migrations/Version20170407084225CreateUsersTable.php b/migrations/Version20170407084225CreateUsersTable.php index 43e0bca1..82cff066 100644 --- a/migrations/Version20170407084225CreateUsersTable.php +++ b/migrations/Version20170407084225CreateUsersTable.php @@ -10,18 +10,15 @@ class Version20170407084225CreateUsersTable extends Migration */ public function up(): void { - $this->create( - "users", - function (SQLGenerator $table) { - $table->addIncrement('id'); - $table->addString('name'); - $table->addString('email', ['unique' => true]); - $table->addString('description', ['nullable' => true]); - $table->addString('password'); - $table->addTimestamps(); - $table->withEngine('InnoDB'); - } - ); + $this->create("users", function (SQLGenerator $table) { + $table->addIncrement('id'); + $table->addString('name'); + $table->addString('email', ['unique' => true]); + $table->addString('description', ['nullable' => true]); + $table->addString('password'); + $table->addTimestamps(); + $table->withEngine('InnoDB'); + }); } /** diff --git a/public/css/app.css b/public/css/app.css index 28698a20..afe577fb 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -1 +1,584 @@ -#main{position:relative;margin:10% auto;width:550px;text-align:center;font-family:Lato,console,monospace,serif,"sans-serif"} \ No newline at end of file +*, ::before, ::after { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; + --tw-translate-x: 0; + --tw-translate-y: 0; + --tw-rotate: 0; + --tw-skew-x: 0; + --tw-skew-y: 0; + --tw-scale-x: 1; + --tw-scale-y: 1; + --tw-pan-x: ; + --tw-pan-y: ; + --tw-pinch-zoom: ; + --tw-scroll-snap-strictness: proximity; + --tw-gradient-from-position: ; + --tw-gradient-via-position: ; + --tw-gradient-to-position: ; + --tw-ordinal: ; + --tw-slashed-zero: ; + --tw-numeric-figure: ; + --tw-numeric-spacing: ; + --tw-numeric-fraction: ; + --tw-ring-inset: ; + --tw-ring-offset-width: 0px; + --tw-ring-offset-color: #fff; + --tw-ring-color: rgb(59 130 246 / 0.5); + --tw-ring-offset-shadow: 0 0 #0000; + --tw-ring-shadow: 0 0 #0000; + --tw-shadow: 0 0 #0000; + --tw-shadow-colored: 0 0 #0000; + --tw-blur: ; + --tw-brightness: ; + --tw-contrast: ; + --tw-grayscale: ; + --tw-hue-rotate: ; + --tw-invert: ; + --tw-saturate: ; + --tw-sepia: ; + --tw-drop-shadow: ; + --tw-backdrop-blur: ; + --tw-backdrop-brightness: ; + --tw-backdrop-contrast: ; + --tw-backdrop-grayscale: ; + --tw-backdrop-hue-rotate: ; + --tw-backdrop-invert: ; + --tw-backdrop-opacity: ; + --tw-backdrop-saturate: ; + --tw-backdrop-sepia: ; + --tw-contain-size: ; + --tw-contain-layout: ; + --tw-contain-paint: ; + --tw-contain-style: ; +} + +::backdrop { + --tw-border-spacing-x: 0; + --tw-border-spacing-y: 0; + --tw-translate-x: 0; + --tw-translate-y: 0; + --tw-rotate: 0; + --tw-skew-x: 0; + --tw-skew-y: 0; + --tw-scale-x: 1; + --tw-scale-y: 1; + --tw-pan-x: ; + --tw-pan-y: ; + --tw-pinch-zoom: ; + --tw-scroll-snap-strictness: proximity; + --tw-gradient-from-position: ; + --tw-gradient-via-position: ; + --tw-gradient-to-position: ; + --tw-ordinal: ; + --tw-slashed-zero: ; + --tw-numeric-figure: ; + --tw-numeric-spacing: ; + --tw-numeric-fraction: ; + --tw-ring-inset: ; + --tw-ring-offset-width: 0px; + --tw-ring-offset-color: #fff; + --tw-ring-color: rgb(59 130 246 / 0.5); + --tw-ring-offset-shadow: 0 0 #0000; + --tw-ring-shadow: 0 0 #0000; + --tw-shadow: 0 0 #0000; + --tw-shadow-colored: 0 0 #0000; + --tw-blur: ; + --tw-brightness: ; + --tw-contrast: ; + --tw-grayscale: ; + --tw-hue-rotate: ; + --tw-invert: ; + --tw-saturate: ; + --tw-sepia: ; + --tw-drop-shadow: ; + --tw-backdrop-blur: ; + --tw-backdrop-brightness: ; + --tw-backdrop-contrast: ; + --tw-backdrop-grayscale: ; + --tw-backdrop-hue-rotate: ; + --tw-backdrop-invert: ; + --tw-backdrop-opacity: ; + --tw-backdrop-saturate: ; + --tw-backdrop-sepia: ; + --tw-contain-size: ; + --tw-contain-layout: ; + --tw-contain-paint: ; + --tw-contain-style: ; +} + +/* +! tailwindcss v3.4.19 | MIT License | https://tailwindcss.com +*/ + +/* +1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4) +2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116) +*/ + +*, +::before, +::after { + box-sizing: border-box; + /* 1 */ + border-width: 0; + /* 2 */ + border-style: solid; + /* 2 */ + border-color: #e5e7eb; + /* 2 */ +} + +::before, +::after { + --tw-content: ''; +} + +/* +1. Use a consistent sensible line-height in all browsers. +2. Prevent adjustments of font size after orientation changes in iOS. +3. Use a more readable tab size. +4. Use the user's configured `sans` font-family by default. +5. Use the user's configured `sans` font-feature-settings by default. +6. Use the user's configured `sans` font-variation-settings by default. +7. Disable tap highlights on iOS +*/ + +html, +:host { + line-height: 1.5; + /* 1 */ + -webkit-text-size-adjust: 100%; + /* 2 */ + -moz-tab-size: 4; + /* 3 */ + -o-tab-size: 4; + tab-size: 4; + /* 3 */ + font-family: Figtree, ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + /* 4 */ + font-feature-settings: normal; + /* 5 */ + font-variation-settings: normal; + /* 6 */ + -webkit-tap-highlight-color: transparent; + /* 7 */ +} + +/* +1. Remove the margin in all browsers. +2. Inherit line-height from `html` so users can set them as a class directly on the `html` element. +*/ + +body { + margin: 0; + /* 1 */ + line-height: inherit; + /* 2 */ +} + +/* +1. Add the correct height in Firefox. +2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655) +3. Ensure horizontal rules are visible by default. +*/ + +hr { + height: 0; + /* 1 */ + color: inherit; + /* 2 */ + border-top-width: 1px; + /* 3 */ +} + +/* +Add the correct text decoration in Chrome, Edge, and Safari. +*/ + +abbr:where([title]) { + -webkit-text-decoration: underline dotted; + text-decoration: underline dotted; +} + +/* +Remove the default font size and weight for headings. +*/ + +h1, +h2, +h3, +h4, +h5, +h6 { + font-size: inherit; + font-weight: inherit; +} + +/* +Reset links to optimize for opt-in styling instead of opt-out. +*/ + +a { + color: inherit; + text-decoration: inherit; +} + +/* +Add the correct font weight in Edge and Safari. +*/ + +b, +strong { + font-weight: bolder; +} + +/* +1. Use the user's configured `mono` font-family by default. +2. Use the user's configured `mono` font-feature-settings by default. +3. Use the user's configured `mono` font-variation-settings by default. +4. Correct the odd `em` font sizing in all browsers. +*/ + +code, +kbd, +samp, +pre { + font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + /* 1 */ + font-feature-settings: normal; + /* 2 */ + font-variation-settings: normal; + /* 3 */ + font-size: 1em; + /* 4 */ +} + +/* +Add the correct font size in all browsers. +*/ + +small { + font-size: 80%; +} + +/* +Prevent `sub` and `sup` elements from affecting the line height in all browsers. +*/ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* +1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297) +2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016) +3. Remove gaps between table borders by default. +*/ + +table { + text-indent: 0; + /* 1 */ + border-color: inherit; + /* 2 */ + border-collapse: collapse; + /* 3 */ +} + +/* +1. Change the font styles in all browsers. +2. Remove the margin in Firefox and Safari. +3. Remove default padding in all browsers. +*/ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; + /* 1 */ + font-feature-settings: inherit; + /* 1 */ + font-variation-settings: inherit; + /* 1 */ + font-size: 100%; + /* 1 */ + font-weight: inherit; + /* 1 */ + line-height: inherit; + /* 1 */ + letter-spacing: inherit; + /* 1 */ + color: inherit; + /* 1 */ + margin: 0; + /* 2 */ + padding: 0; + /* 3 */ +} + +/* +Remove the inheritance of text transform in Edge and Firefox. +*/ + +button, +select { + text-transform: none; +} + +/* +1. Correct the inability to style clickable types in iOS and Safari. +2. Remove default button styles. +*/ + +button, +input:where([type='button']), +input:where([type='reset']), +input:where([type='submit']) { + -webkit-appearance: button; + /* 1 */ + background-color: transparent; + /* 2 */ + background-image: none; + /* 2 */ +} + +/* +Use the modern Firefox focus style for all focusable elements. +*/ + +:-moz-focusring { + outline: auto; +} + +/* +Remove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737) +*/ + +:-moz-ui-invalid { + box-shadow: none; +} + +/* +Add the correct vertical alignment in Chrome and Firefox. +*/ + +progress { + vertical-align: baseline; +} + +/* +Correct the cursor style of increment and decrement buttons in Safari. +*/ + +::-webkit-inner-spin-button, +::-webkit-outer-spin-button { + height: auto; +} + +/* +1. Correct the odd appearance in Chrome and Safari. +2. Correct the outline style in Safari. +*/ + +[type='search'] { + -webkit-appearance: textfield; + /* 1 */ + outline-offset: -2px; + /* 2 */ +} + +/* +Remove the inner padding in Chrome and Safari on macOS. +*/ + +::-webkit-search-decoration { + -webkit-appearance: none; +} + +/* +1. Correct the inability to style clickable types in iOS and Safari. +2. Change font properties to `inherit` in Safari. +*/ + +::-webkit-file-upload-button { + -webkit-appearance: button; + /* 1 */ + font: inherit; + /* 2 */ +} + +/* +Add the correct display in Chrome and Safari. +*/ + +summary { + display: list-item; +} + +/* +Removes the default spacing and border for appropriate elements. +*/ + +blockquote, +dl, +dd, +h1, +h2, +h3, +h4, +h5, +h6, +hr, +figure, +p, +pre { + margin: 0; +} + +fieldset { + margin: 0; + padding: 0; +} + +legend { + padding: 0; +} + +ol, +ul, +menu { + list-style: none; + margin: 0; + padding: 0; +} + +/* +Reset default styling for dialogs. +*/ + +dialog { + padding: 0; +} + +/* +Prevent resizing textareas horizontally by default. +*/ + +textarea { + resize: vertical; +} + +/* +1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300) +2. Set the default placeholder color to the user's configured gray 400 color. +*/ + +input::-moz-placeholder, textarea::-moz-placeholder { + opacity: 1; + /* 1 */ + color: #9ca3af; + /* 2 */ +} + +input::placeholder, +textarea::placeholder { + opacity: 1; + /* 1 */ + color: #9ca3af; + /* 2 */ +} + +/* +Set the default cursor for buttons. +*/ + +button, +[role="button"] { + cursor: pointer; +} + +/* +Make sure disabled buttons don't get the pointer cursor. +*/ + +:disabled { + cursor: default; +} + +/* +1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14) +2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210) + This can trigger a poorly considered lint error in some tools but is included by design. +*/ + +img, +svg, +video, +canvas, +audio, +iframe, +embed, +object { + display: block; + /* 1 */ + vertical-align: middle; + /* 2 */ +} + +/* +Constrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14) +*/ + +img, +video { + max-width: 100%; + height: auto; +} + +/* Make elements with the HTML hidden attribute stay hidden by default */ + +[hidden]:where(:not([hidden="until-found"])) { + display: none; +} + +.relative { + position: relative; +} + +.block { + display: block; +} + +.flex { + display: flex; +} + +.hidden { + display: none; +} + +.underline { + text-decoration-line: underline; +} + +.grayscale { + --tw-grayscale: grayscale(100%); + filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow); +} + +.filter { + filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow); +} diff --git a/tailwind.config.js b/tailwind.config.js index acb111d6..f6b2f2f9 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -3,10 +3,11 @@ import defaultTheme from "tailwindcss/defaultTheme"; /** @type {import('tailwindcss').Config} */ export default { content: [ - "./storage/views/*.php", - "./templates/**/*.blade.php", - "./templates/**/*.js", - "./templates/**/*.vue", + "./templates/**/*.{blade,tintin}.php", + "./templates/**/*.twig", + "./templates/**/*.{js,jsx,ts,tsx,vue}", + "./assets/js/**/*.{js,jsx,ts,tsx,vue}", + "./var/views/**/*.php", ], theme: { extend: { @@ -15,5 +16,9 @@ export default { }, }, }, - plugins: [], + plugins: [ + // require('@tailwindcss/forms'), + // require('@tailwindcss/typography'), + // Add more plugins as needed + ], }; diff --git a/vite.config.js b/vite.config.js index aa13fde7..f11bb773 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,52 +1,63 @@ -import { defineConfig } from "vite"; -import react from "@vitejs/plugin-react"; -import vue from "@vitejs/plugin-vue"; -import path from "path"; -import tailwindcss from "@tailwindcss/vite"; + +import { defineConfig } from 'vite'; +import vue from '@vitejs/plugin-vue'; +import react from '@vitejs/plugin-react'; +import path from 'path'; +import tailwindcss from '@tailwindcss/vite'; export default defineConfig({ - plugins: [react(), vue(), tailwindcss()], + plugins: [ + vue(), + react(), + tailwindcss(), + ], root: path.resolve(__dirname, 'assets'), build: { outDir: path.resolve(__dirname, 'public'), emptyOutDir: true, rollupOptions: { input: { - app: path.resolve(__dirname, 'assets/js/app.js') + app: path.resolve(__dirname, 'assets/js/app.js'), }, output: { entryFileNames: 'js/[name].js', chunkFileNames: 'js/[name]-[hash].js', assetFileNames: (assetInfo) => { - const info = assetInfo.name.split('.') - const ext = info[info.length - 1] + // Place images/fonts in their own folders, css in css/ + const ext = assetInfo.name.split('.').pop(); if (/\.(css|scss|sass|less)$/.test(assetInfo.name)) { - return 'css/[name]-[hash][extname]' + return 'css/[name]-[hash][extname]'; + } + if (/\.(png|jpe?g|gif|svg|webp|ico)$/.test(assetInfo.name)) { + return 'img/[name]-[hash][extname]'; + } + if (/\.(woff2?|eot|ttf|otf)$/.test(assetInfo.name)) { + return 'fonts/[name]-[hash][extname]'; } - return `${ext}/[name]-[hash][extname]` - } - } - } + return '[ext]/[name]-[hash][extname]'; + }, + }, + }, }, css: { preprocessorOptions: { scss: { - additionalData: `@import "${path.resolve(__dirname, 'assets/sass/variables.scss')}";` + additionalData: `@import "${path.resolve(__dirname, 'assets/sass/variables.scss')}";`, }, less: { - javascriptEnabled: true - } - } + javascriptEnabled: true, + }, + }, }, resolve: { alias: { '@': path.resolve(__dirname, 'assets/js'), - '@sass': path.resolve(__dirname, 'assets/sass') - } + '@sass': path.resolve(__dirname, 'assets/sass'), + }, }, server: { watch: { - usePolling: true - } - } + usePolling: true, + }, + }, });