Merge branch 'dev-miccighel'

Miccighel · May 2, 2024 · a92a5a1 · a92a5a1
2 parents 12f4fa5 + 395c873
commit a92a5a1
Show file tree

Hide file tree

Showing 30 changed files with 749 additions and 389 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto
diff --git a/data/build/deploy/model.html b/data/build/deploy/model.html
@@ -1,20 +1,22 @@
 <!doctype html>
-<html lang="en">
+<html lang="en-US" dir="ltr" data-critters-container>
 <head>
+	<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <meta charset="utf-8">
     % if task_title:
     <title>${task_title}</title>
     % else:
-    <title>${task_name} | ${batch_name}</title>
+    <title>${task_name}/${batch_name}</title>
     % endif
+	<base href="/${task_name}/${batch_name}/">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500&display=swap" rel="stylesheet">
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
     <link rel="stylesheet" href="styles.css">
 </head>
 <body>
-<app-loader></app-loader>
+<app-base></app-base>
 <script src="./scripts.js"></script>
 </body>
 </html>
diff --git a/data/build/mturk/model.html b/data/build/mturk/model.html
@@ -93,7 +93,11 @@ <h1 class="display-4">Steps Needed To Complete The Task</h1>
       </li>
     </ol>
     <hr class="my-4">
-    <p id="task-link-container" class="lead"><a target="_blank" id="task-link" href="https://${aws_deploy_bucket}.s3.${aws_region}.amazonaws.com/${task_name}/${batch_name}/index.html">https://${aws_deploy_bucket}.s3.${aws_region}.amazonaws.com/${task_name}/${batch_name}/index.html</a></p>
+	  % if cloudfront_endpoint:
+	  <p id="task-link-container" class="lead"><a target="_blank" id="task-link" href="${cloudfront_endpoint}/${task_name}/${batch_name}/">https://${cloudfront_endpoint}/${task_name}/${batch_name}/</a></p>
+	  % else:
+	  <p id="task-link-container" class="lead"><a target="_blank" id="task-link" href="https://${aws_deploy_bucket}.s3.${aws_region}.amazonaws.com/${task_name}/${batch_name}/index.html">https://${aws_deploy_bucket}.s3.${aws_region}.amazonaws.com/${task_name}/${batch_name}/index.html</a></p>
+	  % endif
     <div id="token-output-container" class="lead">
       <input type="text" id="token-output" name="token_output" class="form-control" placeholder="your_output_token_here">
     </div>

diff --git a/data/build/toloka/model.html b/data/build/toloka/model.html
@@ -28,8 +28,12 @@ <h1 class="display-4">Steps Needed To Complete The Task</h1>
             </li>
         </ol>
         <hr class="my-4">
-        <p id="task-link-container" class="lead"><a target="_blank" id="task-link" href="https://${aws_deploy_bucket}.s3.${aws_region}.amazonaws.com/${task_name}/${batch_name}/index.html?platform=toloka">https://${aws_deploy_bucket}.s3.${aws_region}.amazonaws.com/${task_name}/${batch_name}/index.html</a></p>
-         <div id="token-output-container" class="lead">
+		% if cloudfront_endpoint:
+		<p id="task-link-container" class="lead"><a target="_blank" id="task-link" href="${cloudfront_endpoint}/${task_name}/${batch_name}/">https://${cloudfront_endpoint}/${task_name}/${batch_name}/?platform=toloka</a></p>
+		% else:
+		<p id="task-link-container" class="lead"><a target="_blank" id="task-link" href="https://${aws_deploy_bucket}.s3.${aws_region}.amazonaws.com/${task_name}/${batch_name}/index.html">https://${aws_deploy_bucket}.s3.${aws_region}.amazonaws.com/${task_name}/${batch_name}/index.html?platform=toloka</a></p>
+		% endif
+		<div id="token-output-container" class="lead">
             {{field type="input" name="token_input"  placeholder="Insert the input token"  validation-show="right-center" size="XL"}}
             {{field type="input" name="token_output" placeholder="Insert the output token" validation-show="right-center" size="XL"}}
         </div>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Auto detect text files and perform LF normalization
		* text=auto