mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
fix weird bug with ts import
This commit is contained in:
parent
3ea630748a
commit
a9bc98738e
@ -1,5 +1,5 @@
|
||||
import {EventInput} from '@fullcalendar/vue3';
|
||||
import {DateTime, User, UserAssociatedInterface} from 'ChillMainAssets/types';
|
||||
import {DateTime, User, UserAssociatedInterface} from '../../../ChillMainBundle/Resources/public/types' ;
|
||||
|
||||
export interface CalendarRange {
|
||||
id: number;
|
||||
|
@ -1,7 +1,7 @@
|
||||
import {fetchResults} from 'ChillMainAssets/lib/api/apiMethods';
|
||||
import {datetimeToISO} from 'ChillMainAssets/chill/js/date';
|
||||
import {User} from 'ChillMainAssets/types';
|
||||
import {CalendarRange, CalendarRemote} from 'ChillCalendarAssets/types';
|
||||
import {fetchResults} from '../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods';
|
||||
import {datetimeToISO} from '../../../../../ChillMainBundle/Resources/public/chill/js/date';
|
||||
import {User} from '../../../../../ChillMainBundle/Resources/public/types';
|
||||
import {CalendarRange, CalendarRemote} from '../../types';
|
||||
|
||||
export const whoami = (): Promise<User> => {
|
||||
const url = `/api/1.0/main/whoami.json`;
|
||||
|
@ -1,8 +1,8 @@
|
||||
import {COLORS} from '../const';
|
||||
import {ISOToDatetime} from 'ChillMainAssets/chill/js/date';
|
||||
import {DateTime, User} from 'ChillMainAssets/types';
|
||||
import {CalendarRange, CalendarRemote} from 'ChillCalendarAssets/types';
|
||||
import type {EventInputCalendarRange} from 'ChillCalendarAssets/types';
|
||||
import {ISOToDatetime} from '../../../../../../ChillMainBundle/Resources/public/chill/js/date';
|
||||
import {DateTime, User} from '../../../../../../ChillMainBundle/Resources/public/types';
|
||||
import {CalendarRange, CalendarRemote} from '../../../types';
|
||||
import type {EventInputCalendarRange} from '../../../types';
|
||||
import {EventInput} from '@fullcalendar/vue3';
|
||||
|
||||
export interface UserData {
|
||||
|
@ -8,8 +8,8 @@ import me, {MeState} from './modules/me';
|
||||
import fullCalendar, {FullCalendarState} from './modules/fullcalendar';
|
||||
import calendarRanges, {CalendarRangesState} from './modules/calendarRanges';
|
||||
import calendarRemotes, {CalendarRemotesState} from './modules/calendarRemotes';
|
||||
import {whoami} from 'ChillCalendarAssets/vuejs/Calendar/api';
|
||||
import {User} from 'ChillMainAssets/types';
|
||||
import {whoami} from '../../Calendar/api';
|
||||
import {User} from '../../../../../../ChillMainBundle/Resources/public/types';
|
||||
|
||||
const debug = process.env.NODE_ENV !== 'production';
|
||||
|
||||
|
@ -1,13 +1,13 @@
|
||||
import {State} from './../index';
|
||||
import {ActionContext, Module} from 'vuex';
|
||||
import {CalendarRange, CalendarRangeEdit} from "ChillCalendarAssets/types";
|
||||
import {fetchCalendarRangeForUser} from 'ChillCalendarAssets/vuejs/Calendar/api';
|
||||
import {calendarRangeToFullCalendarEvent} from 'ChillCalendarAssets/vuejs/Calendar/store/utils';
|
||||
import {CalendarRange, CalendarRangeEdit} from "../../../../types";
|
||||
import {fetchCalendarRangeForUser} from '../../../Calendar/api';
|
||||
import {calendarRangeToFullCalendarEvent} from '../../../Calendar/store/utils';
|
||||
import {UserAssociatedInterface} from "../../../../../../../ChillMainBundle/Resources/public/types";
|
||||
import {EventInput} from '@fullcalendar/vue3';
|
||||
import {makeFetch} from "../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
|
||||
import {datetimeToISO} from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
|
||||
import type {EventInputCalendarRange} from "ChillCalendarAssets/types";
|
||||
import type {EventInputCalendarRange} from "../../../../types";
|
||||
|
||||
export interface CalendarRangesState {
|
||||
ranges: (EventInput | EventInputCalendarRange) [],
|
||||
|
@ -1,12 +1,11 @@
|
||||
import {State} from './../index';
|
||||
import {ActionContext, Module} from 'vuex';
|
||||
import {CalendarRemote} from 'ChillCalendarAssets/types';
|
||||
import {fetchCalendarRemoteForUser} from 'ChillCalendarAssets/vuejs/Calendar/api';
|
||||
import {calendarRangeToFullCalendarEvent} from 'ChillCalendarAssets/vuejs/Calendar/store/utils';
|
||||
import {CalendarRemote} from '../../../../types';
|
||||
import {fetchCalendarRemoteForUser} from '../../../Calendar/api';
|
||||
import {EventInput, EventSource} from '@fullcalendar/vue3';
|
||||
import {remoteToFullCalendarEvent} from "../../../Calendar/store/utils";
|
||||
import {TransportExceptionInterface} from "ChillMainAssets/lib/api/apiMethods";
|
||||
import {COLORS} from "ChillCalendarAssets/vuejs/Calendar/const";
|
||||
import {TransportExceptionInterface} from "../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
|
||||
import {COLORS} from "../../../Calendar/const";
|
||||
|
||||
export interface CalendarRemotesState {
|
||||
remotes: EventInput[],
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {State} from './../index';
|
||||
import {User} from 'ChillMainAssets/types';
|
||||
import {User} from '../../../../../../../ChillMainBundle/Resources/public/types';
|
||||
import {ActionContext} from 'vuex';
|
||||
|
||||
export interface MeState {
|
||||
|
@ -1,4 +1,4 @@
|
||||
var mime = require('mime-types');
|
||||
var mime = require('mime');
|
||||
|
||||
var algo = 'AES-CBC';
|
||||
|
||||
@ -28,7 +28,7 @@ var download = (button) => {
|
||||
labelPreparing = button.dataset.labelPreparing,
|
||||
labelReady = button.dataset.labelReady,
|
||||
mimeType = button.dataset.mimeType,
|
||||
extension = mime.extension(mimeType),
|
||||
extension = mime.getExtension(mimeType),
|
||||
decryptError = "Error while decrypting file",
|
||||
fetchError = "Error while fetching file",
|
||||
key, url
|
||||
@ -93,4 +93,4 @@ window.addEventListener('load', function(e) {
|
||||
initializeButtons(e.target);
|
||||
});
|
||||
|
||||
export { initializeButtons, download };
|
||||
export { initializeButtons, download };
|
||||
|
@ -1,4 +1,4 @@
|
||||
import {Scope} from 'ChillMainAssets/types';
|
||||
import {Scope} from '../../types';
|
||||
|
||||
export type body = {[key: string]: boolean|string|number|null};
|
||||
export type fetchOption = {[key: string]: boolean|string|number|null};
|
||||
|
@ -1,4 +1,4 @@
|
||||
/*
|
||||
/*
|
||||
* Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
@ -15,12 +15,12 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
var mime = require('mime-types')
|
||||
var mime = require('mime')
|
||||
|
||||
var download_report = (url, container) => {
|
||||
var download_text = container.dataset.downloadText,
|
||||
alias = container.dataset.alias;
|
||||
|
||||
|
||||
window.fetch(url, { credentials: 'same-origin' })
|
||||
.then(response => {
|
||||
if (!response.ok) {
|
||||
@ -29,21 +29,21 @@ var download_report = (url, container) => {
|
||||
|
||||
return response.blob();
|
||||
}).then(blob => {
|
||||
|
||||
|
||||
var content = URL.createObjectURL(blob),
|
||||
link = document.createElement("a"),
|
||||
type = blob.type,
|
||||
hasForcedType = 'mimeType' in container.dataset,
|
||||
extension;
|
||||
|
||||
|
||||
if (hasForcedType) {
|
||||
// force a type
|
||||
type = container.dataset.mimeType;
|
||||
blob = new Blob([ blob ], { 'type': type });
|
||||
content = URL.createObjectURL(blob);
|
||||
}
|
||||
|
||||
extension = mime.extension(type);
|
||||
|
||||
extension = mime.getExtension(type);
|
||||
|
||||
link.appendChild(document.createTextNode(download_text));
|
||||
link.classList.add("btn", "btn-action");
|
||||
@ -56,7 +56,7 @@ var download_report = (url, container) => {
|
||||
container.appendChild(link);
|
||||
}).catch(function(error) {
|
||||
console.log(error);
|
||||
var problem_text =
|
||||
var problem_text =
|
||||
document.createTextNode("Problem during download");
|
||||
|
||||
container
|
||||
@ -64,4 +64,4 @@ var download_report = (url, container) => {
|
||||
});
|
||||
};
|
||||
|
||||
module.exports = download_report;
|
||||
module.exports = download_report;
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { createI18n } from 'vue-i18n';
|
||||
import datetimeFormats from 'ChillMainAssets/vuejs/i18n/datetimeFormats';
|
||||
import datetimeFormats from '../i18n/datetimeFormats';
|
||||
|
||||
const messages = {
|
||||
fr: {
|
||||
|
Loading…
x
Reference in New Issue
Block a user