Merge pull request #438 from Duke-MatSci/develop

feat: Merge develop to main
Duke-MatSci · Aug 24, 2023 · 37c98be · 37c98be
2 parents 9d7d0dd + b6c56d3
commit 37c98be
Show file tree

Hide file tree

Showing 178 changed files with 16,417 additions and 8,128 deletions.
diff --git a/README.md b/README.md
@@ -29,11 +29,7 @@ Make sure nvm is installed with node >= v16.20.0 or run the command below to ins
 ```bash
  nvm install 16
 ```
-Run the following command from the root directory:
-```bash
- npm run dev:install
-```
-Run the following command to start the applications:
+Run the following command to start the applications from the root directory:
 ```bash
  npm run dev:start
 ```
@@ -84,7 +80,7 @@ docker-compose down -v
    General branch naming convention: `#<issue number>_short_but_specific_title` .
 3. Before committing, run the full test suite by running `npm run test` from the root `materialsmine` directory.
 
-   If you are adding a new feature, please create a unit test for that feature, either in `/app/tests/unit` for frontend features, or in `/resfulservice/spec` for backend.
+   If you are adding a new feature, please create a unit test for that feature, either by using [Vue Test Utils](https://v1.test-utils.vuejs.org/) in `/app/tests/unit` for frontend features, or using [Chai](https://www.chaijs.com/) in `/resfulservice/spec` for backend.
 4. Commit messages should follow Angular’s formatting guidelines, [described here](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#-commit-message-format).
 5. Push your branch to GitHub with `git push origin your_branch_name` .
 6. In GitHub, send a pull request to `develop`. In your PR, describe your changes and [use a keyword](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) to link the related issue (e.g., closes #999, fixes #001).
diff --git a/app/jest.config.js b/app/jest.config.js
@@ -1,5 +1,15 @@
 module.exports = {
   preset: '@vue/cli-plugin-unit-jest',
+  collectCoverage: true,
+  collectCoverageFrom: ['src/**/*.{js,vue}', '!src/router/**'],
+  coverageThreshold: {
+    // global: {
+    //   branches: 13,
+    //   functions: 30,
+    //   lines: 30,
+    //   statements: 30
+    // }
+  },
   transform: {
     '^.+\\.vue$': 'vue-jest',
     '\\.(gif)$': '<rootDir>/tests/jest/__mocks__/fileMock.js',

diff --git a/app/public/master_template.xlsx b/app/public/master_template.xlsx
diff --git a/app/src/assets/css/modules/_form.scss b/app/src/assets/css/modules/_form.scss
@@ -147,7 +147,12 @@
     }
 
     &__stepper {
-        .md-active, .md-done {
+        .md-done {
+            .md-stepper-number {
+                background-color: $secondary-grey !important;
+            }
+        }
+        .md-active {
             .md-button-content {
                 color: $primary !important;
                 font-size: 1.8rem;
@@ -162,7 +167,6 @@
             font-size: 1.8rem;
         }
         .md-button_next {
-            margin-top: 3rem;
             background: $primary;
             .md-button-content, .md-icon {
                 color: $primary-white !important;
@@ -175,14 +179,23 @@
             }
         }
         .md-button_prev {
-            margin-top: 3rem;
             background: $tertiary;
             .md-button-content, .md-icon {
                 color: $primary !important;
             }
         }
     }
 
+    &__file-input {
+        width: 100%;
+        margin: 0 auto;
+        transition: .2s ease;
+        cursor: pointer;
+        input[type=file] {
+            visibility: hidden;
+        }
+    }
+
     &__drop-area {
         max-width: 80%;
         margin: 2.5rem;

diff --git a/app/src/assets/css/modules/_pages.scss b/app/src/assets/css/modules/_pages.scss
@@ -227,12 +227,15 @@
             width: 70%;
         }
         &-img {
-            height: 18rem !important;
+            max-height: 18rem !important;
         }
     }
     &_headline {
         margin-top: 1.5rem;
         text-align: center;
+        @include respond(tab-land) {
+            margin: 2rem;
+        }
     }
 
     &_menu {
@@ -274,6 +277,15 @@
     transition: all 0.3s cubic-bezier(.25,.8,.25,1);
     cursor: pointer;
 
+    &-adjust {
+        @include respond(tab-land) {
+            width: 250px;
+        }
+        @include respond(tab-port) {
+            width: 270px;
+        }
+    }
+
     &-icon {
         font-size: 10rem;
         @include respond(phone) {
@@ -333,7 +345,7 @@
             margin-top: 0.5rem;
             font-size: 3.5rem;
             @include respond(phone) {
-                font-size: 1.14rem;
+                font-size: 2rem;
             }
         }
 

diff --git a/app/src/assets/css/modules/_resetvuematerial.scss b/app/src/assets/css/modules/_resetvuematerial.scss
@@ -123,10 +123,21 @@
             margin-bottom: 1rem;
         }
 
+        &-tall {
+            height: 38rem !important;
+        }
+
         &::after {
             display: none !important;
             visibility: hidden !important;
         }
+
+        & > a {
+            color: $primary !important;
+            &:hover{
+                text-decoration: none !important;
+            }
+        }
     }
 }
 .md-menu-content {
@@ -148,7 +159,7 @@
 
     &_parent {
         position: relative;
-        z-index: 15;
+        z-index: 15 !important;
     }
 
     & > li {
@@ -214,6 +225,9 @@
     right: 0;
     left: 0;
     transform: translateY(-5rem);
+    &.media-icon-mod {
+        @include absCenter;
+    }
 }
 
 .md-snackbar {
@@ -225,4 +239,22 @@
         }
     }
 
+}
+
+.md-list.md-dense .md-list-item-content.md-list-item-content-reduce{
+    min-height: auto;
+    padding-left: 0px;
+    @include respond(phone){
+        padding-left: 16px;
+    }
+}
+
+.md-icon.md-small-size{
+    @include respond(phone){
+        &-3x{
+            height: 72px;
+            font-size: 72px!important;
+        }
+    }
+
 }
diff --git a/app/src/assets/css/modules/_section.scss b/app/src/assets/css/modules/_section.scss
@@ -215,4 +215,37 @@
             }
         }
     }
