Skip to content

Commit

Permalink
Merge branch 'main' into dpb_734
Browse files Browse the repository at this point in the history
  • Loading branch information
KlemenSpruk committed Oct 27, 2023
2 parents 5ce5613 + e2d0b01 commit 0017b42
Show file tree
Hide file tree
Showing 15 changed files with 471 additions and 68 deletions.
1 change: 1 addition & 0 deletions django_project_base/account/rest/account.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ class VerifyRegistrationViewSet(viewsets.ViewSet):
methods=["post"],
url_path="verify-registration",
url_name="verify-registration",
permission_classes=[],
)
def verify_registration(self, request: Request) -> Response:
if (
Expand Down
513 changes: 457 additions & 56 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@vitejs/plugin-vue": "^4.0.0",
"@vue/test-utils": "^2.2.4",
"esbuild": "^0.16",
"eslint-config-velis": "^1.1.13",
"eslint-config-velis": "^1.1.16",
"http-proxy-middleware": "^2.0.6",
"vite": "^4.0.4",
"vite-plugin-eslint": "^1.8.1",
Expand Down
2 changes: 1 addition & 1 deletion vue/apiClient.ts → vue/api-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { apiClient } from '@velis/dynamicforms';
import { InternalAxiosRequestConfig } from 'axios';
import _ from 'lodash';

import { HTTP_401_UNAUTHORIZED, shouldUrlBeIgnoredAfterApiResponseNotFound } from './apiConfig';
import { HTTP_401_UNAUTHORIZED, shouldUrlBeIgnoredAfterApiResponseNotFound } from './api-config';
import { showGeneralErrorNotification } from './notifications';
import { Store } from './store';

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion vue/apps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import LoginDialog from './components/user-session/login-dialog.vue';
import Login from './components/user-session/login-inline.vue';
import ProjectList from './components/user-session/project-list.vue';
import UserProfile from './components/user-session/user-profile.vue';
import DefaultCookieOptions from './defaultCookieOptions';
import DefaultCookieOptions from './default-cookie-options';
import TitlebarAppStandalone from './titlebar-app-standalone.vue';

export { default as useUserSessionStore } from './components/user-session/state';
Expand Down
2 changes: 1 addition & 1 deletion vue/components/notifications-editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
} from '@velis/dynamicforms';
import { onMounted, onUnmounted, ref } from 'vue';
import { apiClient } from '../apiClient';
import { apiClient } from '../api-client';
import {
closeNotification,
showNotification,
Expand Down
2 changes: 1 addition & 1 deletion vue/components/project-settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { storeToRefs } from 'pinia';
import { onMounted, onUnmounted, Ref, ref, watch, h } from 'vue';
import { useCookies } from 'vue3-cookies';
import { apiClient } from '../apiClient';
import { apiClient } from '../api-client';
import { PROFILE_TABLE_PRIMARY_KEY_PROPERTY_NAME } from './user-session/data-types';
import useUserSessionStore from './user-session/state';
Expand Down
2 changes: 1 addition & 1 deletion vue/components/titlebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { apiClient } from '@velis/dynamicforms';
import _ from 'lodash';
import { defineComponent } from 'vue';
import { API_CONFIG } from '../apiConfig';
import { API_CONFIG } from '../api-config';
import { maintenanceNotificationAcknowledged as MaintenanceNotificationAcknowledged } from '../events';
import { showMaintenanceNotification } from '../notifications';
Expand Down
2 changes: 1 addition & 1 deletion vue/components/user-session/login-inline.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import { h, onMounted, reactive } from 'vue';
// eslint-disable-next-line import/no-extraneous-dependencies
import { useCookies } from 'vue3-cookies';
import { apiClient } from '../../apiClient';
import { apiClient } from '../../api-client';
import { parseErrors, useLogin } from './login';
import SocialLogos from './social-logos.vue';
Expand Down
2 changes: 1 addition & 1 deletion vue/components/user-session/login.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { AxiosError } from 'axios';
import _ from 'lodash';
import { h, reactive, ref, Ref } from 'vue';

import { apiClient } from '../../apiClient';
import { apiClient } from '../../api-client';

import useUserSessionStore from './state';
import { showLoginDialog } from './use-login-dialog';
Expand Down
2 changes: 1 addition & 1 deletion vue/components/user-session/state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { apiClient } from '@velis/dynamicforms';
import { AxiosRequestConfig } from 'axios';
import { defineStore } from 'pinia';

import { setCurrentProject } from '../../apiClient';
import { setCurrentProject } from '../../api-client';

import {
UserDataJSON,
Expand Down
6 changes: 3 additions & 3 deletions vue/components/user-session/user-profile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import { computed, h, onMounted, reactive, watch } from 'vue';
import { useCookies } from 'vue3-cookies';
import { useDisplay } from 'vuetify';
import { apiClient } from '../../apiClient';
import { HTTP_401_UNAUTHORIZED } from '../../apiConfig';
import { apiClient } from '../../api-client';
import { HTTP_401_UNAUTHORIZED } from '../../api-config';
import { showGeneralErrorNotification } from '../../notifications';
import { SocialAccItem } from '../../socialIntegrations';
import { SocialAccItem } from '../../social-integrations';
import { PROFILE_TABLE_PRIMARY_KEY_PROPERTY_NAME, UserDataJSON } from './data-types';
import icons from './icons';
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions vue/socialIntegrations.ts → vue/social-integrations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ interface SocialAccItem {
name: string; url: string
}

// eslint-disable-next-line import/prefer-default-export
export { SocialAccItem };

0 comments on commit 0017b42

Please sign in to comment.