Skip to content

Commit

Permalink
Restore api commits (#261)
Browse files Browse the repository at this point in the history
## Изменения
Вернул apiClient, вмержил изменения из мэйна, пофиксил чуток багов
  • Loading branch information
BatuevIO authored Oct 24, 2024
1 parent 83e4908 commit 69bcee9
Show file tree
Hide file tree
Showing 99 changed files with 2,418 additions and 2,552 deletions.
14 changes: 10 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
"check": "vue-tsc && pnpm run lint && pnpm run prettier && pnpm run stylelint"
},
"dependencies": {
"@profcomff/api-uilib": "^2024.10.22",
"markdown-it": "^14.1.0",
"openapi-fetch": "^0.12.2",
"pinia": "^2.2.4",
"query-string": "^9.1.1",
"ua-parser-js": "^1.0.39",
Expand All @@ -31,17 +33,20 @@
"devDependencies": {
"@profcomff/api-uilib": "^2024.9.29",
"@types/markdown-it": "^14.1.2",
"@types/node": "^20.16.12",
"@types/node": "^20.17.0",
"@types/ua-parser-js": "^0.7.39",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@vitejs/plugin-vue": "^5.1.4",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@vitejs/plugin-vue": "^5.1.4",
"@vue/eslint-config-typescript": "^12.0.0",
"axios": "^1.7.7",
"eslint": "^8.57.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-vue": "^9.29.0",
"eslint-plugin-vue": "^9.29.1",
"openapi-typescript": "^7.4.1",
"postcss": "^8.4.47",
"postcss-html": "^1.7.0",
"postcss-preset-env": "^9.6.0",
Expand All @@ -50,11 +55,12 @@
"stylelint-config-recommended-vue": "^1.5.0",
"stylelint-config-standard": "^36.0.1",
"typescript": "5.3.3",
"vite": "^5.4.9",
"vite": "^5.4.10",
"vite-plugin-eslint": "^1.8.1",
"vite-plugin-pwa": "^0.19.8",
"vite-plugin-stylelint": "^5.3.1",
"vite-plugin-vuetify": "^2.0.4",
"vite-plugin-vuetify": "^2.0.4",
"vitest": "^1.6.0",
"vue-tsc": "^2.1.6",
"vuetify": "^3.7.3"
Expand Down
2,138 changes: 1,370 additions & 768 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script setup lang="ts">
import { onMounted } from 'vue';
import { marketingApi } from './api/marketing';
import { useProfileStore } from './store/profile';
import { useTimetableStore } from './store/timetable';
import { navbarItems } from './constants/navbarItems';
Expand All @@ -9,6 +8,7 @@ import IrdomToastList from './components/IrdomToastList.vue';
import { useToolbar } from './store/toolbar';
import IrdomToolbar from './components/IrdomToolbar.vue';
import CalendarDropdown from './views/timetable/CalendarDropdown.vue';
import apiClient from '@/api/';
const profileStore = useProfileStore();
const toolbar = useToolbar();
Expand All @@ -22,9 +22,11 @@ onMounted(async () => {
updateTokenScopes();
await updateMarketingId();
if (profileStore.marketingId) {
marketingApi.writeAction({
action: 'app loaded',
user_id: profileStore.marketingId,
apiClient.POST('/marketing/v1/action', {
body: {
action: 'app loaded',
user_id: profileStore.marketingId,
},
});
}
});
Expand Down
78 changes: 0 additions & 78 deletions src/api/BaseApi.ts

This file was deleted.

38 changes: 0 additions & 38 deletions src/api/EntityBaseApi.ts

This file was deleted.

74 changes: 0 additions & 74 deletions src/api/achievement/AchievementApi.ts

This file was deleted.

2 changes: 0 additions & 2 deletions src/api/achievement/index.ts

This file was deleted.

7 changes: 0 additions & 7 deletions src/api/auth/AuthBaseApi.ts

This file was deleted.

93 changes: 0 additions & 93 deletions src/api/auth/AuthEmailApi.ts

This file was deleted.

14 changes: 0 additions & 14 deletions src/api/auth/AuthGithubApi.ts

This file was deleted.

Loading

0 comments on commit 69bcee9

Please sign in to comment.