IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

change reviews style

Browse Source
This commit is contained in:
ogerly 2022-12-13 19:19:41 +01:00
parent dfca1e36c0
commit 27acb7564b
13 changed files with 75 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/assets/scss/custom/gradido-custom/_color.scss
View File

@ -12,6 +12,7 @@ $gray-600: #8898aa !default; // Line footer color
$gray-700: #525f7f !default; // Line p color
$gray-800: #32325d !default; // Line heading color
$gray-900: #212529 !default;
$gradido-f5: #f5f5f5 !default;
$black: #000 !default;
$grays: () !default;
$grays: map.merge(
@ -24,7 +25,8 @@ $grays: map.merge(
"600": $gray-600,
"700": $gray-700,
"800": $gray-800,
"900": $gray-900
"900": $gray-900,
"f5": $gradido-f5
),
$grays
);
@ -57,10 +59,12 @@ $colors: map.merge(
"gray": $gray-600,
"light": $gray-400,
"lighter": $gray-200,
"gray-dark": $gray-800
"gray-dark": $gray-800,
"f5": $gradido-f5,
),
$colors
);
$f5f5f5: $gradido-f5 !default;
$default: #172b4d !default;
$primary: #5e72e4 !default;
$secondary: #f7fafc !default;
@ -93,7 +97,8 @@ $theme-colors: map.merge(
"white": $white,
"neutral": $white,
"dark": $dark,
"darker": $darker
"darker": $darker,
"f5": $gradido-f5
),
$theme-colors
);

2
frontend/src/components/Contributions/ContributionList.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="contribution-list container">
<div class="mb-5" v-for="item in items" :key="item.id">
<div class="mb-3" v-for="item in items" :key="item.id">
<contribution-list-item
v-bind="item"
@closeAllOpenCollapse="$emit('closeAllOpenCollapse')"

8
frontend/src/components/GddSend/TransactionConfirmationSend.vue
View File

@ -4,7 +4,7 @@
<div class="h3 mb-4">{{ $t('form.send_check') }}</div>
<b-row class="mt-5">
<b-col cols="2">
<b-avatar :text="avatarText" variant="success" size="3em"></b-avatar>
<!-- <b-avatar :text="avatarText" variant="success" size="3em"></b-avatar> -->
</b-col>
<b-col>
<div class="h4">
@ -125,6 +125,12 @@ export default {
disabled: false,
}
},
// computed: {
// avatarText() {
// // return this.linkedUser.firstName[0] + this.linkedUser.lastName[0]
// return 'xx'
// },
// },
}
</script>
<style>

16
frontend/src/components/GddSend/TransactionForm.vue
View File

