Skip to content

Commit

Permalink
Move everything into solutions folder (#394)
Browse files Browse the repository at this point in the history
  • Loading branch information
basecode authored Oct 5, 2023
1 parent 8435f35 commit f7c1b60
Show file tree
Hide file tree
Showing 72 changed files with 27 additions and 27 deletions.
10 changes: 5 additions & 5 deletions 404.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
</script>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta property="og:title" content="Page not found">
<script src="/scripts/scripts.js" type="module" crossorigin="use-credentials"></script>
<script src="/solutions/scripts/scripts.js" type="module" crossorigin="use-credentials"></script>
<script type="module">
import { decorateButtons, sampleRUM } from '/scripts/lib-franklin.js';
import { decorateButtons, sampleRUM } from '/solutions/scripts/lib-franklin.js';

window.addEventListener('load', async () => {
const response = await fetch('/404.plain.html');
const response = await fetch('/solutions/404.plain.html');
if (response.ok) {
const htmlContent = await response.text();
const specialSection = document.querySelector('.link-section');
Expand All @@ -24,7 +24,7 @@
sampleRUM('404', { source: document.referrer, target: window.location.href });
});
</script>
<link rel="stylesheet" href="/styles/styles.css">
<link rel="stylesheet" href="/solutions/styles/styles.css">
<style>

:root {
Expand Down Expand Up @@ -132,7 +132,7 @@
}

</style>
<link rel="stylesheet" href="/styles/lazy-styles.css">
<link rel="stylesheet" href="/solutions/styles/lazy-styles.css">
</head>

<body>
Expand Down
8 changes: 4 additions & 4 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="/scripts/lib-franklin.js" type="module"></script>
<script src="/scripts/utils/utils.js" type="module"></script>
<script src="/scripts/scripts.js" type="module"></script>
<link rel="stylesheet" href="/styles/styles.css"/>
<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"/>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Starter project for Adobe Helix",
"scripts": {
"lint:js": "eslint .",
"lint:css": "stylelint blocks/**/*.css styles/*.css",
"lint:css": "stylelint solutions/blocks/**/*.css solutions/styles/*.css",
"lint": "npm run lint:js && npm run lint:css"
},
"repository": {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ main .section .awards-search .awards-results-container .award-item-container h2
width: 1.5rem;
height: 1.3125rem;
/* stylelint-disable-next-line property-no-vendor-prefix */
-webkit-mask: url('/icons/arrow-right.svg');
mask: url('/icons/arrow-right.svg');
-webkit-mask: url('/solutions/icons/arrow-right.svg');
mask: url('/solutions/icons/arrow-right.svg');
background-color: var(--read-more-text-color);
display: inline-block;
opacity: 1;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ main .section.two-columns .right-col .products.plans a.button:any-link {


.two-columns .left-col p a.info-button.modal::before {
content: url("/icons/user-guide-white.svg");
content: url("/solutions/icons/user-guide-white.svg");
color: white;
padding-right: 8px;
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
width: 14px;
height: 8px;
margin: 0 3px;
background: url("../../../icons/tabs_arrow.svg") no-repeat;
background: url("/solutions/icons/tabs_arrow.svg") no-repeat;
background-size: 100%;;
transform: rotate(180deg);
transition: all .3s linear;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,8 @@ header a.button:hover span.button-text {
width: 24px;
height: 24px;
/* stylelint-disable-next-line property-no-vendor-prefix */
-webkit-mask:url('/icons/arrow-right.svg');
mask: url('/icons/arrow-right.svg');
-webkit-mask:url('/solutions/icons/arrow-right.svg');
mask: url('/solutions/icons/arrow-right.svg');
background-color: var(--button-link-color);
display: inline-block;
transition: all .2s cubic-bezier(.4,0,.2,1);
Expand Down Expand Up @@ -901,8 +901,8 @@ header a.button:hover span.button-text {
width: 24px;
height: 24px;
/* stylelint-disable-next-line property-no-vendor-prefix */
-webkit-mask:url('/icons/arrow-right.svg');
mask: url('/icons/arrow-right.svg');
-webkit-mask:url('/solutions/icons/arrow-right.svg');
mask: url('/solutions/icons/arrow-right.svg');
background-color: var(--button-link-color);
display: inline-block;
transition: all .2s cubic-bezier(.4,0,.2,1);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions scripts/lib-franklin.js → solutions/scripts/lib-franklin.js
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ export async function fetchPlaceholders(prefix = 'default') {
const loaded = window.placeholders[`${prefix}-loaded`];
if (!loaded) {
window.placeholders[`${prefix}-loaded`] = new Promise((resolve, reject) => {
fetch(`${prefix === 'default' ? '' : prefix}/placeholders.json`)
fetch(`${prefix === 'default' ? '' : prefix}/solutions/placeholders.json`)
.then((resp) => {
if (resp.ok) {
return resp.json();
Expand Down Expand Up @@ -738,7 +738,7 @@ export function setup() {
window.hlx.codeBasePath = '';
window.hlx.lighthouse = new URLSearchParams(window.location.search).get('lighthouse') === 'on';

const scriptEl = document.querySelector('script[src$="/scripts/scripts.js"]');
const scriptEl = document.querySelector('script[src$="/solutions/scripts/scripts.js"]');
if (scriptEl) {
try {
[window.hlx.codeBasePath] = new URL(scriptEl.src).pathname.split('/scripts/scripts.js');
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions scripts/scripts.js → solutions/scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ export function getEnvironment(hostname, country) {
*/
function setPageLanguage(param) {
document.documentElement.lang = param.language;
createMetadata('nav', '/nav');
createMetadata('footer', '/footer');
createMetadata('nav', '/solutions/nav');
createMetadata('footer', '/solutions/footer');
}

export function pushToDataLayer(event, payload) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ export async function fetchIndex(indexFile, sheet, pageSize = 500) {
const handleIndex = async (offset) => {
const sheetParam = sheet ? `&sheet=${sheet}` : '';

const resp = await fetch(`/${indexFile}.json?limit=${pageSize}&offset=${offset}${sheetParam}`);
const resp = await fetch(`/solutions/${indexFile}.json?limit=${pageSize}&offset=${offset}${sheetParam}`);
const json = await resp.json();

const newIndex = {
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions styles/styles.css → solutions/styles/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ a.info-button.modal {
}

a.info-button.modal::before {
content: url('/icons/user-guide.svg');
content: url('/solutions/icons/user-guide.svg');
display: flex;
}

Expand All @@ -608,8 +608,8 @@ a.button::after, input[type="submit"]::after {
width: 24px;
height: 24px;
/* stylelint-disable-next-line property-no-vendor-prefix */
-webkit-mask:url('/icons/arrow-right.svg');
mask: url('/icons/arrow-right.svg');
-webkit-mask:url('/solutions/icons/arrow-right.svg');
mask: url('/solutions/icons/arrow-right.svg');
background-color: var(--button-link-color);
display: inline-block;
transition: all .2s cubic-bezier(.4,0,.2,1);
Expand Down Expand Up @@ -1008,7 +1008,7 @@ main .section.blue a.button.modal::after {

@media (min-width: 992px) {
main .section.circle {
background-image: url("/icons/blue-circle.svg");
background-image: url("/solutions/icons/blue-circle.svg");
background-position: top 0 right 60%;
background-repeat: no-repeat;
background-size: auto 100%;
Expand Down
File renamed without changes.

0 comments on commit f7c1b60

Please sign in to comment.