diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 9366139..fa5add0 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -102,28 +102,28 @@ jobs: dep: --file=./build/deploy.php release:switch stage private-key: ${{secrets.STAGE_KEY}} - # deploy-production: - # needs: build - # runs-on: ubuntu-latest - # steps: - # - name: Setup PHP - # uses: shivammathur/setup-php@7c0b4c8c8ebed23eca9ec2802474895d105b11bc - # with: - # php-version: ${{ env.PHP_VERSION }} - # - uses: actions/download-artifact@v3 - # with: - # name: typo3 - # - name: Extract artifact - # run: | - # tar xf typo3.tar.gz - # rm typo3.tar.gz - # - name: Install ssh agent and rsync - # run: | - # apt update - # apt install -y openssh-client rsync - # - name: Deploy - # uses: deployphp/action@v1 - # with: - # deployer-binary: "./bin/dep" - # dep: --file=./build/deploy.php release:create production - # private-key: ${{secrets.PROD_KEY}} + deploy-production: + needs: build + runs-on: ubuntu-latest + steps: + - name: Setup PHP + uses: shivammathur/setup-php@7c0b4c8c8ebed23eca9ec2802474895d105b11bc + with: + php-version: ${{ env.PHP_VERSION }} + - uses: actions/download-artifact@v3 + with: + name: typo3 + - name: Extract artifact + run: | + tar xf typo3.tar.gz + rm typo3.tar.gz + - name: Install ssh agent and rsync + run: | + apt update + apt install -y openssh-client rsync + - name: Deploy + uses: deployphp/action@v1 + with: + deployer-binary: "./bin/dep" + dep: --file=./build/deploy.php release:create production + private-key: ${{secrets.PROD_KEY}} diff --git a/build/servers.yaml b/build/servers.yaml index a469b79..86c34cf 100644 --- a/build/servers.yaml +++ b/build/servers.yaml @@ -2,7 +2,7 @@ hosts: production: stage: production hostname: web-arm.cloonar.com - remote_user: dialog_relations_at + remote_user: lena_schilling_at writable_mode: chmod forward_agent: true deploy_path: ~/ @@ -10,7 +10,7 @@ hosts: stage: stage: staging hostname: web-arm.cloonar.com - remote_user: dialog_relations_cloonar_dev + remote_user: lena_schilling_cloonar_dev writable_mode: chmod forward_agent: true deploy_path: ~/ diff --git a/packages/base/Configuration/Sets/SitePackage/PageTsConfig/BackendLayouts/HomePage.tsconfig b/packages/base/Configuration/Sets/SitePackage/PageTsConfig/BackendLayouts/HomePage.tsconfig deleted file mode 100644 index 00f15c4..0000000 --- a/packages/base/Configuration/Sets/SitePackage/PageTsConfig/BackendLayouts/HomePage.tsconfig +++ /dev/null @@ -1,22 +0,0 @@ -mod.web_layout.BackendLayouts { - home_page { - title = LLL:EXT:base/Resources/Private/Language/locallang_be.xlf:backend_layout.home_page - icon = EXT:base/Resources/Public/Images/BackendLayouts/default.png - config { - backend_layout { - colCount = 1 - rowCount = 1 - rows { - 1 { - columns { - 1 { - name = LLL:EXT:base/Resources/Private/Language/locallang_be.xlf:backend_layout.column.content - colPos = 0 - } - } - } - } - } - } - } -} \ No newline at end of file diff --git a/packages/base/Configuration/Sets/SitePackage/TypoScript/Helper/PageClass.typoscript b/packages/base/Configuration/Sets/SitePackage/TypoScript/Helper/PageClass.typoscript deleted file mode 100644 index cde353b..0000000 --- a/packages/base/Configuration/Sets/SitePackage/TypoScript/Helper/PageClass.typoscript +++ /dev/null @@ -1,40 +0,0 @@ -# PAGE CLASS -lib.page.class = COA -lib.page.class { - // Page alias or id as fallback - 10 = TEXT - 10 { - field = alias // uid - noTrimWrap = |page-|| - } - // Current level of the page within the tree structure - 20 = TEXT - 20 { - data = level:1 - noTrimWrap = | pagelevel-|| - } - // Language - 30 = TEXT - 30 { - data = siteLanguage:languageId - noTrimWrap = | language-|| - } - // Backend layout - 40 = TEXT - 40 { - data = pagelayout - replacement.10 { - search = pagets__ - replace = - } - ifEmpty = default - noTrimWrap = | backendlayout-|| - } - // Layout - 50 = TEXT - 50 { - field = layout - noTrimWrap = | layout-|| - ifEmpty = default - } -} \ No newline at end of file diff --git a/packages/base/Configuration/Sets/SitePackage/TypoScript/page.typoscript b/packages/base/Configuration/Sets/SitePackage/TypoScript/page.typoscript index b29c8d8..08a0d5c 100644 --- a/packages/base/Configuration/Sets/SitePackage/TypoScript/page.typoscript +++ b/packages/base/Configuration/Sets/SitePackage/TypoScript/page.typoscript @@ -3,24 +3,10 @@ # Include constants # -# HELPER -@import 'EXT:base/Configuration/Sets/SitePackage/TypoScript/Helper/PageClass.typoscript' - page = PAGE page { typeNum = 0 shortcutIcon = EXT:base/Resources/Public/Favicons/favicon-96x96.png - - bodyTagCObject = COA - bodyTagCObject { - 10 = TEXT - 10.data = TSFE:id - 10.noTrimWrap = | id="p|"| - 20 =< lib.page.class - 20.stdWrap.noTrimWrap = | class="|"| - wrap = - } - 10 = PAGEVIEW 10 { paths { @@ -46,7 +32,6 @@ page { as = metanavigation } } - } meta { @@ -103,7 +88,6 @@ page { } footerMenuPid = {$footerMenuPid} - } lib.contentElement { diff --git a/packages/base/ContentBlocks/ContentElements/hero/templates/frontend.html b/packages/base/ContentBlocks/ContentElements/hero/templates/frontend.html index 6033b6a..d5fba2c 100644 --- a/packages/base/ContentBlocks/ContentElements/hero/templates/frontend.html +++ b/packages/base/ContentBlocks/ContentElements/hero/templates/frontend.html @@ -50,9 +50,15 @@
+ class="bg-primary border-4 border-white rounded-full p-5 inline-flex items-center justify-center hover:bg-opacity-90"> Scroll down - + + +
@@ -64,30 +70,34 @@

