@windward/core 0.1.3 → 0.1.4

package/.idea/codeStyles/Project.xml

@@ -0,0 +1,58 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <HTMLCodeStyleSettings>
+      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+      <option name="HTML_ENFORCE_QUOTES" value="true" />
+    </HTMLCodeStyleSettings>
+    <JSCodeStyleSettings version="0">
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </JSCodeStyleSettings>
+    <TypeScriptCodeStyleSettings version="0">
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </TypeScriptCodeStyleSettings>
+    <VueCodeStyleSettings>
+      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
+      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
+    </VueCodeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="TypeScript">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Vue">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/windward-ui-plugin-core.iml" filepath="$PROJECT_DIR$/.idea/windward-ui-plugin-core.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/php-docker-settings.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpDockerContainerSettings">
+    <list>
+      <map>
+        <entry key="79d59a8f-c56c-4789-b96c-e55a326ab125">
+          <value>
+            <DockerContainerSettings>
+              <option name="version" value="1" />
+              <option name="volumeBindings">
+                <list>
+                  <DockerVolumeBindingImpl>
+                    <option name="containerPath" value="/opt/project" />
+                    <option name="hostPath" value="$PROJECT_DIR$" />
+                  </DockerVolumeBindingImpl>
+                </list>
+              </option>
+            </DockerContainerSettings>
+          </value>
+        </entry>
+      </map>
+    </list>
+  </component>
+</project>

package/.idea/php.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MessDetectorOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCSFixerOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCodeSnifferOptionsConfiguration">
+    <option name="highlightLevel" value="WARNING" />
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PhpStanOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PsalmOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+</project>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

package/.idea/watcherTasks.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectTasksOptions" suppressed-tasks="SCSS" />
+</project>

package/.idea/windward-ui-plugin-core.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/components/Content/Blocks/Email.vue

@@ -46,8 +46,15 @@
                     elevation="0"
                 >
                     <v-expansion-panel-header>
-                        <v-row>
-                            <v-col class="pa-0 d-flex align-center">
+                        <v-row class="container-header">
+                            <v-col
+                                xl="1"
+                                lg="1"
+                                md="1"
+                                sm="2"
+                                xs="2"
+                                class="pa-0 d-flex align-center"
+                            >
                                 <v-btn fab x-small class="primary" elevation="0"
                                     >{{ item.initials ? item.initials : '' }}
                                 </v-btn>
@@ -66,28 +73,54 @@
                                     color="secondary"
                                     >mdi-circle-medium</v-icon
                                 >
+                            </v-col>
+                            <v-col
+                                xl="1"
+                                lg="3"
+                                md="11"
+                                sm="10"
+                                xs="10"
+                                class="d-flex align-center"
+                            >
                                 <span class="span-details"
                                     >{{ item.from ? item.from : 'From' }}
                                 </span>
                             </v-col>
+                            <v-col
+                                v-if="selectedPanels !== index"
+                                xl="10"
+                                lg="8"
+                                class="d-flex align-center container-body-preview"
+                            >
+                                <div class="div-preview">
+                                    {{ onRemoveTags(item.body) }}
+                                </div>
+                            </v-col>
                         </v-row>
                     </v-expansion-panel-header>
                     <v-expansion-panel-content>
-                        <v-container class="pa-0 container-details">
+                        <v-container class="pa-0">
                             <v-row>
-                                <v-col cols="1"></v-col>
                                 <v-col
-                                    class="pa-0 div-details"
+                                    cols="1"
+                                    xl="1"
+                                    lg="1"
+                                    md="1"
+                                    sm="2"
+                                    xs="2"
+                                ></v-col>
+                                <v-col
+                                    class="div-details"
                                     v-if="item.to || item.cc"
                                 >
-                                    <div class="div-details-to pl-4">
+                                    <div class="div-details-to">
                                         {{
                                             $t(
                                                 'windward.core.components.content.blocks.email.to'
                                             )
                                         }}: {{ item.to }}
                                     </div>
