Skip to content

Commit

Permalink
remove keycloak theme from sill
Browse files Browse the repository at this point in the history
  • Loading branch information
JeromeBu committed Dec 11, 2024
1 parent 388816a commit 37170de
Show file tree
Hide file tree
Showing 30 changed files with 604 additions and 2,122 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,6 @@ jobs:
- run: cd web
- name: Build
run: yarn build
- name: Keycloakify
run: cd web && npx keycloakify && cd ..
env:
XDG_CACHE_HOME: "/home/runner/.cache/yarn"
- run: mv web/build_keycloak/target/retrocompat-*.jar retrocompat-keycloak-theme.jar
- run: mv web/build_keycloak/target/*.jar keycloak-theme.jar
- name: "Generate release candidate on github"
uses: softprops/action-gh-release@v2
with:
Expand All @@ -99,9 +93,6 @@ jobs:
tag_name: ${{ env.PRE_RELEASE_TAG }}
generate_release_notes: true
token: ${{ secrets.GITHUB_TOKEN }}
files: |
retrocompat-keycloak-theme.jar
keycloak-theme.jar
- name: Delete old prereleases
uses: actions/github-script@v7
with:
Expand Down
4 changes: 2 additions & 2 deletions api/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"packageRules": [
{
"packagePatterns": ["*"],
"excludePackagePatterns": ["keycloakify", "run-exclusive", "i18nifty", "tsafe", "evt"],
"excludePackagePatterns": ["run-exclusive", "i18nifty", "tsafe", "evt"],
"enabled": false
},
{
"packagePatterns": ["keycloakify", "run-exclusive", "i18nifty", "tsafe", "evt"],
"packagePatterns": ["run-exclusive", "i18nifty", "tsafe", "evt"],
"matchUpdateTypes": ["minor", "patch"],
"automerge": false,
"automergeType": "pr",
Expand Down
16 changes: 3 additions & 13 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
"license": "MIT",
"scripts": {
"dev": "react-app-rewired start",
"build": "react-app-rewired build && rimraf build/keycloak-resources",
"build-keycloak-theme": "yarn build && keycloakify",
"build": "react-app-rewired build",
"storybook": "start-storybook -p 6006",
"lint": "eslint --max-warnings=0 --ext .ts,.tsx,.js,.jsx src",
"_format": "prettier '**/*.{ts,tsx,json,md}'",
"format": "yarn _format --write",
"format:check": "yarn _format --list-different",
"analyze": "source-map-explorer 'build/static/js/*.js'",
"postinstall": "react-dsfr copy-static-assets && copy-keycloak-resources-to-public",
"postinstall": "react-dsfr copy-static-assets",
"prestorybook": "react-dsfr update-icons",
"prestart": "react-dsfr update-icons",
"prebuild": "react-dsfr update-icons",
Expand All @@ -33,7 +32,6 @@
"evt": "^2.5.7",
"flexsearch": "0.7.43",
"i18nifty": "^3.2.2",
"keycloakify": "^9.6.7",
"memoizee": "^0.4.14",
"moment": "^2.29.1",
"oidc-spa": "^5.1.2",
Expand All @@ -42,7 +40,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.43.0",
"react-markdown": "^5.0.3",
"react-markdown": "^9.0.1",
"react-scripts": "5.0.1",
"react-waypoint": "^10.3.0",
"redux-clean-architecture": "^4.1.1",
Expand Down Expand Up @@ -82,14 +80,6 @@
"ts-node": "^10.2.1",
"typescript": "^4.1.6"
},
"keycloakify": {
"themeName": "dsfr",
"extraThemeProperties": [
"homeUrl=${env.DSFR_THEME_HOME_URL:}",
"serviceTitle=${env.DSFR_THEME_SERVICE_TITLE:}",
"brandTop=${env.DSFR_THEME_BRAND_TOP:}"
]
},
"eslintConfig": {
"plugins": [
"tss-unused-classes"
Expand Down
16 changes: 1 addition & 15 deletions web/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import { lazy, Suspense } from "react";
import { createRoot } from "react-dom/client";
import { kcContext as kcLoginThemeContext } from "keycloak-theme/login/kcContext";
import { kcContext as kcAccountThemeContext } from "keycloak-theme/account/kcContext";
import { MuiDsfrThemeProvider } from "@codegouvfr/react-dsfr/mui";
import { startReactDsfr } from "@codegouvfr/react-dsfr/spa";
import { assert } from "tsafe/assert";
startReactDsfr({ "defaultColorScheme": "system" });

const App = lazy(() => import("ui/App"));
const KcLoginThemeApp = lazy(() => import("keycloak-theme/login/KcApp"));
const KcAccountThemeApp = lazy(() => import("keycloak-theme/account/KcApp"));

createRoot(
(() => {
Expand All @@ -22,17 +18,7 @@ createRoot(
).render(
<Suspense>
<MuiDsfrThemeProvider>
{(() => {
if (kcLoginThemeContext !== undefined) {
return <KcLoginThemeApp kcContext={kcLoginThemeContext} />;
}

if (kcAccountThemeContext !== undefined) {
return <KcAccountThemeApp kcContext={kcAccountThemeContext} />;
}

return <App />;
})()}
<App />
</MuiDsfrThemeProvider>
</Suspense>
);
46 changes: 0 additions & 46 deletions web/src/keycloak-theme/account/KcApp.tsx

This file was deleted.

103 changes: 0 additions & 103 deletions web/src/keycloak-theme/account/Template.tsx

This file was deleted.

6 changes: 0 additions & 6 deletions web/src/keycloak-theme/account/i18n.ts

This file was deleted.

9 changes: 0 additions & 9 deletions web/src/keycloak-theme/account/kcContext.ts

This file was deleted.

Loading

0 comments on commit 37170de

Please sign in to comment.