Skip to content

Commit

Permalink
Update how terms
Browse files Browse the repository at this point in the history
  • Loading branch information
garronej committed Jun 21, 2024
1 parent 5c71c15 commit 3e8981c
Show file tree
Hide file tree
Showing 4 changed files with 622 additions and 249 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ This starter is based on Vite. There is also [a Webpack based starter](https://g
```bash
git clone https://github.com/keycloakify/keycloakify-starter
cd keycloakify-starter
yarn install # Or use an other package manager, just be sure to delete the yarn.lock if you do.
yarn install # Or use an other package manager, just be sure to delete the yarn.lock if you do.
```

# Testing the theme locally

[Documentation](https://docs.keycloakify.dev/v/v10/testing-your-theme)
[Documentation](https://docs.keycloakify.dev/v/v10/testing-your-theme)

# How to customize the theme

Expand All @@ -25,16 +25,17 @@ yarn install # Or use an other package manager, just be sure to delete the yarn.
# Building the theme

You need to have Maven installed to build the theme (The `mvn` command must be in the PATH).
- On macOS: `brew install maven`
- On Debian/Ubuntu: `sudo apt-get install maven`
- On Windows: `choco install openjdk` and `choco install maven` (Or download from [here](https://maven.apache.org/download.cgi))

- On macOS: `brew install maven`
- On Debian/Ubuntu: `sudo apt-get install maven`
- On Windows: `choco install openjdk` and `choco install maven` (Or download from [here](https://maven.apache.org/download.cgi))

```bash
npm run build-keycloak-theme
```

Note that by default Keycloakify generates multiple .jar files for different versions of Keycloak.
You can customize this behavior, see documentation [here](https://docs.keycloakify.dev/v/v10/targetting-specific-keycloak-versions).
You can customize this behavior, see documentation [here](https://docs.keycloakify.dev/v/v10/targetting-specific-keycloak-versions).

# GitHub Actions

Expand All @@ -44,4 +45,3 @@ To release a new version **just update the `package.json` version and push**.

To enable the workflow go to your fork of this repository on GitHub then navigate to:
`Settings` > `Actions` > `Workflow permissions`, select `Read and write permissions`.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"license": "MIT",
"keywords": [],
"dependencies": {
"keycloakify": "10.0.0-rc.77",
"keycloakify": "10.0.0-rc.78",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
34 changes: 16 additions & 18 deletions src/login/KcPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,25 @@ export default function KcPage(props: { kcContext: KcContext }) {
useDownloadTerms({
kcContext,
downloadTermsMarkdown: async ({ currentLanguageTag }) => {
let termsLanguageTag = currentLanguageTag;
let termsFileName: string;
for (const languageTag of [currentLanguageTag, "en"]) {
const response = await fetch(
`${import.meta.env.BASE_URL}terms/${languageTag}.md`
);

switch (currentLanguageTag) {
case "fr":
termsFileName = "fr.md";
break;
case "es":
termsFileName = "es.md";
break;
default:
termsFileName = "en.md";
termsLanguageTag = "en";
break;
}
if (!response.ok) {
continue;
}

const termsMarkdown = await fetch(
`${import.meta.env.BASE_URL}terms/${termsFileName}`
).then(r => r.text());
return {
termsMarkdown: await response.text(),
termsLanguageTag: languageTag
};
}

return { termsMarkdown, termsLanguageTag };
return {
termsMarkdown: "No terms found",
termsLanguageTag: "en"
};
}
});

Expand Down
Loading

0 comments on commit 3e8981c

Please sign in to comment.