refactor: remove excessive counter classes

k11q · Apr 25, 2023 · db212f4 · db212f4
1 parent ca360a4
commit db212f4
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 60 deletions.
diff --git a/pages/index.vue b/pages/index.vue
@@ -127,11 +127,7 @@ import type { Database } from '~/types/database.types';
 import formatLocaleTime from '~/utils/format-locale-time';
 import {
 	IntervalCounter,
-	IntervalCharactersCounter,
-	TotalCharactersCounter,
-	TotalCorrectsCounter,
-	TotalErrorsCounter,
-	IntervalErrorCounter,
+	BaseCounter,
 } from '~/src/counters';
 
 definePageMeta({
@@ -213,12 +209,12 @@ const intervalCount = new IntervalCounter();
 const liveWpm = ref(0);
 const liveRawWpm = ref(0);
 const liveTimer = ref(0);
-const intervalError = new IntervalErrorCounter();
-const intervalCharacterCount = new IntervalCharactersCounter();
+const intervalError = new BaseCounter();
+const intervalCharacterCount = new BaseCounter();
 let characterCountPerFiveSeconds: number[] = [];
-const totalCharactersCount = new TotalCharactersCounter();
-const totalErrorsCount = new TotalErrorsCounter();
-const totalCorrectsCount = new TotalCorrectsCounter();
+const totalCharactersCount = new BaseCounter();
+const totalErrorsCount = new BaseCounter();
+const totalCorrectsCount = new BaseCounter();
 const totalExtrasCount = 0;
 let sessionId: number;
 

diff --git a/src/counters/base-counter.ts b/src/counters/base-counter.ts
@@ -1,4 +1,4 @@
-abstract class BaseCounter {
+class BaseCounter {
 	protected value: number;
 
 	constructor() {
@@ -22,4 +22,4 @@ abstract class BaseCounter {
 	}
 }
 
-export default BaseCounter;
+export {BaseCounter};
diff --git a/src/counters/errors-counter.ts b/src/counters/errors-counter.ts
diff --git a/src/counters/index.ts b/src/counters/index.ts
@@ -1,7 +1,2 @@
-export { TotalCorrectsCounter } from './total-corrects-counter';
 export { IntervalCounter } from './interval-counter';
-export { IntervalCharactersCounter } from './interval-characters-counter';
-export { TotalCharactersCounter } from './total-characters-counter';
-export { TotalErrorsCounter } from './total-errors-counter';
-export { ErrorsCounter } from './errors-counter';
-export { IntervalErrorCounter } from './interval-error-counter';
+export { BaseCounter } from './base-counter';
diff --git a/src/counters/interval-characters-counter.ts b/src/counters/interval-characters-counter.ts
diff --git a/src/counters/interval-counter.ts b/src/counters/interval-counter.ts
@@ -1,4 +1,4 @@
-import BaseCounter from './base-counter';
+import {BaseCounter} from './base-counter';
 
 class IntervalCounter extends BaseCounter{
 	constructor() {

diff --git a/src/counters/interval-error-counter.ts b/src/counters/interval-error-counter.ts
diff --git a/src/counters/total-characters-counter.ts b/src/counters/total-characters-counter.ts
diff --git a/src/counters/total-corrects-counter.ts b/src/counters/total-corrects-counter.ts
diff --git a/src/counters/total-errors-counter.ts b/src/counters/total-errors-counter.ts