Merge branch 'master' into text-position#4369

Author: tanmoysrt

.database_consistency.yml

@@ -22,8 +22,6 @@ DatabaseConsistencyCheckers:
     enabled: false # Disabling this flag as currently there are issues reported on the project regarding this key.
   ThreeStateBooleanChecker:
     enabled: false # Disabling this flag as currently there are issues reported on the project regarding this key.
-  ForeignKeyChecker:
-    enabled: false # Disabling this flag as currently there are issues reported on the project regarding this key.
   MissingAssociationClassChecker:
     enabled: false # Disabling this flag as currently there are issues reported on the project regarding this key.
   ForeignKeyTypeChecker:
@@ -35,54 +33,18 @@ DatabaseConsistencyCheckers:
   RedundantIndexChecker:
     enabled: false # Disabling this flag as currently there are issues reported on the project regarding this key.
 
-User:
-  enabled: true # Enables/disables checks for the whole model. This can be overwritten by deeper configuration (latest configuration has highest priority).
-  phone:
-    enabled: true # Enables/disables checks for the field. This can be overwritten by deeper configuration (latest configuration has highest priority).
-    ColumnPresenceChecker:
-      enabled: true # Enables/disables specific checker for the field. This has the highest priority (except globally disabled checkers).
-  name:
-    enabled: true
-  code:
-    enabled: true
-    NullConstraintChecker:
-      enabled: true
-  name+email:
-    MissingUniqueIndexChecker:
-      enabled: true
-
-Country:
-  users:
-    MissingIndexChecker:
-      enabled: true
-
-# Can be compact (example), "enabled: true" is default
-# User:
-#   phone:
-#     ColumnPresenceChecker:
-#       enabled: false
-#   name:
-#     enabled: false
-# Company:
-#   enabled: false
-
-
-# Concerns can be emulated using YAML's anchors and aliases
-
-# 1. Define an anchor before declaring concern-related settings
-DateConcern: &ignore_date_concern
-  date:
-    NullConstraintChecker:
+Ahoy::Event:
+  visit:
+    ForeignKeyChecker:
       enabled: false
-NameConcern: &ignore_name_concern
-  name:
-    ColumnPresenceChecker:
+  user:
+    ForeignKeyChecker:
+      enabled: false
+Ahoy::Visit:
+  user:
+    ForeignKeyChecker:
+      enabled: false
+PushSubscription:
+  user:
+    ForeignKeyChecker:
       enabled: false
-
-# Models using concerns
-# 2. Now include the relevant settings using aliases
-Event:
-  <<: *ignore_date_concern
-  <<: *ignore_name_concern
-Poll:
-  <<: *ignore_date_concern

.github/workflows/docs.yml

@@ -10,17 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: jsdocs-dep
         run: npm install
-      - name: jsdocs-action
-        uses: andstor/[email protected]
-        with:
-          source_dir: ./simulator/src
-          recurse: true
-          output_dir: ./out
-          config_file: ./conf.json
-          template: better-docs
+      - name: jsdocs-generate
+        run: node ./node_modules/jsdoc/jsdoc.js ./simulator/src -r -c ./conf.json -t ./node_modules/better-docs -d ./out
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         with:

app/assets/stylesheets/users.scss

@@ -323,7 +323,7 @@
 
   input {
     border: 0;
-    border-left: 1px solid $form-border-grey;
+    border: 1px solid $primary-green;
     border-radius: 0;
     font-size: 16px;
     margin: 0;

app/views/projects/_add_collaborator_modal.html.erb

@@ -21,7 +21,7 @@
         <div class="field">
           <%= form.hidden_field :project_id, id: :collaboration_project_id %>
         </div>
-        <div class="form-group">
+        <div class="form-group d-flex flex-column">
           <%= form.label :emails %>
           <%= form.select :emails, [], {}, { class: "form-select", multiple: true } %>
         </div>

app/views/users/circuitverse/index.html.erb

@@ -70,7 +70,7 @@
         <button id="collaborator-circuits" class="btn users-circuits-tab users-collaborators-tab"><%= t("users.circuitverse.index.collaborated_circuits") %></button>
       </div>
       <div class="users-circuits-search-container">
-      <span><i class="fas fa-search search-icon-dashboard"></i><input type="search" class="users-circuits-search" placeholder="<%= t("users.circuitverse.index.search_circuits") %>"></span>
+      <span><i class="fas fa-search search-icon-dashboard"></i><input type="search" class="users-circuits-search form-control form-input " placeholder="<%= t("users.circuitverse.index.search_circuits") %>"></span>
       </div>
     </div>
   </div>