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

feat: shared packages #237

Merged
merged 15 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/validate-n-build-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
filters: |
api:
- 'apps/api/**'
- 'packages/shared/**'
- 'packages/database/**'

- name: Setup Node.js
if: steps.filter.outputs.api == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ dist
build.ps1

# Data Folder
data
data
9 changes: 6 additions & 3 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

## Projects

- [Explorer](/explorer/README.md) - Website API + NextJS frontend
- [Indexer](/indexer/) - The main indexer process
- [Shared](/shared/) - Shared project
- [Deploy](/apps/deploy-web/README.md) - NextJS frontend for Console
- [Stats](/apps/stats-web/README.md) - NextJS frontend for Stats
- [Api](/apps/api/README.md) - The main Console API
- [Indexer](/apps/indexer/README.md) - The main indexer process
- [Database](/packages/database/) - Database shared package
- [UI](/packages/ui/) - UI components shared

## Create docker images

Expand Down
2 changes: 1 addition & 1 deletion apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"dependencies": {
"@akashnetwork/akash-api": "^1.3.0",
"@akashnetwork/cloudmos-shared": "*",
"@akashnetwork/database": "*",
baktun14 marked this conversation as resolved.
Show resolved Hide resolved
"@chain-registry/assets": "^0.7.1",
"@cosmjs/crypto": "^0.28.11",
"@cosmjs/encoding": "^0.28.11",
Expand Down
6 changes: 3 additions & 3 deletions apps/api/src/db/dbConnection.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { chainDefinitions } from "@akashnetwork/cloudmos-shared/chainDefinitions";
import { chainModels, getChainModels, userModels } from "@akashnetwork/cloudmos-shared/dbSchemas";
import { Template, TemplateFavorite, UserAddressName, UserSetting } from "@akashnetwork/cloudmos-shared/dbSchemas/user";
import { chainDefinitions } from "@akashnetwork/database/chainDefinitions";
import { chainModels, getChainModels, userModels } from "@akashnetwork/database/dbSchemas";
import { Template, TemplateFavorite, UserAddressName, UserSetting } from "@akashnetwork/database/dbSchemas/user";
import pg from "pg";
import { Transaction as DbTransaction } from "sequelize";
import { Sequelize } from "sequelize-typescript";
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/routers/dashboardRouter.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Template, UserSetting } from "@akashnetwork/cloudmos-shared/dbSchemas/user";
import { Template, UserSetting } from "@akashnetwork/database/dbSchemas/user";
import { Hono } from "hono";

import { privateMiddleware } from "@src/middlewares/privateMiddleware";
Expand Down
6 changes: 3 additions & 3 deletions apps/api/src/routes/internal/gpuPrices.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { MsgCreateBid } from "@akashnetwork/akash-api/akash/market/v1beta4";
import { Block } from "@akashnetwork/cloudmos-shared/dbSchemas";
import { AkashMessage, Deployment, DeploymentGroup, DeploymentGroupResource } from "@akashnetwork/cloudmos-shared/dbSchemas/akash";
import { Day, Transaction } from "@akashnetwork/cloudmos-shared/dbSchemas/base";
import { Block } from "@akashnetwork/database/dbSchemas";
import { AkashMessage, Deployment, DeploymentGroup, DeploymentGroupResource } from "@akashnetwork/database/dbSchemas/akash";
import { Day, Transaction } from "@akashnetwork/database/dbSchemas/base";
import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
import { addDays, sub } from "date-fns";
import { Op, QueryTypes } from "sequelize";
Expand Down
4 changes: 2 additions & 2 deletions apps/api/src/routes/internal/leasesDuration.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Block } from "@akashnetwork/cloudmos-shared/dbSchemas";
import { Lease } from "@akashnetwork/cloudmos-shared/dbSchemas/akash";
import { Block } from "@akashnetwork/database/dbSchemas";
import { Lease } from "@akashnetwork/database/dbSchemas/akash";
import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
import { differenceInSeconds } from "date-fns";
import { Op } from "sequelize";
Expand Down
4 changes: 2 additions & 2 deletions apps/api/src/services/db/blocksService.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AkashBlock as Block, AkashMessage as Message } from "@akashnetwork/cloudmos-shared/dbSchemas/akash";
import { Transaction, Validator } from "@akashnetwork/cloudmos-shared/dbSchemas/base";
import { AkashBlock as Block, AkashMessage as Message } from "@akashnetwork/database/dbSchemas/akash";
import { Transaction, Validator } from "@akashnetwork/database/dbSchemas/base";
import { addSeconds, differenceInSeconds } from "date-fns";

