diff --git a/.eslintrc.json b/.eslintrc.json index 53398ab..42a2da7 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -29,7 +29,14 @@ "sourceType": "module" }, "plugins": ["vue", "@typescript-eslint"], - "ignorePatterns": ["webpack.mix.js", "**/vendor/*.js", "**/vendor/**/*.js"], + "ignorePatterns": [ + "webpack.mix.js", + "**/*.php", + "**/*.svg", + "**/vendor/*.js", + "**/vendor/**/*.js", + "**/vendor/**/*.scss" + ], "rules": { "indent": ["error", 4, { "SwitchCase": 1 }], "linebreak-style": ["error", "unix"], diff --git a/app/Http/Middleware/SecureHeaders.php b/app/Http/Middleware/SecureHeaders.php index 50a5b92..cb1dc2a 100644 --- a/app/Http/Middleware/SecureHeaders.php +++ b/app/Http/Middleware/SecureHeaders.php @@ -63,7 +63,11 @@ class SecureHeaders 'https://recaptcha.google.com/recaptcha/', 'https://www.google.com/maps/' ]) . ';', - "font-src 'self' data: https://fonts.gstatic.com;", + "font-src 'self' data: " . \implode(' ', [ + // * VITE DEV + config('app.debug') ? "https://vite.{$host}:4443" : '', + 'https://fonts.gstatic.com;' + ]) . ';', // ! Using CKEditor will must have unsafe-inline style // phpcs:ignore Generic.Files.LineLength.TooLong "style-src 'self' 'unsafe-inline' " . \implode(' ', [ diff --git a/resources/assets/fonts/Basecoat-Bold.woff b/resources/assets/fonts/Basecoat-Bold.woff index cd17041..564fd75 100644 Binary files a/resources/assets/fonts/Basecoat-Bold.woff and b/resources/assets/fonts/Basecoat-Bold.woff differ diff --git a/resources/assets/fonts/Basecoat-Bold.woff2 b/resources/assets/fonts/Basecoat-Bold.woff2 index 49cc628..cab2d52 100644 Binary files a/resources/assets/fonts/Basecoat-Bold.woff2 and b/resources/assets/fonts/Basecoat-Bold.woff2 differ diff --git a/resources/assets/fonts/Basecoat-Regular.woff b/resources/assets/fonts/Basecoat-Regular.woff index cb265d6..11538c7 100644 Binary files a/resources/assets/fonts/Basecoat-Regular.woff and b/resources/assets/fonts/Basecoat-Regular.woff differ diff --git a/resources/assets/fonts/Basecoat-Regular.woff2 b/resources/assets/fonts/Basecoat-Regular.woff2 index d0ddfbd..6a10253 100644 Binary files a/resources/assets/fonts/Basecoat-Regular.woff2 and b/resources/assets/fonts/Basecoat-Regular.woff2 differ diff --git a/resources/assets/fonts/ReadexPro-Bold.woff b/resources/assets/fonts/ReadexPro-Bold.woff index 313ed5e..816a9f5 100644 Binary files a/resources/assets/fonts/ReadexPro-Bold.woff and b/resources/assets/fonts/ReadexPro-Bold.woff differ diff --git a/resources/assets/fonts/ReadexPro-Bold.woff2 b/resources/assets/fonts/ReadexPro-Bold.woff2 index 9626750..4c6a66a 100644 Binary files a/resources/assets/fonts/ReadexPro-Bold.woff2 and b/resources/assets/fonts/ReadexPro-Bold.woff2 differ diff --git a/resources/assets/fonts/ReadexPro-Regular.woff b/resources/assets/fonts/ReadexPro-Regular.woff index 11eefe5..9b3149a 100644 Binary files a/resources/assets/fonts/ReadexPro-Regular.woff and b/resources/assets/fonts/ReadexPro-Regular.woff differ diff --git a/resources/assets/fonts/ReadexPro-Regular.woff2 b/resources/assets/fonts/ReadexPro-Regular.woff2 index 70af249..616d856 100644 Binary files a/resources/assets/fonts/ReadexPro-Regular.woff2 and b/resources/assets/fonts/ReadexPro-Regular.woff2 differ diff --git a/resources/assets/fonts/Rufina-Bold.woff b/resources/assets/fonts/Rufina-Bold.woff index dd6cdf3..0b0cbf9 100644 Binary files a/resources/assets/fonts/Rufina-Bold.woff and b/resources/assets/fonts/Rufina-Bold.woff differ diff --git a/resources/assets/fonts/Rufina-Bold.woff2 b/resources/assets/fonts/Rufina-Bold.woff2 index 5d8c990..637e7f9 100644 Binary files a/resources/assets/fonts/Rufina-Bold.woff2 and b/resources/assets/fonts/Rufina-Bold.woff2 differ diff --git a/resources/assets/fonts/Rufina-Regular.woff b/resources/assets/fonts/Rufina-Regular.woff index af0250f..d3fcc29 100644 Binary files a/resources/assets/fonts/Rufina-Regular.woff and b/resources/assets/fonts/Rufina-Regular.woff differ diff --git a/resources/assets/fonts/Rufina-Regular.woff2 b/resources/assets/fonts/Rufina-Regular.woff2 index d8fc012..a3672c0 100644 Binary files a/resources/assets/fonts/Rufina-Regular.woff2 and b/resources/assets/fonts/Rufina-Regular.woff2 differ diff --git a/resources/assets/fonts/Sheldon.woff b/resources/assets/fonts/Sheldon.woff index 41b49c5..38b6bb9 100644 Binary files a/resources/assets/fonts/Sheldon.woff and b/resources/assets/fonts/Sheldon.woff differ diff --git a/resources/assets/fonts/Sheldon.woff2 b/resources/assets/fonts/Sheldon.woff2 index 0f06deb..bbedc9e 100644 Binary files a/resources/assets/fonts/Sheldon.woff2 and b/resources/assets/fonts/Sheldon.woff2 differ diff --git a/resources/assets/images/layout/footer-bg-mobile.svg b/resources/assets/images/layout/footer-bg-mobile.svg new file mode 100644 index 0000000..e51f7e2 --- /dev/null +++ b/resources/assets/images/layout/footer-bg-mobile.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/resources/assets/images/layout/footer-bg.svg b/resources/assets/images/layout/footer-bg.svg new file mode 100644 index 0000000..3fbf1a2 --- /dev/null +++ b/resources/assets/images/layout/footer-bg.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/resources/assets/images/layout/footer-h-bar.svg b/resources/assets/images/layout/footer-h-bar.svg new file mode 100644 index 0000000..435d822 --- /dev/null +++ b/resources/assets/images/layout/footer-h-bar.svg @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/resources/assets/images/layout/footer-left-logo.svg b/resources/assets/images/layout/footer-left-logo.svg new file mode 100644 index 0000000..caa641b --- /dev/null +++ b/resources/assets/images/layout/footer-left-logo.svg @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/assets/images/layout/footer-right-logo.svg b/resources/assets/images/layout/footer-right-logo.svg new file mode 100644 index 0000000..4b95004 --- /dev/null +++ b/resources/assets/images/layout/footer-right-logo.svg @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/assets/images/layout/footer-v-bar.svg b/resources/assets/images/layout/footer-v-bar.svg new file mode 100644 index 0000000..1ef6200 --- /dev/null +++ b/resources/assets/images/layout/footer-v-bar.svg @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/resources/assets/images/socials/facebook-logo.svg b/resources/assets/images/socials/facebook-logo.svg new file mode 100644 index 0000000..2a0c222 --- /dev/null +++ b/resources/assets/images/socials/facebook-logo.svg @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/resources/assets/images/socials/instagram-logo.svg b/resources/assets/images/socials/instagram-logo.svg new file mode 100644 index 0000000..3a4cdf7 --- /dev/null +++ b/resources/assets/images/socials/instagram-logo.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + diff --git a/resources/assets/images/socials/linkedin-logo.svg b/resources/assets/images/socials/linkedin-logo.svg new file mode 100644 index 0000000..b089897 --- /dev/null +++ b/resources/assets/images/socials/linkedin-logo.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + diff --git a/resources/sass/fo/base/_bootstrap-overload.scss b/resources/sass/fo/base/_bootstrap-overload.scss index a791e79..1d02e16 100644 --- a/resources/sass/fo/base/_bootstrap-overload.scss +++ b/resources/sass/fo/base/_bootstrap-overload.scss @@ -1,4 +1,4 @@ .nav-link.active { - color: $primary; - font-weight: bold; + color: $primary; + font-weight: bold; } diff --git a/resources/sass/fo/base/_fonts.scss b/resources/sass/fo/base/_fonts.scss index c693cd6..a276cfe 100644 --- a/resources/sass/fo/base/_fonts.scss +++ b/resources/sass/fo/base/_fonts.scss @@ -57,6 +57,7 @@ font-family: Sheldon; font-style: normal; font-weight: 500; + size-adjust: 160%; src: url('@/fonts/Sheldon.woff2') format('woff2'), url('@/fonts/Sheldon.woff') format('woff'); } diff --git a/resources/sass/fo/base/_layout.scss b/resources/sass/fo/base/_layout.scss index 6669bea..7c4324e 100644 --- a/resources/sass/fo/base/_layout.scss +++ b/resources/sass/fo/base/_layout.scss @@ -1,44 +1,98 @@ .main-menu { - .center-main-menu-text { - font-family: 'Readex Pro', Arial, Helvetica, sans-serif; - font-weight: bold; - } + .center-main-menu-text { + font-family: 'Readex Pro', Arial, Helvetica, sans-serif; + font-weight: bold; + } - .offcanvas-main-menu { - height: inherit !important; - } + .offcanvas-main-menu { + height: inherit !important; + } - #offcanvas-nav-menu { - background-color: $bg-white; - background-image: url('@/images/layout/links-menu-bg-mobile.svg'); + #offcanvas-nav-menu { + background-color: $bg-white; + background-image: url('@/images/layout/links-menu-bg-mobile.svg'); + background-position: center; + background-repeat: no-repeat; + background-size: 100% 100%; + + @include media-breakpoint-up(md) { + background-image: url('@/images/layout/links-menu-bg.svg'); + } + + hr { + position: relative; + width: 90vw; + border-top-width: 0.2rem; + margin: 0 auto; + opacity: 1; + } + + .offcanvas-body { + .wrapper { + background-image: url('@/images/layout/bg-compass.svg'); + background-position-x: 43vw; + background-position-y: 96%; + background-repeat: no-repeat; + background-size: 64vw; + + @include media-breakpoint-up(md) { + background-image:initial; + } + } + + .right-bg-cell { + @include media-breakpoint-up(md) { + background-image: url('@/images/layout/bg-compass.svg'); + background-position-x: center; + background-position-y: center; + background-repeat: no-repeat; + background-size: 36vw; + } + + @include media-breakpoint-up(lg) { + background-position-x: 90%; + background-position-y: center; + background-repeat: no-repeat; + } + } + } + } +} + +.main-footer { + background-image: url('@/images/layout/footer-bg-mobile.svg'); background-position: center; background-repeat: no-repeat; background-size: 100% 100%; - @include media-breakpoint-up(md) { - background-image: url('@/images/layout/links-menu-bg.svg'); + .container-fluid { + .row { + padding: 2rem 0; + + &:nth-child(2),&:nth-child(3) { + padding-bottom: 3rem; + background-image: url('@/images/layout/footer-h-bar.svg'); + background-position: center bottom; + background-repeat: no-repeat; + background-size: 100% .3rem; + } + + &:nth-child(3) { + padding-bottom: 5rem; + background-position: center 92%; + } + } } - hr { - position: relative; - width: 90vw; - border-top-width: 0.2rem; - margin: 0 auto; - opacity: 1; + .footer-header { + letter-spacing: .1rem; } - .offcanvas-body { - background-image: url('@/images/layout/bg-compass.svg'); - background-position-x: 43vw; - background-position-y: 96%; - background-size: 64vw; - - @include media-breakpoint-up(md) { - background-image: url('@/images/layout/links-menu-bg.svg'); - background-position-x: 85%; - background-position-y: center; - background-size: 47rem; - } + .social-icon { + width: 4rem; + } + + a,span { + font-family: 'Readex Pro', sans-serif !important; } - } } diff --git a/resources/sass/fo/utilities/_bootstrap-variables.scss b/resources/sass/fo/utilities/_bootstrap-variables.scss index bf7423a..58bc9ab 100644 --- a/resources/sass/fo/utilities/_bootstrap-variables.scss +++ b/resources/sass/fo/utilities/_bootstrap-variables.scss @@ -14,23 +14,23 @@ $danger: $color-danger; $light: $color-light; $dark: $color-dark; $theme-colors: ( - primary: $primary, - secondary: $secondary, - tertiary: $tertiary, - quad: $quad, - quint: $quint, - success: $success, - info: $info, - warning: $warning, - danger: $danger, - light: $light, - dark: $dark, + primary: $primary, + secondary: $secondary, + tertiary: $tertiary, + quad: $quad, + quint: $quint, + success: $success, + info: $info, + warning: $warning, + danger: $danger, + light: $light, + dark: $dark, ); $custom-theme-colors: map.merge($theme-colors, ( - 'tertiary': $tertiary, - 'quad': $quad, - 'quint': $quint, + 'tertiary': $tertiary, + 'quad': $quad, + 'quint': $quint, )); $theme-colors: map.merge($theme-colors, $custom-theme-colors); $theme-colors-rgb: map-loop($theme-colors, to-rgb, '$value'); diff --git a/resources/sass/fo/utilities/bs-customs/_button.scss b/resources/sass/fo/utilities/bs-customs/_button.scss index c481cec..4e4ecb2 100644 --- a/resources/sass/fo/utilities/bs-customs/_button.scss +++ b/resources/sass/fo/utilities/bs-customs/_button.scss @@ -1,46 +1,46 @@ @each $color, $value in $theme-colors { - .btn-#{$color} { - --#{$prefix}btn-color: #{color-contrast($value)}; - --#{$prefix}btn-bg: #{$value}; - --#{$prefix}btn-hover-color: #{color-contrast(shade-color($input-btn-active-bg-color, $btn-hover-bg-shade-amount))}; - --#{$prefix}btn-hover-bg: #{shade-color($input-btn-active-bg-color, $btn-hover-bg-shade-amount)}; - --#{$prefix}btn-active-color: color-contrast(shade-color($input-btn-active-bg-color, $btn-active-bg-shade-amount)); - --#{$prefix}btn-active-bg: #{shade-color($input-btn-active-bg-color, $btn-active-bg-shade-amount)}; - --#{$prefix}btn-disabled-color: #{color-contrast($input-btn-active-bg-color)}; - --#{$prefix}btn-disabled-bg: #{$input-btn-active-bg-color}; + .btn-#{$color} { + --#{$prefix}btn-color: #{color-contrast($value)}; + --#{$prefix}btn-bg: #{$value}; + --#{$prefix}btn-hover-color: #{color-contrast(shade-color($input-btn-active-bg-color, $btn-hover-bg-shade-amount))}; + --#{$prefix}btn-hover-bg: #{shade-color($input-btn-active-bg-color, $btn-hover-bg-shade-amount)}; + --#{$prefix}btn-active-color: color-contrast(shade-color($input-btn-active-bg-color, $btn-active-bg-shade-amount)); + --#{$prefix}btn-active-bg: #{shade-color($input-btn-active-bg-color, $btn-active-bg-shade-amount)}; + --#{$prefix}btn-disabled-color: #{color-contrast($input-btn-active-bg-color)}; + --#{$prefix}btn-disabled-bg: #{$input-btn-active-bg-color}; - @include button-shape($value); + @include button-shape($value); - &:hover { - @include button-shape(shade-color($input-btn-active-bg-color, $btn-hover-bg-shade-amount)); + &:hover { + @include button-shape(shade-color($input-btn-active-bg-color, $btn-hover-bg-shade-amount)); + } + + &:active { + @include button-shape(shade-color($input-btn-active-bg-color, $btn-active-bg-shade-amount)); + } + + .btn-check + &:hover { + @include button-shape(shade-color($input-btn-active-bg-color, $btn-hover-bg-shade-amount)); + + color: #{color-contrast(shade-color($input-btn-active-bg-color, $btn-hover-bg-shade-amount))}; + } + + .btn-check:checked + &, + :not(.btn-check) + &:active, + &:first-child:active, + &.active, + &.show { + @include button-shape(shade-color($input-btn-active-bg-color, $btn-active-bg-shade-amount)); + + color: #{color-contrast(shade-color($input-btn-active-bg-color, $btn-active-bg-shade-amount))}; + } + + &:disabled, + &.disabled, + fieldset:disabled & { + @include button-shape(color-contrast($input-btn-active-bg-color)); + + color: #{color-contrast($input-btn-active-bg-color)}; + } } - - &:active { - @include button-shape(shade-color($input-btn-active-bg-color, $btn-active-bg-shade-amount)); - } - - .btn-check + &:hover { - @include button-shape(shade-color($input-btn-active-bg-color, $btn-hover-bg-shade-amount)); - - color: #{color-contrast(shade-color($input-btn-active-bg-color, $btn-hover-bg-shade-amount))}; - } - - .btn-check:checked + &, - :not(.btn-check) + &:active, - &:first-child:active, - &.active, - &.show { - @include button-shape(shade-color($input-btn-active-bg-color, $btn-active-bg-shade-amount)); - - color: #{color-contrast(shade-color($input-btn-active-bg-color, $btn-active-bg-shade-amount))}; - } - - &:disabled, - &.disabled, - fieldset:disabled & { - @include button-shape(color-contrast($input-btn-active-bg-color)); - - color: #{color-contrast($input-btn-active-bg-color)}; - } - } } diff --git a/resources/views/fo/layout.blade.php b/resources/views/fo/layout.blade.php index c946ca3..7314dd7 100644 --- a/resources/views/fo/layout.blade.php +++ b/resources/views/fo/layout.blade.php @@ -24,6 +24,7 @@ + @include('fo.layouts.footer') @stack('scripts-constants') @include('modules.script-constants') @vite(['resources/ts/fo/fo.ts']) diff --git a/resources/views/fo/layouts/footer.blade.php b/resources/views/fo/layouts/footer.blade.php new file mode 100644 index 0000000..1a62d1e --- /dev/null +++ b/resources/views/fo/layouts/footer.blade.php @@ -0,0 +1,108 @@ + diff --git a/resources/views/fo/layouts/nav-offcanvas.blade.php b/resources/views/fo/layouts/nav-offcanvas.blade.php index 58eef12..1ec2411 100644 --- a/resources/views/fo/layouts/nav-offcanvas.blade.php +++ b/resources/views/fo/layouts/nav-offcanvas.blade.php @@ -3,8 +3,12 @@
-
- @include('fo.layouts.nav-list') +
+
+ @include('fo.layouts.nav-list') +
+
+
diff --git a/vite.config.ts b/vite.config.ts index e64f989..108b544 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -53,7 +53,7 @@ export default defineConfig({ }, eslint: { lintCommand: - "eslint --quiet -c .eslintrc.json \"./resources\"", + "eslint --quiet -c .eslintrc.json \"./resources/ts/*\"", }, stylelint: { lintCommand: