Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert "feat: add alloy and related scripts (#433)" #469

Merged
merged 1 commit into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
helix-importer-ui
tools/sitemap
solutions/plugins/experimentation
solutions/vendor
16 changes: 8 additions & 8 deletions 404.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<meta property="og:title" content="Page not found">
<script src="/solutions/scripts/scripts.js" type="module" crossorigin="use-credentials"></script>
<script type="module">
import { decorateButtons, sampleRUM } from '/solutions/scripts/aem.js';

import { decorateButtons, sampleRUM } from '/solutions/scripts/lib-franklin.js';
window.addEventListener('load', async () => {
const response = await fetch('/solutions/404.plain.html');
if (response.ok) {
Expand All @@ -23,7 +23,7 @@
}
sampleRUM('404', { source: document.referrer, target: window.location.href });
});
</script>
</script>
<link rel="stylesheet" href="/solutions/styles/styles.css">
<style>

Expand Down Expand Up @@ -67,7 +67,7 @@
font-weight: var(--font-weight-bold);
}


/* Default styles (mobile-first) */

main .link-section {
Expand All @@ -91,10 +91,10 @@

.link-section > div:last-child {
margin-top: 1rem;
column-count: 1;
column-count: 1;
width: 100%;
display: flex;
flex-direction: column;
flex-direction: column;
align-items: center;
}

Expand Down Expand Up @@ -126,7 +126,7 @@

.link-section > div:last-child {
column-count: 2;
display: block;
display: block;
align-items: initial;
}
}
Expand All @@ -146,7 +146,7 @@ <h2 class="error-message">Page Not Found</h2>
<p>The page you are looking for might have been removed, had its name changed, or is temporarily unavailable.</p>
</div>
<div class="link-section">
</div>
</div>
</main>
<footer></footer>
</body>
Expand Down
6 changes: 3 additions & 3 deletions head.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<meta name="referrer" content="no-referrer-when-downgrade" />
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<script src="/solutions/scripts/aem.js" type="module"></script>
<script src="/solutions/scripts/utils.js" type="module"></script>
<script src="/solutions/scripts/lib-franklin.js" type="module"></script>
<script src="/solutions/scripts/utils/utils.js" type="module"></script>
<script src="/solutions/scripts/scripts.js" type="module"></script>
<link rel="stylesheet" href="/solutions/styles/styles.css"/>
<link rel="stylesheet" href="/solutions/styles/styles.css"/>
2 changes: 1 addition & 1 deletion solutions/blocks/awards-search/awards-search.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createOptimizedPicture } from '../../scripts/aem.js';
import { createOptimizedPicture } from '../../scripts/lib-franklin.js';

let awardsData = [];
let filteredAwards = [];
Expand Down
2 changes: 1 addition & 1 deletion solutions/blocks/cards/cards.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createOptimizedPicture } from '../../scripts/aem.js';
import { createOptimizedPicture } from '../../scripts/lib-franklin.js';

