Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

platform table adaptive + alert + redesign, strategy & users & contests & chains pages, e2e tests fix, invest form fix #267

Merged
merged 30 commits into from
Oct 19, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1621880
upd: platform table adaptive + redesign
DevTeaLeaf Oct 13, 2024
9c956d4
upd: e2e tests fix + platfrom alert redesign + CF form fix
DevTeaLeaf Oct 15, 2024
0b2ac41
upd: e2e yml
DevTeaLeaf Oct 15, 2024
f632182
upd: remove libasoud2
DevTeaLeaf Oct 15, 2024
9dfa993
remove install deps
DevTeaLeaf Oct 15, 2024
f8e6ac2
add get upd
DevTeaLeaf Oct 15, 2024
bc363d8
playwright update
DevTeaLeaf Oct 16, 2024
deb6456
upd: yieldRates test fix + basic tests
DevTeaLeaf Oct 17, 2024
6e08d1d
upd: users page contests
DevTeaLeaf Oct 17, 2024
fa1ec70
upd: contests block + table tabs with date + header fix
DevTeaLeaf Oct 17, 2024
afc0839
upd: types + refactoring + header fix
DevTeaLeaf Oct 17, 2024
07ab3a1
Contests appearance
a17 Oct 17, 2024
6d924cb
Merge remote-tracking branch 'refs/remotes/origin/4-vault' into alien…
a17 Oct 17, 2024
b80d1e2
upd: contests & functions fix
DevTeaLeaf Oct 17, 2024
d1367b3
upd: all contests
DevTeaLeaf Oct 17, 2024
9e2d882
upd: created badge
DevTeaLeaf Oct 17, 2024
bbc7763
upd: unit test
DevTeaLeaf Oct 17, 2024
3e73430
upd: leaderboard tabs
DevTeaLeaf Oct 17, 2024
1e9cadc
Contests appearance, lib =0.18.3
a17 Oct 18, 2024
537de01
upd: contests page
DevTeaLeaf Oct 18, 2024
270bb7b
upd: contests library
DevTeaLeaf Oct 18, 2024
f616261
upd: contests page leaderboard
DevTeaLeaf Oct 18, 2024
d89cb6f
upd: contest page reward + adaptive tables + tests
DevTeaLeaf Oct 19, 2024
d0822e7
upd: chains table protocols
DevTeaLeaf Oct 19, 2024
cfd373e
upd: pages size
DevTeaLeaf Oct 19, 2024
754d1f0
upd: vault info block header
DevTeaLeaf Oct 19, 2024
c8436f7
fix: menu no-scroll
DevTeaLeaf Oct 19, 2024
d9701eb
upd: truncated text
DevTeaLeaf Oct 19, 2024
8b52e95
upd: text block
DevTeaLeaf Oct 19, 2024
8c45203
upd: readme
DevTeaLeaf Oct 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions .github/workflows/3_e2e.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
# name: End-to-End Tests(Playwright)
# on:
# push:
# branches: [main, master]
# pull_request:
# branches: [main, master]
name: End-to-End Tests(Playwright)
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

