-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(ProfilePageRedux & Search & Chatbar & UserSearch): Added new pro…
…file mockup, updated appearances and functions and added user search component (#115) * feat(ProfilePageRedux): added new profile mockup * feat(ButtonGroup): moved marketplace's buttongroup to components and updated it * updated(search & chatbar): disabled calendar's month picker and enabled deletion of command * updated(ProfilePageRedux): added extra spacing styles and updated badge data * update(ProfilePageRedux): changed style name * feat(UserSearch&AddFriends): added user search component and friends functions * updated(ButtonGroup): reflected initial active status * feat(Audio Constraints): added function to change audio constraints Co-authored-by: Matt Wisniewski <[email protected]>
- Loading branch information
nickjjang
and
Matt Wisniewski
authored
Sep 6, 2021
1 parent
7b9fb7d
commit b64409f
Showing
34 changed files
with
782 additions
and
115 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
12 changes: 8 additions & 4 deletions
12
.../marketplace/buttongroup/Buttongroup.less → ...nteractables/ButtonGroup/ButtonGroup.less
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,24 @@ | ||
.button-group { | ||
display: inline; | ||
.is-button { | ||
.button { | ||
display: inline-block; | ||
cursor: pointer; | ||
border-radius: 0; | ||
margin: 0; | ||
&:first-child { | ||
border-radius: @corner-rounding 0px 0px @corner-rounding; | ||
margin-right: -3px; | ||
} | ||
&:nth-child(2) { | ||
border-right: none; | ||
border-left: none; | ||
&:not(:first-child) { | ||
margin: 0 -3px; | ||
border-left: none; | ||
} | ||
&:last-child { | ||
border-radius: 0px @corner-rounding @corner-rounding 0px; | ||
} | ||
&.active { | ||
background: #0984e3; | ||
color: #dae0ff; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
<template src="./ButtonGroup.html"></template> | ||
|
||
<script lang="ts"> | ||
import Vue from 'vue' | ||
export default Vue.extend({ | ||
props: { | ||
value: { | ||
type: String, | ||
required: false, | ||
default: null, | ||
}, | ||
/** | ||
* Callable function when button is clicked | ||
* | ||
* @remarks | ||
* This should usually be a store mutation or UI change. | ||
*/ | ||
action: { | ||
type: Function, | ||
required: false, | ||
default: null, | ||
}, | ||
/** | ||
* Set the active class of selected button | ||
* | ||
* @remarks | ||
* This class has already defined | ||
*/ | ||
activeClass: { | ||
type: String, | ||
required: false, | ||
default: 'active', | ||
}, | ||
}, | ||
data() { | ||
return { | ||
active: null as HTMLElement | null, | ||
} | ||
}, | ||
computed: {}, | ||
mounted() { | ||
this.$el.querySelectorAll('.button').forEach((button) => { | ||
const text = button.querySelector('span')?.textContent | ||
if (text === this.value) { | ||
button.classList.add(this.activeClass) | ||
this.active = button as HTMLElement | ||
} | ||
button.addEventListener('click', () => { | ||
if (this.active != null) { | ||
this.active.classList.remove(this.activeClass) | ||
} | ||
this.active = button as HTMLElement | ||
this.active.classList.add(this.activeClass) | ||
this.$emit('input', text) | ||
if (this.action != null) { | ||
this.action(text) | ||
} | ||
}) | ||
}) | ||
}, | ||
}) | ||
</script> | ||
|
||
<style scoped lang="less" src="./ButtonGroup.less"></style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -201,4 +201,4 @@ | |
top: @statusbar-height + (@normal-spacing * 8); | ||
position: fixed; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 0 additions & 18 deletions
18
components/tailored/marketplace/buttongroup/Buttongroup.vue
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.