Merge pull request #440 from harena-lab/development

feat (annotator): case insensitive memory
harena-lab · Sep 4, 2023 · a58b7e8 · a58b7e8
2 parents a4d0577 + e6e1a7e
commit a58b7e8
Show file tree

Hide file tree

Showing 24 changed files with 1,957 additions and 53 deletions.
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -27,7 +27,7 @@ services:
       - HARENA_LOGGER_URL=http://localhost:10030
       - HARENA_LOGGER_API_VERSION=v1
 
-    restart: always
+    restart: on-failure:5
     networks:
       - harena-space
     volumes:
@@ -57,7 +57,7 @@ services:
       - HASH_DRIVER=bcrypt
     depends_on:
       - harena-manager-database
-    restart: always
+    restart: on-failure:5
     networks:
       - harena-space
     volumes:
@@ -78,7 +78,7 @@ services:
       - MYSQL_PASSWORD=jacinto
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
       - MYSQL_ROOT_PASSWORD=root
-    restart: always
+    restart: on-failure:5
     networks:
       - harena-space
 

diff --git a/src/adonisjs/public/author/drafts/index.html b/src/adonisjs/public/author/drafts/index.html
@@ -173,9 +173,22 @@ <h5 class="modal-title">Filter by:</h5>
                   <option value="student">Student</option>
                 </select>
               </div>
+              <div class="pr-3" style="width: 120px;">
+                <dcc-rest id="harena-user-groups" bind="harena-user-groups"></dcc-rest>
+                <dcc-dhtml id="harena-dhtml-groups" connect="retrieve:harena-user-groups:service/request/get">
+                  <select id="fGroup" name="fGroup" class="custom-select custom-select-sm">
+                    <option selected value="">Group</option>
+                    {{@foreach . group}}
+                    <option value={{group.group_id}}>{{group.group_title}}</option>
+                    {{@endfor}}
+                  </select>
+                </dcc-dhtml>
+              </div>
+
               <div class="pr-3" style="width: 120px;">
                 <input type="text" class="form-control custom-select-sm" id="fSpecialty" placeholder="Specialty">
               </div>
+
               <input type="text" class="mr-2 my-2 form-control custom-select-sm" id="fSearchStr"
                placeholder="Search similar title, keywords or description...">
 