+    &_contact{
+        &_text-editor{
+            .editor{
+                width: 100%;
+                min-height: 6em;
+                outline: none;
+                border: 1px solid #e2dcdc;
+                border-radius: 6px;
+                padding: 8px 16px;
+                text-align: left;
+
+                &:hover{
+                    border: .1rem solid $primary;
+                }
+                & > * {
+                    margin: .51rem 0;
+                }
+                & > h1{
+                    margin: 1rem 0;
+                }
+            }
+
+        }
+        &__box{
+            &-email {
+                max-width: 120px;
+                text-overflow: ellipsis;
+                @include respond(phone) {
+                    max-width: fit-content;
+                }
+            }
+        }
+    }
 }
diff --git a/app/src/assets/css/modules/_utility.scss b/app/src/assets/css/modules/_utility.scss
@@ -108,6 +108,9 @@
         }
         &-neg {
             margin-top: -1rem !important;
+            &-left {
+                margin-left: -1rem !important;
+            }
         }
         &-pos {
             margin: 1rem;
@@ -170,7 +173,7 @@
 
     &--shadow {
         &-none {
-            box-shadow: none;
+            box-shadow: none !important;
         }
     }
 
@@ -291,7 +294,7 @@
             font-size: 3rem;
         }
         @include respond(phone){
-            top: -10px;
+            top: -10px !important;
             font-size: 2.3rem;
         }
         &_subtitle {
@@ -342,6 +345,10 @@
             }
         }
 
+        &-med {
+            margin-bottom: 3rem !important;
+        }
+
         &-small {
             margin-bottom: 1rem !important;
         }
@@ -416,7 +423,7 @@
         }
         & > div:hover{ // Todo (ticket xx): This requires a rewrite. We can use existing utils
             background-color: $primary-light;
-            & > i {
+            & > i, & > p {
                 color: $secondary-light !important;
             }
         }
@@ -470,6 +477,14 @@
         background-color: rgba($primary-black, 0.7) !important;
         border: 1px solid $primary !important;
     }
+    &_icon_mobile { 
+        &_lg {
+            @include respond(phone){
+                height: 72px;
+                font-size: 72px!important;
+            }
+        }
+    }
 }
 
 .dialog-box {

diff --git a/app/src/assets/css/modules/_visualize.scss b/app/src/assets/css/modules/_visualize.scss
@@ -33,6 +33,19 @@
                 }
             }
         }
+        &-mm {
+            @include respond(laptop) {
+                display: none;
+                visibility: hidden;
+                position: absolute;
+            }
+            @include respond(tab-land) {
+                display: block;
+                visibility: visible;
+                top: 15rem;
+                cursor: pointer;
+            }
+        }
         &-left {
             left: -0.5rem;
         }
@@ -230,17 +243,27 @@
         opacity: 1;
         -webkit-backface-visibility: hidden;
         backface-visibility: hidden;
+        @include chartDisplayAdjust($i, 5);
+        &-narrow {
+            @include chartDisplayAdjust($i, 4);
+        }
 
         /* @include respond(big-desktop-chart-adjust){
             @include chartDisplayAdjust($i, 4);
         } */
 
         @include respond(laptop) {
             @include chartDisplayAdjust($i, 4);
+            &-narrow {
+                @include chartDisplayAdjust($i, 3);
+            }
         }
 
         @include respond(tab-land) {
             @include chartDisplayAdjust($i, 3);
+            &-narrow {
+                @include chartDisplayAdjust($i, 2);
+            }
         }
 
         @include respond(tab-port) {

diff --git a/app/src/components/Dialog.vue b/app/src/components/Dialog.vue
@@ -8,8 +8,8 @@
           <slot name="title">
           </slot>
         </md-dialog-title>
-        <md-button v-if="!disableClose" class="md-icon-button dialog-box_close" @click="toggleDialogBox()">
-          <md-icon class="utility-navfonticon">close</md-icon>
+        <md-button v-if="!disableClose" class="md-icon-button dialog-box_close facet-content_container u_margin-right-small" @click="toggleDialogBox()">
+          <md-icon class="utility-navfonticon u--font-emph-xl">close</md-icon>
         </md-button>
       </div>
       <div class="dialog-box_content">