export async function getBlocks(limit: number) {
Expand Down
6 changes: 3 additions & 3 deletions apps/api/src/services/db/deploymentService.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as v2beta2 from "@akashnetwork/akash-api/akash/market/v1beta2";
import * as v1beta1 from "@akashnetwork/akash-api/deprecated/akash/market/v1beta1";
import { Block, Message } from "@akashnetwork/cloudmos-shared/dbSchemas";
import { Deployment, Lease } from "@akashnetwork/cloudmos-shared/dbSchemas/akash";
import { Transaction } from "@akashnetwork/cloudmos-shared/dbSchemas/base";
import { Block, Message } from "@akashnetwork/database/dbSchemas";
import { Deployment, Lease } from "@akashnetwork/database/dbSchemas/akash";
import { Transaction } from "@akashnetwork/database/dbSchemas/base";
import { Op, WhereOptions } from "sequelize";

import { decodeMsg } from "@src/utils/protobuf";
Expand Down
4 changes: 2 additions & 2 deletions apps/api/src/services/db/networkRevenueService.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AkashBlock as Block } from "@akashnetwork/cloudmos-shared/dbSchemas/akash";
import { Day } from "@akashnetwork/cloudmos-shared/dbSchemas/base";
import { AkashBlock as Block } from "@akashnetwork/database/dbSchemas/akash";
import { Day } from "@akashnetwork/database/dbSchemas/base";
import { add } from "date-fns";
import { Op } from "sequelize";

Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/services/db/providerDataService.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Provider, ProviderAttribute } from "@akashnetwork/cloudmos-shared/dbSchemas/akash";
import { Provider, ProviderAttribute } from "@akashnetwork/database/dbSchemas/akash";

import { getProviderAttributesSchema } from "@src/services/external/githubService";

Expand Down
4 changes: 2 additions & 2 deletions apps/api/src/services/db/providerStatusService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import {
ProviderAttributeSignature,
ProviderSnapshotNode,
ProviderSnapshotNodeGPU
} from "@akashnetwork/cloudmos-shared/dbSchemas/akash";
import { ProviderSnapshot } from "@akashnetwork/cloudmos-shared/dbSchemas/akash/providerSnapshot";
} from "@akashnetwork/database/dbSchemas/akash";
import { ProviderSnapshot } from "@akashnetwork/database/dbSchemas/akash/providerSnapshot";
import { add, sub } from "date-fns";
import { Op } from "sequelize";

Expand Down
4 changes: 2 additions & 2 deletions apps/api/src/services/db/statsService.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AkashBlock as Block } from "@akashnetwork/cloudmos-shared/dbSchemas/akash";
import { Day } from "@akashnetwork/cloudmos-shared/dbSchemas/base";
import { AkashBlock as Block } from "@akashnetwork/database/dbSchemas/akash";
import { Day } from "@akashnetwork/database/dbSchemas/base";
import { subHours } from "date-fns";
import { Op, QueryTypes } from "sequelize";

Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/services/db/templateService.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Template, TemplateFavorite, UserSetting } from "@akashnetwork/cloudmos-shared/dbSchemas/user";
import { Template, TemplateFavorite, UserSetting } from "@akashnetwork/database/dbSchemas/user";
import { Op } from "sequelize";
import * as uuid from "uuid";

Expand Down
4 changes: 2 additions & 2 deletions apps/api/src/services/db/transactionsService.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AkashBlock as Block, AkashMessage as Message } from "@akashnetwork/cloudmos-shared/dbSchemas/akash";
import { AddressReference, Transaction } from "@akashnetwork/cloudmos-shared/dbSchemas/base";
import { AkashBlock as Block, AkashMessage as Message } from "@akashnetwork/database/dbSchemas/akash";
import { AddressReference, Transaction } from "@akashnetwork/database/dbSchemas/base";
import { QueryTypes } from "sequelize";

import { chainDb } from "@src/db/dbConnection";
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/services/db/userDataService.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UserAddressName, UserSetting } from "@akashnetwork/cloudmos-shared/dbSchemas/user";
import { UserAddressName, UserSetting } from "@akashnetwork/database/dbSchemas/user";
import { Transaction } from "sequelize";

