chore: move js and sass files to up dir (#3086)

package.json

@@ -11,7 +11,7 @@
     "e2e": "$(yarn bin)/cypress run",
     "e2e-gui": "$(yarn bin)/cypress open",
     "inst": "yarn install --ignore-engines --frozen-lockfile",
-    "lint": "eslint --ext .js,.vue resources/assets/js/",
+    "lint": "eslint --ext .js,.vue resources/js/",
     "snyk-protect": "snyk protect",
     "prepublish": "npm run snyk-protect"
   },

public/mix-manifest.json

@@ -1,10 +1,10 @@
 {
     "/js/manifest.js": "/js/manifest.js?id=7db827d654313dce4250",
-    "/js/vendor.js": "/js/vendor.js?id=8cde8389f5853073550d",
-    "/js/app.js": "/js/app.js?id=8868843c559b3a3f8c1f",
+    "/js/vendor.js": "/js/vendor.js?id=e14cfe2f6d778189d447",
+    "/js/app.js": "/js/app.js?id=2a1382e3dffd5ace725c",
     "/css/app-ltr.css": "/css/app-ltr.css?id=65bed70084cc067ba47f",
     "/css/app-rtl.css": "/css/app-rtl.css?id=3cb4d83dad74941264e7",
     "/css/stripe.css": "/css/stripe.css?id=746c8aaac01c56d3cee1",
-    "/js/stripe.js": "/js/stripe.js?id=639c2abd57f8e57920ba",
+    "/js/stripe.js": "/js/stripe.js?id=5e5e1d73338a536f7ce9",
     "/js/u2f-api.js": "/js/u2f-api.js?id=1948d3efdfd801bed14a"
 }

resources/js/common.js