@ -7,7 +7,7 @@
<b-form-radio-group v-model="radioSelected">
<b-row class="mb-4">
<b-col>
<b-row class="bg-secondary gradido-border-radius p-2">
<b-row class="bg-f5 gradido-border-radius p-2">
<b-col cols="9">{{ $t('send_gdd') }}</b-col>
<b-col cols="3">
<b-form-radio
@ -20,7 +20,7 @@
</b-row>
</b-col>
<b-col>
<b-row class="bg-secondary gradido-border-radius p-2">
<b-row class="bg-f5 gradido-border-radius p-2">
<b-col cols="9">{{ $t('send_per_link') }}</b-col>
<b-col cols="3">
<b-form-radio
@ -151,12 +151,12 @@ export default {
this.form.amount = ''
this.form.memo = ''
},
// normalizeAmount(isValid) {
// this.amountFocused = false
// if (!isValid) return
// this.form.amountValue = Number(this.form.amount.replace(',', '.'))
// this.form.amount = this.$n(this.form.amountValue, 'ungroupedDecimal')
// },
normalizeAmount(isValid) {
this.amountFocused = false
if (!isValid) return
this.form.amountValue = Number(this.form.amount.replace(',', '.'))
this.form.amount = this.$n(this.form.amountValue, 'ungroupedDecimal')
},
normalizeEmail() {
this.emailFocused = false
this.form.email = this.form.email.trim()

2
frontend/src/components/GddTransactionList.vue
View File

@ -26,7 +26,7 @@
</template>
</transaction-list-item>
</div>
<div class="h4 m-3">{{ $t('lastMonth') }}</div>
<div v-if="transactionCount > 0" class="h4 m-3">{{ $t('lastMonth') }}</div>
<div v-for="({ id, typeId }, index) in transactions" :key="`l2-` + id">
<transaction-list-item
v-if="typeId !== 'DECAY'"

29
frontend/src/components/Menu/Sidebar.vue
View File

@ -18,15 +18,15 @@
</b-nav-item> -->
<b-nav-item to="/send" class="mb-3" active-class="activeRoute">
<b-icon icon="arrow-left-right" aria-hidden="true"></b-icon>
<b-icon icon="cash-stack" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.send') }}</span>
</b-nav-item>
<b-nav-item to="/transactions" class="mb-3" active-class="activeRoute">
<b-icon icon="layout-text-sidebar-reverse" aria-hidden="true"></b-icon>
<b-icon icon="layers" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.transactions') }}</span>
</b-nav-item>
<b-nav-item to="/gdt" class="mb-3" active-class="activeRoute">
<b-icon icon="layout-text-sidebar-reverse" aria-hidden="true"></b-icon>
<b-icon icon="layers" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('gdt.gdt') }}</span>
</b-nav-item>
<!-- <b-nav-item to="/profile" class="mb-3 HIDE_FOR_WORK_IN_PROCESS">
@ -35,13 +35,13 @@
</b-nav-item> -->
<b-nav-item to="/community#my" class="mb-3" active-class="activeRoute">
<b-icon icon="people" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.members') }}</span>
<span class="ml-2">{{ $t('creation') }}</span>
</b-nav-item>
</b-nav>
<hr />
<b-nav vertical class="w-100">
<b-nav-item to="/information" class="mb-3" active-class="activeRoute">
<b-icon icon="info" aria-hidden="true"></b-icon>
<b-icon icon="info-circle" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.info') }}</span>
</b-nav-item>
<!-- <b-nav-item
@ -63,7 +63,7 @@
<span class="ml-2">{{ $t('navigation.settings') }}</span>
</b-nav-item>
<b-nav-item
class="mb-3"
class="mb-3 text-light"
v-if="$store.state.isAdmin"
@click="$emit('admin')"
active-class="activeRoute"
@ -71,9 +71,13 @@
<b-icon icon="shield-check" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.admin_area') }}</span>
</b-nav-item>
<b-nav-item class="mb-3" @click="$emit('logout')" active-class="activeRoute">
<b-icon icon="power" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.logout') }}</span>
<b-nav-item
class="mb-3 font-weight-bold"
@click="$emit('logout')"
active-class="activeRoute"
>
<b-icon icon="power" aria-hidden="true" variant="danger"></b-icon>
<span class="ml-2 text-danger">{{ $t('navigation.logout') }}</span>
</b-nav-item>
</b-nav>
</div>
@ -91,10 +95,13 @@ export default {
}
</script>
<style>
.nav-link {
color: rgb(56, 56, 56);
}
.activeRoute {
font-weight: bold;
color: rgb(219, 129, 19);
border-left: 1px solid;
color: rgb(2, 2, 1);
border-left: 4px rgb(219, 129, 19) solid;
}
/* .component-navbar .active, */

11
frontend/src/components/UserSettings/UserCard.vue
View File

