diff --git a/.env b/.env
index 0b1a428..ca5082d 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,6 @@
REACT_APP_TAB_TITLE=Gepafin
REACT_APP_API_EXECUTION_ADDRESS=https://api-dev-gepafin.memento.credit/v1
REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit
-REACT_APP_LOGO_FILENAME=gepafin-logo.svg
+REACT_APP_LOGO_FILENAME=sviluppumbria-logo.png
REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico
REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs
\ No newline at end of file
diff --git a/public/loaded-files/sviluppumbria-logo.png b/public/loaded-files/sviluppumbria-logo.png
new file mode 100644
index 0000000..ac75489
Binary files /dev/null and b/public/loaded-files/sviluppumbria-logo.png differ
diff --git a/src/assets/scss/components/layout.scss b/src/assets/scss/components/layout.scss
index aa00313..b81708b 100644
--- a/src/assets/scss/components/layout.scss
+++ b/src/assets/scss/components/layout.scss
@@ -35,7 +35,7 @@ img {
}
.appLogo {
- height: 50px;
+ height: 150px;
}
.inner {
diff --git a/src/assets/scss/components/misc.scss b/src/assets/scss/components/misc.scss
index b2c5847..8d5a701 100644
--- a/src/assets/scss/components/misc.scss
+++ b/src/assets/scss/components/misc.scss
@@ -113,16 +113,15 @@
background-color: rgba(255,255,255,0.3)
}
-.p-inputgroup {
- align-items: center;
-}
-
.p-accordion-header-text, .p-accordion-content {
p {
margin: 0;
}
}
+.p-inputgroup.flex-1 {
+ align-items: center;
+}
.flex-1 {
display: flex;
align-items: center;
diff --git a/src/assets/scss/components/topBar.scss b/src/assets/scss/components/topBar.scss
index 1a4a924..fc73015 100644
--- a/src/assets/scss/components/topBar.scss
+++ b/src/assets/scss/components/topBar.scss
@@ -1,5 +1,9 @@
.topBar {
- background: var(--horizontalMenu-background)
+ padding: 0.5rem 1rem;
+ background: var(--horizontalMenu-background);
+}
+.topBar .appLogo {
+ height: 70px;
}
.topBar__endContent {
display: flex;
diff --git a/src/layouts/DefaultLayout/components/AppSidebar/index.js b/src/layouts/DefaultLayout/components/AppSidebar/index.js
index 013aa06..85985d2 100644
--- a/src/layouts/DefaultLayout/components/AppSidebar/index.js
+++ b/src/layouts/DefaultLayout/components/AppSidebar/index.js
@@ -50,7 +50,7 @@ const AppSidebar = () => {
{
label: __('Domande da valutare', 'gepafin'),
icon: 'pi pi-calendar-clock',
- href: '/valutazioni',
+ href: '/domande',
id: 6,
enable: intersection(permissions, ['EVALUATE_APPLICATIONS']).length
},
diff --git a/src/pages/BandoApplication/index.js b/src/pages/BandoApplication/index.js
index 12e6982..b1b7ae9 100644
--- a/src/pages/BandoApplication/index.js
+++ b/src/pages/BandoApplication/index.js
@@ -627,15 +627,16 @@ const BandoApplication = () => {
: null}
-
-
-
+ {'DRAFT' !== applicationStatus
+ ?
+
+
: null}
diff --git a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
index d0745dd..46618ee 100644
--- a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
+++ b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
@@ -1,12 +1,13 @@
import React, { useState, useEffect} from 'react';
import { __ } from '@wordpress/i18n';
import { is, uniq } from 'ramda';
+import { Link } from 'react-router-dom';
// store
-//import { storeSet, storeGet } from '../../../../store';
+import { useStore } from '../../../../store';
// api
-//import ApplicationService from '../../../../service/application-service';
+import AssignedApplicationService from '../../../../service/assigned-application-service';
// components
import { FilterMatchMode, FilterOperator } from 'primereact/api';
@@ -18,8 +19,6 @@ import { InputIcon } from 'primereact/inputicon';
import { Button } from 'primereact/button';
import { Calendar } from 'primereact/calendar';
import ProperBandoLabel from '../../../../components/ProperBandoLabel';
-import AssignedApplicationService from '../../../../service/assigned-application-service';
-import { useStore } from '../../../../store';
const PreInstructorDomandeTable = () => {
@@ -128,10 +127,13 @@ const PreInstructorDomandeTable = () => {
};
const actionsBodyTemplate = (rowData) => {
- return