Resolve merge conflicts

consensusnetworks · Oct 12, 2023 · 656dc33 · 656dc33
2 parents 27f4b4e + f6c8157
commit 656dc33
Show file tree

Hide file tree

Showing 59 changed files with 3,554 additions and 2,854 deletions.
diff --git a/apps/landing/index.html b/apps/landing/index.html
@@ -7,7 +7,17 @@
 
     <!-- Font -->
     <link rel="stylesheet" media="screen" href="https://fontlibrary.org//face/open-sauce-one" type="text/css"/>
-
+
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link
+      href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@200;300;400;500&display=swap"
+      rel="stylesheet"
+    />
+    <link
+      href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,100;0,200;0,300;0,400;1,100;1,200;1,300&family=IBM+Plex+Sans:wght@200;300;400;500&display=swap"
+      rel="stylesheet"
+    />
     <!-- Icon Library -->
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/lucaburgio/iconoir@main/css/iconoir.css">
 
@@ -16,5 +26,6 @@
   <body>
     <div id="app"></div>
     <script type="module" src="/src/main.ts"></script>
+    <script src="https://cdn.usefathom.com/script.js" data-site="FZREKLVM" defer></script>
   </body>
 </html>
diff --git a/apps/landing/package.json b/apps/landing/package.json
@@ -11,6 +11,8 @@
   "dependencies": {
     "@heroicons/vue": "^1.0.6",
     "iconoir": "^5.3.2",
+    "sass": "^1.69.1",
+    "snarkdown": "^2.0.0",
     "vue": "^3.2.25",
     "vue-router": "^4.0.15"
   },

diff --git a/apps/landing/public/action.png b/apps/landing/public/action.png
diff --git a/apps/landing/public/arrow.svg b/apps/landing/public/arrow.svg
diff --git a/apps/landing/public/credit-card.svg b/apps/landing/public/credit-card.svg
diff --git a/apps/landing/public/decentralized_nodes.svg b/apps/landing/public/decentralized_nodes.svg
diff --git a/apps/landing/public/disc.svg b/apps/landing/public/disc.svg
diff --git a/apps/landing/public/discord.svg b/apps/landing/public/discord.svg
diff --git a/apps/landing/public/flash.svg b/apps/landing/public/flash.svg
diff --git a/apps/landing/public/future_casimir.svg b/apps/landing/public/future_casimir.svg
diff --git a/apps/landing/public/gg.svg b/apps/landing/public/gg.svg
diff --git a/apps/landing/public/hero.png b/apps/landing/public/hero.png
diff --git a/apps/landing/public/key.svg b/apps/landing/public/key.svg
diff --git a/apps/landing/public/lock.svg b/apps/landing/public/lock.svg
diff --git a/apps/landing/public/logo.png b/apps/landing/public/logo.png
diff --git a/apps/landing/public/logo.svg b/apps/landing/public/logo.svg
diff --git a/apps/landing/public/metamask.svg b/apps/landing/public/metamask.svg
diff --git a/apps/landing/public/minimal_trust.svg b/apps/landing/public/minimal_trust.svg
diff --git a/apps/landing/public/stake.png b/apps/landing/public/stake.png
diff --git a/apps/landing/public/staking.png b/apps/landing/public/staking.png
diff --git a/apps/landing/public/twitter_x_logo.png b/apps/landing/public/twitter_x_logo.png
diff --git a/apps/landing/public/tx.png b/apps/landing/public/tx.png
diff --git a/apps/landing/public/txx.png b/apps/landing/public/txx.png
diff --git a/apps/landing/public/txx2.png b/apps/landing/public/txx2.png
diff --git a/apps/landing/public/users.svg b/apps/landing/public/users.svg
diff --git a/apps/landing/public/walletIcon.svg b/apps/landing/public/walletIcon.svg
diff --git a/apps/landing/src/App.vue b/apps/landing/src/App.vue
@@ -1,34 +1,19 @@
 <script lang="ts" setup>
-import NavBar from '@/components/NavBar.vue'
-import Footer from '@/components/Footer.vue'
+// Initalize blogs here for least amount of fetch calls
+import useBlogs from '@/composables/blogs.ts'
 
+const {
+  activeBlog,
+  allBlogs,
+  loadingBlogs,
+} = useBlogs()
 </script>
 
 <template>
-  <div class="w-full h-screen overflow-y-auto min-w-[360px]">
-    <div 
-      class="absolute top-0 left-0 w-full"
-      style="z-index: 2;"
-    >
-      <NavBar
-        class="sticky top-0 left-0 w-full px-[60px] 800s:px-[5%] z-[999]"
-      />
-      <RouterView
-        class="w-full px-[60px] 800s:px-[5%]"
-      />
-      <Footer
-        class="px-[60px] 800s:px-[5%]  " 
-      />
-    </div>
-
-
-    <div
-      class="absolute w-full h-[700px] bg-black top-0 left-0"
-      style="z-index: 0;"
-    />
+  <div>
+    <router-view />
   </div>
 </template>
 
 
-<style scoped>
-</style>
+<style scoped></style>
diff --git a/apps/landing/src/blogs/blog.md b/apps/landing/src/blogs/blog.md
@@ -0,0 +1,11 @@
+# Casimir is Live on Goerli!
+
+10/2/2023
+
+We're proud to announce that our distributed, self custody ETH staking platform, Casimir, is live on the ETH Goerli Testnet. Casimir is powered by distributed key generation and distributed validator technology. The Casimir SelfStake manager offers an approach where stakers can directly deposit any amount of ETH to high-performing Ethereum operators. This approach minimizes counterparty risk for users and enhances the decentralization of Ethereum staking:
+* Validators duties are performed by openly registered (and collateralized) operators running distributed validator technology (DVT)
+* Keys are trustlessly managed using zero-coordination distributed key generation (DKG)
+* Automated actions (like compounding stake or handling a slash) are carried out by a decentralized oracle network (DON)
+* The staking user experience is improved by wrapping staking contract actions using account abstraction.
+
+By creating a smart contract primitive that trustlessly connects stakers and node operators, we create a customizable staking process that allows users to access new staking features, such as restaking. Over the next few weeks we'll be introducing some of these additional features, such as restaking, to our platform.
diff --git a/apps/landing/src/components/Footer.vue b/apps/landing/src/components/Footer.vue