@@ -19,7 +19,7 @@ Vue.filter('formatDate', function(value) {
 window.marked = require('marked');
 
 // i18n
-import messages from '../../../public/js/langs/en.json';
+import messages from '../../public/js/langs/en.json';
 
 export default {
   i18n: new VueI18n({

resources/js/components/people/Addresses.vue

@@ -31,7 +31,7 @@
       <li v-for="(contactAddress, i) in contactAddresses" :key="contactAddress.id" class="mb2">
         <div v-show="!contactAddress.edit" class="w-100 dt">
           <div class="dtc">
-            <i class="f6 light-silver fa fa-globe pr2"></i>
+            <em class="f6 light-silver fa fa-globe pr2"></em>
 
             <a v-if="!editMode" :href="contactAddress.googleMapAddress" target="_blank" rel="noopener noreferrer">
               {{ contactAddress.address }}
@@ -51,8 +51,8 @@
             </span>
 
             <div v-if="editMode" class="fr">
-              <i class="fa fa-pencil-square-o pointer pr2" @click="toggleEdit(contactAddress)"></i>
-              <i class="fa fa-trash-o pointer" @click="trash(contactAddress)"></i>
+              <em class="fa fa-pencil-square-o pointer pr2" @click="toggleEdit(contactAddress)"></em>
+              <em class="fa fa-trash-o pointer" @click="trash(contactAddress)"></em>
             </div>
           </div>
         </div>

resources/js/components/people/Archive.vue

@@ -14,7 +14,7 @@
     </a>
 
     <span v-tooltip.top="$t('people.contact_archive_help')">
-      <i class="fa fa-info-circle relative pointer"></i>
+      <em class="fa fa-info-circle relative pointer"></em>
     </span>
   </div>
 </template>

resources/js/components/people/ContactInformation.vue

@@ -29,8 +29,8 @@
       <li v-for="contactInformation in contactInformationData" :key="contactInformation.id" class="mb2">
         <div v-show="!contactInformation.edit" class="w-100 dt">
           <div class="dtc">
-            <i v-if="contactInformation.fontawesome_icon" :class="contactInformation.fontawesome_icon" class="pr2 f6 light-silver"></i>
-            <i v-else class="pr2 fa fa-address-card-o f6 gray"></i>
+            <em v-if="contactInformation.fontawesome_icon" :class="contactInformation.fontawesome_icon" class="pr2 f6 light-silver"></em>
+            <em v-else class="pr2 fa fa-address-card-o f6 gray"></em>
 
             <a v-if="contactInformation.protocol" :href="contactInformation.protocol + contactInformation.data">
               {{ contactInformation.shortenName }}
@@ -43,8 +43,8 @@
             </span>
           </div>
           <div v-if="editMode" class="dtc" :class="[ dirltr ? 'tr' : 'tl' ]">
-            <i class="fa fa-pencil-square-o pointer pr2" @click="toggleEdit(contactInformation)"></i>
-            <i class="fa fa-trash-o pointer" @click="trash(contactInformation)"></i>
+            <em class="fa fa-pencil-square-o pointer pr2" @click="toggleEdit(contactInformation)"></em>
+            <em class="fa fa-trash-o pointer" @click="trash(contactInformation)"></em>
           </div>
         </div>
 

resources/js/components/people/Notes.vue

@@ -33,7 +33,7 @@
             <div class="pa2 cf bt b--black-10 br--bottom f7 lh-copy">
               <div class="fl w-50">
                 <div class="f5 di mr1">
-                  <i v-tooltip.top="$t('people.notes_favorite')" class="pointer" :class="[note.is_favorited ? 'fa fa-star' : 'fa fa-star-o']" @click="toggleFavorite(note)"></i>
+                  <em v-tooltip.top="$t('people.notes_favorite')" class="pointer" :class="[note.is_favorited ? 'fa fa-star' : 'fa fa-star-o']" @click="toggleFavorite(note)"></em>
                 </div>
                 {{ note.created_at_short }}
               </div>

resources/js/components/people/Pets.vue

@@ -39,8 +39,8 @@
             </span>
           </div>
           <div v-if="editMode" class="dtc" :class="[ dirltr ? 'tr' : 'tl' ]">
-            <i class="fa fa-pencil-square-o pointer pr2" @click="toggleEdit(pet)"></i>
-            <i class="fa fa-trash-o pointer" @click="trash(pet)"></i>
+            <em class="fa fa-pencil-square-o pointer pr2" @click="toggleEdit(pet)"></em>
+            <em class="fa fa-trash-o pointer" @click="trash(pet)"></em>
           </div>
         </div>
 

resources/js/components/people/Tasks.vue

@@ -47,8 +47,8 @@
           </form-checkbox>
           
           <div v-if="editMode" class="di">
-            <i class="fa fa-pencil-square-o pointer pr2 ml3 dark-blue" @click="toggleEditMode(task)"></i>
-            <i class="fa fa-trash-o pointer pr2 dark-blue" :cy-name="'task-delete-button-' + task.id" @click="trash(task)"></i>
+            <em class="fa fa-pencil-square-o pointer pr2 ml3 dark-blue" @click="toggleEditMode(task)"></em>
+            <em class="fa fa-trash-o pointer pr2 dark-blue" :cy-name="'task-delete-button-' + task.id" @click="trash(task)"></em>
           </div>
 
           <!-- EDIT BOX -->
@@ -139,7 +139,7 @@
             </span>
           </form-checkbox>
           <div v-if="editMode" class="di">
-            <i class="fa fa-trash-o pointer pr2 ml3 dark-blue" @click="trash(task)"></i>
+            <em class="fa fa-trash-o pointer pr2 ml3 dark-blue" @click="trash(task)"></em>
           </div>
         </li>
       </ul>
@@ -148,8 +148,6 @@
 </template>
 
 <script>
-import moment from 'moment';
-
 export default {
 
   props: {
@@ -267,7 +265,7 @@ export default {
     },
 
     formatDate(dateAsString) {
-      var moment = require('moment-timezone');
+      let moment = require('moment-timezone');
       moment.locale(this._i18n.locale);
       moment.tz.setDefault('UTC');
 

resources/js/components/settings/ActivityTypes.vue

@@ -54,8 +54,8 @@
           </div>
           <div class="dtc">
             <div class="pa2" :class="[ dirltr ? 'tr' : 'tl' ]">
-              <i v-if="!limited" class="fa fa-pencil-square-o pointer pr2" @click="showEditCategory(activityTypeCategory)"></i>
-              <i v-if="!limited" class="fa fa-trash-o pointer" @click="showDeleteCategory(activityTypeCategory)"></i>
+              <em v-if="!limited" class="fa fa-pencil-square-o pointer pr2" @click="showEditCategory(activityTypeCategory)"></em>
+              <em v-if="!limited" class="fa fa-trash-o pointer" @click="showDeleteCategory(activityTypeCategory)"></em>
             </div>
           </div>
         </div>
@@ -67,8 +67,8 @@
           </div>
           <div class="dtc" :class="[ dirltr ? 'tr' : 'tl' ]">
             <div class="pa2">
-              <i v-if="!limited" class="fa fa-pencil-square-o pointer pr2" @click="showEditType(activityType)"></i>
-              <i v-if="!limited" class="fa fa-trash-o pointer" @click="showDeleteType(activityType)"></i>
+              <em v-if="!limited" class="fa fa-pencil-square-o pointer pr2" @click="showEditType(activityType)"></em>
+              <em v-if="!limited" class="fa fa-trash-o pointer" @click="showDeleteType(activityType)"></em>
             </div>
           </div>
         </div>

resources/js/components/settings/ContactFieldTypes.vue

@@ -47,8 +47,8 @@
       <div v-for="contactFieldType in contactFieldTypes" :key="contactFieldType.id" class="dt-row hover bb b--light-gray">
         <div class="dtc">
           <div class="pa2">
-            <i v-if="contactFieldType.fontawesome_icon" :class="contactFieldType.fontawesome_icon" class="pr2"></i>
-            <i v-else class="pr2 fa fa-address-card-o"></i>
+            <em v-if="contactFieldType.fontawesome_icon" :class="contactFieldType.fontawesome_icon" class="pr2"></em>
+            <em v-else class="pr2 fa fa-address-card-o"></em>
             {{ contactFieldType.name }}
           </div>
         </div>
@@ -59,8 +59,8 @@
         </div>
         <div class="dtc" :class="[ dirltr ? 'tr' : 'tl' ]">
           <div class="pa2">
-            <i class="fa fa-pencil-square-o pointer pr2" @click="edit(contactFieldType)"></i>
-            <i v-if="contactFieldType.delible" class="fa fa-trash-o pointer" @click="showDelete(contactFieldType)"></i>
+            <em class="fa fa-pencil-square-o pointer pr2" @click="edit(contactFieldType)"></em>
+            <em v-if="contactFieldType.delible" class="fa fa-trash-o pointer" @click="showDelete(contactFieldType)"></em>
           </div>
         </div>
       </div>

resources/js/components/settings/Genders.vue

@@ -62,8 +62,8 @@
         </div>
         <div class="dtc" :class="[ dirltr ? 'tr' : 'tl' ]">
           <div class="pa2">
-            <i class="fa fa-pencil-square-o pointer pr2" @click="showEdit(gender)"></i>
-            <i v-if="genders.length > 1" class="fa fa-trash-o pointer" @click="showDelete(gender)"></i>
+            <em class="fa fa-pencil-square-o pointer pr2" @click="showEdit(gender)"></em>
+            <em v-if="genders.length > 1" class="fa fa-trash-o pointer" @click="showDelete(gender)"></em>
           </div>
         </div>
       </div>

resources/js/components/settings/U2fConnector.vue

@@ -92,7 +92,7 @@
             </div>
           </div>
 
-          <div v-if="errorMessage == ''" align="center">
+          <div v-if="errorMessage == ''" class="tc">
             <img
               src="https://ssl.gstatic.com/accounts/strongauth/Challenge_2SV-Gnubby_graphic.png"
               :alt="$t('settings.u2f_insertKey')"
@@ -150,7 +150,7 @@
         </div>
       </div>
 
-      <div align="center">
+      <div class="tc">
         <img
           src="https://ssl.gstatic.com/accounts/strongauth/Challenge_2SV-Gnubby_graphic.png"
           :alt="$t('settings.u2f_insertKey')"

resources/js/components/settings/WebauthnConnector.vue

@@ -93,7 +93,7 @@
             </div>
           </div>
 
-          <div v-if="errorMessage == ''" align="center">
+          <div v-if="errorMessage == ''" class="tc">
             <img src="https://ssl.gstatic.com/accounts/strongauth/Challenge_2SV-Gnubby_graphic.png"
                  :alt="$t('settings.webauthn_insertKey')"
             />
@@ -147,7 +147,7 @@
         </div>
       </div>
 
-      <div align="center">
+      <div class="tc">
         <img src="https://ssl.gstatic.com/accounts/strongauth/Challenge_2SV-Gnubby_graphic.png"
              :alt="$t('settings.webauthn_insertKey')"
         />
@@ -187,7 +187,7 @@
 
 <script>
 import { SweetModal } from 'sweet-modal-vue';
-import * as WebAuthn from '../../../../../vendor/asbiin/laravel-webauthn/resources/js/webauthn.js';
+import * as WebAuthn from '../../../../vendor/asbiin/laravel-webauthn/resources/js/webauthn.js';
 
 export default {
 

webpack.mix.js

@@ -15,16 +15,16 @@ let purgeCssOptions = {
     whitelistPatternsChildren: [/^vdp-datepicker/, /^vgt/, /^vue-tooltip/, /^pretty/]
 };
 
-mix.js('resources/assets/js/app.js', 'public/js')
-    .sass('resources/assets/sass/app-ltr.scss', 'public/css')
-    .sass('resources/assets/sass/app-rtl.scss', 'public/css')
+mix.js('resources/js/app.js', 'public/js')
+    .sass('resources/sass/app-ltr.scss', 'public/css')
+    .sass('resources/sass/app-rtl.scss', 'public/css')
 
     // stripe
-    .js('resources/assets/js/stripe.js', 'public/js')
-    .sass('resources/assets/sass/stripe.scss', 'public/css')
+    .js('resources/js/stripe.js', 'public/js')
+    .sass('resources/sass/stripe.scss', 'public/css')
 
     // u2f
-    .scripts(['resources/assets/js/vendor/u2f/u2f-api.js'], 'public/js/u2f-api.js')
+    .scripts(['resources/js/vendor/u2f/u2f-api.js'], 'public/js/u2f-api.js')
 
     // global commands
     .purgeCss(purgeCssOptions)