Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/farmtech/authentication.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ def authenticate(self, request):
signing_key.key,
algorithms=["RS256"],
issuer=issuer,
audience=getattr(settings, "KEYCLOAK_CLIENT_ID", {}),
options=decode_options,
)

Expand Down
12 changes: 6 additions & 6 deletions src/farmtech/client/js/components/index/IndexApp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,29 +101,29 @@ export const IndexApp = ({ staticUrl = '' }) => {
<div className="funding-logos-track">
{/* Primo set di loghi */}
<a href="/" className="d-inline-block flex-shrink-0">
<img src={`${staticUrl}img/TRC_logo_orizzontale.svg`} alt="Logo Tech4You" className="img-fluid" style={{maxHeight: '80px'}} />
<img src={`${staticUrl}img/FARM-TECH.svg`} alt="Logo Tech4You" className="img-fluid" style={{maxHeight: '80px'}} />
</a>
<a href="/" className="d-inline-block flex-shrink-0">
<img src={`${staticUrl}img/TRC_logo_orizzontale.svg`} alt="Logo Partner 1" className="img-fluid" style={{maxHeight: '80px'}} />
<img src={`${staticUrl}img/SS_logo_orizzontale.svg`} alt="Logo Partner 1" className="img-fluid" style={{maxHeight: '80px'}} />
</a>
<a href="/" className="d-inline-block flex-shrink-0">
<img src={`${staticUrl}img/TRC_logo_orizzontale.svg`} alt="Logo Partner 2" className="img-fluid" style={{maxHeight: '80px'}} />
</a>
<a href="/" className="d-inline-block flex-shrink-0">
<img src={`${staticUrl}img/TRC_logo_orizzontale.svg`} alt="Logo Partner 3" className="img-fluid" style={{maxHeight: '80px'}} />
<img src={`${staticUrl}img/SS_logo_orizzontale.svg`} alt="Logo Partner 3" className="img-fluid" style={{maxHeight: '80px'}} />
</a>
{/* Duplica i loghi per loop continuo */}
<a href="/" className="d-inline-block flex-shrink-0">
<img src={`${staticUrl}img/TRC_logo_orizzontale.svg`} alt="Logo Tech4You" className="img-fluid" style={{maxHeight: '80px'}} />
<img src={`${staticUrl}img/FARM-TECH.svg`} alt="Logo Tech4You" className="img-fluid" style={{maxHeight: '80px'}} />
</a>
<a href="/" className="d-inline-block flex-shrink-0">
<img src={`${staticUrl}img/TRC_logo_orizzontale.svg`} alt="Logo Partner 1" className="img-fluid" style={{maxHeight: '80px'}} />
<img src={`${staticUrl}img/SS_logo_orizzontale.svg`} alt="Logo Partner 1" className="img-fluid" style={{maxHeight: '80px'}} />
</a>
<a href="/" className="d-inline-block flex-shrink-0">
<img src={`${staticUrl}img/TRC_logo_orizzontale.svg`} alt="Logo Partner 2" className="img-fluid" style={{maxHeight: '80px'}} />
</a>
<a href="/" className="d-inline-block flex-shrink-0">
<img src={`${staticUrl}img/TRC_logo_orizzontale.svg`} alt="Logo Partner 3" className="img-fluid" style={{maxHeight: '80px'}} />
<img src={`${staticUrl}img/SS_logo_orizzontale.svg`} alt="Logo Partner 3" className="img-fluid" style={{maxHeight: '80px'}} />
</a>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/farmtech/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
# Override cache backend to use the correct pymemcache backend
CACHES["default"] = {
"BACKEND": "django.core.cache.backends.memcached.PyLibMCCache",
"LOCATION": os.getenv("MEMCACHED_LOCATION", "127.0.0.1:11211"),
"LOCATION": os.getenv("MEMCACHED_LOCATION", "memcached:11211"),
}

# Configure django-select2 to use the default cache
Expand Down
23 changes: 23 additions & 0 deletions src/farmtech/static/img/SS_logo_orizzontale.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/farmtech/views/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ def post(self, request):
"client_id": keycloak_client_id,
"username": username,
"password": password,
"scope": "openid profile email",
}

if keycloak_client_secret:
Expand Down