Skip to content

Commit 3e2ab62

Browse files
committed
big update front
1 parent a1f8a8a commit 3e2ab62

File tree

14 files changed

+1677
-202
lines changed

14 files changed

+1677
-202
lines changed

frontend/src/components/NavBar.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<li v-if="isClient"><router-link to="/client/request">Заявки</router-link></li>
88
<li v-if="isAdmin"><router-link to="/admin/statistics">Cтатистика</router-link></li>
99
<li v-if="isAdmin"><router-link to="/admin/request">Заявки</router-link></li>
10-
<!-- <li v-if="isAdmin"><router-link to="/admin/main">История</router-link></li> -->
10+
<li v-if="isAdmin"><router-link to="/history">История</router-link></li>
1111
<li v-if="isClient && !isOnProfilePage"><router-link to="/client/profile">{{ userName }}</router-link></li>
1212
<li v-if="isAdmin && !isOnProfilePage"><router-link to="/admin/profile">{{ userName }}</router-link></li>
1313
<li v-if="isClient && isOnProfilePage"><a href="#" @click.prevent="logout">Выход</a></li>
@@ -27,7 +27,7 @@ export default {
2727
return localStorage.getItem('userType') === 'admin';
2828
},
2929
userName() {
30-
return localStorage.getItem('userName') || 'Пользователь';
30+
return localStorage.getItem('userName') || 'Не найдено';
3131
},
3232
isOnProfilePage() {
3333
return this.$route.path === '/client/profile' || this.$route.path === '/admin/profile';

frontend/src/router/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import ClientLoanApplication from '../views/client/LoanApplication.vue';
1212
import Statistics from '../views/admin/Statistics.vue';
1313
import RequestDetail from '../views/RequestDetail.vue';
1414
import CreditDetail from '../views/CreditDetail.vue';
15+
import History from '../views/admin/History.vue';
16+
import ClientCreditHistory from '../views/admin/ClientCreditHistory.vue';
1517

1618
const routes = [
1719
// { path: '/', redirect: '/login' },
@@ -24,6 +26,8 @@ const routes = [
2426
{ path: '/admin/request', component: AdminRequest },
2527
{ path: '/request', component: RequestDetail},
2628
{ path: '/credit', component: CreditDetail },
29+
{ path: '/history', component: History },
30+
{ path: '/client_credit_history', component: ClientCreditHistory },
2731
{ path: '/client/profile', component: ClientProfile },
2832
{ path: '/admin/profile', component: AdminProfile },
2933
{ path: '/admin/statistics', component: Statistics },

frontend/src/views/CreditDetail.vue

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<h1>Детали кредита</h1>
44
<div v-if="request">
55
<div><strong>Название кредита:</strong> {{ request.loan_name }}</div>
6-
<div><strong>Дата открытия:</strong> {{ formatDate(request.opening_date) }}</div>
6+
<div><strong>Дата открытия:</strong> {{ formatDateTime(request.opening_date) }}</div>
77
<div><strong>Сумма:</strong> {{ request.amount }} руб.</div>
88
<div><strong>Ставка:</strong> {{ request.interest_rate }} %</div>
99
<div><strong>Срок:</strong> {{ request.expiration_time }} мес.</div>
@@ -30,6 +30,9 @@ export default {
3030
created() {
3131
this.getCreditDetails();
3232
},
33+
mounted() {
34+
document.title = "Детали кредита";
35+
},
3336
methods: {
3437
async getCreditDetails() {
3538
try {
@@ -44,7 +47,7 @@ export default {
4447
console.log('Ошибка при получении данных кредита:', error);
4548
}
4649
},
47-
formatDate(date) {
50+
formatDateTime(date) {
4851
const options = {
4952
year: 'numeric',
5053
month: 'long',
@@ -54,6 +57,14 @@ export default {
5457
second: '2-digit'
5558
};
5659
return new Date(date).toLocaleString('ru-RU', options);
60+
},
61+
formatDate(date) {
62+
const options = {
63+
year: 'numeric',
64+
month: 'long',
65+
day: 'numeric'
66+
};
67+
return new Date(date).toLocaleString('ru-RU', options);
5768
}
5869
}
5970
};

frontend/src/views/RequestDetail.vue

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<h1>Детали заявки</h1>
44
<div v-if="request">
55
<div><strong>Название кредита:</strong> {{ request.loan_name }}</div>
6-
<div><strong>Дата заявки:</strong> {{ formatDate(request.request_time) }}</div>
6+
<div><strong>Дата заявки:</strong> {{ formatDateTime(request.request_time) }}</div>
77
<div><strong>Статус:</strong> {{ request.status }}</div>
88
<div><strong>Сумма:</strong> {{ request.amount }} руб.</div>
99
<div><strong>Ставка:</strong> {{ request.interest_rate }} %</div>
@@ -44,6 +44,9 @@ export default {
4444
created() {
4545
this.getRequestDetails();
4646
},
47+
mounted() {
48+
document.title = "Детали заявки";
49+
},
4750
methods: {
4851
async getRequestDetails() {
4952
try {
@@ -59,7 +62,7 @@ export default {
5962
console.log('Ошибка при получении данных заявки:', error);
6063
}
6164
},
62-
formatDate(date) {
65+
formatDateTime(date) {
6366
const options = {
6467
year: 'numeric',
6568
month: 'long',

0 commit comments

Comments
 (0)