Skip to content

Commit c5d0752

Browse files
TatevikGrtatevikg1
andauthored
Analytics (#89)
* Feat: statistics * Feat: statistics * After review 0 * Add tests * Add tests 1 * Fix workflow file, add more tests --------- Co-authored-by: Tatevik <tatevikg1@gmail.com>
1 parent 7a456a9 commit c5d0752

71 files changed

Lines changed: 4332 additions & 132 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
run: |
5757
curl -sSL https://dl.google.com/linux/linux_signing_key.pub | gpg --dearmor | sudo tee /usr/share/keyrings/google.gpg > /dev/null
5858
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google.gpg] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list
59-
sudo apt-get update
59+
sudo apt-get update --allow-releaseinfo-change-label
6060
sudo apt-get install -y google-chrome-stable
6161
sudo apt install socat
6262
@@ -87,7 +87,7 @@ jobs:
8787
- name: Run PHPMD
8888
run: vendor/bin/phpmd src/ text vendor/phplist/core/config/PHPMD/rules.xml
8989
- name: Run PHP_CodeSniffer
90-
run: vendor/bin/phpcs --standard=vendor/phplist/core/config/PhpCodeSniffer/ src/ tests/
90+
run: vendor/bin/phpcs --ignore=tests/Unit/assets --standard=vendor/phplist/core/config/PhpCodeSniffer/ src/ tests/
9191

9292
- name: Install Prism
9393
run: npm install -g @stoplight/prism-cli

.husky/pre-commit

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@ echo "📏 Running PHPMD..."
88
php vendor/bin/phpmd src/ text vendor/phplist/core/config/PHPMD/rules.xml || exit 1
99

1010
echo "🧹 Running PHPCS..."
11-
php vendor/bin/phpcs --standard=vendor/phplist/core/config/PhpCodeSniffer/ src/ tests/ || exit 1
11+
php vendor/bin/phpcs \
12+
--standard=vendor/phplist/core/config/PhpCodeSniffer/ \
13+
--ignore=tests/Unit/assets \
14+
src/ tests/ || exit 1

assets/router/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import CampaignEditView from '../vue/views/CampaignEditView.vue'
88
import TemplatesView from '../vue/views/TemplatesView.vue'
99
import TemplateEditView from '../vue/views/TemplateEditView.vue'
1010
import BouncesView from '../vue/views/BouncesView.vue'
11+
import AnalyticsView from '../vue/views/AnalyticsView.vue'
1112
import PublicPagesView from '../vue/views/PublicPagesView.vue'
1213
import PublicPageEditView from '../vue/views/PublicPageEditView.vue'
1314
import SettingsView from '../vue/views/SettingsView.vue'
@@ -26,6 +27,7 @@ export const router = createRouter({
2627
{ path: '/campaigns/:campaignId/edit', name: 'campaign-edit', component: CampaignEditView, meta: { title: 'Edit Campaign' } },
2728
{ path: '/lists/:listId/subscribers', name: 'list-subscribers', component: ListSubscribersView, meta: { title: 'List Subscribers' } },
2829
{ path: '/bounces', name: 'bounces', component: BouncesView, meta: { title: 'Bounces' } },
30+
{ path: '/analytics', name: 'analytics', component: AnalyticsView, meta: { title: 'Analytics' } },
2931
{ path: '/public', name: 'public-pages', component: PublicPagesView, meta: { title: 'Public Pages' } },
3032
{ path: '/public/create', name: 'public-page-create', component: PublicPageEditView, meta: { title: 'Create Public Page' } },
3133
{ path: '/public/:pageId/edit', name: 'public-page-edit', component: PublicPageEditView, meta: { title: 'Edit Public Page' } },

assets/vue/api.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import {
1111
SubscriberAttributesClient,
1212
TemplatesClient,
1313
BouncesClient,
14-
ConfigClient, AdminAttributeClient,
14+
ConfigClient,
15+
AdminAttributeClient,
1516
} from '@tatevikgr/rest-api-client';
1617

1718
const AUTHENTICATION_REDIRECT_PATH = '/login';

assets/vue/components/dashboard/KpiCard.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import BaseCard from '../../components/base/BaseCard.vue'
2525
import BaseIcon from '../../components/base/BaseIcon.vue'
2626
2727
const props = defineProps({
28+
id: String,
2829
label: String,
2930
value: [String, Number],
3031
change: String, // "+12.5%" etc.

assets/vue/components/settings/EditAdminModal.vue

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,11 @@ const resetForm = () => {
212212
watch(
213213
() => [props.isOpen, props.admin?.id],
214214
([isOpen]) => {
215-
if (isOpen) {
216-
resetForm()
217-
}
218-
}
215+
if (isOpen) {
216+
resetForm()
217+
}
218+
},
219+
{ immediate: true }
219220
)
220221
221222
const close = () => {

0 commit comments

Comments
 (0)