Skip to content

Commit

Permalink
fix(site): pain
Browse files Browse the repository at this point in the history
  • Loading branch information
cor committed Sep 27, 2023
1 parent 8f572a0 commit da0b6bc
Show file tree
Hide file tree
Showing 16 changed files with 158 additions and 160 deletions.
4 changes: 2 additions & 2 deletions docs/docs/02_architecture/voyager.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ stateDiagram-v2
Actor --> Galois
Galois --> [*]
}
Processor --> Chains
Chains --> EventListener
```

Voyager integrates over [gRPC](https://grpc.io/) with Galois to offload computation to dedicated hardware, with pending support for proving markets.
Voyager integrates over [gRPC](https://grpc.io/) with Galois to offload computation to dedicated hardware, with pending support for proving markets.
File renamed without changes.
76 changes: 38 additions & 38 deletions site/package.json
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
{
"name": "union-site",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"lint": "prettier --plugin-search-dir . --check . && eslint .",
"format": "prettier --plugin-search-dir . --write ."
},
"devDependencies": {
"@sveltejs/adapter-static": "^2.0.2",
"@sveltejs/kit": "^1.20.4",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"autoprefixer": "^10.4.16",
"eslint": "^8.28.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-svelte": "^2.30.0",
"mdsvex": "^0.11.0",
"postcss": "^8.4.30",
"postcss-load-config": "^4.0.1",
"prettier": "^2.8.0",
"prettier-plugin-svelte": "^3.0.3",
"svelte": "^4.0.5",
"svelte-check": "^3.4.3",
"svelte-typewriter": "^3.1.6",
"tailwindcss": "^3.3.3",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"vite": "^4.4.2"
},
"type": "module",
"dependencies": {
"@sveltejs/adapter-static": "^2.0.3"
}
"name": "union-site",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"lint": "prettier --plugin-search-dir . --check . && eslint .",
"format": "prettier --plugin-search-dir . --write ."
},
"devDependencies": {
"@sveltejs/adapter-static": "^2.0.2",
"@sveltejs/kit": "^1.20.4",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"autoprefixer": "^10.4.16",
"eslint": "^8.28.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-svelte": "^2.30.0",
"mdsvex": "^0.11.0",
"postcss": "^8.4.30",
"postcss-load-config": "^4.0.1",
"prettier": "^2.8.0",
"prettier-plugin-svelte": "^3.0.3",
"svelte": "^4.0.5",
"svelte-check": "^3.4.3",
"svelte-typewriter": "^3.1.6",
"tailwindcss": "^3.3.3",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"vite": "^4.4.2"
},
"type": "module",
"dependencies": {
"@sveltejs/adapter-static": "^2.0.3"
}
}
10 changes: 5 additions & 5 deletions site/postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import tailwind from 'tailwindcss'
import tailwindConfig from './tailwind.config.js'
import autoprefixer from 'autoprefixer'
import tailwind from "tailwindcss";
import tailwindConfig from "./tailwind.config.js";
import autoprefixer from "autoprefixer";
export default {
plugins: [tailwind(tailwindConfig),autoprefixer]
}
plugins: [tailwind(tailwindConfig), autoprefixer],
};
20 changes: 10 additions & 10 deletions site/src/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
@tailwind utilities;

@font-face {
font-family: 'Inter';
src: url('/fonts/Inter.var.woff2') format('woff2 supports variations'),
url('/fonts/Inter.var.woff2') format('woff2-variations');
font-weight: 100 1000;
font-family: "Inter";
src: url("/fonts/Inter.var.woff2") format("woff2 supports variations"),
url("/fonts/Inter.var.woff2") format("woff2-variations");
font-weight: 100 1000;
}

@font-face {
font-family: 'Disket-Mono';
src: url('/fonts/Disket-Mono-Regular.ttf') format('truetype');
font-weight: 400;
font-family: "Disket-Mono";
src: url("/fonts/Disket-Mono-Regular.ttf") format("truetype");
font-weight: 400;
}

@font-face {
font-family: 'Disket-Mono';
src: url('/fonts/Disket-Mono-Bold.ttf') format('truetype');
font-weight: 700;
font-family: "Disket-Mono";
src: url("/fonts/Disket-Mono-Bold.ttf") format("truetype");
font-weight: 700;
}
12 changes: 6 additions & 6 deletions site/src/app.d.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// See https://kit.svelte.dev/docs/types#app
// for information about these interfaces
declare global {
namespace App {
// interface Error {}
// interface Locals {}
// interface PageData {}
// interface Platform {}
}
namespace App {
// interface Error {}
// interface Locals {}
// interface PageData {}
// interface Platform {}
}
}

export {};
30 changes: 17 additions & 13 deletions site/src/app.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%sveltekit.assets%/favicon.ico" sizes="32x32">
<link rel="icon" href="%sveltekit.assets%/icon.svg" type="image/svg+xml">
<link rel="apple-touch-icon" href="%sveltekit.assets%/apple-touch-icon.png"><!-- 180×180 -->
<link rel="manifest" href="%sveltekit.assets%/manifest.webmanifest">
<!-- source on how to export: https://evilmartians.com/chronicles/how-to-favicon-in-2021-six-files-that-fit-most-needs !-->
<meta name="viewport" content="width=device-width" />
%sveltekit.head%
</head>
<body data-sveltekit-preload-data="hover">
<div style="display: contents">%sveltekit.body%</div>
</body>
<head>
<meta charset="utf-8" />
<link rel="icon" href="%sveltekit.assets%/favicon.ico" sizes="32x32" />
<link rel="icon" href="%sveltekit.assets%/icon.svg" type="image/svg+xml" />
<link
rel="apple-touch-icon"
href="%sveltekit.assets%/apple-touch-icon.png"
/>
<!-- 180×180 -->
<link rel="manifest" href="%sveltekit.assets%/manifest.webmanifest" />
<!-- source on how to export: https://evilmartians.com/chronicles/how-to-favicon-in-2021-six-files-that-fit-most-needs !-->
<meta name="viewport" content="width=device-width" />
%sveltekit.head%
</head>
<body data-sveltekit-preload-data="hover">
<div style="display: contents">%sveltekit.body%</div>
</body>
</html>
6 changes: 4 additions & 2 deletions site/src/lib/Footer.svelte
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<footer class="flex items-center p-4 gap-4 flex justify-center text-lg text-gray-200">
<div>&copy; Union.fi Labs, Inc.</div>
<footer
class="flex items-center p-4 gap-4 flex justify-center text-lg text-gray-200"
>
<div>&copy; Union.fi Labs, Inc.</div>
</footer>
16 changes: 8 additions & 8 deletions site/src/lib/Header.svelte
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<header class="bg-bgDark flex items-center p-4 gap-4">
<a href="/"><img class="h-[32px]" src="/logo.svg" alt="Union Logo" /></a>
<nav class="flex flex-1 justify-end">
<ul class="flex gap-4 font-mono">
<li><a href="/blog">blog</a></li>
<li><a href="https://docs.union.build">docs</a></li>
<li><a href="https://x.com/union_build">X</a></li>
</ul>
</nav>
<a href="/"><img class="h-[32px]" src="/logo.svg" alt="Union Logo" /></a>
<nav class="flex flex-1 justify-end">
<ul class="flex gap-4 font-mono">
<li><a href="/blog">blog</a></li>
<li><a href="https://docs.union.build">docs</a></li>
<li><a href="https://x.com/union_build">X</a></li>
</ul>
</nav>
</header>
4 changes: 0 additions & 4 deletions site/src/routes/blog/+layout.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<script>
export const preprender = true;
</script>

<slot />

Expand Down
4 changes: 2 additions & 2 deletions site/src/routes/blog/start-of-the-endgame/+page.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ published: false

Galois and CometBLS have been live on our internal testnets for a while, but now we are ready to share a brief demo in anticipation of Cosmoverse. This is the **first, tangible implementation** of an effort that has been going on for the last few years by many different teams. We proudly present the first IBC connection to Ethereum.

Below is a live view of two smart contracts using General Message Passing (GMP) to play pingpong. Under the hood, [Galois]() is generating zero knowledge proofs to update lightclient state. Voyager is handling IBC relaying between `union-testnet-3` and `sepolia`.
Below is a live view of two smart contracts using General Message Passing (GMP) to play pingpong. Under the hood, [Galois]() is generating zero knowledge proofs to update lightclient state. Voyager is handling IBC relaying between `union-testnet-3` and `sepolia`.

## Next Steps

The testnet does not have a live explorer yet, we'll be deploying that in the coming weeks, including a faucet and token transfers.
The testnet does not have a live explorer yet, we'll be deploying that in the coming weeks, including a faucet and token transfers.

Our next demonstration will show ERC-20 to native token transfers, setting the foundation for accessing Ethereum assets natively on any appchain.

Expand Down
3 changes: 0 additions & 3 deletions site/src/routes/blog/the-journey-so-far/+page.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,3 @@ If aligned with our mission:
- Speak with us at [Cosmoverse 2023](https://cosmoverse.org/).

Our Discord and forum will be operational in the coming weeks, as well as further updates arriving in the coming days.



51 changes: 25 additions & 26 deletions site/svelte.config.js
Original file line number Diff line number Diff line change
@@ -1,35 +1,34 @@
import preprocess from 'svelte-preprocess';
import adapter from '@sveltejs/adapter-static';
import { vitePreprocess } from '@sveltejs/kit/vite';
import { mdsvex } from 'mdsvex';
import preprocess from "svelte-preprocess";
import adapter from "@sveltejs/adapter-static";
import { vitePreprocess } from "@sveltejs/kit/vite";
import { mdsvex } from "mdsvex";

// import { join } from "path";


/** @type {import('@sveltejs/kit').Config} */
const config = {
// Consult https://kit.svelte.dev/docs/integrations#preprocessors
// for more information about preprocessors
extensions: ['.svelte', '.md'],
preprocess: [
mdsvex({
extensions: ['.md' ],
layout: {
blog: 'src/mdsvex/BlogLayout.svelte',
}
}),
vitePreprocess(),
preprocess({
postcss: true
})
],
// Consult https://kit.svelte.dev/docs/integrations#preprocessors
// for more information about preprocessors
extensions: [".svelte", ".md"],
preprocess: [
mdsvex({
extensions: [".md"],
layout: {
blog: "src/mdsvex/BlogLayout.svelte",
},
}),
vitePreprocess(),
preprocess({
postcss: true,
}),
],

kit: {
// adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
// If your environment is not supported or you settled on a specific environment, switch out the adapter.
// See https://kit.svelte.dev/docs/adapters for more information about adapters.
adapter: adapter()
}
kit: {
// adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
// If your environment is not supported or you settled on a specific environment, switch out the adapter.
// See https://kit.svelte.dev/docs/adapters for more information about adapters.
adapter: adapter(),
},
};

export default config;
46 changes: 23 additions & 23 deletions site/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
/** @type {import('tailwindcss').Config} */
export default {
content: ['./src/**/*.{html,js,svelte,ts}'],
theme: {
extend: {
fontFamily: {
mono: 'Disket-Mono, Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"',
sans: [
'Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"',
{
fontFeatureSettings: '"cv11", "ss01"',
fontVariationSettings: '"opsz" 32'
}
]
},
colors: {
background: '#1b1b1d',
bgDark: '#242526',
sub: '#252525',
accent: '#00FFF0',
primary: '#fff'
}
}
},
plugins: []
content: ["./src/**/*.{html,js,svelte,ts}"],
theme: {
extend: {
fontFamily: {
mono: 'Disket-Mono, Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"',
sans: [
'Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"',
{
fontFeatureSettings: '"cv11", "ss01"',
fontVariationSettings: '"opsz" 32',
},
],
},
colors: {
background: "#1b1b1d",
bgDark: "#242526",
sub: "#252525",
accent: "#00FFF0",
primary: "#fff",
},
},
},
plugins: [],
};
30 changes: 15 additions & 15 deletions site/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"extends": "./.svelte-kit/tsconfig.json",
"compilerOptions": {
"allowJs": true,
"checkJs": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": true
}
// Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
//
// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
// from the referenced tsconfig.json - TypeScript does not merge them in
"extends": "./.svelte-kit/tsconfig.json",
"compilerOptions": {
"allowJs": true,
"checkJs": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": true
}
// Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
//
// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
// from the referenced tsconfig.json - TypeScript does not merge them in
}
6 changes: 3 additions & 3 deletions site/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { sveltekit } from '@sveltejs/kit/vite';
import { defineConfig } from 'vite';
import { sveltekit } from "@sveltejs/kit/vite";
import { defineConfig } from "vite";

export default defineConfig({
plugins: [sveltekit()]
plugins: [sveltekit()],
});

0 comments on commit da0b6bc

Please sign in to comment.