- {data.header} + Dialog Relations

- {data.bodytext} + Sorem ipsum dolor sit amet, consectetur adipiscing elit. + Nunc vulputate libero et velit interdum, ac aliquet odio mattis.

-
- - +
+ + LinkedIn + - - + + Instagram + - - + + Facebook +
diff --git a/packages/base/Resources/Private/Language/locallang_be.xlf b/packages/base/Resources/Private/Language/locallang_be.xlf index a835fdd..81d9be7 100644 --- a/packages/base/Resources/Private/Language/locallang_be.xlf +++ b/packages/base/Resources/Private/Language/locallang_be.xlf @@ -18,16 +18,6 @@ Right - - Home Page - - - Hero - - - Content - - diff --git a/packages/base/Resources/Private/PageView/Pages/Home_page.html b/packages/base/Resources/Private/PageView/Pages/Home_page.html deleted file mode 100644 index b914912..0000000 --- a/packages/base/Resources/Private/PageView/Pages/Home_page.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - Render main content for colPos 0 (Home Page) - - \ No newline at end of file diff --git a/packages/base/Resources/Public/Icons/Extension.svg b/packages/base/Resources/Public/Icons/Extension.svg new file mode 100644 index 0000000..d853637 --- /dev/null +++ b/packages/base/Resources/Public/Icons/Extension.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/base/Resources/Public/Icons/angle-left.svg b/packages/base/Resources/Public/Icons/angle-left.svg new file mode 100644 index 0000000..4e24f33 --- /dev/null +++ b/packages/base/Resources/Public/Icons/angle-left.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/base/Resources/Public/Icons/angle-right.svg b/packages/base/Resources/Public/Icons/angle-right.svg new file mode 100644 index 0000000..b0b8cbb --- /dev/null +++ b/packages/base/Resources/Public/Icons/angle-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/base/Resources/Public/Icons/arrow-down.svg b/packages/base/Resources/Public/Icons/arrow-down.svg deleted file mode 100644 index 01399b1..0000000 --- a/packages/base/Resources/Public/Icons/arrow-down.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/base/Resources/Public/Icons/email.svg b/packages/base/Resources/Public/Icons/email.svg new file mode 100644 index 0000000..0f8aafc --- /dev/null +++ b/packages/base/Resources/Public/Icons/email.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/base/Resources/Public/Icons/facebook.svg b/packages/base/Resources/Public/Icons/facebook.svg deleted file mode 100644 index 8d928fc..0000000 --- a/packages/base/Resources/Public/Icons/facebook.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/base/Resources/Public/Icons/instagram.svg b/packages/base/Resources/Public/Icons/instagram.svg index a0005e1..3a5f02b 100644 --- a/packages/base/Resources/Public/Icons/instagram.svg +++ b/packages/base/Resources/Public/Icons/instagram.svg @@ -1,5 +1,3 @@ - - - - + + diff --git a/packages/base/Resources/Public/Icons/linkedin.svg b/packages/base/Resources/Public/Icons/linkedin.svg index 45f06f5..41dc387 100644 --- a/packages/base/Resources/Public/Icons/linkedin.svg +++ b/packages/base/Resources/Public/Icons/linkedin.svg @@ -1,5 +1,3 @@ - - - - + + diff --git a/packages/base/Resources/Public/Icons/phone.svg b/packages/base/Resources/Public/Icons/phone.svg new file mode 100644 index 0000000..06b9376 --- /dev/null +++ b/packages/base/Resources/Public/Icons/phone.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/base/Resources/Public/Icons/skip-back.svg b/packages/base/Resources/Public/Icons/skip-back.svg new file mode 100644 index 0000000..30a1631 --- /dev/null +++ b/packages/base/Resources/Public/Icons/skip-back.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/base/Resources/Public/Icons/skip-forward.svg b/packages/base/Resources/Public/Icons/skip-forward.svg new file mode 100644 index 0000000..f2b4ac2 --- /dev/null +++ b/packages/base/Resources/Public/Icons/skip-forward.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/base/Resources/Public/Icons/tiktok.svg b/packages/base/Resources/Public/Icons/tiktok.svg new file mode 100644 index 0000000..d0230ba --- /dev/null +++ b/packages/base/Resources/Public/Icons/tiktok.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/base/Resources/Public/Icons/x.svg b/packages/base/Resources/Public/Icons/x.svg new file mode 100644 index 0000000..97f47cc --- /dev/null +++ b/packages/base/Resources/Public/Icons/x.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/base/Resources/Public/JavaScript/navigation.js b/packages/base/Resources/Public/JavaScript/navigation.js index 5c78ba5..a986230 100644 --- a/packages/base/Resources/Public/JavaScript/navigation.js +++ b/packages/base/Resources/Public/JavaScript/navigation.js @@ -1,39 +1,16 @@ document.addEventListener('DOMContentLoaded', function () { - const nav = document.getElementById('mainNav'); // Keep for mobile toggle - const header = document.querySelector('header'); // Get the header element + const nav = document.getElementById('mainNav'); const toggle = document.getElementById('navToggle'); // Toggle menu on mobile toggle.addEventListener('click', function () { - nav.classList.toggle('open'); // Mobile menu still controlled by nav + nav.classList.toggle('open'); toggle.classList.toggle('active'); }); - // Handle transparent header scroll effect for home page on desktop - const body = document.body; - const scrollThreshold = 50; // Pixels to scroll before changing background - - function handleScroll() { - // Check if it's the home page layout and desktop view - if (header && body.classList.contains('backendlayout-home_page') && window.innerWidth >= 1024) { // 1024px is Tailwind's default lg breakpoint - if (window.scrollY > scrollThreshold) { - header.classList.add('scrolled'); // Add class to header - } else { - header.classList.remove('scrolled'); // Remove class from header - } - } else if (header) { // Check if header exists before trying to remove class - // Ensure scrolled class is removed if not on home page desktop or resized below lg - header.classList.remove('scrolled'); // Remove class from header - } - } - - // Initial check in case the page loads already scrolled - handleScroll(); - - // Add scroll and resize listeners - window.addEventListener('scroll', handleScroll); - window.addEventListener('resize', handleScroll); // Re-check on resize - + // No need to add or remove sticky class here since CSS handles position: sticky + // We simply rely on the CSS-based sticky behavior and reserved space via body padding. + const submenuParents = document.querySelectorAll('.nav-item.has-submenu'); submenuParents.forEach(parent => { parent.addEventListener('click', (e) => { diff --git a/packages/base/Resources/Public/Scss/abstracts/_icons.scss b/packages/base/Resources/Public/Scss/abstracts/_icons.scss index 950420e..6183328 100644 --- a/packages/base/Resources/Public/Scss/abstracts/_icons.scss +++ b/packages/base/Resources/Public/Scss/abstracts/_icons.scss @@ -21,15 +21,36 @@ mask-image: url(../Icons/instagram.svg); } -.ci-linkedin::before { - mask-image: url(../Icons/linkedin.svg); +.ci-tiktok::before { + mask-image: url(../Icons/tiktok.svg); width: 0.9em; height: 0.9em; } -.ci-facebook::before { - mask-image: url(../Icons/facebook.svg); +.ci-linkedin::before { + mask-image: url(../Icons/linkedin.svg); } -.ci-arrow-down::before { - mask-image: url(../Icons/arrow-down.svg); +.ci-x::before { + mask-image: url(../Icons/x.svg); +} +.ci-email::before { + mask-image: url(../Icons/email.svg); +} +.ci-phone::before { + mask-image: url(../Icons/phone.svg); +} +.ci-angle-right::before { + mask-image: url(../Icons/angle-right.svg); +} + +.ci-angle-left::before { + mask-image: url(../Icons/angle-left.svg); +} + +.ci-skip-forward::before { + mask-image: url(../Icons/skip-forward.svg); +} + +.ci-skip-back::before { + mask-image: url(../Icons/skip-back.svg); } diff --git a/packages/base/Resources/Public/Scss/base/_global.scss b/packages/base/Resources/Public/Scss/base/_global.scss index 63b5583..63af864 100644 --- a/packages/base/Resources/Public/Scss/base/_global.scss +++ b/packages/base/Resources/Public/Scss/base/_global.scss @@ -1,19 +1,15 @@ -:root { - --color-primary: #0B197D; -} - body { line-height: 1.5; } -/* a[href^="tel:"]::before { */ -/* @extend .ci; */ -/* @extend .ci-phone; */ -/* margin-right: 0.5em; */ -/* } */ +a[href^="tel:"]::before { + @extend .ci; + @extend .ci-phone; + margin-right: 0.5em; +} -/* a[href^="mailto:"]::before { */ -/* @extend .ci; */ -/* @extend .ci-email; */ -/* margin-right: 0.5em; */ -/* } */ +a[href^="mailto:"]::before { + @extend .ci; + @extend .ci-email; + margin-right: 0.5em; +} diff --git a/packages/base/Resources/Public/Scss/components/_news.scss b/packages/base/Resources/Public/Scss/components/_news.scss index 2d58983..2c366d6 100644 --- a/packages/base/Resources/Public/Scss/components/_news.scss +++ b/packages/base/Resources/Public/Scss/components/_news.scss @@ -114,7 +114,7 @@ mask-position: center; background-color: currentColor; /* vertical-align: middle; */ - /* mask-image: url(../Icons/angle-right.svg); */ + mask-image: url(../Icons/angle-right.svg); } } diff --git a/packages/base/Resources/Public/Scss/layouts/_home-page.scss b/packages/base/Resources/Public/Scss/layouts/_home-page.scss deleted file mode 100644 index fb503df..0000000 --- a/packages/base/Resources/Public/Scss/layouts/_home-page.scss +++ /dev/null @@ -1,82 +0,0 @@ -// Styles specific to the Home Page layout (.backendlayout-home_page) - -.backendlayout-home_page { - - // --- Target the header element --- - header { - // --- Mobile First: Always Primary Background --- - @apply bg-primary text-white; - - // Mobile link/icon colors (on primary background) - #mainNav .nav-link { // Target links within #mainNav - @apply text-white hover:text-gray-200; - } - #mainNav .nav-toggle-icon, - #mainNav .nav-toggle-icon::before, - #mainNav .nav-toggle-icon::after { - @apply bg-white; // Ensure mobile toggle is visible - } - // Adjust mobile submenu link colors if needed (depends on dropdown background) - #mainNav .sub-menu .nav-link { - @apply text-gray-700 hover:text-black; // Assuming light dropdown background - } - - // --- Desktop Styles --- - @screen lg { - // Initial state: Transparent background, fixed position - @apply fixed top-0 left-0 right-0 z-50 bg-transparent transition-colors duration-300 ease-in-out; - - // Initial link colors and background for transparent header (desktop) - #mainNav .nav-link { - @apply bg-white text-primary hover:text-brand px-3 py-1 rounded; // Add bg-white, padding, and rounded corners - } - // Ensure mobile toggle icon also uses primary color initially on desktop if visible (though usually hidden) - #mainNav .nav-toggle-icon, - #mainNav .nav-toggle-icon::before, - #mainNav .nav-toggle-icon::after { - @apply bg-primary; - } - // Desktop submenu link colors (assuming light dropdown background) - #mainNav .sub-menu .nav-link { - @apply text-gray-700 hover:text-black; - } - - // Scrolled state: Primary background (desktop) - &.scrolled { - @apply bg-primary shadow-md; - - // Link colors for primary background (desktop scrolled) - #mainNav .nav-link { - @apply bg-primary text-white hover:text-gray-200; - } - // Submenu link colors likely don't need changing here if dropdown is consistent - } - } - } -} - -// --- Default styles for header on NON-home pages --- -// Ensures header has a background and correct colors on other pages -body:not(.backendlayout-home_page) { - header { - @apply bg-primary text-white; // Or your desired default background/text - - #mainNav .nav-link { - @apply text-white hover:text-gray-200; - } - #mainNav .nav-toggle-icon, - #mainNav .nav-toggle-icon::before, - #mainNav .nav-toggle-icon::after { - @apply bg-white; - } - #mainNav .sub-menu .nav-link { - @apply text-gray-700 hover:text-black; // Assuming light dropdown background - } - } - // On non-home pages, main content doesn't need extra padding-top - @screen lg { - main { - @apply pt-0; // Reset padding if needed - } - } -} \ No newline at end of file diff --git a/packages/base/Resources/Public/Scss/main.scss b/packages/base/Resources/Public/Scss/main.scss index e3e7267..fe2890b 100644 --- a/packages/base/Resources/Public/Scss/main.scss +++ b/packages/base/Resources/Public/Scss/main.scss @@ -15,5 +15,3 @@ @import "components/news_detail"; @import 'components/footer'; @import 'components/buttons'; -@import 'layouts/home-page'; - diff --git a/tailwind.config.js b/tailwind.config.js index 7c715f4..f983855 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -18,7 +18,12 @@ module.exports = { hajime: ['"Hajime Sans"', ...defaultTheme.fontFamily.sans], }, colors: { - primary: 'var(--color-primary)', + primary: { + DEFAULT: '#0B197D', // Use SCSS primary color for text + dark: '#1C2B00', + light: '#4E5E32', + 'brand-blue': '#0B197D', + }, yellow: '#F5AE07', 'light-green': '#F4F6EC', brand: '#6B8E23', // Added brand color for hover states from SCSS