Merge pull request #401 from Lenni009/web-dev

Bugfixes

fauna.html

@@ -521,7 +521,7 @@ <h1 class="title is-3">Hub Wiki Page Creator - Fauna</h1>
 					</div>
 
 					<div>==Location==</div>
-					<div>It can be found on the [[<output id="celestialBody"></output>]] in the [[<output id="locSystem"
+					<div>It can be found on the <output id="celestialBody"></output> in the [[<output id="locSystem"
 							name="system"></output>]] [[star system]].</div>
 					<br>
 					<div>{{CoordGlyphConvert|<output id="portalglyphs1" name="portalglyphs"></output>}}

src/datalists/mineralDatalists.ts

@@ -149,6 +149,7 @@ const mineralDatalists = {
 		'Copper',
 		'Silver',
 		'Tritium',
+		'Carbon',
 	]
 }
 

src/miscLogic/locationLogic.ts

@@ -27,13 +27,14 @@ export function planetMoon(moon = pageData.moon) {
  * @returns {string} - The description sentence, or "" if `globalElements.output.celestialBody`
  *                     is falsy.
  */
-export function planetMoonSentence(planet: string = pageData.planet as string, moon: string = pageData.moon as string) {
+export function planetMoonSentence(planet: string = pageData.planet as string, moon: string = pageData.moon as string, link: boolean = false) {
 	const dest = globalElements.output.celestialBody as HTMLOutputElement;
 	const body = planetMoon(moon);
 	const text = body == 'Moon' ? `moon [[${sanitiseString(moon)}]]` : `planet [[${sanitiseString(planet)}]]`;
+	const linkedText = link ? `[[${text.split(' ')[0]}]] ${text.split(' ').slice(1)}` : text;
 
-	if (!dest) return text;
-	dest.innerText = text;
+	if (!dest) return linkedText;
+	dest.innerText = linkedText;
 	return '';
 }
 

src/modules/gallery.ts

@@ -47,6 +47,7 @@ export function galleryUpload() {
 			const p = document.createElement('p');
 			const span = document.createElement('span');
 			p.innerText = name;
+			p.style.wordBreak = 'break-all'
 			span.classList.add('has-text-weight-bold');
 			span.innerText = 'Name: ';
 			p.insertAdjacentElement('afterbegin', span);

src/pages/fauna/elementFunctions.ts

@@ -16,7 +16,7 @@ const creatureElementFunctions: ElementFunctions = [
 	},
 	{
 		element: ['planetInput', 'moonInput'],
-		func: () => planetMoonSentence()
+		func: () => planetMoonSentence(undefined, undefined, true)
 	},
 	{
 		element: 'ecosystemInput',

src/pages/fauna/index.ts

@@ -8,6 +8,7 @@ import creatureElementFunctions from "./elementFunctions";
 import creatureElements from "./elementStore";
 import { albumOtherExternal, albumCivExternal, addInfo, albumDropdown, bundlePropFunctions, genderDropdown, genusDropdown, genusProduces, hideAlbumEntry, hideCreaturePrio, hideSecGenderProps, noLineBreak, pageName, specialNotes, specialNotesTextFunc, generateGalleryArray, resetExternal } from "./fauna";
 import { globalFunctions } from "../../variables/objects";
+import { planetMoonSentence } from "../../miscLogic/locationLogic";
 import '../../startup';
 
 globalFunctions.albumOtherExternal = () => albumOtherExternal();
@@ -36,6 +37,7 @@ datalists(creatureDatalists);
 updateGlobalElements(creatureElements);
 assignElementFunctions(creatureElementFunctions);
 
+planetMoonSentence(undefined, undefined, true);
 genusDropdown();
 genderDropdown();
 albumDropdown();

src/scss/components/_gallery.scss

@@ -37,6 +37,9 @@
 		flex-grow: 1;
 		padding: .5em;
 		position: relative;
+		display: flex;
+		flex-direction: column;
+		gap: .5rem;
 
 		input {
 			min-height: 25px;