import { getUserPlan } from "../external/stripeService";
Expand Down
6 changes: 3 additions & 3 deletions apps/api/src/services/external/apiNodeService.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Block } from "@akashnetwork/cloudmos-shared/dbSchemas";
import { Deployment, Lease, Provider, ProviderAttribute } from "@akashnetwork/cloudmos-shared/dbSchemas/akash";
import { Validator } from "@akashnetwork/cloudmos-shared/dbSchemas/base";
import { Block } from "@akashnetwork/database/dbSchemas";
import { Deployment, Lease, Provider, ProviderAttribute } from "@akashnetwork/database/dbSchemas/akash";
import { Validator } from "@akashnetwork/database/dbSchemas/base";
import axios from "axios";
import fetch from "node-fetch";
import { Op } from "sequelize";
Expand Down
4 changes: 2 additions & 2 deletions apps/api/src/services/external/stripeService.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { UserSetting } from "@akashnetwork/cloudmos-shared/dbSchemas/user";
import { PlanCode } from "@akashnetwork/cloudmos-shared/plans";
import { UserSetting } from "@akashnetwork/database/dbSchemas/user";
import { PlanCode } from "@akashnetwork/database/plans";
import Stripe from "stripe";

import { env } from "@src/utils/env";
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/utils/map/provider.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Provider, ProviderSnapshot, ProviderSnapshotNode } from "@akashnetwork/cloudmos-shared/dbSchemas/akash";
import { Provider, ProviderSnapshot, ProviderSnapshotNode } from "@akashnetwork/database/dbSchemas/akash";
import semver from "semver";

import { Auditor, ProviderAttributesSchema, ProviderList } from "@src/types/provider";
Expand Down
2 changes: 1 addition & 1 deletion apps/deploy-web/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const moduleExports = {
eslint: {
ignoreDuringBuilds: true
},
transpilePackages: ["geist"],
transpilePackages: ["geist", "@akashnetwork/ui"],
// experimental: {
// // outputStandalone: true,
// externalDir: true // to make the import from shared parent folder work https://github.com/vercel/next.js/issues/9474#issuecomment-810212174
Expand Down
4 changes: 1 addition & 3 deletions apps/deploy-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"dependencies": {
"@akashnetwork/akash-api": "^1.3.0",
"@akashnetwork/akashjs": "^0.10.0",
"@akashnetwork/ui": "*",
"@auth0/nextjs-auth0": "^3.5.0",
"@chain-registry/types": "^0.41.3",
"@cosmjs/encoding": "^0.32.3",
Expand Down Expand Up @@ -116,8 +117,6 @@
"sharp": "^0.30.3",
"stripe": "^10.14.0",
"tailwind-merge": "^2.0.0",
"tailwind-scrollbar": "^3.0.5",
"tailwindcss-animate": "^1.0.7",
"tss-react": "^4.8.5",
"use-state-with-callback": "^3.0.2",
"usehooks-ts": "^2.9.1",
Expand All @@ -130,7 +129,6 @@
"@akashnetwork/dev-config": "*",
"@keplr-wallet/types": "^0.10.15",
"@next/bundle-analyzer": "^14.0.1",
"@tailwindcss/typography": "^0.5.12",
"@types/auth0": "^2.35.3",
"@types/file-saver": "^2.0.5",
"@types/js-yaml": "^4.0.5",
Expand Down
9 changes: 1 addition & 8 deletions apps/deploy-web/postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
module.exports = {
plugins: {
"postcss-import": {},
"tailwindcss/nesting": "postcss-nesting",
tailwindcss: {},
autoprefixer: {}
}
};
module.exports = require("@akashnetwork/ui/postcss");
2 changes: 1 addition & 1 deletion apps/deploy-web/public/sw.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/deploy-web/public/sw.js.map

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions apps/deploy-web/public/workbox-19663cdd.js

This file was deleted.

1 change: 0 additions & 1 deletion apps/deploy-web/public/workbox-19663cdd.js.map

This file was deleted.

2 changes: 2 additions & 0 deletions apps/deploy-web/public/workbox-495fd258.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/deploy-web/public/workbox-495fd258.js.map

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Bin, Edit } from "iconoir-react";

import { Address } from "@src/components/shared/Address";
import { AKTAmount } from "@src/components/shared/AKTAmount";
import { Button } from "@src/components/ui/button";
import { Button } from "@akashnetwork/ui/components";
import { TableCell, TableRow } from "@src/components/ui/table";
import { AllowanceType } from "@src/types/grant";
import { getAllowanceTitleByType } from "@src/utils/grants";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Address } from "@src/components/shared/Address";
import { Fieldset } from "@src/components/shared/Fieldset";
import { Popup } from "@src/components/shared/Popup";
import Spinner from "@src/components/shared/Spinner";
import { Button } from "@src/components/ui/button";
import { Button } from "@akashnetwork/ui/components";
import { Table, TableBody, TableHead, TableHeader, TableRow } from "@src/components/ui/table";
import { useWallet } from "@src/context/WalletProvider";
import { useAllowancesGranted, useAllowancesIssued, useGranteeGrants, useGranterGrants } from "@src/queries/useGrantsQuery";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Bin, Edit } from "iconoir-react";