# jobs:
# test:
# timeout-minutes: 60
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# - uses: actions/setup-node@v4
# with:
# node-version: lts/*
# - name: Install dependencies
# run: yarn install
# - name: Install Playwright Browsers
# run: yarn playwright install --with-deps
# - name: Run Playwright tests
# run: yarn test:e2e
# - uses: actions/upload-artifact@v4
# if: always()
# with:
# name: playwright-report
# path: playwright-report/
# retention-days: 30
jobs:
test:
timeout-minutes: 60
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: lts/*
- name: Install dependencies
run: yarn install
- name: Install Playwright Browsers
run: yarn playwright install --with-deps
- name: Run Playwright tests
run: yarn test:e2e
- uses: actions/upload-artifact@v4
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "stability-ui",
"type": "module",
"version": "0.12.25-alpha",
"version": "0.12.27-alpha",
"scripts": {
"dev": "astro dev",
"start": "astro dev",
Expand Down Expand Up @@ -33,6 +33,7 @@
"http-proxy-middleware": "^2.0.6",
"nanostores": "^0.9.3",
"openai": "^4.0.0",
"playwright": "^1.48.0",
"proxy-middleware": "^0.15.0",
"react": "^18.0.0",
"react-device-detect": "^2.2.3",
Expand All @@ -46,7 +47,7 @@
},
"devDependencies": {
"@currents/playwright": "1.4.5",
"@playwright/test": "1.44.1",
"@playwright/test": "1.48.0",
"@types/node": "^20.14.10",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
Expand Down
37 changes: 12 additions & 25 deletions src/components/Header/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ const Header = (): JSX.Element => {
if (body) body.classList.toggle("no-scroll", !menu);
};

const isPlatform =
platformPaths.some((path) => path === currentPath) ||
currentPath.includes("network/") ||
currentPath.includes("chains/") ||
currentPath.includes("strategies/");

const isVaults = currentPath === "" || currentPath.includes("vault/");
return (
<WagmiLayout>
<header className="font-manrope bg-accent-950 md:bg-transparent rounded-b-[16px]">
Expand All @@ -41,33 +48,15 @@ const Header = (): JSX.Element => {
<div className="menu w-2/12 text-[16px]">
<a
data-testid="vaults-link"
className={
currentPath === "" || currentPath.includes("vault/")
? "active"
: ""
}
className={isVaults ? "active" : ""}
href="/"
>
Vaults
</a>
<a
data-testid="vaults-link"
className={currentPath === "users" ? "active" : ""}
href="/users"
>
<a className={currentPath === "users" ? "active" : ""} href="/users">
Users
</a>
<a
data-testid="vaults-link"
className={
platformPaths.some((path) => path === currentPath) ||
currentPath.includes("network") ||
currentPath.includes("chains")
? "active"
: ""
}
href="/platform"
>
<a className={isPlatform ? "active" : ""} href="/platform">
Platform
</a>
</div>
Expand All @@ -83,21 +72,19 @@ const Header = (): JSX.Element => {
</div>
<nav className={`menu-nav text-center gap-3 ${menu && "active"}`}>
<a
className={`px-4 py-[10px] font-semibold ${currentPath === "" || currentPath.includes("vault/") ? "bg-accent-800 rounded-[16px]" : ""}`}
className={`px-4 py-[10px] font-semibold ${isVaults ? "bg-accent-800 rounded-[16px]" : ""}`}
href="/"
>
Vaults
</a>
<a
data-testid="vaults-link"
className={`px-4 py-[10px] font-semibold ${currentPath === "users" ? "bg-accent-800 rounded-[16px]" : ""}`}
href="/users"
>
Users
</a>
<a
data-testid="vaults-link"
className={`px-4 py-[10px] font-semibold ${platformPaths.some((path) => path === currentPath) || currentPath.includes("network") ? "bg-accent-800 rounded-[16px]" : ""}`}
className={`px-4 py-[10px] font-semibold ${isPlatform ? "bg-accent-800 rounded-[16px]" : ""}`}
href="/platform"
>
Platform
Expand Down
4 changes: 2 additions & 2 deletions src/modules/Platform/components/Assets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { assets } from "@stabilitydao/stability";

import { sortTable } from "@utils";

import { Breadcrumbs, TableColumnSort } from "@ui";
import { Breadcrumbs, TableColumnSort, HeadingText } from "@ui";

import { ASSETS_TABLE } from "@constants";

Expand Down Expand Up @@ -32,7 +32,7 @@ const Assets = (): JSX.Element => {
<div>
<Breadcrumbs links={["Platform", "Assets"]} />

<h1>Assets</h1>
<HeadingText text="Assets" scale={1} />

<table className="font-manrope w-full">
<thead className="bg-accent-950 text-neutral-600 h-[36px]">
Expand Down
Loading
Loading