-                                    <div class="div-details-cc pl-4">
+                                    <div class="div-details-cc">
                                         {{
                                             $t(
                                                 'windward.core.components.content.blocks.email.cc'
@@ -220,7 +253,11 @@ export default {
     mounted() {
         this.selectedPanels = this.block.metadata.config.emails.length - 1
     },
-    methods: {},
+    methods: {
+        onRemoveTags(body) {
+            return body.replace(/(<([^>]+)>)/gi, '')
+        },
+    },
 }
 </script>
 <style scoped>
@@ -230,12 +267,10 @@ export default {
 .column-simulation {
     font-size: 12px;
 }
-.container-details {
-    font-size: 10px;
-    margin-top: -26px;
-}
 .div-details {
     color: grey;
+    font-size: 10px;
+    margin-top: -25px;
 }
 .div-details-cc {
     margin-top: -9px;
@@ -247,4 +282,19 @@ export default {
 .v-expansion-panel {
     border: 1px solid var(--v-primary-base);
 }
+@media only screen and (max-width: 1264px) {
+    .container-body-preview {
+        display: none !important;
+    }
+}
+.div-preview {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-top: auto;
+    margin-bottom: auto;
+}
+.container-header {
+    width: 100%;
+}
 </style>

package/components/Content/Blocks/HorizontalRule.vue

@@ -0,0 +1,52 @@
+<template>
+    <div>
+        <hr :class="isDashed" />
+    </div>
+</template>
+<script>
+import _ from 'lodash'
+import BaseContentBlock from '~/components/Content/Blocks/BaseContentBlock'
+export default {
+    name: 'HorizontalRule',
+    extends: BaseContentBlock,
+    beforeMount() {
+        if (_.isEmpty(this.block)) {
+            this.block = {}
+        }
+        if (_.isEmpty(this.block.metadata)) {
+            this.block.metadata = {}
+        }
+        if (_.isEmpty(this.block.metadata.config)) {
+            this.block.metadata.config = {}
+        }
+        if (_.isEmpty(this.block.metadata.config)) {
+            this.block.metadata.config = {}
+        }
+        if (_.isEmpty(this.block.metadata.config.dashed)) {
+            this.block.metadata.config.dashed = false
+        }
+    },
+    data() {
+        return {
+            isDashed: 'solid',
+        }
+    },
+    watch: {
+        value(newValue) {
+            if (newValue.metadata.config.dashed) {
+                this.isDashed = 'dashed'
+            } else if (newValue.metadata.config.dashed === false) {
+                this.isDashed = 'solid'
+            }
+        },
+    },
+}
+</script>
+<style>
+.solid {
+    border-bottom: solid 1px var(--v-primary-base);
+}
+.dashed {
+    border-bottom: dashed 1px var(--v-primary-base);
+}
+</style>

package/components/Content/Blocks/UserUpload.vue

@@ -38,7 +38,7 @@
                         :enrollment="enrollment"
                     ></DisplayUserFilesTable>
                 </v-col>
-                <v-col cols="12">
+                <v-col cols="12" v-if="showUpload">
                     <div v-if="blockExists">
                         <v-form
                             ref="form"
@@ -149,6 +149,7 @@ export default {
             uploadFiles: [],
             userFileAsset: {},
             studentUpload: null,
+            maxFileLimit: 10,
         }
     },
     computed: {
@@ -160,17 +161,27 @@ export default {
         },
         canUpload() {
             if (this.valid) {
+                const currentFiles = _.get(
+                    this.userFileAsset,
+                    'file_assets',
+                    []
+                )
+
                 // Multiple disabled, single file selected
                 if (
                     !Array.isArray(this.uploadFiles) &&
                     !this.block.metadata.config.uploadSettings.multiple &&
-                    this.uploadFiles
+                    this.uploadFiles &&
+                    currentFiles.length === 0
                 ) {
                     return true
                 } else if (
                     // Multi enabled, one or more files selected
+                    this.block.metadata.config.uploadSettings.multiple &&
                     Array.isArray(this.uploadFiles) &&
-                    this.uploadFiles.length > 0
+                    this.uploadFiles.length > 0 &&
+                    this.uploadFiles.length + currentFiles.length <=
+                        this.maxFileLimit
                 ) {
                     return true
                 } else {
@@ -180,6 +191,26 @@ export default {
             }
             return false
         },
+        showUpload() {
+            const currentFiles = _.get(this.userFileAsset, 'file_assets', [])
+
+            // Multiple disabled, confirm there's no current files
+            if (
+                !this.block.metadata.config.uploadSettings.multiple &&
+                currentFiles.length === 0
+            ) {
+                return true
+            } else if (
+                // Multi enabled, make sure we're not over our max limit
+                this.block.metadata.config.uploadSettings.multiple &&
+                currentFiles.length < this.maxFileLimit
+            ) {
+                return true
+            } else {
+                // Hide the uploader
+                return false
+            }
+        },
     },
     mounted() {
         if (this.blockExists) {
@@ -202,19 +233,24 @@ export default {
             }
 
             // Create a new UserFileAsset if we don't have an instance yet
-            if (!Uuid.test(this.userFileAsset.id)) {
-                this.userFileAsset = new UserFileAsset({
-                    file: uploadFiles,
-                }).for(
-                    new Enrollment(this.enrollment),
-                    new ContentBlock({ id: this.block.id })
-                )
+            let userFileAssetRequest = new UserFileAsset({
+                file: uploadFiles,
+            }).for(
+                new Enrollment(this.enrollment),
+                new ContentBlock({ id: this.block.id })
+            )
+
+            // Apply the existing id if we already have an instance
+            if (Uuid.test(this.userFileAsset.id)) {
+                userFileAssetRequest.id = this.userFileAsset.id
             }
 
-            this.userFileAsset.file = uploadFiles
+            // Add our files to upload
+            userFileAssetRequest.file = uploadFiles
 
             try {
-                this.userFileAsset = await this.userFileAsset.save()
+                // Apply the response back to the reactive this.userFileAsset
+                this.userFileAsset = await userFileAssetRequest.save()
             } catch (e) {
                 this.$toast.error(this.$t('shared.forms.errors.unknown'))
                 console.log(e)

package/components/Settings/HorizontalRuleSettings.vue

@@ -0,0 +1,42 @@
+<template>
+    <div>
+        <v-switch
+            v-model="block.metadata.config.dashed"
+            :label="
+                $t('windward.core.components.settings.horizontal_rule.dashed')
+            "
+        ></v-switch>
+    </div>
+</template>
+
+<script>
+import _ from 'lodash'
+import BaseContentSettings from '~/components/Content/Tool/BaseContentSettings.js'
+
+export default {
+    name: 'HorizontalRuleSettings',
+    extends: BaseContentSettings,
+    components: {},
+    beforeMount() {
+        if (_.isEmpty(this.block)) {
+            this.block = {}
+        }
+        if (_.isEmpty(this.block.metadata)) {
+            this.block.metadata = {}
+        }
+        if (_.isEmpty(this.block.metadata.config)) {
+            this.block.metadata.config = {}
+        }
+        if (_.isEmpty(this.block.metadata.config)) {
+            this.block.metadata.config = {}
+        }
+        if (!_.isBoolean(this.block.metadata.config.dashed)) {
+            this.block.metadata.config.dashed = false
+        }
+    },
+    data() {
+        return {}
+    },
+}
+</script>
+<style></style>

package/components/utils/assets/tinymce/css/content.scss

@@ -1,11 +1,11 @@
 
 table {
     max-width: 100%;
-    border: 1px solid black;
+    border: 1px solid var(--v-primary-base) !important;
     border-spacing: 0;
 
     th, td {
-        border: 1px solid black;
+        border: 1px solid var(--v-primary-base) !important;
         padding: 3px;
     }