import { Address } from "@src/components/shared/Address";
import { AKTAmount } from "@src/components/shared/AKTAmount";
import { Button } from "@src/components/ui/button";
import { Button } from "@akashnetwork/ui/components";
import { TableCell, TableRow } from "@src/components/ui/table";
import { useDenomData } from "@src/hooks/useWalletBalance";
import { GrantType } from "@src/types/grant";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { event } from "nextjs-google-analytics";

import Spinner from "@src/components/shared/Spinner";
import { Alert } from "@src/components/ui/alert";
import { Button, buttonVariants } from "@src/components/ui/button";
import { Button, buttonVariants } from "@akashnetwork/ui/components";
import { Tabs, TabsList, TabsTrigger } from "@src/components/ui/tabs";
import { useCertificate } from "@src/context/CertificateProvider";
import { useSettings } from "@src/context/SettingsProvider";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useRouter } from "next/navigation";
import { event } from "nextjs-google-analytics";

import { CustomDropdownLinkItem } from "@src/components/shared/CustomDropdownLinkItem";
import { Button } from "@src/components/ui/button";
import { Button } from "@akashnetwork/ui/components";
import { DropdownMenu, DropdownMenuContent } from "@src/components/ui/dropdown-menu";
import { useLocalNotes } from "@src/context/LocalNoteProvider";
import { useWallet } from "@src/context/WalletProvider";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Link from "next/link";
import Spinner from "@src/components/shared/Spinner";
import ViewPanel from "@src/components/shared/ViewPanel";
import { Alert } from "@src/components/ui/alert";
import { Button } from "@src/components/ui/button";
import { Button } from "@akashnetwork/ui/components";
import { useCertificate } from "@src/context/CertificateProvider";
import { useCustomWebSocket } from "@src/hooks/useCustomWebSocket";
import { XTerm } from "@src/lib/XTerm";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { NextSeo } from "next-seo";
import { CustomPagination } from "@src/components/shared/CustomPagination";
import { LinkTo } from "@src/components/shared/LinkTo";
import Spinner from "@src/components/shared/Spinner";
import { Button, buttonVariants } from "@src/components/ui/button";
import { Button, buttonVariants } from "@akashnetwork/ui/components";
import { CheckboxWithLabel } from "@src/components/ui/checkbox";
import { InputWithIcon } from "@src/components/ui/input";
import { Table, TableBody, TableHead, TableHeader, TableRow } from "@src/components/ui/table";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { PricePerMonth } from "../shared/PricePerMonth";
import { PriceValue } from "../shared/PriceValue";
import { SpecDetailList } from "../shared/SpecDetailList";
import Spinner from "../shared/Spinner";
import { Button } from "../ui/button";
import { Button } from "@akashnetwork/ui/components";
import { Checkbox } from "../ui/checkbox";
import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from "../ui/dropdown-menu";
import { TableCell, TableRow } from "../ui/table";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { SelectCheckbox } from "@src/components/shared/SelectCheckbox";
import Spinner from "@src/components/shared/Spinner";
import ViewPanel from "@src/components/shared/ViewPanel";
import { Alert } from "@src/components/ui/alert";
import { Button } from "@src/components/ui/button";
import { Button } from "@akashnetwork/ui/components";
import { Checkbox, CheckboxWithLabel } from "@src/components/ui/checkbox";
import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from "@src/components/ui/dropdown-menu";
import { useBackgroundTask } from "@src/context/BackgroundTaskProvider";
Expand Down
2 changes: 1 addition & 1 deletion apps/deploy-web/src/components/deployments/LeaseRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Spinner from "@src/components/shared/Spinner";
import { StatusPill } from "@src/components/shared/StatusPill";
import { Alert } from "@src/components/ui/alert";
import { Badge } from "@src/components/ui/badge";
import { Button } from "@src/components/ui/button";
import { Button } from "@akashnetwork/ui/components";
import { Card, CardContent, CardHeader } from "@src/components/ui/card";
import { useCertificate } from "@src/context/CertificateProvider";
import { LocalCert } from "@src/context/CertificateProvider/CertificateProviderContext";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { LinkTo } from "@src/components/shared/LinkTo";
import Spinner from "@src/components/shared/Spinner";
import ViewPanel from "@src/components/shared/ViewPanel";
import { Alert } from "@src/components/ui/alert";
import { Button } from "@src/components/ui/button";
import { Button } from "@akashnetwork/ui/components";
import { useCertificate } from "@src/context/CertificateProvider";
import { LocalCert } from "@src/context/CertificateProvider/CertificateProviderContext";
import { useSettings } from "@src/context/SettingsProvider";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { cn } from "@src/utils/styleUtils";
import { UrlService } from "@src/utils/urlUtils";
import { CustomTooltip } from "../shared/CustomTooltip";
import { ExternalLink } from "../shared/ExternalLink";
import { Button, buttonVariants } from "../ui/button";
import { Button, buttonVariants } from "@akashnetwork/ui/components";
import { ConnectWalletButton } from "../wallet/ConnectWalletButton";
import { QontoConnector, QontoStepIcon } from "./Stepper";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { UrlService } from "@src/utils/urlUtils";
import { ExternalLink } from "../shared/ExternalLink";
import { LinkTo } from "../shared/LinkTo";
import { Alert } from "../ui/alert";
import { buttonVariants } from "../ui/button";
import { buttonVariants } from "@akashnetwork/ui/components";
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "../ui/collapsible";
import { CreateWalletSection } from "./CreateWalletSection";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { UrlService } from "@src/utils/urlUtils";
import { ExternalLink } from "../shared/ExternalLink";
import { LinkTo } from "../shared/LinkTo";
import { Alert } from "../ui/alert";
import { buttonVariants } from "../ui/button";
import { buttonVariants } from "@akashnetwork/ui/components";
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "../ui/collapsible";
import { CreateWalletSection } from "./CreateWalletSection";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Link from "next/link";
import { cn } from "@src/utils/styleUtils";
import { UrlService } from "@src/utils/urlUtils";
import { ExternalLink } from "../shared/ExternalLink";
import { buttonVariants } from "../ui/button";
import { buttonVariants } from "@akashnetwork/ui/components";

