Skip to content

Commit

Permalink
Merge branch 'develop' into feature/pandemos
Browse files Browse the repository at this point in the history
  • Loading branch information
NXXR committed Jul 25, 2024
2 parents dcce1f3 + d51f9b4 commit 15bdcc9
Show file tree
Hide file tree
Showing 24 changed files with 893 additions and 154 deletions.
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/0-blank.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# SPDX-FileCopyrightText: 2024 German Aerospace Center (DLR)
# SPDX-License-Identifier: CC0-1.0

name: Blank Issue
description: Create a blank issue
projects: "DLR-SC/5"
body:
- type: textarea
id: content
attributes:
label: Description
description: Describe the issue.
validations:
required: true
Original file line number Diff line number Diff line change
@@ -1,38 +1,31 @@
# SPDX-FileCopyrightText: 2024 German Aerospace Center (DLR)
# SPDX-License-Identifier: CC0-1.0

name: Bug Report
description: File a bug report
title: "[Bug]: "
labels: ["class:bug"]
name: Feedback or Bug Report
description: File a report to tell us your thoughts
labels: ["FEEDBACK"]
projects: "DLR-SC/5"
body:
- type: markdown
attributes:
value: |
Thank you for your report!
Thank you for your report/feedback!
- type: textarea
id: description
attributes:
label: Description
placeholder: |
Provide a clear and concise description of the bug.
If necessary, add screenshots to explain the problem.
Provide steps to reproduce the problem.
value: |
Provide a clear and concise description of the bug.
If necessary, add screenshots to explain the problem.
Steps to reproduce the problem:
1. Do this
2. Do that
Tell us about your feedback or provide a description of the bug you found.
If necessary, add screenshots to explain the idea or problem.
If possible provide steps to reproduce the problem.
validations:
required: true
- type: textarea
id: expected
attributes:
label: Expected Behavior
description: Please describe what should happen instead.
placeholder: A clear description of what you expected to happen.
label: Expected Outcome
description: Please describe what should or could happen.
placeholder: A clear description of what you think should happen.
validations:
required: false
- type: dropdown
Expand All @@ -49,7 +42,7 @@ body:
- Internet Explorer
- Other
validations:
required: true
required: false
- type: input
id: version
attributes:
Expand Down
51 changes: 51 additions & 0 deletions .github/ISSUE_TEMPLATE/2-epic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# SPDX-FileCopyrightText: 2024 German Aerospace Center (DLR)
# SPDX-License-Identifier: CC0-1.0

name: Epic
description: Create a new epic
title: "[EPIC]: "
projects: "DLR-SC/5"
labels: ["Epic"]
body:
- type: checkboxes
id: pre-steps
attributes:
label: Things to do durng epic creation
options:
- label: Create a Label with a short name for this epic (`Epic:ShortName`) with the color `#4660F9` and add the label to this issue
required: true
- label: Add this Issue to the "ESID-Frontend" Project board
required: true
- label: Crate a branch for this epic (`feature/short-name`) and add it in the development field
required: true
- type: textarea
id: subtasks
attributes:
label: Related Issues/Tasks
value: |
<!--
Add a checkbox list (- [ ]) with the tasks needed for the Epic.
replace them with issue links (#<issue number>) when the issues are created.
i.e.:
- [ ] Do thing for epic
- [ ] #110
-->
---
validations:
required: true
- type: textarea
id: details
attributes:
label: Details
value: |
<!-- Detailed description of the Epic, its requirements, and goals -->
---
validations:
required: true
- type: textarea
id: notes
attributes:
label: Notes
value: |
<!-- Notes on things that are out of scope of the Epic but may spawn new issues at a later date -->
38 changes: 0 additions & 38 deletions .github/ISSUE_TEMPLATE/EPIC.yml

This file was deleted.

45 changes: 0 additions & 45 deletions .github/ISSUE_TEMPLATE/FEEDBACK-REPORT.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# SPDX-FileCopyrightText: 2024 German Aerospace Center (DLR)
# SPDX-License-Identifier: CC0-1.0

blank_issues_enabled: true
2 changes: 2 additions & 0 deletions frontend/locales/de-global.json5
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
topBar: {
'icon-alt': 'ESID Anwendungslogo',
language: 'Sprache',
org: 'Organisation',
menu: {
label: 'Anwendungsmenü',
login: 'Anmelden',
logout: 'Abmelden',
imprint: 'Impressum',
'privacy-policy': 'Datenschutzerklärung',
accessibility: 'Barrierefreiheit',
Expand Down
2 changes: 2 additions & 0 deletions frontend/locales/en-global.json5
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
topBar: {
'icon-alt': 'ESID application logo',
language: 'Language',
org: 'Organization',
menu: {
label: 'Application menu',
login: 'Login',
logout: 'Logout',
imprint: 'Imprint',
'privacy-policy': 'Privacy Policy',
accessibility: 'Accessibility',
Expand Down
11 changes: 11 additions & 0 deletions frontend/package-lock.json

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

1 change: 1 addition & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"react-i18next": "^13.5.0",
"react-lazyload": "github:twobin/react-lazyload",
"react-markdown": "^9.0.1",
"react-oauth2-code-pkce": "^1.18.0",
"react-redux": "^9.0.4",
"react-scroll-sync": "^0.11.2",
"redux": "^5.0.0",
Expand Down
59 changes: 31 additions & 28 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {MUILocalization} from './components/shared/MUILocalization';
import {DataProvider} from 'data_sockets/DataContext';
import {PandemosProvider} from 'data_sockets/PandemosContext';

import AuthProvider from './components/AuthProvider';
/**
* This is the root element of the React application. It divides the main screen area into the three main components.
* The top bar, the sidebar and the main content area.
Expand All @@ -30,35 +31,37 @@ export default function App(): JSX.Element {
return (
<Suspense fallback='loading'>
<Provider store={Store}>
<ThemeProvider theme={Theme}>
<PersistGate loading={null} persistor={Persistor}>
<I18nextProvider i18n={i18n}>
<MUILocalization>
<DataProvider>
<PandemosProvider>
<Initializer />
<Box id='app' display='flex' flexDirection='column' sx={{height: '100%', width: '100%'}}>
<TopBar />
<Box
id='app-content'
sx={{
display: 'flex',
flexDirection: 'row',
flexGrow: 1,
alignItems: 'stretch',
width: '100%',
}}
>
<SidebarContainer />
<MainContent />
<AuthProvider>
<ThemeProvider theme={Theme}>
<PersistGate loading={null} persistor={Persistor}>
<I18nextProvider i18n={i18n}>
<MUILocalization>
<DataProvider>
<PandemosProvider>
<Initializer />
<Box id='app' display='flex' flexDirection='column' sx={{height: '100%', width: '100%'}}>
<TopBar />
<Box
id='app-content'
sx={{
display: 'flex',
flexDirection: 'row',
flexGrow: 1,
alignItems: 'stretch',
width: '100%',
}}
>
<SidebarContainer />
<MainContent />
</Box>
</Box>
</Box>
</PandemosProvider>
</DataProvider>
</MUILocalization>
</I18nextProvider>
</PersistGate>
</ThemeProvider>
</PandemosProvider>
</DataProvider>
</MUILocalization>
</I18nextProvider>
</PersistGate>
</ThemeProvider>
</AuthProvider>
</Provider>
</Suspense>
);
Expand Down
Loading

0 comments on commit 15bdcc9

Please sign in to comment.