Skip to content

Commit 97e2cc2

Browse files
jeppekroghitkjeppekroghitk
committed
Fixed merge conflicts
2 parents e44edf7 + e1cb150 commit 97e2cc2

37 files changed

+1210
-624
lines changed

‎CHANGELOG.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# Changelog
32

43
All notable changes to this project will be documented in this file.

‎e2e/feed-sources.spec.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ test.describe("fest", () => {
219219

220220
test("It loads create datakilde page", async ({ page }) => {
221221
page.getByText("Opret ny datakilde").click();
222-
await expect(page.locator("#save_feed-source")).toBeVisible();
222+
await expect(page.locator("#save")).toBeVisible();
223223
});
224224

225225
test("It display error toast on save error", async ({ page }) => {
@@ -238,7 +238,7 @@ test.describe("fest", () => {
238238
await expect(
239239
page.locator(".Toastify").locator(".Toastify__toast--error")
240240
).not.toBeVisible();
241-
await page.locator("#save_feed-source").click();
241+
await page.locator("#save").click();
242242
await expect(
243243
page.locator(".Toastify").locator(".Toastify__toast--error")
244244
).toBeVisible();
@@ -253,9 +253,9 @@ test.describe("fest", () => {
253253
});
254254
test("Cancel create datakilde", async ({ page }) => {
255255
page.getByText("Opret ny datakilde").click();
256-
await expect(page.locator("#cancel_feed-source")).toBeVisible();
257-
await page.locator("#cancel_feed-source").click();
258-
await expect(page.locator("#cancel_feed-source")).not.toBeVisible();
256+
await expect(page.locator("#cancel")).toBeVisible();
257+
await page.locator("#cancel").click();
258+
await expect(page.locator("#cancel")).not.toBeVisible();
259259
});
260260
});
261261

‎e2e/playlist.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ test.describe("Playlist create tests", () => {
5959
await expect(
6060
page.locator(".Toastify").locator(".Toastify__toast--success")
6161
).not.toBeVisible();
62-
await page.locator("#save_playlist").click();
62+
await page.locator("#save_slide_and_close").click();
6363
await expect(
6464
page
6565
.locator(".Toastify")

‎infrastructure/itkdev/etc/confd/templates/config.tmpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"api": "{{ getenv "API_PATH" "/" }}",
33
"touchButtonRegions": "{{ getenv "APP_TOUCH_BUTTON_REGIONS" "false"}}",
4+
"previewClient": "{{ getenv "APP_PREVIEW_CLIENT" "null"}}",
45
"showScreenStatus": "{{ getenv "APP_SHOW_SCREEN_STATUS" "true"}}",
56
"rejseplanenApiKey": "{{ getenv "APP_REJSEPLANEN_API_KEY" "null"}}",
67
"loginMethods": [

‎infrastructure/os2display/etc/confd/templates/config.tmpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"api": "{{ getenv "API_PATH" "/" }}",
33
"touchButtonRegions": "{{ getenv "APP_TOUCH_BUTTON_REGIONS" "false"}}",
4+
"previewClient": "{{ getenv "APP_PREVIEW_CLIENT" "null"}}",
45
"showScreenStatus": "{{ getenv "APP_SHOW_SCREEN_STATUS" "false"}}",
56
"rejseplanenApiKey": "{{ getenv "APP_REJSEPLANEN_API_KEY" "null"}}",
67
"loginMethods": [

‎public/example_config.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"api": "/",
33
"touchButtonRegions": false,
4+
"previewClient": null,
45
"showScreenStatus": false,
56
"rejseplanenApiKey": null,
67
"loginMethods": [

‎src/app.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ function App() {
220220
<Col lg={9} xl={10}>
221221
<Topbar />
222222
{accessConfig && (
223-
<main className="col p-3">
223+
<main>
224224
<Routes>
225225
<Route path="campaign">
226226
<Route

‎src/components/activation-code/activation-code-activate.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function ActivationCodeActivate() {
6767
};
6868

6969
return (
70-
<>
70+
<div className="p-3">
7171
<LoadingComponent
7272
isLoading={isSaving}
7373
loadingMessage={t("loading-messages.saving-activation-code")}
@@ -99,7 +99,7 @@ function ActivationCodeActivate() {
9999
</Button>
100100
</ContentFooter>
101101
</Form>
102-
</>
102+
</div>
103103
);
104104
}
105105

‎src/components/activation-code/activation-code-form.jsx‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { React } from "react";
22
import { useNavigate } from "react-router-dom";
3-
import { Button } from "react-bootstrap";
3+
import { Button, Col, Row } from "react-bootstrap";
44
import { useTranslation } from "react-i18next";
55
import PropTypes from "prop-types";
66
import Form from "react-bootstrap/Form";
77
import LoadingComponent from "../util/loading-component/loading-component";
88
import ContentBody from "../util/content-body/content-body";
9-
import ContentFooter from "../util/content-footer/content-footer";
109
import FormInput from "../util/forms/form-input";
1110
import RadioButtons from "../util/forms/radio-buttons";
11+
import StickyFooter from "../util/sticky-footer";
1212

1313
/**
1414
* The user form component.
@@ -48,44 +48,48 @@ function ActivationCodeForm({
4848
<>
4949
<LoadingComponent isLoading={isLoading} loadingMessage={loadingMessage} />
5050
<Form>
51-
<h1 id="h1UserDisplayName">{headerText}</h1>
52-
<ContentBody>
53-
<div className="mb-2">
54-
<FormInput
55-
title="display-name"
56-
type="text"
57-
label={t("display-name-label")}
58-
placeholder={t("display-name-placeholder")}
59-
value={activationCode.displayName}
60-
onChange={handleInput}
61-
name="displayName"
62-
required
63-
/>
64-
</div>
65-
<div className="mb-2">
66-
<RadioButtons
67-
radioGroupName="role"
68-
handleChange={handleInput}
69-
options={roles}
70-
label={t("role-label")}
71-
selected={activationCode.role}
72-
/>
73-
<div>
74-
<small>{t("role-external-user-helptext")}</small>
75-
</div>
76-
<div>
77-
<small>{t("role-external-user-admin-helptext")}</small>
78-
</div>
79-
</div>
80-
</ContentBody>
81-
<ContentFooter>
51+
<Row className="m-3">
52+
<h1>{headerText}</h1>
53+
<Col>
54+
<ContentBody>
55+
<div className="mb-2">
56+
<FormInput
57+
title="display-name"
58+
type="text"
59+
label={t("display-name-label")}
60+
placeholder={t("display-name-placeholder")}
61+
value={activationCode.displayName}
62+
onChange={handleInput}
63+
name="displayName"
64+
required
65+
/>
66+
</div>
67+
<div className="mb-2">
68+
<RadioButtons
69+
radioGroupName="role"
70+
handleChange={handleInput}
71+
options={roles}
72+
label={t("role-label")}
73+
selected={activationCode.role}
74+
/>
75+
<div>
76+
<small>{t("role-external-user-helptext")}</small>
77+
</div>
78+
<div>
79+
<small>{t("role-external-user-admin-helptext")}</small>
80+
</div>
81+
</div>
82+
</ContentBody>
83+
</Col>
84+
</Row>
85+
86+
<StickyFooter>
8287
<Button
8388
variant="secondary"
8489
type="button"
8590
id="cancel_user"
8691
onClick={() => navigate("/activation/list/")}
8792
className="margin-right-button"
88-
size="lg"
8993
>
9094
{t("cancel-button")}
9195
</Button>
@@ -94,12 +98,10 @@ function ActivationCodeForm({
9498
type="button"
9599
onClick={handleSubmit}
96100
id="save_user"
97-
size="lg"
98-
className="col"
99101
>
100102
{t("save-button")}
101103
</Button>
102-
</ContentFooter>
104+
</StickyFooter>
103105
</Form>
104106
</>
105107
);

‎src/components/activation-code/activation-code-list.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ function ActivationCodeList() {
185185
}, [listData]);
186186

187187
return (
188-
<>
188+
<div className="p-3">
189189
<ContentHeader
190190
title={t("header")}
191191
newBtnTitle={t("create-activation-codes")}
@@ -208,7 +208,7 @@ function ActivationCodeList() {
208208
)}
209209
</>
210210
</ContentBody>
211-
</>
211+
</div>
212212
);
213213
}
214214

0 commit comments

Comments
 (0)