@ -5,7 +5,7 @@
<b-avatar variant="primary" :text="avatar" size="6rem"></b-avatar>
</div>
<b-container class="d-flex justify-content-center mt-md-5">
<b-container class="justify-content-center mt-md-5">
<b-row>
<b-col>
<div class="text-center font-weight-bold">
@ -22,7 +22,7 @@
</div>
</b-col>
<b-col>
<div class="text-center font-weight-bold">{{ $t('em-dash') }}</div>
<div class="text-center font-weight-bold">{{ CONFIG.COMMUNITY_NAME }}</div>
<div class="text-center">
{{ $t('community.community') }}
</div>
@ -33,12 +33,19 @@
</div>
</template>
<script>
import CONFIG from '@/config'
export default {
name: 'UserCard',
props: {
balance: { type: Number, default: 0 },
transactionCount: { type: Number, default: 0 },
},
data() {
return {
CONFIG,
}
},
computed: {
avatar() {
return `${this.$store.state.firstName[0]} ${this.$store.state.lastName[0]}`

3
frontend/src/locales/de.json
View File

@ -42,6 +42,7 @@
"pending": "Eingereicht und wartet auf Bestätigung",
"rejected": "abgelehnt"
},
"creation":"Schöpfen",
"delete": "Beitrag löschen! Bist du sicher?",
"deleted": "Der Beitrag wurde gelöscht! Wird aber sichtbar bleiben.",
"exhausted": "Für diesen Monat kannst du nichts mehr schöpfen.",
@ -65,7 +66,7 @@
"unique": "(einmalig)"
},
"contributionText": "Beitragstext",
"creation": "Schöpfung",
"creation": "Schöpfen",
"decay": {
"before_startblock_transaction": "Diese Transaktion beinhaltet keine Vergänglichkeit.",
"calculation_decay": "Berechnung der Vergänglichkeit",

14
frontend/src/pages/Community.vue
View File

@ -1,8 +1,8 @@
<template>
<div class="community-page">
<div>
<b-tabs no-nav-style v-model="tabIndex" content-class="mt-3" align="center">
<b-tab>
<b-tabs no-nav-style borderless v-model="tabIndex" content-class="mt-3" align="center">
<b-tab no-body>
<open-creations-amount
:minimalDate="minimalDate"
:maxGddThisMonth="maxGddThisMonth"
@ -19,7 +19,7 @@
:maxGddThisMonth="maxGddThisMonth"
/>
</b-tab>
<b-tab>
<b-tab no-body>
<gradido-notification list="my" />
<contribution-list
@closeAllOpenCollapse="closeAllOpenCollapse"
@ -33,7 +33,7 @@
:pageSize="pageSize"
/>
</b-tab>
<b-tab>
<b-tab no-body>
<gradido-notification list="all" />
<contribution-list
:items="itemsAll"
@ -304,3 +304,9 @@ export default {
},
}
</script>
<style scoped>
.tab-content {
border-left: none;
border-right: none;
}
</style>

17
frontend/src/pages/InfoStatistic.vue
View File

@ -9,10 +9,7 @@
<div>
{{ CONFIG.COMMUNITY_URL }}
</div>
</b-container>
<hr />
<b-container class="bg-white appBoxShadow gradido-border-radius p-4">
<hr />
<div class="h3">{{ $t('community.openContributionLinks') }}</div>
<small v-if="count > 0">
{{
@ -35,18 +32,18 @@
</div>
</li>
</ul>
</b-container>
<hr />
<b-container class="bg-white appBoxShadow gradido-border-radius p-4">
<hr />
<div class="h3">{{ $t('community.moderators') }}</div>
<ul>
<li v-for="item in itemsAdminUser" v-bind:key="item.id">
{{ item.firstName }} {{ item.lastName }}
</li>
</ul>
</b-container>
<hr />
<b-container class="bg-white appBoxShadow gradido-border-radius p-4">
<hr />
<div class="h3">{{ $t('contact') }}</div>
<b-link :href="`mailto:${supportMail}`">{{ supportMail }}</b-link>
</b-container>

2
frontend/src/pages/Overview.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<div>
<community-news class="mb-5 shadow" />
<community-news class="mb-5" />
<!-- <gdd-transaction-list
:transactions="transactions"
:pageSize="5"

2
frontend/src/pages/Settings.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="container">
<div class="container bg-white appBoxShadow gradido-border-radius p-4">
<user-card :balance="balance" :transactionCount="transactionCount"></user-card>
<user-data />
<hr />

4
frontend/src/pages/Transactions.vue
View File

@ -109,9 +109,9 @@ export default {
background-color: rgb(248 249 254);
}
.tab-content {
/* .tab-content {
padding-top: 25px;
border-left: 1px inset rgba(28, 110, 164, 0.1);
border-right: 1px inset rgba(28, 110, 164, 0.1);
}
} */
</style>