diff --git a/src/adonisjs/public/author/env/inf331_2023/css/lab.css b/src/adonisjs/public/author/env/inf331_2023/css/lab.css
@@ -0,0 +1,67 @@
+:root{
+  --dark: #1F2232;
+  --secondary: #596475;
+  --primary: #BC9EC1;
+  --light-pink: #E3BAC6;
+  --light: #FDE8E9;
+}
+.bg-lab-light {
+  background-color: var(--light) !important;
+}
+.bg-lab-light-pink {
+  background-color: var(--light-pink) !important;
+}
+.bg-lab-primary {
+  background-color: var(--primary) !important;
+}
+.bg-lab-secondary {
+  background-color: var(--secondary) !important;
+}
+.bg-lab-dark {
+  background-color: var(--dark) !important;
+}
+
+.text-lab-dark {
+  color: var(--dark) !important;
+}
+
+.text-lab-secondary {
+  color: var(--secondary) !important;
+}
+
+.text-lab-primary {
+  color: var(--primary) !important;
+}
+.text-primary {
+  color: var(--dark) !important;
+}
+
+.text-lab-light-pink {
+  color: var(--light-pink) !important;
+}
+
+.text-lab-light {
+  color: var(--light) !important;
+}
+
+.btn-lab-primary {
+	color: var(--light);
+	background-color: var(--dark);
+	border-color: var(--dark);
+}
+.btn-lab-primary:hover {
+  color: var(--primary) !important;
+  font-size: 1.1rem !important;
+}
+
+.btn-lab-secondary {
+	color: var(--light);
+	background-color: var(--secondary);
+	border-color: var(--secondary);
+}
+
+.disabled-lock, .disabled-look{
+  pointer-events: none;
+  background-color: var(--light-pink);
+  opacity: 0.8
+}
diff --git a/src/adonisjs/public/author/env/inf331_2023/index.html b/src/adonisjs/public/author/env/inf331_2023/index.html
@@ -0,0 +1,141 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>INF 331 - Laboratórios</title>
+
+  <!-- Tell the browser to be responsive to screen width -->
+  <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no" name="viewport">
+
+  <script src="/lib/axios-0.21.0/axios.min.js"></script>
+
+  <script src="/lib/jquery-3-4-1/jquery-3.4.1.slim.min.js"></script>
+  <script src="/lib/popper-1-15-0/popper.min.js"></script>
+  <script src="/lib/bootstrap-4.4.1/js/bootstrap.min.js"></script>
+  <script src="/lib/ckeditor5/ckeditor.js"></script>
+
+  <script src="/config/config.js"></script>
+  <script src="/dccs/infra/bus.js"></script>
+
+  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+  <link rel="shortcut icon" href="/icons/favicon.ico">
+  <link rel="manifest" href="/site.webmanifest">
+
+  <link rel="stylesheet" href="/lib/fontawesome-5-10-1/css/all.min.css">
+  <link rel="stylesheet" href="/lib/bootstrap-4.4.1/css/bootstrap.min.css">
+  <link rel="stylesheet" href="/lib/quill-1-3-7/quill.snow.css">
+
+  <link rel="stylesheet" href="/dccs/css/dccs.css">
+  <link rel="stylesheet" href="/dccs/css/properties.css">
+  <link rel="stylesheet" href="/infra/css/common-player.css">
+  <link rel="stylesheet" href="/infra/css/common-author.css">
+
+  <link rel="stylesheet" href="/author/env/inf331_2023/css/lab.css">
+
+  <script src="/context/context.js"></script>
+
+  <script src="/lib/quill-1-3-7/quill.min.js"></script>
+  <script src="/lib/d3.min.js"></script>
+
+  <script src="/dccs/base/primitive-dcc.js"></script>
+  <script src="/dccs/base/scope-dcc.js"></script>
+  <script src="/dccs/base/dcc.js"></script>
+  <script src="/dccs/base/dcc-base.js"></script>
+  <script src="/dccs/base/dcc-visual.js"></script>
+
+  <script src="/infra/basic.js"></script>
+  <script>
+    Basic.service.rootPath = '../../../'
+  </script>
+  <script src="/infra/dcc-common-server-proxy.js"></script>
+  <script src="/infra/dcc-common-server-address.js"></script>
+  <script src="/infra/simple-page-tasks.js"></script>
+  <script src="/infra/token-validator.js"></script>
+  <script src="/infra/conditional-layout.js"></script>
+  <script src="/prognosis/js/prognosis-bus.js"></script>
+  <script src="/prognosis/js/prognosis-bus-driver.js"></script>
+
+  <script src="/dccs/components/visual/dcc-markdown.js"></script>
+  <script src="/dccs/components/visual/dcc-annotation.js"></script>
+  <script src="/dccs/components/visual/dcc-image.js"></script>
+  <script src="/dccs/components/visual/dcc-expression.js"></script>
+  <script src="/dccs/base/dcc-block.js"></script>
+  <script src="/dccs/components/visual/dcc-button.js"></script>
+  <script src="/dccs/components/visual/dcc-character.js"></script>
+  <script src="/dccs/components/visual/dcc-lively-dialog.js"></script>
+  <script src="/dccs/components/visual/dcc-notice-input.js"></script>
+  <script src="/dccs/components/visual/dcc-context-menu.js"></script>
+  <script src="/dccs/components/visual/dcc-state-select.js"></script>
+  <script src="/dccs/components/visual/dcc-image-marker.js"></script>
+  <script src="/dccs/base/dcc-styler.js"></script>
+  <script src="/dccs/components/visual/dcc-entity.js"></script>
+  <script src="/dccs/components/visual/dcc-input.js"></script>
+  <script src="/dccs/components/visual/dcc-input-typed.js"></script>
+  <script src="/dccs/components/visual/dcc-input-choice.js"></script>
+  <script src="/dccs/components/visual/dcc-input-table.js"></script>
+  <script src="/dccs/components/visual/dcc-slider.js"></script>
+  <script src="/dccs/components/visual/dcc-report.js"></script>
+  <script src="/dccs/components/visual/dcc-graph.js"></script>
+
+  <script src="/dccs/components/control/dcc-timer.js"></script>
+  <script src="/dccs/components/control/dcc-message.js"></script>
+  <script src="/dccs/components/control/dcc-compute.js"></script>
+
+  <script src="/dccs/base/subscribe-dcc.js"></script>
+  <script src="/dccs/base/trigger-dcc.js"></script>
+  <script src="/dccs/base/property-dcc.js"></script>
+  <script src="/dccs/base/connect-dcc.js"></script>
+
+
+  <script src="/dccs/components/data/dcc-model.js"></script>
+  <script src="/dccs/components/data/dcc-submit.js"></script>
+  <script src="/dccs/components/data/dcc-record.js"></script>
+
+  <script src="/dccs/components/web/dcc-include.js"></script>
+  <script src="/dccs/components/web/dcc-dhtml.js"></script>
+  <script src="/dccs/components/web/dcc-rest.js"></script>
+
+  <script src="/infra/dcc-rest-proxy.js"></script>
+  <script src="/infra/dcc-basic.js"></script>
+
+  <script src="/lib/showdown/showdown.min.js"></script>
+  <script src="/translator/translator.js"></script>
+  <script src="/translator/item-templates.js"></script>
+
+  <script src="/author/js/dcc-author-server-proxy.js"></script>
+  <script src="/author/js/template-case.js"></script>
+
+  <script src="/author/env/inf331_2023/js/lab-progress.js"></script>
+
+</head>
+
+<body>
+
+  <dcc-include src="/author/partials/header.html"></dcc-include>
+  <!-- Notice modal -->
+  <div class="modal fade" id="notice-modal" tabindex="-1" role="dialog" aria-labelledby="notice-modal" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+      <div class="modal-content">
+        <div class="modal-body text-center" id="modal-notice-body">
+            <h5 class="" id="modal-notice-txt"></h5>
+        </div>
+      </div>
+    </div>
+  </div>
+  <!-- End notice modal -->
+  <main role="">
+    <div id="main-panel" class="d-flex bg-lab-light flex-column vh-100 vw-100 index-boot-padding">
+      <div id="main-wrapper" class=" d-flex flex-column w-xl-75 h-100 w-100 main-scroll scroll-y 
+      bg-lab-dark mx-auto align-items-center">
+        <h1 class="text-lab-light-pink mt-5">INF 331 - Laboratórios</h1>
+        <div class="mt-5 d-flex flex-column w-75 w-md-100" id="btn-home-container">
+          <div id="lab-progress-wrapper" class="row row-cols-2 justify-content-center">
+          </div>
+        </div>
+      </div>
+    </div>
+  </main>
+</body>
+</html>