export const WithKeplrSection: React.FunctionComponent = () => {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Import } from "iconoir-react";
import { z } from "zod";

import { Card, CardContent, CardHeader, CardTitle } from "@src/components/ui/card";
import { Button } from "../ui/button";
import { Button } from "@akashnetwork/ui/components";

const autoImportOrigin = "https://deploy.cloudmos.io";

Expand Down
2 changes: 1 addition & 1 deletion apps/deploy-web/src/components/home/WelcomePanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Learning, NavArrowDown, Rocket, SearchEngine } from "iconoir-react";
import Link from "next/link";

import { Avatar, AvatarFallback } from "@src/components/ui/avatar";
import { Button } from "@src/components/ui/button";
import { Button } from "@akashnetwork/ui/components";
import { Card, CardContent, CardHeader, CardTitle } from "@src/components/ui/card";
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@src/components/ui/collapsible";
import { cn } from "@src/utils/styleUtils";
Expand Down
2 changes: 1 addition & 1 deletion apps/deploy-web/src/components/home/YourAccount.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { PriceValue } from "../shared/PriceValue";
import Spinner from "../shared/Spinner";
import { StatusPill } from "../shared/StatusPill";
import { Badge } from "../ui/badge";
import { buttonVariants } from "../ui/button";
import { buttonVariants } from "@akashnetwork/ui/components";
import { Card, CardContent, CardHeader, CardTitle } from "../ui/card";

// const LiquidityModal = dynamic(() => import("../liquidity-modal"), {
Expand Down
2 changes: 1 addition & 1 deletion apps/deploy-web/src/components/layout/AccountMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { UrlService } from "@src/utils/urlUtils";
import { CustomDropdownLinkItem } from "../shared/CustomDropdownLinkItem";
import Spinner from "../shared/Spinner";
import { Avatar, AvatarFallback } from "../ui/avatar";
import { Button } from "../ui/button";
import { Button } from "@akashnetwork/ui/components";;
import { DropdownMenu, DropdownMenuContent, DropdownMenuSeparator } from "../ui/dropdown-menu";

export function AccountMenu() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { cn } from "@src/utils/styleUtils";
import { UrlService } from "@src/utils/urlUtils";
import Spinner from "../shared/Spinner";
import { Avatar } from "../ui/avatar";
import { buttonVariants } from "../ui/button";
import { buttonVariants } from "@akashnetwork/ui/components";
import { Separator } from "../ui/separator";
import { SidebarRouteButton } from "./SidebarRouteButton";
import { WalletStatus } from "./WalletStatus";
Expand Down
Loading
Loading