diff --git a/.dependency-cruiser.cjs b/.dependency-cruiser.cjs new file mode 100644 index 0000000..08ad076 --- /dev/null +++ b/.dependency-cruiser.cjs @@ -0,0 +1,395 @@ +/** @type {import('dependency-cruiser').IConfiguration} */ +module.exports = { + forbidden: [ + { + name: 'no-circular', + severity: 'warn', + comment: + 'This dependency is part of a circular relationship. You might want to revise ' + + 'your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ', + from: {}, + to: { + circular: true + } + }, + { + name: 'no-orphans', + comment: + "This is an orphan module - it's likely not used (anymore?). Either use it or " + + "remove it. If it's logical this module is an orphan (i.e. it's a config file), " + + "add an exception for it in your dependency-cruiser configuration. By default " + + "this rule does not scrutinize dot-files (e.g. .eslintrc.js), TypeScript declaration " + + "files (.d.ts), tsconfig.json and some of the babel and webpack configs.", + severity: 'warn', + from: { + orphan: true, + pathNot: [ + '(^|/)[.][^/]+[.](?:js|cjs|mjs|ts|cts|mts|json)$', // dot files + '[.]d[.]ts$', // TypeScript declaration files + '(^|/)tsconfig[.]json$', // TypeScript config + '(^|/)(?:babel|webpack)[.]config[.](?:js|cjs|mjs|ts|cts|mts|json)$' // other configs + ] + }, + to: {}, + }, + { + name: 'no-deprecated-core', + comment: + 'A module depends on a node core module that has been deprecated. Find an alternative - these are ' + + "bound to exist - node doesn't deprecate lightly.", + severity: 'warn', + from: {}, + to: { + dependencyTypes: [ + 'core' + ], + path: [ + '^v8/tools/codemap$', + '^v8/tools/consarray$', + '^v8/tools/csvparser$', + '^v8/tools/logreader$', + '^v8/tools/profile_view$', + '^v8/tools/profile$', + '^v8/tools/SourceMap$', + '^v8/tools/splaytree$', + '^v8/tools/tickprocessor-driver$', + '^v8/tools/tickprocessor$', + '^node-inspect/lib/_inspect$', + '^node-inspect/lib/internal/inspect_client$', + '^node-inspect/lib/internal/inspect_repl$', + '^async_hooks$', + '^punycode$', + '^domain$', + '^constants$', + '^sys$', + '^_linklist$', + '^_stream_wrap$' + ], + } + }, + { + name: 'not-to-deprecated', + comment: + 'This module uses a (version of an) npm module that has been deprecated. Either upgrade to a later ' + + 'version of that module, or find an alternative. Deprecated modules are a security risk.', + severity: 'warn', + from: {}, + to: { + dependencyTypes: [ + 'deprecated' + ] + } + }, + { + name: 'no-non-package-json', + severity: 'error', + comment: + "This module depends on an npm package that isn't in the 'dependencies' section of your package.json. " + + "That's problematic as the package either (1) won't be available on live (2 - worse) will be " + + "available on live with an non-guaranteed version. Fix it by adding the package to the dependencies " + + "in your package.json.", + from: {}, + to: { + dependencyTypes: [ + 'npm-no-pkg', + 'npm-unknown' + ] + } + }, + { + name: 'not-to-unresolvable', + comment: + "This module depends on a module that cannot be found ('resolved to disk'). If it's an npm " + + 'module: add it to your package.json. In all other cases you likely already know what to do.', + severity: 'error', + from: {}, + to: { + couldNotResolve: true + } + }, + { + name: 'no-duplicate-dep-types', + comment: + "Likely this module depends on an external ('npm') package that occurs more than once " + + "in your package.json i.e. bot as a devDependencies and in dependencies. This will cause " + + "maintenance problems later on.", + severity: 'warn', + from: {}, + to: { + moreThanOneDependencyType: true, + // as it's pretty common to have a type import be a type only import + // _and_ (e.g.) a devDependency - don't consider type-only dependency + // types for this rule + dependencyTypesNot: ["type-only"] + } + }, + + /* rules you might want to tweak for your specific situation: */ + + { + name: 'not-to-spec', + comment: + 'This module depends on a spec (test) file. The sole responsibility of a spec file is to test code. ' + + "If there's something in a spec that's of use to other modules, it doesn't have that single " + + 'responsibility anymore. Factor it out into (e.g.) a separate utility/ helper or a mock.', + severity: 'error', + from: {}, + to: { + path: '[.](?:spec|test)[.](?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$' + } + }, + { + name: 'not-to-dev-dep', + severity: 'error', + comment: + "This module depends on an npm package from the 'devDependencies' section of your " + + 'package.json. It looks like something that ships to production, though. To prevent problems ' + + "with npm packages that aren't there on production declare it (only!) in the 'dependencies'" + + 'section of your package.json. If this module is development only - add it to the ' + + 'from.pathNot re of the not-to-dev-dep rule in the dependency-cruiser configuration', + from: { + path: '^(src)', + pathNot: '[.](?:spec|test)[.](?:js|mjs|cjs|jsx|ts|mts|cts|tsx)$' + }, + to: { + dependencyTypes: [ + 'npm-dev', + ], + // type only dependencies are not a problem as they don't end up in the + // production code or are ignored by the runtime. + dependencyTypesNot: [ + 'type-only' + ], + pathNot: [ + 'node_modules/@types/' + ] + } + }, + { + name: 'optional-deps-used', + severity: 'info', + comment: + "This module depends on an npm package that is declared as an optional dependency " + + "in your package.json. As this makes sense in limited situations only, it's flagged here. " + + "If you're using an optional dependency here by design - add an exception to your" + + "dependency-cruiser configuration.", + from: {}, + to: { + dependencyTypes: [ + 'npm-optional' + ] + } + }, + { + name: 'peer-deps-used', + comment: + "This module depends on an npm package that is declared as a peer dependency " + + "in your package.json. This makes sense if your package is e.g. a plugin, but in " + + "other cases - maybe not so much. If the use of a peer dependency is intentional " + + "add an exception to your dependency-cruiser configuration.", + severity: 'warn', + from: {}, + to: { + dependencyTypes: [ + 'npm-peer' + ] + } + } + ], + options: { + + /* Which modules not to follow further when encountered */ + doNotFollow: { + /* path: an array of regular expressions in strings to match against */ + path: ['node_modules'] + }, + + /* Which modules to exclude */ + // exclude : { + // /* path: an array of regular expressions in strings to match against */ + // path: '', + // }, + + /* Which modules to exclusively include (array of regular expressions in strings) + dependency-cruiser will skip everything not matching this pattern + */ + // includeOnly : [''], + + /* List of module systems to cruise. + When left out dependency-cruiser will fall back to the list of _all_ + module systems it knows of. It's the default because it's the safe option + It might come at a performance penalty, though. + moduleSystems: ['amd', 'cjs', 'es6', 'tsd'] + + As in practice only commonjs ('cjs') and ecmascript modules ('es6') + are widely used, you can limit the moduleSystems to those. + */ + + // moduleSystems: ['cjs', 'es6'], + + /* + false: don't look at JSDoc imports (the default) + true: dependency-cruiser will detect dependencies in JSDoc-style + import statements. Implies "parser": "tsc", so the dependency-cruiser + will use the typescript parser for JavaScript files. + + For this to work the typescript compiler will need to be installed in the + same spot as you're running dependency-cruiser from. + */ + // detectJSDocImports: true, + + /* prefix for links in html and svg output (e.g. 'https://github.com/you/yourrepo/blob/main/' + to open it on your online repo or `vscode://file/${process.cwd()}/` to + open it in visual studio code), + */ + // prefix: `vscode://file/${process.cwd()}/`, + + /* false (the default): ignore dependencies that only exist before typescript-to-javascript compilation + true: also detect dependencies that only exist before typescript-to-javascript compilation + "specify": for each dependency identify whether it only exists before compilation or also after + */ + // tsPreCompilationDeps: false, + + /* list of extensions to scan that aren't javascript or compile-to-javascript. + Empty by default. Only put extensions in here that you want to take into + account that are _not_ parsable. + */ + // extraExtensionsToScan: [".json", ".jpg", ".png", ".svg", ".webp"], + + /* if true combines the package.jsons found from the module up to the base + folder the cruise is initiated from. Useful for how (some) mono-repos + manage dependencies & dependency definitions. + */ + // combinedDependencies: false, + + /* if true leave symlinks untouched, otherwise use the realpath */ + // preserveSymlinks: false, + + /* TypeScript project file ('tsconfig.json') to use for + (1) compilation and + (2) resolution (e.g. with the paths property) + + The (optional) fileName attribute specifies which file to take (relative to + dependency-cruiser's current working directory). When not provided + defaults to './tsconfig.json'. + */ + tsConfig: { + fileName: 'jsconfig.json' + }, + + /* Webpack configuration to use to get resolve options from. + + The (optional) fileName attribute specifies which file to take (relative + to dependency-cruiser's current working directory. When not provided defaults + to './webpack.conf.js'. + + The (optional) `env` and `arguments` attributes contain the parameters + to be passed if your webpack config is a function and takes them (see + webpack documentation for details) + */ + // webpackConfig: { + // fileName: 'webpack.config.js', + // env: {}, + // arguments: {} + // }, + + /* Babel config ('.babelrc', '.babelrc.json', '.babelrc.json5', ...) to use + for compilation + */ + // babelConfig: { + // fileName: '.babelrc', + // }, + + /* List of strings you have in use in addition to cjs/ es6 requires + & imports to declare module dependencies. Use this e.g. if you've + re-declared require, use a require-wrapper or use window.require as + a hack. + */ + // exoticRequireStrings: [], + + /* options to pass on to enhanced-resolve, the package dependency-cruiser + uses to resolve module references to disk. The values below should be + suitable for most situations + + If you use webpack: you can also set these in webpack.conf.js. The set + there will override the ones specified here. + */ + enhancedResolveOptions: { + /* What to consider as an 'exports' field in package.jsons */ + exportsFields: ["exports"], + /* List of conditions to check for in the exports field. + Only works when the 'exportsFields' array is non-empty. + */ + conditionNames: ["import", "require", "node", "default", "types"], + /* The extensions, by default are the same as the ones dependency-cruiser + can access (run `npx depcruise --info` to see which ones that are in + _your_ environment). If that list is larger than you need you can pass + the extensions you actually use (e.g. [".js", ".jsx"]). This can speed + up module resolution, which is the most expensive step. + */ + // extensions: [".js", ".jsx", ".ts", ".tsx", ".d.ts"], + /* What to consider a 'main' field in package.json */ + mainFields: ["module", "main", "types", "typings"], + /* A list of alias fields in package.jsons + + See [this specification](https://github.com/defunctzombie/package-browser-field-spec) and + the webpack [resolve.alias](https://webpack.js.org/configuration/resolve/#resolvealiasfields) + documentation. + + Defaults to an empty array (= don't use alias fields). + */ + // aliasFields: ["browser"], + }, + + /* skipAnalysisNotInRules will make dependency-cruiser execute + analysis strictly necessary for checking the rule set only. + + See https://github.com/sverweij/dependency-cruiser/blob/main/doc/options-reference.md#skipanalysisnotinrules + for details + */ + skipAnalysisNotInRules: true, + + reporterOptions: { + dot: { + /* pattern of modules that can be consolidated in the detailed + graphical dependency graph. The default pattern in this configuration + collapses everything in node_modules to one folder deep so you see + the external modules, but their innards. + */ + collapsePattern: 'node_modules/(?:@[^/]+/[^/]+|[^/]+)', + + /* Options to tweak the appearance of your graph.See + https://github.com/sverweij/dependency-cruiser/blob/main/doc/options-reference.md#reporteroptions + for details and some examples. If you don't specify a theme + dependency-cruiser falls back to a built-in one. + */ + // theme: { + // graph: { + // /* splines: "ortho" gives straight lines, but is slow on big graphs + // splines: "true" gives bezier curves (fast, not as nice as ortho) + // */ + // splines: "true" + // }, + // } + }, + archi: { + /* pattern of modules that can be consolidated in the high level + graphical dependency graph. If you use the high level graphical + dependency graph reporter (`archi`) you probably want to tweak + this collapsePattern to your situation. + */ + collapsePattern: '^(?:packages|src|lib(s?)|app(s?)|bin|test(s?)|spec(s?))/[^/]+|node_modules/(?:@[^/]+/[^/]+|[^/]+)', + + /* Options to tweak the appearance of your graph. If you don't specify a + theme for 'archi' dependency-cruiser will use the one specified in the + dot section above and otherwise use the default one. + */ + // theme: { }, + }, + "text": { + "highlightFocused": true + }, + } + } +}; +// generated: dependency-cruiser@16.10.1 on 2025-04-24T20:50:32.854Z diff --git a/bin/depcruise b/bin/depcruise new file mode 100755 index 0000000..5e2fe6e --- /dev/null +++ b/bin/depcruise @@ -0,0 +1,2 @@ +#!/bin/bash +npx depcruise src diff --git a/package.json b/package.json index ad5a789..46cfe3d 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "pinia-plugin-persistedstate": "^4.1.3", "roboto-fontface": "*", "socket.io-client": "^4.7.2", + "uuid": "^11.1.0", "vue": "^3.2.0", "vue-router": "^4.0.0", "vue-scroll-picker": "^1.2.2", @@ -34,6 +35,7 @@ }, "devDependencies": { "@vitejs/plugin-vue": "^4.0.0", + "dependency-cruiser": "^16.10.1", "eslint": "^8.37.0", "eslint-plugin-vue": "^9.3.0", "sass": "^1.60.0", diff --git a/src/App.vue b/src/App.vue index 7ae54cd..b54cb56 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,12 +6,9 @@ diff --git a/src/blockchain/contract.js b/src/blockchain/contract.js index dba6138..85c3940 100644 --- a/src/blockchain/contract.js +++ b/src/blockchain/contract.js @@ -1,6 +1,6 @@ +import {provider as walletProvider} from "@/blockchain/provider.js"; import {ethers} from "ethers"; import {AbiURLCache} from "../common.js"; -import {provider as walletProvider} from "@/blockchain/wallet.js"; export const abiCache = new AbiURLCache('/contract/out/') diff --git a/src/blockchain/orderlib.js b/src/blockchain/orderlib.js index a8d5383..e596067 100644 --- a/src/blockchain/orderlib.js +++ b/src/blockchain/orderlib.js @@ -1,6 +1,6 @@ import {uint32max, uint64max} from "@/misc.js"; import {encodeIEE754} from "@/common.js"; -import {DEFAULT_SLIPPAGE, MIN_SLIPPAGE} from "@/orderbuild.js"; + export const MAX_FRACTION = 65535; export const NO_CONDITIONAL_ORDER = uint64max; @@ -8,6 +8,10 @@ export const NO_OCO = uint64max; export const DISTANT_PAST = 0 export const DISTANT_FUTURE = uint32max +export const MIN_EXECUTION_TIME = 60 // give at least one full minute for each tranche to trigger +export const DEFAULT_SLIPPAGE = 0.0030; +export const MIN_SLIPPAGE = 0.0001; + // struct SwapOrder { // address tokenIn; // address tokenOut; @@ -253,4 +257,3 @@ export function parseFeeSchedule(sched) { fillFee: fillFeeHalfBps/1_000_000 // fillFee is a multiplier on the filled volume. 0.0001 = 0.1% of the output token taken as a fee } } - diff --git a/src/blockchain/prices.js b/src/blockchain/prices.js index f42d289..92d579f 100644 --- a/src/blockchain/prices.js +++ b/src/blockchain/prices.js @@ -1,10 +1,10 @@ -import {socket} from "@/socket.js"; import {useStore} from "@/store/store.js"; import {Exchange} from "@/blockchain/orderlib.js"; import {uniswapV3PoolAddress} from "@/blockchain/uniswap.js"; import {FixedNumber} from "ethers"; -import {provider} from "@/blockchain/wallet.js"; import {newContract} from "@/blockchain/contract.js"; +import {provider} from "@/blockchain/provider.js"; +import {socket} from "@/socket.js"; const subscriptionCounts = {} // key is route and value is a subscription counter export const WIDE_PRICE_FORMAT = {decimals:38, width:512, signed:false}; // 38 decimals is 127 bits diff --git a/src/blockchain/provider.js b/src/blockchain/provider.js new file mode 100644 index 0000000..e8e9d7a --- /dev/null +++ b/src/blockchain/provider.js @@ -0,0 +1 @@ +export let provider = null diff --git a/src/blockchain/route.js b/src/blockchain/route.js index cd097b9..0dad90e 100644 --- a/src/blockchain/route.js +++ b/src/blockchain/route.js @@ -2,7 +2,8 @@ import {Exchange} from "@/blockchain/orderlib.js"; import {useOrderStore, useStore} from "@/store/store.js"; import {queryHelperContract} from "@/blockchain/contract.js"; import {SingletonCoroutine} from "@/misc.js"; -import {provider} from "@/blockchain/wallet.js"; + +import {provider} from "@/blockchain/provider.js"; export async function findRoute(helper, chainId, tokenA, tokenB) { diff --git a/src/blockchain/token.js b/src/blockchain/token.js index 340caf5..7bde80a 100644 --- a/src/blockchain/token.js +++ b/src/blockchain/token.js @@ -1,8 +1,8 @@ -import {socket} from "@/socket.js"; import {useStore} from "@/store/store.js"; import {metadataMap} from "@/version.js"; -import {provider} from "@/blockchain/wallet.js"; import {newContract} from "@/blockchain/contract.js"; +import {provider} from "@/blockchain/provider.js"; +import {socket} from "@/socket.js"; // synchronous version may return null but will trigger a lookup diff --git a/src/blockchain/transaction.js b/src/blockchain/transaction.js index 8b845f9..1774539 100644 --- a/src/blockchain/transaction.js +++ b/src/blockchain/transaction.js @@ -1,28 +1,13 @@ -import {nav, sleep, uuid} from "@/misc.js"; +import {provider} from "@/blockchain/provider.js"; +import {TransactionState, TransactionType} from "@/blockchain/transactionDecl.js"; +import {sleep, uuid} from "@/misc.js"; import {vaultContract} from "@/blockchain/contract.js"; -import {ensureVault, provider, switchChain, useWalletStore} from "@/blockchain/wallet.js"; +import {switchChain, useWalletStore} from "@/blockchain/wallet.js"; import {toRaw} from "vue"; import {useChartOrderStore} from "@/orderbuild.js"; import {placementFee} from "@/fees.js"; +import {router} from "@/router/router.js"; -export const TransactionState = { - Created: 0, // user requested a transaction - Proposed: 1, // tx is sent to the wallet - Signed: 2, // tx is awaiting blockchain mining - Rejected: 3, // user refused to sign the tx - Error: 3, // unknown error sending the tx to the wallet - Mined: 4, // transaction has been confirmed on-chain -} - -export const TransactionType = { - PlaceOrder: 1, - CancelOrder: 2, - CancelAll: 3, - Wrap: 4, - Unwrap: 5, - WithdrawNative: 6, - Withdraw: 7, -} export class Transaction { constructor(chainId, type) { @@ -195,7 +180,8 @@ export class PlaceOrderTransaction extends Transaction { super.end(state) if (state === TransactionState.Mined) { useChartOrderStore().resetOrders() - nav('Status') + // noinspection JSIgnoredPromiseFromCall + router.push({name: 'Status'}) } } @@ -280,4 +266,3 @@ export class UnwrapTransaction extends Transaction { return await vaultContract.unwrap(this.amount) } } - diff --git a/src/blockchain/transactionDecl.js b/src/blockchain/transactionDecl.js new file mode 100644 index 0000000..12454dc --- /dev/null +++ b/src/blockchain/transactionDecl.js @@ -0,0 +1,17 @@ +export const TransactionState = { + Created: 0, // user requested a transaction + Proposed: 1, // tx is sent to the wallet + Signed: 2, // tx is awaiting blockchain mining + Rejected: 3, // user refused to sign the tx + Error: 3, // unknown error sending the tx to the wallet + Mined: 4, // transaction has been confirmed on-chain +} +export const TransactionType = { + PlaceOrder: 1, + CancelOrder: 2, + CancelAll: 3, + Wrap: 4, + Unwrap: 5, + WithdrawNative: 6, + Withdraw: 7, +} \ No newline at end of file diff --git a/src/blockchain/wallet.js b/src/blockchain/wallet.js index 74afba6..2ca3f20 100644 --- a/src/blockchain/wallet.js +++ b/src/blockchain/wallet.js @@ -1,16 +1,14 @@ +import {provider} from "@/blockchain/provider.js"; import {BrowserProvider, ethers} from "ethers"; import {useStore} from "@/store/store"; -import {socket} from "@/socket.js"; import {errorSuggestsMissingVault, SingletonCoroutine} from "@/misc.js"; import {newContract, vaultAddress, vaultContract} from "@/blockchain/contract.js"; import {defineStore} from "pinia"; import {computed, ref} from "vue"; import {metadataMap, version} from "@/version.js"; -import {CancelAllTransaction, TransactionState, TransactionType} from "@/blockchain/transaction.js"; +import {TransactionState, TransactionType} from "@/blockchain/transactionDecl.js"; import {track} from "@/track.js"; - - -export let provider = null +import {socket} from "@/socket.js"; export const useWalletStore = defineStore('wallet', ()=>{ @@ -121,17 +119,17 @@ export function detectChain() { try { window.ethereum.on('chainChanged', onChainChanged); window.ethereum.on('accountsChanged', onAccountsChanged); + new ethers.BrowserProvider(window.ethereum).getNetwork().then((network)=>{ + const chainId = network.chainId + onChainChanged(chainId) + }) } catch (e) { console.log('Could not connect change hooks to wallet', e) - return } - new ethers.BrowserProvider(window.ethereum).getNetwork().then((network)=>{ - const chainId = network.chainId - onChainChanged(chainId) - }) } +detectChain() const errorHandlingProxy = { get(target, prop, proxy) { @@ -308,11 +306,6 @@ export async function cancelOrder(vault, orderIndex) { }) } -export async function cancelAll(vault) { - new CancelAllTransaction(useStore().chainId, vault).submit() -} - - async function progressTransactions() { const s = useStore() const ws = useWalletStore(); @@ -324,7 +317,7 @@ async function progressTransactions() { signer = await provider.getSigner() } catch (e) { - console.log('signer error', e.code, e.info.error.code) + console.log('signer error', e.code, e.info?.error?.code) if (e?.info?.error?.code === 4001) { console.log('signer rejected') signer = null @@ -643,4 +636,4 @@ export async function addNetworkAndConnectWallet(chainId) { if (e.code !== 4001) console.log('connectWallet() failed', e) } -} \ No newline at end of file +} diff --git a/src/charts/datafeed.js b/src/charts/datafeed.js index 22ba4e2..7dee652 100644 --- a/src/charts/datafeed.js +++ b/src/charts/datafeed.js @@ -1,3 +1,4 @@ +import {provider} from "@/blockchain/provider.js"; import {convertTvResolution, loadOHLC} from './ohlc.js'; import {metadata} from "@/version.js"; import FlexSearch from "flexsearch"; @@ -5,12 +6,11 @@ import {useChartOrderStore} from "@/orderbuild.js"; import {useStore} from "@/store/store.js"; import {subOHLC, unsubOHLC} from "@/blockchain/ohlcs.js"; import {ohlcStart} from "@/charts/chart-misc.js"; - -import {timestamp, USD_FIAT} from "@/common.js"; +import {timestamp} from "@/common.js"; import {erc20Contract} from "@/blockchain/contract.js"; -import {provider} from "@/blockchain/wallet.js"; import {track} from "@/track.js"; + const DEBUG_LOGGING = false const log = DEBUG_LOGGING ? console.log : ()=>{} diff --git a/src/components/ApproveRegion.vue b/src/components/ApproveRegion.vue index 0c01260..2cec1d1 100644 --- a/src/components/ApproveRegion.vue +++ b/src/components/ApproveRegion.vue @@ -8,8 +8,8 @@ + + \ No newline at end of file diff --git a/src/components/Faucet.vue b/src/components/Faucet.vue index cbc2909..d9fc47e 100644 --- a/src/components/Faucet.vue +++ b/src/components/Faucet.vue @@ -36,8 +36,8 @@ import {useStore} from "@/store/store"; import {computed, ref} from "vue"; import Btn from "@/components/Btn.vue"; -import {socket} from "@/socket.js"; import {metadata} from "@/version.js"; +import {socket} from "@/socket.js"; const DISABLED_DURATION = 60_000; diff --git a/src/components/NavDrawer.vue b/src/components/NavDrawer.vue index cbf171d..5cc8aa5 100644 --- a/src/components/NavDrawer.vue +++ b/src/components/NavDrawer.vue @@ -15,7 +15,7 @@ diff --git a/src/corp/Home.vue b/src/corp/Home.vue index 6f37e31..92a3558 100644 --- a/src/corp/Home.vue +++ b/src/corp/Home.vue @@ -26,7 +26,8 @@
- +
@@ -36,10 +37,8 @@ import beta from "@/components/Beta.vue"; import Soon from "@/components/Soon.vue"; import UniswapLogo from "@/corp/UniswapLogo.vue"; import Logo from "@/components/Logo.vue"; -import {nav} from "@/misc.js"; import AppBtn from "@/corp/AppBtn.vue"; -import Social from "@/components/Social.vue"; - +import {router} from "@/router/router.js";