Fix demo CSV paths

Fix pastec status endpoints Update TypeScript from 5.3 to to 5.4
ducksmanager · Mar 9, 2024 · d2be04b · d2be04b
1 parent 8938bd6
commit d2be04b
Show file tree

Hide file tree

Showing 14 changed files with 283 additions and 258 deletions.
diff --git a/apps/dumili b/apps/dumili
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -64,7 +64,7 @@
     "histoire": "^0.17.9",
     "prettier": "^3.2.5",
     "sass": "^1.71.1",
-    "typescript": "^5.3.3",
+    "typescript": "^5.4.2",
     "typescript-eslint": "^7.1.0",
     "unplugin-auto-import": "^0.17.5",
     "unplugin-icons": "^0.18.5",

diff --git a/apps/web/pnpm-lock.yaml b/apps/web/pnpm-lock.yaml
diff --git a/apps/whattheduck-ionic b/apps/whattheduck-ionic
diff --git a/packages/api/index.ts b/packages/api/index.ts
@@ -53,10 +53,10 @@ const httpServer = createServer(async (req, res) => {
       data = await getDbStatus()
       break;
     case '/status/pastecsearch':
-      data = await getPastecStatus()
+      data = await getPastecSearchStatus()
       break;
     case '/status/pastec':
-      data = await getPastecSearchStatus()
+      data = await getPastecStatus()
     default:
       res.writeHead(404);
       res.end();

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -44,7 +44,7 @@
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.8",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.3.3",
+    "typescript": "^5.4.2",
     "typescript-eslint": "^7.1.0"
   }
 }
diff --git a/packages/api/pnpm-lock.yaml b/packages/api/pnpm-lock.yaml
diff --git a/packages/api/services/collection/issues/index.ts b/packages/api/services/collection/issues/index.ts
@@ -1,5 +1,6 @@
 import { parse } from "csv-parse/sync";
-import { readFileSync } from "fs";
+import { existsSync, readFileSync } from "fs";
+import { cwd } from "process";
 import { Socket } from "socket.io";
 
 import { TransactionResults } from "~dm-types/TransactionResults";
@@ -272,6 +273,8 @@ export const resetDemo = async () => {
     return;
   }
 
+  const csvPath = existsSync("/app/services/demo_issues.csv") ? "/app/services/": cwd() + "/services/";
+
   demo.lastReset = new Date();
   await prismaDm.demo.update({
     data: demo,
@@ -293,8 +296,11 @@ export const resetDemo = async () => {
     issuenumber: string;
   }
 
+  const currentDir = process.cwd();
+  console.log(currentDir)
+
   const csvIssues: CsvIssue[] = parse(
-    readFileSync("/app/routes/demo/demo_issues.csv"),
+    readFileSync(`${csvPath}demo_issues.csv`),
     { columns: true }
   );
   await prismaDm.$transaction(
@@ -320,7 +326,7 @@ export const resetDemo = async () => {
   }
 
   const csvPurchases: CsvPurchase[] = parse(
-    readFileSync("/app/routes/demo/demo_purchases.csv"),
+    readFileSync(`${csvPath}demo_purchases.csv`),
     { columns: true }
   );
   await prismaDm.$transaction(
+5 −4		api/.eslintrc.json
+134 −108		api/index.ts
+17 −13		api/services/_auth.ts
+4 −2		api/services/index.ts
+467 −291		api/services/indexations/index.ts
+23 −9		api/services/indexations/kumiko.ts
+2 −2		api/services/indexations/ocr.ts
+110 −46		api/services/indexations/types.ts
+1 −1		api/services/types.ts
+15 −15		package.json
+394 −382		pnpm-lock.yaml
+1 −1		src/App.vue
+39 −228		src/components/Book.vue
+11 −10		src/components/Entry.vue
+1 −1		src/components/Gallery.vue
+1 −1		src/components/Issue.vue
+14 −14		src/components/IssueSelect.vue
+1 −1		src/components/IssueSuggestionList.vue
+7 −7		src/components/IssueSuggestionModal.vue
+1 −1		src/components/StorySearch.vue
+2 −2		src/components/StorySuggestionList.vue
+2 −2		src/components/SuggestionList.vue
+253 −0		src/components/TableOfContents.vue
+1 −1		src/components/TableTooltip.vue
+8 −9		src/components/TextEditor.vue
+6 −6		src/composables/useAi.ts
+3 −3		src/composables/useDumiliSocket.ts
+4 −4		src/composables/useHint.ts
+1 −1		src/pages/index.vue
+2 −2		src/pages/indexation/[id].vue
+12 −31		src/stores/suggestions.ts
+1 −0		tsconfig.json
+2 −2		vite.config.ts
+4 −2		.env
+1 −0		.nvmrc
+1 −1		android/app/build.gradle
+0 −1		android/app/capacitor.build.gradle
+1 −1		android/app/src/main/java/net/ducksmanager/whattheduck/MainActivity.java
+1 −1		android/build.gradle
+10 −13		android/capacitor.settings.gradle
+2 −1		android/gradle/wrapper/gradle-wrapper.properties
+7 −7		android/variables.gradle
+0 −15		capacitor.config.json
+1 −1		ionic.config.json
+4 −2		ios/App/App.xcodeproj/project.pbxproj
+12 −13		ios/App/Podfile
+43 −64		ios/App/Podfile.lock
+35 −45		package.json
+1,035 −1,214		pnpm-lock.yaml
+0 −5		public/assets/databases/databases.json
+ −		public/assets/sql-wasm.wasm
+41 −45		src/App.vue
+7 −0		src/components/Country.vue
+41 −37		src/components/List.vue
+1 −1		src/components/NavigationDrawer.vue
+3 −3		src/components/OwnedIssueCopy.vue
+2 −2		src/components/PurchaseGraph.vue
+27 −0		src/composables/usePersistedData.ts
+4 −52		src/main.ts
+0 −50		src/persistence/data-sources/db.ts
+0 −5		src/persistence/database.ts
+0 −12		src/persistence/models/coa/InducksCountryname.ts
+0 −17		src/persistence/models/coa/InducksIssueWithCoverUrl.ts
+0 −17		src/persistence/models/coa/InducksIssuequotation.ts
+0 −11		src/persistence/models/coa/InducksPerson.ts
+0 −11		src/persistence/models/coa/InducksPublication.ts
+0 −17		src/persistence/models/coa/InducksStory.ts
+0 −20		src/persistence/models/composite/SuggestedIssueSimple.ts
+0 −11		src/persistence/models/dm/AuthorUser.ts
+0 −12		src/persistence/models/dm/ContributionTotalPoints.ts
+0 −35		src/persistence/models/dm/Issue.ts
+0 −17		src/persistence/models/dm/IssuePopularity.ts
+0 −8		src/persistence/models/dm/NotificationCountry.ts
+0 −14		src/persistence/models/dm/Purchase.ts
+0 −11		src/persistence/models/dm/User.ts
+0 −10		src/persistence/models/internal/HttpCache.ts
+0 −10		src/persistence/models/internal/Sync.ts
+0 −6		src/router/index.ts
+26 −12		src/stores/app.ts
+27 −11		src/stores/wtdcollection.ts
+22 −22		src/views/AddFromCamera.vue
+2 −1		src/views/Authors.vue
+0 −6		src/views/CountryList.vue
+0 −1		src/views/IssueList.vue
+5 −7		src/views/Login.vue
+4 −3		src/views/Logout.vue
+0 −183		src/views/RecentIssueList.vue
+3 −2		src/views/Search.vue
+1 −5		src/views/Signup.vue
+1 −1		vite.config.ts