Commit 9d5b6238 authored by Wolf's avatar Wolf 💯
Browse files

Merge branch 'contributors' into 'develop'

Contributors

See merge request !117
parents bd02b84c 8998ce16
......@@ -107,3 +107,8 @@ h3 {
flex-shrink: 1;
flex-grow: 1;
}
.link {
color: $primary-color-100;
cursor: pointer;
}
......@@ -134,11 +134,12 @@ export default defineComponent({
setup(_props, {root}) {
const hover = ref(false)
const dict = {threespeak: '3speak'}
const statsApp = root.$accessor.statsAppsData.filter(
(d) => d.name === (dict[_props.item.id] || _props.item.id),
)[0]
let stats: any = {}
if (statsApp) stats = computed(() => statsApp)
const stats = computed(
() =>
root.$accessor.statsAppsData.filter(
(d) => d.name === (dict[_props.item.id] || _props.item.id),
)[0],
)
const getImage = (image) => {
try {
return require(`~/assets/images/apps/${image}`)
......
......@@ -2,7 +2,9 @@
<div
class="app-type"
:class="{'app-type--withCount': Boolean(count)}"
:style="`background: ${TYPE_COLORS[appType].background}; color: ${TYPE_COLORS[appType].text}`"
:style="`background: ${
true ? TYPE_COLORS[appType].background : 'rgb(222 222 236)'
}; color: ${true ? TYPE_COLORS[appType].text : 'rgb(96 96 110)'}`"
>
{{ appType }}
<span v-if="count">({{ count }})</span>
......
......@@ -4,8 +4,13 @@
<div class="contributors__subtitle">
We're a decentralized project, running on more than
{{ CONTRIBUTORS.length }} people contributing regularly to the Hive
Ecosystem
Ecosystem.
</div>
<div>
The list of contributors below is
<i class="link" @click="$accessor.shuffleContributors()">randomized</i>.
</div>
<div class="contributors__labels">
<ContributorsContributorLabel
v-for="label in contributorLabels"
......@@ -89,6 +94,10 @@ export default defineComponent({
() => route.value.query.t,
(newT) => getFilteredContributors(newT),
)
watch(
() => root.$accessor.shuffledContributors,
() => getFilteredContributors(route.value.query.t),
)
return {
filteredContributors: filteredContributors as IContributor[],
......@@ -143,7 +152,7 @@ export default defineComponent({
&__container {
display: flex;
flex-flow: row wrap;
justify-content: space-between;
justify-content: center;
width: 100%;
}
......
......@@ -75,7 +75,7 @@ export const CONTRIBUTORS: IContributor[] = [
},
{
id: 'howo',
name: 'Howo',
name: 'Martin Lees',
social: {
hive: 'howo',
},
......@@ -183,7 +183,7 @@ export const CONTRIBUTORS: IContributor[] = [
social: {
hive: 'crimsonclad',
},
labels: [ContributorLabel.marketing, ContributorLabel.blockProducer],
labels: [ContributorLabel.operations, ContributorLabel.blockProducer],
},
{
id: 'theycallmedan',
......@@ -203,11 +203,11 @@ export const CONTRIBUTORS: IContributor[] = [
},
{
id: 'guiltyparties',
name: 'Guiltyparties',
name: 'Guilty Parties',
social: {
hive: 'guiltyparties',
},
labels: [ContributorLabel.blockProducer],
labels: [ContributorLabel.operations, ContributorLabel.blockProducer],
},
{
id: 'acidyo',
......@@ -243,6 +243,22 @@ export const CONTRIBUTORS: IContributor[] = [
},
labels: [ContributorLabel.developer],
},
{
id: 'andablackwidow',
name: 'ABW',
social: {
hive: 'andablackwidow',
},
labels: [ContributorLabel.coreDeveloper],
},
{
id: 'martibis',
name: 'Martibis',
social: {
hive: 'andablackwidow',
},
labels: [ContributorLabel.coreDeveloper],
},
]
export const CONTRIBUTOR_LABELS = {
......@@ -250,13 +266,17 @@ export const CONTRIBUTOR_LABELS = {
background: '#7eaafa8c',
text: 'rgb(54 100 182)',
},
[ContributorLabel.developer]: {
background: '#7ed2fa8c',
text: '#0426378c',
},
[ContributorLabel.marketing]: {
background: '#faa07e8c',
text: 'rgb(166 77 43)',
},
[ContributorLabel.developer]: {
background: '#7ed2fa8c',
text: '#0426378c',
[ContributorLabel.operations]: {
background: '#faea7e8c',
text: 'rgb(117 104 20)',
},
[ContributorLabel.blockProducer]: {
background: '#917efa8c',
......
......@@ -75,11 +75,8 @@ export const actions = actionTree(
// async nuxtServerInit({commit}, {req, app}: any) {
// },
nuxtClientInit({commit}) {
commit(
'setShuffledContributors',
shuffleArray(CONTRIBUTORS.filter((e) => !e.inactive)),
)
nuxtClientInit({commit, dispatch}) {
dispatch('shuffleContributors')
this.$axios
.get('https://hivedapps.com/api/global')
.then((result) => {
......@@ -98,6 +95,12 @@ export const actions = actionTree(
})
.catch()
},
shuffleContributors({commit}) {
commit(
'setShuffledContributors',
shuffleArray(CONTRIBUTORS.filter((e) => !e.inactive)),
)
},
},
)
......
......@@ -38,6 +38,7 @@ export const enum ContributorLabel {
developer = 'Developer',
blockProducer = 'Block Producer',
marketing = 'Marketing',
operations = 'Operations',
}
export type OS =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment