ui updates

luniehq · Sep 12, 2017 · a6a41b3 · a6a41b3
1 parent fa3f9f9
commit a6a41b3
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 82 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/src/renderer/components/common/NiFormGroup.vue b/app/src/renderer/components/common/NiFormGroup.vue
@@ -38,7 +38,7 @@ export default {
     display none
 
   &.form-group-error
-    .ni-field
+    .ni-field, .ni-select
       border-color #f00
     .ni-form-msg-error
       display flex

diff --git a/app/src/renderer/components/common/PageSignIn.vue b/app/src/renderer/components/common/PageSignIn.vue
@@ -11,14 +11,14 @@ page(title='Welcome to Cosmos' v-if="signInStep === 0")
 
       p Now that you have been thoroughly warned, please type in “{{ welcomeFields.agreement }}” into the input field below.
 
-  part(title="Agreement")
+  part()
 
     form-struct(:submit="welcomeOnSubmit")
-      form-group(:error="$v.welcomeFields.repeatAgreement.$error")
-        field(
-          theme="cosmos"
+      form-group(:error="$v.welcomeFields.repeatAgreement.$error"
+        field-id="signin-agreement" field-label="Repeat Agreement")
+        field#signin-agreement(
           type="text"
-          placeholder="Type here..."
+          placeholder="Enter here"
           v-model="welcomeFields.repeatAgreement")
         form-msg(
           name="Agreement"
@@ -34,10 +34,9 @@ page(title='Welcome to Cosmos' v-if="signInStep === 0")
 
 page(title='Sign In' v-else)
   form-struct(:submit='signInOnSubmit')
-    form-group(:error='$v.signInFields.seed.$error')
-      label 12-Word Seed
-      field(
-        theme='cosmos'
+    form-group(:error='$v.signInFields.seed.$error'
+      field-id="signin-seed" field-label="12-Word Seed")
+      field#signin-seed(
         type='text'
         placeholder='Input seed...'
         v-model='signInFields.seed')

diff --git a/app/src/renderer/components/staking/PageNominate.vue b/app/src/renderer/components/staking/PageNominate.vue
@@ -1,28 +1,16 @@
 <template lang='pug'>
 page(:title='pageTitle')
-  tool-bar
-    router-link(v-if='user.nominationActive' :to="{name: 'candidate', params: { candidate: fields.id }}")
-      | #[i.material-icons eye] View Candidate
-    div
-    a(v-if='user.nominationActive' @click='onSubmit')
-      | #[i.material-icons refresh] Update Nomination
-    a(v-else @click='onSubmit')
-      | #[i.material-icons check] Nominate
   form-struct(:submit='onSubmit')
     form-group( error='$v.fields.id.$error'
       field-id='form-nominate-id' field-label='Keybase ID')
-      field(
+      field#form-nominate-id(
         v-if="user.nominationActive"
-        id='form-nominate-id'
-        theme='cosmos'
         type='text'
         placeholder='Keybase ID'
         :value='fields.id'
         disabled)
-      field(
+      field#form-nominate-id(
         v-else
-        id='form-nominate-id'
-        theme='cosmos'
         type='text'
         placeholder='Keybase ID'
         v-model='fields.id')
@@ -35,9 +23,7 @@ page(:title='pageTitle')
 
     form-group(:error='$v.fields.description.$error'
       field-id='form-nominate-descripton' field-label='Description')
-      field(
-        id='form-nominate-description'
-        theme='cosmos'
+      field#form-nominate-description(
         type='textarea'
         placeholder='Have a message for delegators? Write it here.'
         v-model='fields.description')
@@ -49,9 +35,7 @@ page(:title='pageTitle')
 
     form-group(:error='$v.fields.serverDetails.$error'
       field-id='form-nominate-server-power' field-label='Server Power')
-      field(
-        id='form-nominate-server-power'
-        theme='cosmos'
+      field#form-nominate-server-power(
         type='textarea'
         placeholder='Network connection, RAM, HDD space, OS, units, etc.'
         v-model='fields.serverDetails')
@@ -63,21 +47,15 @@ page(:title='pageTitle')
 
     form-group(:error='$v.fields.country.$error'
       field-id='form-nominate-country' field-label='Country')
-      field(
-        id='form-nominate-country'
-        theme='cosmos'
-        type='country'
-        placeholder='Select Country'
+      field#form-nominate-country(type='countries' placeholder='Select country...'
         v-model='fields.country')
       form-msg(name='Country' type='required'
         v-if='!$v.fields.country.required')
 
     form-group(:error='$v.fields.commissionPercent.$error'
       field-id='form-nominate-commission-percent' field-label='Commission Percent')
       field-group
-        field(
-          id='form-nominate-commission-percent'
-          theme='cosmos'
+        field#form-nominate-commission-percent(
           type='number'
           step='any'
           placeholder='Enter rate'
@@ -92,12 +70,10 @@ page(:title='pageTitle')
     form-group(:error='$v.fields.ownCoinsBonded.$error'
       field-id='form-nominate-atoms-to-bond' field-label='Atoms to Bond')
       field-group
-        field(
-          id='form-atoms-to-bond'
-          theme='cosmos'
+        field#form-atoms-to-bond(
           type='number'
           step='any'
-          placeholder='Enter how much ATOM you want to self-delegate'
+          placeholder='Enter atoms'
           v-model.number='fields.ownCoinsBonded')
         field-addon ATOM
       form-msg(name='OwnCoinsBonded' type='required'
@@ -107,10 +83,8 @@ page(:title='pageTitle')
         v-if='!$v.fields.ownCoinsBonded.between')
 
     form-group(:error='$v.fields.website.$error'
-      field-id='form-nominate-website' field-label='Website')
-      field(
-        id='form-nominate-website'
-        theme='cosmos'
+      field-id='form-nominate-website' field-label='Website (Optional)')
+      field#form-nominate-website(
         type='text'
         placeholder='https://'
         v-model='fields.website')
@@ -119,17 +93,21 @@ page(:title='pageTitle')
       form-msg(name='Website' type='url'
         v-if='!$v.fields.website.url')
 
-    form-group(:error='$v.fields.ipAddress.$error'
-      field-id='form-nominate-ip-address' field-label='Website (Optional')
+    // form-group(:error='$v.fields.ipAddress.$error'
+      field-id='form-nominate-ip-address' field-label='IP Address (Optional)')
       field-group
-        field(
-          id='form-nominate-address'
-          theme='cosmos'
+        field#form-nominate-address(
           type='text'
           placeholder='Enter IP'
           v-model.trim='fields.ipAddress')
       form-msg(name='IP Address' type='ipAddress'
         v-if='!$v.fields.ipAddress.ipAddress')
+
+    div(slot="footer")
+      btn(v-if='user.nominationActive' type="link" :to="{name: 'candidate', params: { candidate: fields.id }}" icon="eye" value="View Candidate")
+      div
+      btn(v-if='user.nominationActive' @click='onSubmit' icon="refresh" value="Update Nomination")
+      btn(v-else @click='onSubmit' icon="check" value="Nominate")
 </template>
 
 <script>
@@ -144,7 +122,6 @@ import FormGroup from '../common/NiFormGroup'
 import FormMsg from '../common/NiFormMsg'
 import FormStruct from '../common/NiFormStruct'
 import Page from '../common/NiPage'
-import ToolBar from '../common/NiToolBar'
 export default {
   name: 'page-nominate',
   components: {
@@ -155,8 +132,7 @@ export default {
     FormGroup,
     FormMsg,
     FormStruct,
-    Page,
-    ToolBar
+    Page
   },
   computed: {
     ...mapGetters(['config', 'user']),

diff --git a/app/src/renderer/components/wallet/PageSend.vue b/app/src/renderer/components/wallet/PageSend.vue
@@ -1,37 +1,33 @@
 <template lang='pug'>
 page(title='Send Coins')
   form-struct(:submit='verifySend')
-    form-group(:error='$v.fields.denom.$error')
-      label Denomination
-      field-group.denoms
+    form-group(:error='$v.fields.denom.$error'
+      field-id='send-denomination' field-label='Denomination')
+      field-group#send-denomination.denoms
         btn.denom(
           v-for='balance in wallet.balances'
           @click.native='setDenom(balance.denom, $event)'
           :value="balance.denom.toUpperCase()")
         btn.denom(v-if="wallet.balances.length == 0" value="N/A" disabled)
 
-        // field(type='select' :options='blockchainOptions' v-model='blockchainName')
-        //
-          <field
-          id="send-denom"
+        // field#send-denomination(
           type="select"
           v-model="fields.denom"
           @input="$v.fields.denom.$touch()"
           placeholder="Denomination"
-          required>
-          </field>
+          required)
       form-msg(name='Denomination', type='required', v-if='!$v.fields.denom.required')
 
-    form-group(:error='$v.fields.address.$error')
-      label(for='send-address') Pay To
+    form-group(:error='$v.fields.address.$error'
+      field-id='send-address' field-label='Pay To')
       field-group
         field#send-address(type='text', v-model='fields.address', @input='$v.fields.address.$touch()', placeholder='Address', required='')
       form-msg(name='Address', type='required', v-if='!$v.fields.address.required')
       form-msg(name='Address', type='exactLength', length='40', v-if='!$v.fields.address.minLength || !$v.fields.address.maxLength')
       form-msg(name='Address', type='alphaNum', v-if='!$v.fields.address.alphaNum')
 
-    form-group(:error='$v.fields.amount.$error')
-      label(for='send-amount') Amount
+    form-group(:error='$v.fields.amount.$error'
+      field-id='send-amount' field-label='Amount')
       field-group
         field#send-amount(type='number', v-model='fields.amount', @input='$v.fields.amount.$touch()', placeholder='Amount', required='')
         field-addon Coins

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -99,13 +99,12 @@
   },
   "dependencies": {
     "@nylira/vue-button": "^4.0.1",
-    "@nylira/vue-field": "^1.1.5",
+    "@nylira/vue-field": "^1.1.8",
     "@nylira/vue-form-msg": "^1.0.3",
-    "@nylira/vue-notifications": "^1.3.0",
     "@nylira/vue-input": "^3.2.0",
+    "@nylira/vue-notifications": "^1.3.0",
     "axios": "^0.16.2",
     "chart.js": "^2.6.0",
-    "disable-scroll": "^0.3.0",
     "electron": "^1.7.5",
     "moment": "^2.17.1",
     "mousetrap": "^1.6.1",