Merge pull request #613 from inab/staging

Staging - #611 and #610
inab · Jun 3, 2024 · 978aedb · 978aedb
2 parents 87ba671 + b78c44d
commit 978aedb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/components/observatory/CollectionSelector.vue b/components/observatory/CollectionSelector.vue
@@ -54,11 +54,15 @@
 							</p>
 						</v-col>
 						<v-col cols="2">
-							<v-img
-								:src="
-									require(`@/static/collections/${collections[model].image}`)
-								"
-							></v-img>
+							<div class="container">
+								<img
+									class="responsive-image"
+									alt="Community logo"
+									:src="
+										require(`@/static/collections/${collections[model].image}`)
+									"
+								/>
+							</div>
 						</v-col>
 					</v-row>
 				</v-sheet>
@@ -141,6 +145,20 @@ export default {
 };
 </script>
 <style scoped>
+.container {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 110px;
+	height: 130px;
+}
+
+.responsive-image {
+	width: 100%;
+	height: auto;
+	object-fit: contain;
+}
+
 .collections-header {
 	color: #0b579f;
 }

diff --git a/components/observatory/evaluation/GitHub/GitHubInput.vue b/components/observatory/evaluation/GitHub/GitHubInput.vue
@@ -14,7 +14,7 @@
 						v-model="value"
 						class="ml-1"
 						label="Link to GitHub repository"
-						:rules="[rules.required]"
+						:rules="[rules.required, rules.gitHubURL]"
 						outlined
 						clearable
 						clear-icon="mdi-close-circle"
@@ -73,7 +73,7 @@ export default {
 			required: (value) => !!value || 'Required.',
 			gitHubURL: (value) => {
 				const pattern =
-					/^(http(s?):\/\/)?(www\.)?github\.([a-z])+\/(.*)+\/(.*)+\/?$/i;
+					/^(https?:\/\/)?(www\.)?github\.[a-z]+\/[^/]+\/[^/]+\/?$/i;
 				return (
 					pattern.test(value) || 'Please enter a valid GitHub repository link.'
 				);