Merge pull request #184 from OneBusAway/survey-fnf

Survey fit and finish
OneBusAway · Feb 20, 2025 · 57a49d4 · 57a49d4
2 parents d36806e + 7212d83
commit 57a49d4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/src/components/surveys/SurveyModal.svelte b/src/components/surveys/SurveyModal.svelte
@@ -111,14 +111,13 @@
 </script>
 
 {#if $showSurveyModal && currentSurvey}
-	<Modal open={$showSurveyModal} size="3xl" class="max-w-5xl rounded-2xl">
-		<div
-			class="flex items-center justify-between rounded-t-2xl border-b border-gray-200 p-6 dark:border-gray-700"
-		>
-			<h2 class="text-2xl font-bold text-gray-900 dark:text-white">{currentSurvey.name}</h2>
-		</div>
-
-		<div class="flex flex-col space-y-6 p-6">
+	<Modal
+		title={currentSurvey.name}
+		open={$showSurveyModal}
+		size="3xl"
+		class="max-w-5xl rounded-2xl"
+	>
+		<div class="flex flex-col space-y-2">
 			{#if surveySubmitted}
 				<div class="flex flex-1 flex-col items-center justify-center p-12">
 					<svg
@@ -141,7 +140,7 @@
 					</p>
 				</div>
 			{:else}
-				<div class="max-h-[60vh] overflow-y-auto p-6">
+				<div class="max-h-[60vh] overflow-y-auto p-2">
 					{#if !heroQuestionAnswered && !skipHeroQuestion}
 						<SurveyQuestion
 							question={heroQuestion}
@@ -168,7 +167,7 @@
 				</div>
 
 				<div
-					class="sticky bottom-0 flex justify-end gap-4 rounded-b-2xl border-t border-gray-200 bg-white p-6 dark:border-gray-700 dark:bg-gray-800"
+					class="sticky bottom-0 flex justify-end gap-4 rounded-b-2xl border-t border-gray-200 bg-white pt-4 dark:border-gray-700 dark:bg-gray-800"
 				>
 					{#if !heroQuestionAnswered && !skipHeroQuestion}
 						<Button

diff --git a/src/components/surveys/SurveyQuestion.svelte b/src/components/surveys/SurveyQuestion.svelte
@@ -18,13 +18,13 @@
 	};
 
 	const sizeClasses = {
-		label: variant === 'compact' ? 'mb-2 text-xl' : 'mb-4 text-3xl',
+		label: variant === 'compact' ? 'mb-2 text-xl' : 'mb-4 text-2xl',
 		input: variant === 'compact' ? 'mt-1 px-3 py-2 text-lg' : 'mt-2 px-5 py-4 text-xl',
-		option: variant === 'compact' ? 'p-2 text-lg' : 'p-3 text-xl'
+		option: variant === 'compact' ? 'p-1 text-lg' : 'p-2 text-lg'
 	};
 
 	const errorClasses = {
-		label: variant === 'compact' ? 'text-red-500' : 'text-2xl text-red-500'
+		label: variant === 'compact' ? 'text-red-500' : 'text-xl text-red-500'
 	};
 
 	function handleInput(event) {
@@ -34,12 +34,11 @@
 </script>
 
 <label class={`${baseClasses.label} ${sizeClasses.label}`} for="question-{index}">
-	<span class="absolute inset-0 -z-10 rounded-md bg-gray-100 px-3 py-2 dark:bg-gray-800"></span>
 	{#if question.content.type !== 'label'}
 		{question.content.label_text}
 	{/if}
 	{#if required && question.content.type !== 'label'}
-		<span class="ml-1 text-red-500">*</span>
+		<span class="ml-1 text-red-500" aria-label="Required question">*</span>
 	{/if}
 </label>
 
@@ -53,7 +52,7 @@
 		class={`${baseClasses.input} ${sizeClasses.input} ${error ? 'border-red-500' : ''}`}
 	/>
 {:else if question.content.type === 'radio'}
-	<div class={`mt-2 space-y-${variant === 'compact' ? '1' : '4'}`}>
+	<div class={`mt-2 space-y-${variant === 'compact' ? '0' : '2'}`}>
 		{#each question.content.options as option}
 			<Radio
 				name="radio-{index}"
@@ -67,7 +66,7 @@
 		{/each}
 	</div>
 {:else if question.content.type === 'checkbox'}
-	<div class={`mt-2 space-y-${variant === 'compact' ? '1' : '4'}`}>
+	<div class={`mt-2 space-y-${variant === 'compact' ? '0' : '2'}`}>
 		{#each question.content.options as option}
 			<Checkbox
 				name="checkbox-{index}"
@@ -81,7 +80,7 @@
 		{/each}
 	</div>
 {:else if question.content.type === 'label'}
-	<p class={`${sizeClasses.label} mt-4 font-bold text-black dark:text-white`}>
+	<p class={`${sizeClasses.label} text-semibold mt-4 font-bold dark:text-white`}>
 		{question.content.label_text}
 	</p>
 {:else if question.content.type === 'external_survey'}
@@ -90,12 +89,12 @@
 			href={question.content.url}
 			target="_blank"
 			rel="noopener noreferrer"
-			class="inline-block text-2xl font-semibold text-blue-500 underline transition-all hover:text-blue-600"
+			class="inline-block text-xl font-semibold text-blue-500 underline transition-all hover:text-blue-600"
 		>
 			{question.content.label_text}
 		</a>
 		{#if question.content.survey_provider}
-			<p class="mt-1 text-2xl text-gray-500">
+			<p class="mt-1 text-gray-500">
 				Powered by {question.content.survey_provider}
 			</p>
 		{/if}

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -225,7 +225,11 @@
 				{handleViewAllRoutes}
 				{clearPolylines}
 				{handleTripPlan}
-			/>
+			>
+				{#snippet childContent()}
+					<!-- optional child content -->
+				{/snippet}
+			</SearchPane>
 
 			<div class="mt-4 flex-1">
 				{#if stop}