Improvements to Challenge Layout (#9619)

This commit is contained in:
Marvin Rabe
2018-05-01 19:47:04 +02:00
parent 88b14592c5
commit eaa00598d0
6 changed files with 286 additions and 223 deletions

View File

@@ -8,21 +8,7 @@ div
p(v-once) {{ $t('challengeDetails') }}
button.btn.btn-secondary(@click='createChallenge()') {{ $t('createChallenge') }}
template(v-else)
router-link.title(:to="{ name: 'challenge', params: { challengeId: challenge._id } }", v-for='challenge in challenges',:key='challenge._id')
.col-12.challenge-item
.row
.col-9
router-link.title(:to="{ name: 'challenge', params: { challengeId: challenge._id } }")
strong(v-markdown='challenge.name')
p(v-markdown='challenge.summary || challenge.name')
div
.svg-icon.member-icon(v-html="icons.memberIcon")
.member-count {{challenge.memberCount}}
.col-3
div
span.svg-icon.gem(v-html="icons.gemIcon")
span.prize {{challenge.prize}}
div.prize-title Prize
challenge-item(v-for='challenge in challenges',:challenge='challenge',:key='challenge._id',:fullLayout='false')
.col-12.text-center
button.btn.btn-secondary(@click='createChallenge()') {{ $t('createChallenge') }}
</template>
@@ -51,73 +37,19 @@ div
}
</style>
<style scoped>
.title {
color: #4E4A57;
}
.member-icon {
display: inline-block;
width: 20px !important;
vertical-align: bottom;
height: 16px !important;
}
.member-count {
width: 21px;
height: 16px;
font-size: 14px;
line-height: 2;
color: #878190;
display: inline-block;
text-align: center;
}
.challenge-icon {
height: 30px;
width: 30px;
margin-bottom: 2em;
margin: 0 auto;
}
.gem {
width: 26px;
vertical-align: bottom;
display: inline-block;
}
.prize {
color: #686274;
font-size: 18px;
margin-left: .5em;
}
.prize-title {
padding-left: .7em;
}
.challenge-item {
border-radius: 2px;
background-color: #ffffff;
box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
margin-bottom: 1em;
padding: 2em;
}
</style>
<script>
import challengeModal from './challengeModal';
import {mapState} from 'client/libs/store';
import markdownDirective from 'client/directives/markdown';
import challengeItem from './challengeItem';
import challengeIcon from 'assets/svg/challenge.svg';
import gemIcon from 'assets/svg/gem.svg';
import memberIcon from 'assets/svg/member-icon.svg';
export default {
props: ['groupId'],
components: {
challengeModal,
challengeItem,
},
computed: {
...mapState({user: 'user.data'}),
@@ -127,8 +59,6 @@ div
challenges: [],
icons: Object.freeze({
challengeIcon,
memberIcon,
gemIcon,
}),
groupIdForChallenges: '',
};