Skip to content

Commit

Permalink
Merge branch 'main' into LG/election-app-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
lsgunnlsgunn authored Jan 17, 2024
2 parents ed9a925 + 86871a7 commit 59c0cb9
Show file tree
Hide file tree
Showing 382 changed files with 9,636 additions and 6,626 deletions.
2 changes: 2 additions & 0 deletions .changeset/clever-ravens-draw.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/curly-tigers-sleep.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 5 additions & 0 deletions .changeset/dirty-bats-learn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kadena/react-ui': minor
---

Updated the Breadcrumbs component to use `useBreadcrumbs` from react-aria
2 changes: 2 additions & 0 deletions .changeset/fair-cheetahs-rule.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/fifty-bears-knock.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/five-crabs-wash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 5 additions & 0 deletions .changeset/flat-hounds-greet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kadena/react-ui': minor
---

Cleanup old Button and Link components
6 changes: 6 additions & 0 deletions .changeset/friendly-suits-tickle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@kadena/graph-client': patch
'@kadena/graph': patch
---

Performance improvements and bug fixes
2 changes: 2 additions & 0 deletions .changeset/great-radios-cough.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 5 additions & 0 deletions .changeset/great-spiders-lay.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kadena/react-ui': patch
---

Add zIndex to Tooltip component
5 changes: 5 additions & 0 deletions .changeset/khaki-wolves-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kadena/client-utils': minor
---

added createPactCommandFromStringTemplate method
5 changes: 5 additions & 0 deletions .changeset/kind-onions-crash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kadena/create-kadena-app': minor
---

Move create kadena app package
2 changes: 2 additions & 0 deletions .changeset/little-snakes-yell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/long-games-tease.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/lucky-rules-agree.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 5 additions & 0 deletions .changeset/mighty-mangos-sell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kadena/react-ui': minor
---

Updated the Box, Stack, and Grid components to accept refs
2 changes: 2 additions & 0 deletions .changeset/nine-cups-matter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/orange-rice-wash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/quick-mayflies-obey.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/rare-bikes-wait.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/strange-eels-compare.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/strange-turkeys-sleep.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/swift-mangos-tap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 5 additions & 0 deletions .changeset/thin-carrots-pull.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@kadena/graph': patch
---

Added prisma query logging
2 changes: 2 additions & 0 deletions .changeset/tough-rocks-rescue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/tricky-forks-raise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/violet-singers-wave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# About code owners: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners

/.github @ghislain89
/.github @ghislain89 @albert70g @sstraatemans @javadkh2
/.changeset
/common @alber70g
/pnpm-lock.yaml
Expand All @@ -21,5 +21,5 @@
/packages/tools/eslint-plugin @alber70g
/packages/tools/pactjs-cli @alber70g @javadkh2
/packages/tools/shared-config @alber70g
/packages/tools/e2e-tests @ghislain89
/packages/tools/integration-tests @ghislain89
/packages/tools/e2e-tests @ghislain89 @sstraatemans @sanderlooijenga @KristinaSpasevska @MRVDH @nil-amrutlal-dept
/packages/tools/integration-tests @ghislain89 @sstraatemans @sanderlooijenga @KristinaSpasevska @MRVDH @nil-amrutlal-dept
4 changes: 2 additions & 2 deletions .github/actions/devnet/action.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ echo "docker run --name=devnet -d --health-cmd='curl --verbose --fail http://loc
-v /home/runner/work/_temp:/home/runner/work/_temp \
$INPUT_MIGRATIONS \
-e GITHUB_ENV -e GITHUB_OUTPUT -e GITHUB_PATH -e GITHUB_STATE -e GITHUB_STEP_SUMMARY \
-p 8080:8080 \"kadena/devnet\""
-p 8080:8080 -p 5432:5432 \"kadena/devnet\""

exec docker run --name=devnet -d --health-cmd='curl --verbose --fail http://localhost:8080/info || exit 1' \
-v "/var/run/docker.sock":"/var/run/docker.sock" \
-v /home/runner/work/_temp:/home/runner/work/_temp \
$INPUT_MIGRATIONS \
-e GITHUB_ENV -e GITHUB_OUTPUT -e GITHUB_PATH -e GITHUB_STATE -e GITHUB_STEP_SUMMARY \
-p 8080:8080 "kadena/devnet"
-p 8080:8080 -p 5432:5432 "kadena/devnet"

echo "Waiting for devnet to be healthy..."
until [ "`docker inspect -f {{.State.Health.Status}} devnet`"=="healthy" ]; do
Expand Down
20 changes: 16 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
package: ['@kadena/client', '@kadena/client-utils']
package:
[
'@kadena/client',
'@kadena/client-utils',
'@kadena/create-kadena-app',
]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -82,7 +87,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
app: ['tools', 'docs']
app: ['tools', 'docs', 'graph']

steps:
- uses: actions/checkout@v4
Expand All @@ -100,6 +105,11 @@ jobs:
node-version: 18
cache: 'pnpm'

- name: Start devnet
uses: ./.github/actions/devnet
with:
migrations: packages/apps/graph/cwd-extra-migrations

- name: Install dependencies
run: pnpm install

Expand All @@ -108,10 +118,12 @@ jobs:

# Disable remote caching, we need to explicitly rebuild Apps.
- name: build dApp
run: pnpm --filter @kadena/${{ matrix.app }}... build
run: pnpm turbo build --filter @kadena/${{ matrix.app }} --force

- name: Run end-to-end tests
run: pnpm run test:e2e -- -c playwright.${{ matrix.app }}.config.ts
run:
pnpm turbo test:e2e --filter @kadena-dev/e2e-tests -- -c
playwright.${{ matrix.app }}.config.ts
env:
TESTOBJECT: ${{ matrix.app }}

