Skip to content

Commit

Permalink
refactor/import-current-framework-version (#7)
Browse files Browse the repository at this point in the history
* refactor: add current framework version

* refactor: add windows scripts

* refactor: add windows scripts

---------

Co-authored-by: mikewegele <mike.wegele@iav.de>
Co-authored-by: dahelfi <90329764+dahelfi@users.noreply.github.com>
  • Loading branch information
3 people authored Sep 23, 2024
1 parent 106d75b commit 8025cc0
Show file tree
Hide file tree
Showing 20 changed files with 484 additions and 312 deletions.
19 changes: 19 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
<!--
Copyright © 2024 IAV GmbH Ingenieurgesellschaft Auto und Verkehr, All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
SPDX-License-Identifier: Apache-2.0
-->

# IAVFrontendFramework

[![license](https://img.shields.io/badge/license-Apache--2.0-blue)](./LICENSE)
Expand Down Expand Up @@ -36,3 +54,4 @@ the [root of the repository](./LICENSE).

Contributions are welcome! Please read the [contributing guidelines](./CONTRIBUTING.md) before submitting a pull
request.

Binary file modified SBOM.json
Binary file not shown.
12 changes: 10 additions & 2 deletions example/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 25 additions & 7 deletions example/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,28 @@
import { nodeResolve } from '@rollup/plugin-node-resolve';
/**
* Copyright © 2024 IAV GmbH Ingenieurgesellschaft Auto und Verkehr, All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* SPDX-License-Identifier: Apache-2.0
*/

import {nodeResolve} from '@rollup/plugin-node-resolve';

export default {
input: "src/index.js",
output: {
dir: "output",
format: "cjs"
},
plugins: [nodeResolve()]
input: "src/index.js",
output: {
dir: "output",
format: "cjs"
},
plugins: [nodeResolve()]
};
18 changes: 18 additions & 0 deletions example/src/components/context/AuthentificationStore.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
/**
* Copyright © 2024 IAV GmbH Ingenieurgesellschaft Auto und Verkehr, All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* SPDX-License-Identifier: Apache-2.0
*/

import {PropsWithChildren, useCallback, useState} from "react";
import {State} from "iav-frontend-framework/dummyAuthenticationProvider";
import {AuthContext, Credentials} from "iav-frontend-framework/auth";
Expand Down
86 changes: 43 additions & 43 deletions example/src/components/legalDocuments.tsx
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
/**
* Copyright © 2024 IAV GmbH Ingenieurgesellschaft Auto und Verkehr, All Rights Reserved.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*
* SPDX-License-Identifier: Apache-2.0
*/

import { useTranslator } from 'iav-frontend-framework/translators';
import { ImprintText } from 'iav-frontend-framework/imprint';
import { useContext } from 'react';
import { ColorSettingsContext } from 'iav-frontend-framework/colorSettingsContext';
import 'iav-frontend-framework/globalColors.css';
import {useTranslator} from "iav-frontend-framework/translators";
import {ImprintText} from "iav-frontend-framework/imprint";
import {useContext} from "react";
import {ColorSettingsContext} from "iav-frontend-framework/colorSettingsContext";
import "iav-frontend-framework/globalColors.css";

export const LegalDocuments = () => {
const t = useTranslator();
const colorSettingsContext = useContext(ColorSettingsContext);
const t = useTranslator();
const colorSettingsContext = useContext(ColorSettingsContext);

return (
<div
className={
(colorSettingsContext?.darkmode ? 'bg-black' : 'bg-grey-1') + ' p-3'
}
style={{ height: '100%', width: '100%', overflow: 'auto' }}
>
<div
className={
(colorSettingsContext?.darkmode ? 'bg-grey-5' : 'bg-white-1') +
' flex px-3'
}
style={{
flexDirection: 'column',
height: '100%',
width: '100%',
overflow: 'auto',
}}
>
return (
<div
className={
colorSettingsContext?.darkmode ? 'color-blue-3' : 'color-red'
}
style={{
textAlign: 'center',
fontSize: '25px',
fontWeight: 'bolder',
}}
className={
(colorSettingsContext?.darkmode ? "bg-black" : "bg-grey-1") + " p-3"
}
style={{height: "100%", width: "100%", overflow: "auto"}}
>
{t('Customized_legal_documents')}
<div
className={
(colorSettingsContext?.darkmode ? "bg-grey-6" : "bg-white-1") +
" flex px-3"
}
style={{
flexDirection: "column",
height: "100%",
width: "100%",
overflow: "auto",
}}
>
<div
className={
colorSettingsContext?.darkmode ? "color-blue-3" : "color-red"
}
style={{
textAlign: "center",
fontSize: "25px",
fontWeight: "bolder",
}}
>
{t("Customized_legal_documents")}
</div>
<ImprintText/>
</div>
</div>
<ImprintText />
</div>
</div>
);
);
};
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@
],
"scripts": {
"devmode": "./scripts/windows/devmode_build.bat",
"devmode:windows": ".\\scripts\\windows\\devmode_build.bat",
"build-linux": "./scripts/ci_cd/build.sh",
"build": "tsc --build --clean && tsc --build && npx babel ./src --out-dir ./build --extensions .ts,.tsx --copy-files",
"test": "jest --passWithNoTests",
"run-example": "./scripts/windows/setup_and_run_example.bat",
"run-example:windows": ".\\scripts\\windows\\setup_and_run_example.bat",
"lint": "eslint 'src/**/*.{js,ts,tsx}'",
"release": "semantic-release"
},
Expand Down
22 changes: 22 additions & 0 deletions scripts/ci_cd/release_notes/14.1.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!--
Copyright © 2024 IAV GmbH Ingenieurgesellschaft Auto und Verkehr, All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
SPDX-License-Identifier: Apache-2.0
-->

# Fixes

- adjust color in darkmode
- correct CEO name
21 changes: 21 additions & 0 deletions scripts/ci_cd/release_notes/14.1.2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!--
Copyright © 2024 IAV GmbH Ingenieurgesellschaft Auto und Verkehr, All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
SPDX-License-Identifier: Apache-2.0
-->

# Fixes

- fix color in darkmode for imprintText
24 changes: 7 additions & 17 deletions src/coloring/defaultColors.tsx
Original file line number Diff line number Diff line change
@@ -1,36 +1,26 @@
/**
* Copyright © 2024 IAV GmbH Ingenieurgesellschaft Auto und Verkehr, All Rights Reserved.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*
* SPDX-License-Identifier: Apache-2.0
*/

import {
BLACK,
BLUE0,
BLUE3,
GREY1,
GREY4,
GREY5,
GREY6,
GREY_MENU_SPECIAL_1,
WHITE,
} from "../constants";
import {BLACK, BLUE0, BLUE3, GREY1, GREY4, GREY5, GREY6, GREY_MENU_SPECIAL_1, WHITE,} from "../constants";

//. Header
export const LIGHT_HEADER_BACKGROUND_COLOR = BLUE0;
export const DARK_HEADER_BACKGROUND_COLOR = GREY5;
export const DARK_HEADER_BACKGROUND_COLOR = GREY6;

export const LIGHT_HEADER_SETTINGS_ICON_COLOR = WHITE;
export const DARK_HEADER_SETTINGS_ICON_COLOR = WHITE;
Expand Down Expand Up @@ -185,7 +175,7 @@ export const DARK_CONTENT_TAB_ICON_ACTIVE_COLOR = WHITE;

//. Content cell
export const LIGHT_CONTENT_CELL_BACKGROUND_COLOR = WHITE;
export const DARK_CONTENT_CELL_BACKGROUND_COLOR = GREY5;
export const DARK_CONTENT_CELL_BACKGROUND_COLOR = GREY6;

//. Authentication view
export const LIGHT_AUTH_HEADER_BACKGROUND_COLOR = BLUE0;
Expand Down
Loading

0 comments on commit 8025cc0

Please sign in to comment.