Skip to content
Open
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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
- name: Run PHPMD
run: vendor/bin/phpmd src/ text vendor/phplist/core/config/PHPMD/rules.xml
- name: Run PHP_CodeSniffer
run: vendor/bin/phpcs --standard=vendor/phplist/core/config/PhpCodeSniffer/ src/ tests/
run: vendor/bin/phpcs --ignore=tests/Unit/assets --standard=vendor/phplist/core/config/PhpCodeSniffer/ src/ tests/

- name: Install Prism
run: npm install -g @stoplight/prism-cli
Expand Down
5 changes: 4 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ echo "📏 Running PHPMD..."
php vendor/bin/phpmd src/ text vendor/phplist/core/config/PHPMD/rules.xml || exit 1

echo "🧹 Running PHPCS..."
php vendor/bin/phpcs --standard=vendor/phplist/core/config/PhpCodeSniffer/ src/ tests/ || exit 1
php vendor/bin/phpcs \
--standard=vendor/phplist/core/config/PhpCodeSniffer/ \
--ignore=tests/Unit/assets \
src/ tests/ || exit 1
2 changes: 2 additions & 0 deletions assets/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import CampaignEditView from '../vue/views/CampaignEditView.vue'
import TemplatesView from '../vue/views/TemplatesView.vue'
import TemplateEditView from '../vue/views/TemplateEditView.vue'
import BouncesView from '../vue/views/BouncesView.vue'
import AnalyticsView from '../vue/views/AnalyticsView.vue'
import PublicPagesView from '../vue/views/PublicPagesView.vue'
import PublicPageEditView from '../vue/views/PublicPageEditView.vue'
import SettingsView from '../vue/views/SettingsView.vue'
Expand All @@ -26,6 +27,7 @@ export const router = createRouter({
{ path: '/campaigns/:campaignId/edit', name: 'campaign-edit', component: CampaignEditView, meta: { title: 'Edit Campaign' } },
{ path: '/lists/:listId/subscribers', name: 'list-subscribers', component: ListSubscribersView, meta: { title: 'List Subscribers' } },
{ path: '/bounces', name: 'bounces', component: BouncesView, meta: { title: 'Bounces' } },
{ path: '/analytics', name: 'analytics', component: AnalyticsView, meta: { title: 'Analytics' } },
{ path: '/public', name: 'public-pages', component: PublicPagesView, meta: { title: 'Public Pages' } },
{ path: '/public/create', name: 'public-page-create', component: PublicPageEditView, meta: { title: 'Create Public Page' } },
{ path: '/public/:pageId/edit', name: 'public-page-edit', component: PublicPageEditView, meta: { title: 'Edit Public Page' } },
Expand Down
3 changes: 2 additions & 1 deletion assets/vue/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import {
SubscriberAttributesClient,
TemplatesClient,
BouncesClient,
ConfigClient, AdminAttributeClient,
ConfigClient,
AdminAttributeClient,
} from '@tatevikgr/rest-api-client';

const AUTHENTICATION_REDIRECT_PATH = '/login';
Expand Down
1 change: 1 addition & 0 deletions assets/vue/components/dashboard/KpiCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import BaseCard from '../../components/base/BaseCard.vue'
import BaseIcon from '../../components/base/BaseIcon.vue'

const props = defineProps({
id: String,
label: String,
value: [String, Number],
change: String, // "+12.5%" etc.
Expand Down
9 changes: 5 additions & 4 deletions assets/vue/components/settings/EditAdminModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,11 @@ const resetForm = () => {
watch(
() => [props.isOpen, props.admin?.id],
([isOpen]) => {
if (isOpen) {
resetForm()
}
}
if (isOpen) {
resetForm()
}
},
{ immediate: true }
)

const close = () => {
Expand Down
Loading
Loading