Merge remote-tracking branch 'origin/main'

Netcentric · Feb 12, 2024 · 2b7b088 · 2b7b088
2 parents 1aff057 + 1836227
commit 2b7b088
Show file tree

Hide file tree

Showing 14 changed files with 708 additions and 37 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,13 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -18,4 +18,5 @@ module.exports = {
       js: 'always',
     }],
   },
+  ignorePatterns: ['app/*'],
 };
diff --git a/README.md b/README.md
@@ -1,9 +1,10 @@
 # Your Project's Title...
 Your project's description...
 
+
 ## Environments
-- Preview: https://main--{repo}--{owner}.hlx.page/
-- Live: https://main--{repo}--{owner}.hlx.live/
+- Preview: https://main--edge-delivery-solari--netcentric.hlx.page/
+- Live: https://main--edge-delivery-solari--netcentric.hlx.live/
 
 ## Installation
 
@@ -18,6 +19,7 @@ npm run lint
 ```
 
 ## Local development
+### Use node 16 ;) 
 
 1. Create a new repository based on the `aem-boilerplate` template and add a mountpoint in the `fstab.yaml`
 1. Add the [AEM Code Sync GitHub App](https://github.com/apps/aem-code-sync) to the repository

diff --git a/app.html b/app.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>SolariAstrocraft</title>
+    <base href="/" />
+
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+    <script type="module" crossorigin src="/app/index-QXy8U9dP.js"></script>
+    <link rel="stylesheet" crossorigin href="/app/index-b-uLghJ2.css">
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>
diff --git a/app/Gellix-Light_R-rnyaDpLS.woff2 b/app/Gellix-Light_R-rnyaDpLS.woff2
diff --git a/app/Gellix-Regular_R-bkw9j1Fe.woff2 b/app/Gellix-Regular_R-bkw9j1Fe.woff2
diff --git a/app/Gellix-SemiBold_R-0xYLEE4-.woff2 b/app/Gellix-SemiBold_R-0xYLEE4-.woff2
diff --git a/app/cognizant_logo-M8CUJeBM.svg b/app/cognizant_logo-M8CUJeBM.svg
diff --git a/app/gradient-OWzHst01.svg b/app/gradient-OWzHst01.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,4 +18,5 @@ module.exports = { @@
           js: 'always',
         }],
       },
+      ignorePatterns: ['app/*'],
     };