new fonts & favicon

.gitignore

@@ -0,0 +1,208 @@
+public/version.js
+
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Linux template
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### Node template
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+

index.html

@@ -5,7 +5,7 @@
     <meta charset="UTF-8"/>
     <link rel="icon" href="/favicon.ico"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>Dexorder</title>
+    <title>dexorder</title>
 </head>
 
 <body>

src/components/HelloWorld.vue

@@ -1,75 +0,0 @@
-<template>
-  <v-container class="fill-height">
-    <v-responsive class="align-center text-center fill-height">
-      <v-img height="300" src="@/assets/logo.svg" />
-
-      <div class="text-body-2 font-weight-light mb-n1">Welcome to</div>
-
-      <h1 class="text-h2 font-weight-bold">Vuetify</h1>
-
-      <div class="py-14" />
-
-      <v-row class="d-flex align-center justify-center">
-        <v-col cols="auto">
-          <v-btn
-            href="https://vuetifyjs.com/components/all/"
-            min-width="164"
-            rel="noopener noreferrer"
-            target="_blank"
-            variant="text"
-          >
-            <v-icon
-              icon="mdi-view-dashboard"
-              size="large"
-              start
-            />
-
-            Components
-          </v-btn>
-        </v-col>
-
-        <v-col cols="auto">
-          <v-btn
-            color="primary"
-            href="https://vuetifyjs.com/introduction/why-vuetify/#feature-guides"
-            min-width="228"
-            rel="noopener noreferrer"
-            size="x-large"
-            target="_blank"
-            variant="flat"
-          >
-            <v-icon
-              icon="mdi-speedometer"
-              size="large"
-              start
-            />
-
-            Get Started
-          </v-btn>
-        </v-col>
-
-        <v-col cols="auto">
-          <v-btn
-            href="https://community.vuetifyjs.com/"
-            min-width="164"
-            rel="noopener noreferrer"
-            target="_blank"
-            variant="text"
-          >
-            <v-icon
-              icon="mdi-account-group"
-              size="large"
-              start
-            />
-
-            Community
-          </v-btn>
-        </v-col>
-      </v-row>
-    </v-responsive>
-  </v-container>
-</template>
-
-<script setup>
-  //
-</script>

src/components/Vault.vue

@@ -1,16 +1,16 @@
 <template>
   <v-card v-if="s.vault===null">
     <v-card-title><v-icon color="warning" icon="mdi-alert"/>&nbsp;Setup&nbsp;Vault</v-card-title>
-    <v-card-subtitle>Create Your Own Personal DexOrder Vault</v-card-subtitle>
+    <v-card-subtitle>Create Your Own Personal Dexorder Vault</v-card-subtitle>
     <v-card-text>
-      DexOrder never has access to your tokens. Instead, you create a personal
+      Dexorder never has access to your tokens. Instead, you create a personal
-      vault which acts like your DexOrder account.
+      vault which acts like your Dexorder account.
-      Create your own personal asset vault to get started with DexOrder. This vault
+      Create your own personal asset vault to get started with Dexorder. This vault
-      acts like your DexOrder account. For security, only <i>you</i> can deposit
+      acts like your Dexorder account. For security, only <i>you</i> can deposit
       or withdraw tokens from your vault, and no token approvals are ever given to
-      DexOrder. Instead, DexOrder sends trade requests to your vault at the right
+      Dexorder. Instead, Dexorder sends trade requests to your vault at the right
       times, then your vault checks the validity of those trade requests before
-      trading directly from your vault to the dex liquidity pool. DexOrder never
+      trading directly from your vault to the dex liquidity pool. Dexorder never
       has any access to the funds in your vault.
     </v-card-text>
     <v-card-text>
@@ -24,6 +24,7 @@
 
 <script setup>
 import {useStore} from "@/store/store.js";
+import wallet from "@/blockchain/wallet.js";
 
 const s = useStore()
 

src/layouts/default/AppBar.vue

@@ -1,12 +1,23 @@
 <template>
   <v-app-bar flat>
     <v-app-bar-title class="sc">
-      <v-icon icon="mdi-chart-line" />
+      <v-icon icon="mdi-arrow-up-bold" size="x-small" class="arrow" color="green"/>
-      DexOrder
+      <span class="logo">dexorder</span>
-      <v-chip text="alpha test" size="small" color="red"/>
+      <v-chip text="ALPHA" size="x-small" color="red" class="mx-1"/>
     </v-app-bar-title>
   </v-app-bar>
 </template>
 
 <script setup>
 </script>
+
+
+<style lang="scss">
+@use "src/styles/vars" as v;
+.arrow{
+  color: v.$green;
+}
+.logo {
+  font-weight: 500;
+}
+</style>

src/plugins/webfontloader.js

@@ -4,14 +4,16 @@
  * webfontloader documentation: https://github.com/typekit/webfontloader
  */
 
+// todo choose
+const displayFonts = ['Tektur', 'Turret Road', 'Chakra Petch', 'Orbitron', 'Quantico', 'Geo']
+const bodyFonts = ['Victor Mono', 'Nunito', 'Manrope', 'Sofia Sans']
+
 export async function loadFonts () {
   const webFontLoader = await import(/* webpackChunkName: "webfontloader" */'webfontloader')
 
   webFontLoader.load({
     google: {
-      // families: ['Roboto:100,300,400,500,700,900&display=swap'],
+      families: Array.of(...displayFonts,...bodyFonts),
-      // families: ['Marcellus','Marcellus SC'],
-      families: ['Victor Mono', 'Tektur'],
     },
   })
 }

src/styles/vars.scss

@@ -31,8 +31,16 @@ $all-colors: (
         red: $red,
 );
 
-$body-font-family: 'Victor Mono', monospace, sans-serif;
+//$body-font-family: 'Victor Mono', monospace, sans-serif;
-$heading-font-family: 'Tektur', sans-serif;
+$body-font-family: 'Manrope', monospace, sans-serif;
+//$body-font-family: 'Nunito', monospace, sans-serif;
+//$body-font-family: 'Sofia Sans', monospace, sans-serif;
+//$body-font-family: 'Quantico', sans-serif;
+//$body-font-family: 'Chakra Petch', sans-serif;
+//$heading-font-family: 'Tektur', sans-serif;
+$heading-font-family: 'Orbitron', sans-serif;
+//$heading-font-family: 'Quantico', sans-serif;
+//$heading-font-family: 'Chakra Petch', sans-serif;
 
 $sm-breakpoint: 600px;
 $card-maxw: 30rem;