Skip to content

Commit

Permalink
feat(import account): 'Create Import Account Page, linked from Import…
Browse files Browse the repository at this point in the history
… Account button' (#327)

* feat(import account): enable import account button

* feat(import account): add input account component

* feat(import account): disable recover button if phrases.length < 12, update number word style

* feat(webrtc): add low level abstractions for handling p2p connections and audio/video calls (#324)

* wip: WebRTC implementation

* chore: better structure

* chore: documented all methods

* fix: prettier config

* fix: replaced p2pt dependency with the internal one

* Update encoders.ts

* fix: typos in comments and comma dangle

Co-authored-by: Matt Wisniewski <contact.mattdylan@gmail.com>
Co-authored-by: Matt Wisniewski <retropronghorn@gmail.com>

* chore: update linting rules (#326)

* Feat(Timestamp): Add timestamp to Message Actions (AP-106) (#318)

* Feat(Timestamp): Add timestamp to Message Actions (AP-106)

* fix(chat reaction): Fix 'Emoji reactions will increase if user navigates to a different page and back to chat again' (#306)

* fix(chat reaction): Fix 'Emoji reactions will increase if user navigates to a different page and back to chat again'

* put space after if

* fix(message): update timestamp message every minute (#300)

* chore: rebase dev

* chore(message): changes in response to pr review

Co-authored-by: Samir Vimercati <samir.vimercati@knobs.it>

* implements lazy loading for glyphs - AP-101 (#311)

* (update)glyphs: add vuetify import

* update(lazy load glyphs): update implemintation of glyphs to allow lazy loading brought in from vuetify.

* Nuke old code

* nuke old code

* fix - Duplicate friends are being added when page is re-rendered - AP-64 (#308)

* fixed duplicated friends issue = AP-64

* Update actions.ts

Co-authored-by: Matt Wisniewski <retropronghorn@gmail.com>

* chore(readme): doc update (#319)

Updating readme
Adding .env.example file
Updated satellite-lucide-icons to not need ssh key uploaded to github

closes no tickets

* fix merge conflict

* Fix messageOwner in Action html

* fix(Timestamp): removed messageOwner in Action components

* fix(timestamp): add comma dangle

Co-authored-by: Eric Lee <eric.lee6174@gmail.com>
Co-authored-by: vimercati-samir <52865716+vimercati-samir@users.noreply.github.com>
Co-authored-by: Samir Vimercati <samir.vimercati@knobs.it>
Co-authored-by: Jeff Kristian <jekrimo@gmail.com>
Co-authored-by: David Chan <57536961+davidchan1219@users.noreply.github.com>
Co-authored-by: Matt Wisniewski <retropronghorn@gmail.com>
Co-authored-by: Chris Hogan <chris@hogan.io>

* Chat Window Status Bar User Info - #AP-109 (#323)

* feat(Import Account): add remove option for numberedword component

* feat(import account): enable import account button

* feat(import account): add input account component

* feat(import account): disable recover button if phrases.length < 12, update number word style

* feat(Import Account): add remove option for numberedword component

* feat(Import Account): fix routing issue in authenticated middleware

Co-authored-by: Manuel Tumiati <36959970+iltumio@users.noreply.github.com>
Co-authored-by: Matt Wisniewski <contact.mattdylan@gmail.com>
Co-authored-by: Matt Wisniewski <retropronghorn@gmail.com>
Co-authored-by: Sara Tavares <29093946+stavares843@users.noreply.github.com>
Co-authored-by: Nick <81814644+nickjjang@users.noreply.github.com>
Co-authored-by: vimercati-samir <52865716+vimercati-samir@users.noreply.github.com>
Co-authored-by: Samir Vimercati <samir.vimercati@knobs.it>
Co-authored-by: Jeff Kristian <jekrimo@gmail.com>
Co-authored-by: David Chan <57536961+davidchan1219@users.noreply.github.com>
Co-authored-by: Chris Hogan <chris@hogan.io>
  • Loading branch information
11 people committed Dec 1, 2021
1 parent 0eaed15 commit 518a474
Show file tree
Hide file tree
Showing 10 changed files with 205 additions and 72 deletions.
3 changes: 3 additions & 0 deletions components/ui/NumberedWord/NumberedWord.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<p class="tag is-dark">
<span class="tag-number">{{ number }}</span>
{{ word }}
<span v-if="isRemoval" class="remove-word" v-on:click="() => {$emit('remove')}"
><x-icon size="0.8x"></x-icon
></span>
</p>
14 changes: 12 additions & 2 deletions components/ui/NumberedWord/NumberedWord.less
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
padding: 0.85rem @normal-spacing 0.85rem 1.5rem;
position: relative;
font-size: @normal-spacing;

&.is-dark {
background: @semitransparent-lighter-gradient;
color: @bright-text;
box-shadow: 0 5px 14px -5px @light-gray;
}
.tag-number {
position: absolute;
background-color: @primary-color;
Expand All @@ -15,4 +19,10 @@
border-radius: 4px 0 2px 0;
line-height: 1.4;
}
}
.remove-word {
position: absolute;
cursor: pointer;
top: 0;
right: @light-spacing;
}
}
18 changes: 15 additions & 3 deletions components/ui/NumberedWord/NumberedWord.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,37 @@

<script lang="ts">
import Vue from 'vue'
import { XIcon } from 'satellite-lucide-icons'
// This component is helpful for displaying phrases
// It takes a word and a number and displays them neatly
export default Vue.extend({
components: {
XIcon
},
props: {
/**
* Text to include in the word box
*/
word: {
type: String,
default: 'Null',
default: 'Null'
},
/**
* Top left number to display
*/
number: {
type: Number,
default: 0,
default: 0
},
},
/**
* Remove numbered word
*/
isRemoval: {
type: Boolean,
default: false
}
}
})
</script>

Expand Down
Loading

0 comments on commit 518a474

Please sign in to comment.