Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 8 commits into from
Oct 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/stripe.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/js/vendor.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -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"
}
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/assets/js/common.js → resources/js/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand All @@ -148,8 +148,6 @@
</template>

<script>
import moment from 'moment';

export default {

props: {
Expand Down Expand Up @@ -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');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading