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
Binary file modified console-keycloak/APL.jar
Binary file not shown.
51 changes: 0 additions & 51 deletions console-keycloak/APL/theme/APL/login/resources/css/login.css
Original file line number Diff line number Diff line change
Expand Up @@ -294,57 +294,6 @@ ul#kc-totp-supported-apps {
border-style: solid;
border-color: transparent black transparent transparent;
}
.zocial,
a.zocial {
padding: 6px 16px;
color: #fff !important;
background-color: #c03518 !important;
font-size: 1rem;
min-width: 64px;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif,
'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
font-weight: 500;
line-height: 1.75;
border: 0;
border-radius: 2em;
text-transform: none;
text-shadow: none;
}
.zocial:before {
border-right: 0;
margin-right: 0;
}
.zocial span:before {
padding: 7px 10px;
font-size: 14px;
}
.zocial:hover {
box-shadow: 0px 2px 4px -1px rgba(0, 0, 0, 0.2), 0px 4px 5px 0px rgba(0, 0, 0, 0.14),
0px 1px 10px 0px rgba(0, 0, 0, 0.12);
background-color: #f4f4f4 !important;
}

.zocial.facebook,
.zocial.github,
.zocial.google,
.zocial.microsoft,
.zocial.stackoverflow,
.zocial.linkedin,
.zocial.twitter {
background-image: none;
border: 0;

box-shadow: none;
text-shadow: none;
}

/* Copy of zocial windows classes to be used for microsoft's social provider button */
.zocial.microsoft:before {
content: '\f15d';
}
.zocial.stackoverflow:before {
color: inherit;
}

@media (min-width: 768px) {
#kc-container-wrapper {
Expand Down
2 changes: 1 addition & 1 deletion console-keycloak/APL/theme/APL/login/theme.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
parent=keycloak
import=common/keycloak
styles=node_modules/patternfly/dist/css/patternfly.css node_modules/patternfly/dist/css/patternfly-additions.css lib/zocial/zocial.css css/login.css
styles=css/login.css
6 changes: 3 additions & 3 deletions console-keycloak/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Local development

Run keycloak locally with `APL` theme mounted.
Run keycloak locally with `APL` theme mounted, from the main project directory.

```
docker run -p 8084:8080 -e KEYCLOAK_ADMIN=admin -e KEYCLOAK_ADMIN_PASSWORD=admin -v $PWD/keycloak/themes/APL:/opt/keycloak/themes/APL console -v $PWD/keycloak/providers:/opt/keycloak/providers keycloak/keycloak start-dev
```sh
docker run --name keycloak --rm -p 8084:8080 -e KC_BOOTSTRAP_ADMIN_USERNAME=admin -e KC_BOOTSTRAP_ADMIN_PASSWORD=admin -v $PWD/console-keycloak/APL/theme/APL:/opt/keycloak/themes/APL keycloak/keycloak start-dev
```

Next:
Expand Down
4 changes: 2 additions & 2 deletions src/components/Error.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default function ({ error }: Props): React.ReactElement {
variant='contained'
color='primary'
onClick={() => {
window.location.href = '/logout-otomi'
window.location.href = '/platform-logout'
}}
>
{t('Logout', { ns: 'error' })}
Expand Down Expand Up @@ -84,7 +84,7 @@ export default function ({ error }: Props): React.ReactElement {
variant='contained'
color='primary'
onClick={() => {
window.location.href = '/logout-otomi'
window.location.href = '/platform-logout'
}}
>
{t('Logout', { ns: 'error' })}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Logout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ interface Props {
export default function Logout({ fetchError = false }: Props): React.ReactElement {
// This component manages the logout process for users authenticated with Keycloak.
// - If a fetch error occurs, the page reloads automatically to handle potential session issues.
// - If no fetch error occurs, the user is redirected to the Keycloak logout page ('/logout-otomi' route).
// - If no fetch error occurs, the user is redirected to the Keycloak logout page ('/platform-logout' route).
// - On component unmount, the page reloads to ensure a clean and consistent state.
useEffect(() => {
if (fetchError) window.location.reload()
else window.location.href = '/logout-otomi'
else window.location.href = '/platform-logout'
return () => {
window.location.reload()
}
Expand Down
2 changes: 1 addition & 1 deletion src/providers/Session.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ type DbMessage = {

export default function SessionProvider({ children }: Props): React.ReactElement {
const { pathname } = useLocation()
const skipFetch = pathname === '/logout' || pathname === '/logout-otomi'
const skipFetch = pathname === '/logout' || pathname === '/platform-logout'
const [oboTeamId, setOboTeamId] = useLocalStorage<string>('oboTeamId', undefined)
const {
data: session,
Expand Down