Expand Down
6 changes: 0 additions & 6 deletions .vscode/settings.json

This file was deleted.

2 changes: 0 additions & 2 deletions packages/apps/docs/next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import {
remarkAdmonitions,
remarkCheckForCodeTitle,
remarkFigureOutOfParagraph,
remarkFixAbsoluteLinks,
remarkFrontmatterToProps,
remarkHeadersToProps,
remarkPropsToStaticRender,
Expand Down Expand Up @@ -82,7 +81,6 @@ const withMDX = mdx({
remarkSideMenuToProps,
remarkPropsToStaticRender,
remarkAdmonitions,
remarkFixAbsoluteLinks,
remarkYoutube,
remarkTwitter,
remarkCheckForCodeTitle,
Expand Down
6 changes: 4 additions & 2 deletions packages/apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
"build:scripts": "tsx ./src/scripts/build.ts",
"build:storybook": "pnpm run build:scripts && storybook build",
"chromatic": "chromatic -b build:storybook",
"dev": "NODE_OPTIONS=--max-old-space-size=8192 NODE_ENV=development pnpm run build:scripts && concurrently \"next dev\" \"pnpm run dev:docswatch\"",
"dev": "NODE_OPTIONS=--max-old-space-size=8192 IGNOREREPO=true NODE_ENV=development pnpm run build:scripts && concurrently \"next dev\" \"pnpm run dev:docswatch\"",
"dev:docswatch": "NODE_ENV=development tsx ./src/scripts/watchdocs.ts",
"dev:full": "NODE_OPTIONS=--max-old-space-size=8192 NODE_ENV=development pnpm run build:scripts && concurrently \"next dev\" \"pnpm run dev:docswatch\"",
"format": "pnpm run --sequential /^format:.*/",
"format:lint": "pnpm run lint:src --fix",
"format:src": "prettier . --cache --write",
Expand All @@ -29,7 +30,8 @@
"storybook": "storybook dev -p 6006",
"test": "vitest run",
"test:coverage": "vitest run --coverage",
"test:watch": "vitest"
"test:watch": "vitest",
"verify": "tsc --noEmit"
},
"dependencies": {
"@7-docs/edge": "^0.5.1",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions packages/apps/docs/src/components/Blog/Avatar/styles.css.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { sprinkles, vars } from '@kadena/react-ui/theme';
import { atoms, tokens } from '@kadena/react-ui/theme';
import { style, styleVariants } from '@vanilla-extract/css';

export const avatarClass = style([
sprinkles({
atoms({
display: 'flex',
justifyContent: 'center',
alignItems: 'center',

backgroundColor: '$primaryContrastInverted',
color: '$primarySurfaceInverted',
fontWeight: '$bold',
fontSize: '$md',
backgroundColor: 'base.default',
color: 'text.base.default',
fontWeight: 'bodyFont.bold',
fontSize: 'md',
}),
{
borderRadius: '50%',
Expand All @@ -19,11 +19,11 @@ export const avatarClass = style([

export const avatarSizeVariant = styleVariants({
default: {
width: vars.sizes.$10,
height: vars.sizes.$10,
width: tokens.kda.foundation.spacing.xxxl,
height: tokens.kda.foundation.spacing.xxxl,
},
large: {
width: vars.sizes.$15,
height: vars.sizes.$15,
width: tokens.kda.foundation.size.n15,
height: tokens.kda.foundation.size.n15,
},
});
39 changes: 15 additions & 24 deletions packages/apps/docs/src/components/Blog/BlogItem/BlogItem.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { IMenuData } from '@kadena/docs-tools';
import { Box, Heading, Stack, TagGroup, TagItem } from '@kadena/react-ui';
import { sprinkles } from '@kadena/react-ui/theme';

import classNames from 'classnames';
import Image from 'next/image';
import Link from 'next/link';
Expand All @@ -19,6 +19,7 @@ import {
gridBlogItemContent,
gridBlogItemImage,
gridWrapperClass,
headingWrapperClass,
imageClass,
link,
metaItem,
Expand All @@ -35,25 +36,18 @@ export const BlogItem: FC<IProps> = ({ item, size = 'default' }) => {
<Link className={link} href={item.root}>
<div className={gridWrapperClass}>
<div className={gridBlogItemImage} style={{ gridArea: 'image' }}>
<Box
className={sprinkles({
marginInlineStart: { xs: 0, md: '$8' },
marginBlockEnd: { xs: '$8', md: 0 },
})}
>
<figure className={classNames(figureClass, figureVariant[size])}>
{item.headerImage && (
<Image
className={imageClass}
src={item.headerImage}
fill
style={{ objectFit: 'cover' }}
alt={item.title}
sizes="100%"
/>
)}
</figure>
</Box>
<figure className={classNames(figureClass, figureVariant[size])}>
{item.headerImage && (
<Image
className={imageClass}
src={item.headerImage}
fill
style={{ objectFit: 'cover' }}
alt={item.title}
sizes="100%"
/>
)}
</figure>
</div>
<div
className={gridBlogItemContent[size]}
Expand All @@ -74,10 +68,7 @@ export const BlogItem: FC<IProps> = ({ item, size = 'default' }) => {
)}
</Heading>
</Stack>
<Box
marginBlockStart="md"
className={sprinkles({ marginInlineStart: '$12' })}
>
<Box marginBlockStart="md" className={headingWrapperClass}>
<Heading as="h3" variant={size === 'large' ? 'h5' : 'h6'}>
{item.title}
</Heading>
Expand Down
Loading

0 comments on commit 59c0cb9

Please sign in to comment.