export default function decorate(block) {
/* change to ul, li */
Expand Down
4 changes: 2 additions & 2 deletions solutions/blocks/footer/footer.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { decorateIcons, getMetadata } from '../../scripts/aem.js';
import { adobeMcAppendVisitorId } from '../../scripts/utils.js';
import { decorateIcons, getMetadata } from '../../scripts/lib-franklin.js';
import { adobeMcAppendVisitorId } from '../../scripts/utils/utils.js';

function wrapImgsInLinks(container) {
const pictures = container.querySelectorAll('picture');
Expand Down
2 changes: 1 addition & 1 deletion solutions/blocks/fragment-metadata/fragment-metadata.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { readBlockConfig } from '../../scripts/aem.js';
import { readBlockConfig } from '../../scripts/lib-franklin.js';
import { openUrlForOs } from '../../scripts/scripts.js';

export default function decorate(block) {
Expand Down
4 changes: 2 additions & 2 deletions solutions/blocks/header/header.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {
getMetadata, decorateIcons, decorateButtons, decorateTags,
} from '../../scripts/aem.js';
} from '../../scripts/lib-franklin.js';

import { decorateBlockWithRegionId, decorateLinkWithLinkTrackingId } from '../../scripts/scripts.js';
import { adobeMcAppendVisitorId } from '../../scripts/utils.js';
import { adobeMcAppendVisitorId } from '../../scripts/utils/utils.js';

function createLoginModal() {
const loginModal = document.querySelector('nav > div:nth-child(4)');
Expand Down
2 changes: 1 addition & 1 deletion solutions/blocks/hero/hero.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
createNanoBlock,
renderNanoBlocks,
fetchProduct,
} from '../../scripts/utils.js';
} from '../../scripts/utils/utils.js';

/**
* Builds hero block and prepends to main in a new section.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createNanoBlock, renderNanoBlocks, fetchProduct } from '../../scripts/utils.js';
import { createNanoBlock, renderNanoBlocks, fetchProduct } from '../../scripts/utils/utils.js';

const fetchedProducts = [];

Expand Down
2 changes: 1 addition & 1 deletion solutions/blocks/products/products.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
renderNanoBlocks,
fetchProduct,
createTag,
} from '../../scripts/utils.js';
} from '../../scripts/utils/utils.js';

import { trackProduct } from '../../scripts/scripts.js';

Expand Down
4 changes: 2 additions & 2 deletions solutions/blocks/quote-carousel/quote-carousel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createTag } from '../../scripts/utils.js';
import { decorateIcons } from '../../scripts/aem.js';
import { createTag } from '../../scripts/utils/utils.js';
import { decorateIcons } from '../../scripts/lib-franklin.js';

const SLIDE_PREFIX = 'carousel-slide-';
const CONTROL_PREFIX = 'carousel-control-';
Expand Down
4 changes: 2 additions & 2 deletions solutions/blocks/quote/quote.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createTag } from '../../scripts/utils.js';
import { decorateIcons } from '../../scripts/aem.js';
import { createTag } from '../../scripts/utils/utils.js';
import { decorateIcons } from '../../scripts/lib-franklin.js';

function createQuote(item) {
const paragraphs = Array.from(item.querySelectorAll('p'));
Expand Down
2 changes: 1 addition & 1 deletion solutions/blocks/sticky-navigation/sticky-navigation.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { STICKY_NAVIGATION_DATASET_KEY } from '../../scripts/aem.js';
import { STICKY_NAVIGATION_DATASET_KEY } from '../../scripts/lib-franklin.js';

function scrollToAnchorWithOffset(anchorId) {
const anchorElement = document.getElementById(anchorId);
Expand Down
2 changes: 1 addition & 1 deletion solutions/blocks/tabs/tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import {
readBlockConfig,
} from '../../scripts/aem.js';
} from '../../scripts/lib-franklin.js';

function isMobileScreenSize() {
const isDesktop = window.matchMedia('(min-width: 900px)');
Expand Down
101 changes: 0 additions & 101 deletions solutions/scripts/analytics.js

This file was deleted.

2 changes: 1 addition & 1 deletion solutions/scripts/breadcrumbs.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
createTag,
fetchIndex,
fixExcelFilterZeroes,
} from './utils.js';
} from './utils/utils.js';

// eslint-disable-next-line import/no-cycle
import { decorateBlockWithRegionId } from './scripts.js';
Expand Down
4 changes: 2 additions & 2 deletions solutions/scripts/delayed.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
sampleRUM,
fetchPlaceholders,
getMetadata,
} from './aem.js';
} from './lib-franklin.js';

// eslint-disable-next-line import/no-cycle
import {
Expand All @@ -15,7 +15,7 @@ import {
openUrlForOs,
} from './scripts.js';
import { loadBreadcrumbs } from './breadcrumbs.js';
import { onAdobeMcLoaded } from './utils.js';
import { onAdobeMcLoaded } from './utils/utils.js';

// Core Web Vitals RUM collection
sampleRUM('cwv');
Expand Down
File renamed without changes.
58 changes: 0 additions & 58 deletions solutions/scripts/onetrust.js

This file was deleted.

Loading
Loading