- {MessageNewUserNoPhotosInFolder} {MessageNoPhotosInFolder}
+ {MessageNewUserNoPhotosInFolder}{" "}
+
+ {MessageReadMoreHere}.
+ {" "}
+ {MessageNoPhotosInFolder}
);
}
diff --git a/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.spec.tsx b/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.spec.tsx
index 71fa1f8eec..b8bee87488 100644
--- a/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.spec.tsx
+++ b/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.spec.tsx
@@ -7,8 +7,8 @@ import { IFileIndexItem, newIFileIndexItemArray } from "../../../interfaces/IFil
import { Router } from "../../../router-app/router-app";
import * as FlatListItem from "../../atoms/flat-list-item/flat-list-item";
import * as ListImageChildItem from "../../atoms/list-image-child-item/list-image-child-item";
-import ItemListView from "./item-list-view";
import * as ShiftSelectionHelper from "./internal/shift-selection-helper";
+import ItemListView from "./item-list-view";
describe("ItemListView", () => {
it("renders (without state component)", () => {
@@ -69,9 +69,10 @@ describe("ItemListView", () => {
const component = render(
);
- expect(component.container.textContent).toBe(
- "New? Set your drive location in the settings. There are no photos in this folder"
+ expect(component.container.textContent).toContain(
+ "New? Set your drive location in the settings."
);
+ expect(component.container.textContent).toContain("There are no photos in this folder");
});
it("text should be: There are no photos in this folder", () => {
diff --git a/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.stories.tsx b/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.stories.tsx
index 8c7a06fe6e..ed2f782c70 100644
--- a/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.stories.tsx
+++ b/starsky/starsky/clientapp/src/components/molecules/item-list-view/item-list-view.stories.tsx
@@ -26,6 +26,13 @@ export const Default = () => {
Default.storyName = "default";
+export const HomeNoContent = () => {
+ Router.navigate("/");
+ return ;
+};
+
+HomeNoContent.storyName = "home no content";
+
export const _8ItemsSelectionDisabled = () => {
Router.navigate("/");
return (
diff --git a/starsky/starsky/clientapp/src/components/organisms/preference-app-settings-desktop/preference-app-settings-desktop.tsx b/starsky/starsky/clientapp/src/components/organisms/preference-app-settings-desktop/preference-app-settings-desktop.tsx
index 0a64842314..e2dc8d99e3 100644
--- a/starsky/starsky/clientapp/src/components/organisms/preference-app-settings-desktop/preference-app-settings-desktop.tsx
+++ b/starsky/starsky/clientapp/src/components/organisms/preference-app-settings-desktop/preference-app-settings-desktop.tsx
@@ -117,7 +117,9 @@ const PreferencesAppSettingsDesktop: React.FunctionComponent = () => {
? "preference-app-settings-desktop-use-local-desktop-true"
: "preference-app-settings-desktop-use-local-desktop-false"
}
- className={appSettings?.useLocalDesktop ? "" : "warning-box"}
+ className={
+ appSettings?.useLocalDesktop ? "warning-box warning-box--optional" : "warning-box"
+ }
>
{MessageSwitchButtonDesktopApplicationDescription}
diff --git a/starsky/starsky/clientapp/src/components/organisms/preferences-app-settings-storage-folder/preferences-app-settings-storage-folder.stories.tsx b/starsky/starsky/clientapp/src/components/organisms/preferences-app-settings-storage-folder/preferences-app-settings-storage-folder.stories.tsx
index aa67399455..29e4053f9e 100644
--- a/starsky/starsky/clientapp/src/components/organisms/preferences-app-settings-storage-folder/preferences-app-settings-storage-folder.stories.tsx
+++ b/starsky/starsky/clientapp/src/components/organisms/preferences-app-settings-storage-folder/preferences-app-settings-storage-folder.stories.tsx
@@ -5,7 +5,11 @@ export default {
};
export const Default = () => {
- return ;
+ return (
+
+ );
};
Default.storyName = "default";
diff --git a/starsky/starsky/clientapp/src/components/organisms/preferences-app-settings-storage-folder/preferences-app-settings-storage-folder.tsx b/starsky/starsky/clientapp/src/components/organisms/preferences-app-settings-storage-folder/preferences-app-settings-storage-folder.tsx
index 20d92999e9..02e037d329 100644
--- a/starsky/starsky/clientapp/src/components/organisms/preferences-app-settings-storage-folder/preferences-app-settings-storage-folder.tsx
+++ b/starsky/starsky/clientapp/src/components/organisms/preferences-app-settings-storage-folder/preferences-app-settings-storage-folder.tsx
@@ -37,7 +37,7 @@ const PreferencesAppSettingsStorageFolder: React.FunctionComponent = () => {
const MessageAppSettingStorageFolderEnvUsedFail = language.key(
localization.MessageAppSettingStorageFolderEnvUsedFail
);
-
+ const MessageReadMoreHere = language.key(localization.MessageReadMoreHere);
const permissionsData = useFetch(new UrlQuery().UrlAccountPermissions(), "get");
const [isEnabled, setIsEnabled] = useState(false);
@@ -91,7 +91,10 @@ const PreferencesAppSettingsStorageFolder: React.FunctionComponent = () => {
{storageFolder !== appSettings?.storageFolder && !storageFolderNotFound ? (
) : null}
diff --git a/starsky/starsky/clientapp/src/components/organisms/preferences-username/preferences-username.tsx b/starsky/starsky/clientapp/src/components/organisms/preferences-username/preferences-username.tsx
index 37384d6c1d..cb66e9bb7d 100644
--- a/starsky/starsky/clientapp/src/components/organisms/preferences-username/preferences-username.tsx
+++ b/starsky/starsky/clientapp/src/components/organisms/preferences-username/preferences-username.tsx
@@ -35,7 +35,7 @@ const PreferencesUsername: React.FunctionComponent = () => {
{userName}
{MessageRole}
- {accountStatus?.data?.roleCode}
+ {accountStatus?.data?.roleCode}
);
};
diff --git a/starsky/starsky/clientapp/src/localization/localization.json b/starsky/starsky/clientapp/src/localization/localization.json
index 29a2187343..11d2cd9ba1 100644
--- a/starsky/starsky/clientapp/src/localization/localization.json
+++ b/starsky/starsky/clientapp/src/localization/localization.json
@@ -580,9 +580,29 @@
"de": "Nächste"
},
"MessageAddName": {
- "en": "Hinzufügen zu",
+ "en": "Add to",
"nl": "Toevoegen",
- "de": "Mehr"
+ "de": "Hinzufügen zu"
+ },
+ "MessageTagsWithColon": {
+ "en": "Tags: ",
+ "nl": "Tags: ",
+ "de": "Schlagwörter: "
+ },
+ "MessageInfoWithColon": {
+ "en": "Info: ",
+ "nl": "Info: ",
+ "de": "Info: "
+ },
+ "MessageTagsDescription": {
+ "en": "Tags are comma-separated",
+ "nl": "Tags zijn gescheiden door komma's",
+ "de": "Schlagwörter sind durch Kommas getrennt"
+ },
+ "MessageTitleWithColon": {
+ "en": "Title: ",
+ "nl": "Titel: ",
+ "de": "Titel: "
},
"MessageOverwriteName": {
"en": "Overwrite",
@@ -994,6 +1014,11 @@
"nl": "Ga naar de homepagina",
"de": "Gehe zur Startseite"
},
+ "MessageReadMoreHere": {
+ "en": "Read more here",
+ "nl": "Lees meer hier",
+ "de": "Lesen Sie hier mehr"
+ },
"temp1": {
"en": "More",
"nl": "Meer",
diff --git a/starsky/starsky/clientapp/src/shared/url/url-query.spec.ts b/starsky/starsky/clientapp/src/shared/url/url-query.spec.ts
index 73c71b3e10..88d5ead5b5 100644
--- a/starsky/starsky/clientapp/src/shared/url/url-query.spec.ts
+++ b/starsky/starsky/clientapp/src/shared/url/url-query.spec.ts
@@ -1,5 +1,8 @@
import { UrlQuery } from "./url-query";
+/**
+ * UrlQueryTest
+ */
describe("url-query", () => {
const urlQuery = new UrlQuery();
@@ -236,6 +239,11 @@ describe("url-query", () => {
});
});
+ it("DocsGettingStartedFirstSteps", () => {
+ const test = urlQuery.DocsGettingStartedFirstSteps();
+ expect(test).toContain("docs/getting-started/first-steps");
+ });
+
describe("UrlRealtime", () => {
const { location } = window;
/**
diff --git a/starsky/starsky/clientapp/src/shared/url/url-query.ts b/starsky/starsky/clientapp/src/shared/url/url-query.ts
index 219341dacc..03a35fca97 100644
--- a/starsky/starsky/clientapp/src/shared/url/url-query.ts
+++ b/starsky/starsky/clientapp/src/shared/url/url-query.ts
@@ -436,4 +436,8 @@ export class UrlQuery {
url += "//" + window.location.host + this.prefix + "/realtime";
return url;
}
+
+ public DocsGettingStartedFirstSteps(): string {
+ return "https://docs.qdraw.nl/docs/getting-started/first-steps";
+ }
}
diff --git a/starsky/starsky/clientapp/src/style/css/00-index.css b/starsky/starsky/clientapp/src/style/css/00-index.css
index 3478a7751d..8898c83f4c 100644
--- a/starsky/starsky/clientapp/src/style/css/00-index.css
+++ b/starsky/starsky/clientapp/src/style/css/00-index.css
@@ -27,6 +27,8 @@
@import "./37-video.css";
@import "./38-arrow-to.css";
@import "./39-select.css";
+@import "./40-tooltip.css";
+
@import "./50-preferences.css";
@import "./vendor/60-leaflet.css";
diff --git a/starsky/starsky/clientapp/src/style/css/20-content.css b/starsky/starsky/clientapp/src/style/css/20-content.css
index 16bb2ba57e..4e8fb11740 100644
--- a/starsky/starsky/clientapp/src/style/css/20-content.css
+++ b/starsky/starsky/clientapp/src/style/css/20-content.css
@@ -170,6 +170,13 @@
margin-bottom: 8px;
}
+.content--text .warning-box a,
+.content .warning-box a,
+.content > form > .content--error-true a {
+ color: white;
+ text-decoration: underline;
+}
+
.warning-box.warning-box--under-form {
margin-top: 25px;
}
@@ -259,10 +266,3 @@
.publish .warning-box {
margin-top: 4px;
}
-
-/*for password gui*/
-@media (prefers-color-scheme: dark) {
- .preferences-username-text {
- color: #fff;
- }
-}
diff --git a/starsky/starsky/clientapp/src/style/css/38-arrow-to.css b/starsky/starsky/clientapp/src/style/css/38-arrow-to.css
index 96a88036cd..b8c4555abc 100644
--- a/starsky/starsky/clientapp/src/style/css/38-arrow-to.css
+++ b/starsky/starsky/clientapp/src/style/css/38-arrow-to.css
@@ -6,3 +6,13 @@
background-size: contain;
background-image: url("../images/s-next.svg");
}
+
+@media (prefers-color-scheme: dark) {
+ .arrow-to {
+ background-size: contain;
+ background-image: none;
+ mask-image: url("../images/s-next.svg");
+ mask-size: contain;
+ background-color: white;
+ }
+}
diff --git a/starsky/starsky/clientapp/src/style/css/40-tooltip.css b/starsky/starsky/clientapp/src/style/css/40-tooltip.css
new file mode 100644
index 0000000000..ffaad763c8
--- /dev/null
+++ b/starsky/starsky/clientapp/src/style/css/40-tooltip.css
@@ -0,0 +1,60 @@
+.tooltip-container {
+ position: relative;
+ background-color: transparent;
+ display: inline;
+ vertical-align: bottom;
+}
+
+.tooltip-container .tooltip {
+ position: absolute;
+ background-color: #90a4ae;
+ color: black;
+ padding: 8px;
+ border-radius: 3px;
+ z-index: 1;
+ bottom: 125%;
+ left: 50%;
+ transform: translateX(-50%);
+ white-space: nowrap;
+}
+
+.tooltip-container.left .tooltip {
+ left: 70%;
+ transform: translateX(-30%);
+}
+
+.tooltip-container .tooltip::after {
+ content: "";
+ position: absolute;
+ top: 100%; /* Position the arrow just below the tooltip */
+ left: 50%;
+ border-width: 5px;
+ border-style: solid;
+ border-color: #90a4ae transparent transparent transparent; /* Black arrow with transparent top border */
+ transform: translateX(-50%);
+}
+
+.tooltip-container.left .tooltip::after {
+ left: 28%;
+}
+
+.tooltip-container:hover .tooltip {
+ visibility: visible;
+}
+
+.tooltip-container > .info--small {
+ display: table-cell;
+ width: 16px;
+ height: 16px;
+
+ background-color: #263238;
+ mask-image: url("../images/s-info.svg");
+ mask-position: 0px 0px;
+ mask-size: 100%;
+}
+
+@media (prefers-color-scheme: dark) {
+ .tooltip-container > .info--small {
+ background-color: white;
+ }
+}
diff --git a/starsky/starsky/clientapp/src/style/css/50-preferences.css b/starsky/starsky/clientapp/src/style/css/50-preferences.css
index 54f4c00a15..4768dc7b30 100644
--- a/starsky/starsky/clientapp/src/style/css/50-preferences.css
+++ b/starsky/starsky/clientapp/src/style/css/50-preferences.css
@@ -2,3 +2,18 @@
.preferences--password .warning-box {
margin-top: 10px;
}
+
+@media (prefers-color-scheme: dark) {
+ .preferences--app-settings h3,
+ .preferences--app-settings p {
+ color: white;
+ }
+}
+
+/*for password gui*/
+@media (prefers-color-scheme: dark) {
+ .preferences-role,
+ .preferences-username-text {
+ color: #fff;
+ }
+}
diff --git a/starskydesktop/starskydesktop.code-workspace b/starskydesktop/starskydesktop.code-workspace
index b83fd5ae4d..992f6c40be 100644
--- a/starskydesktop/starskydesktop.code-workspace
+++ b/starskydesktop/starskydesktop.code-workspace
@@ -17,6 +17,7 @@
"editor.formatOnSave": true,
"typescript.preferences.quoteStyle": "double",
"typescript.updateImportsOnFileMove.enabled": "always",
- "cSpell.words": ["Starsky"]
+ "cSpell.words": ["Starsky"],
+ "testing.openTesting": "neverOpen"
}
}