From 53d49d38945326fc7b7ee410f80aaede273f13f7 Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Sun, 1 Nov 2020 18:39:47 +0100 Subject: [PATCH] cleanup frontend directory structure --- .../NelmioApiDocBundle/SwaggerUi/index.html.twig | 4 ++-- front/{resources/ts => src}/app.ts | 0 front/{resources/ts => src}/components/app.ts | 0 .../ts => src}/components/departures.ts | 4 ++-- .../ts => src}/components/favourites.ts | 4 ++-- .../{resources/ts => src}/components/history.ts | 2 +- front/{resources/ts => src}/components/index.ts | 0 front/{resources/ts => src}/components/line.ts | 2 +- front/{resources/ts => src}/components/map.ts | 0 .../{resources/ts => src}/components/messages.ts | 2 +- .../ts => src}/components/page/index.ts | 0 .../ts => src}/components/page/providers.ts | 2 +- front/{resources/ts => src}/components/picker.ts | 4 ++-- .../ts => src}/components/settings/departures.ts | 4 ++-- .../ts => src}/components/settings/index.ts | 0 .../ts => src}/components/settings/messages.ts | 2 +- front/{resources/ts => src}/components/stop.ts | 6 +++--- .../{resources/ts => src}/components/tooltip.ts | 2 +- front/{resources/ts => src}/components/trip.ts | 2 +- .../ts => src}/components/ui/dialog.ts | 2 +- .../{resources/ts => src}/components/ui/icon.ts | 2 +- .../{resources/ts => src}/components/ui/index.ts | 0 .../ts => src}/components/ui/numeric-input.ts | 2 +- .../ts => src}/components/ui/switch.ts | 2 +- front/{resources/ts => src}/components/utils.ts | 4 ++-- front/{resources/ts => src}/decorators.ts | 0 front/{resources/ts => src}/filters.ts | 0 front/{resources/ts => src}/icons.ts | 16 ++++++++-------- front/{resources/ts => src}/model/common.ts | 0 front/{resources/ts => src}/model/departure.ts | 0 front/{resources/ts => src}/model/error.ts | 0 front/{resources/ts => src}/model/identity.ts | 0 front/{resources/ts => src}/model/index.ts | 0 front/{resources/ts => src}/model/line.ts | 0 front/{resources/ts => src}/model/message.ts | 0 front/{resources/ts => src}/model/provider.ts | 0 front/{resources/ts => src}/model/stop.ts | 0 front/{resources/ts => src}/model/trip.ts | 0 front/{resources/ts => src}/store/common.ts | 0 front/{resources/ts => src}/store/departures.ts | 0 front/{resources/ts => src}/store/favourites.ts | 0 front/{resources/ts => src}/store/history.ts | 0 front/{resources/ts => src}/store/index.ts | 0 front/{resources/ts => src}/store/messages.ts | 0 front/{resources/ts => src}/store/migrations.ts | 0 front/{resources/ts => src}/store/root.ts | 0 .../ts => src}/store/settings/departures.ts | 0 .../ts => src}/store/settings/messages.ts | 0 front/{resources/ts => src}/types/webpack.d.ts | 0 front/{resources/ts => src}/urls.ts | 0 front/{resources/ts => src}/utils.ts | 0 front/{resources => }/styles/_animations.scss | 0 front/{resources => }/styles/_common.scss | 0 front/{resources => }/styles/_controls.scss | 0 front/{resources => }/styles/_departure.scss | 0 front/{resources => }/styles/_dragscroll.scss | 0 front/{resources => }/styles/_favourites.scss | 0 front/{resources => }/styles/_form.scss | 0 front/{resources => }/styles/_line.scss | 0 front/{resources => }/styles/_map.scss | 0 front/{resources => }/styles/_stop.scss | 0 front/{resources => }/styles/_trigonometry.scss | 0 front/{resources => }/styles/_trip.scss | 0 front/{resources => }/styles/api.scss | 0 front/{resources => }/styles/main.scss | 0 .../styles/page/_provider-picker.scss | 0 front/{resources => }/styles/ui/_modal.scss | 0 front/{resources => }/styles/ui/_popup.scss | 0 front/{resources => }/styles/ui/_switch.scss | 0 .../components => templates}/departures.html | 0 .../departures/departure.html | 0 .../components => templates}/favourites.html | 0 .../favourites/save.html | 0 .../components => templates}/finder.html | 0 .../components => templates}/fold.html | 0 .../components => templates}/lazy.html | 0 .../components => templates}/line.html | 0 .../components => templates}/messages.html | 0 .../components => templates}/page/providers.html | 0 .../components => templates}/picker/stop.html | 0 .../settings/departures.html | 0 .../settings/messages.html | 0 .../components => templates}/stop.html | 0 .../components => templates}/stop/details.html | 0 .../components => templates}/stop/history.html | 0 .../components => templates}/stop/map.html | 0 .../components => templates}/tooltip.html | 0 .../components => templates}/trip.html | 0 .../components => templates}/ui/dialog.html | 0 .../components => templates}/ui/icon.html | 0 .../components => templates}/ui/numeric.html | 0 .../components => templates}/ui/switch.html | 0 front/tsconfig.json | 14 +++++++++++--- front/webpack.config.js | 10 +++++++--- 94 files changed, 52 insertions(+), 40 deletions(-) rename front/{resources/ts => src}/app.ts (100%) rename front/{resources/ts => src}/components/app.ts (100%) rename front/{resources/ts => src}/components/departures.ts (92%) rename front/{resources/ts => src}/components/favourites.ts (93%) rename front/{resources/ts => src}/components/history.ts (83%) rename front/{resources/ts => src}/components/index.ts (100%) rename front/{resources/ts => src}/components/line.ts (81%) rename front/{resources/ts => src}/components/map.ts (100%) rename front/{resources/ts => src}/components/messages.ts (92%) rename front/{resources/ts => src}/components/page/index.ts (100%) rename front/{resources/ts => src}/components/page/providers.ts (91%) rename front/{resources/ts => src}/components/picker.ts (96%) rename front/{resources/ts => src}/components/settings/departures.ts (81%) rename front/{resources/ts => src}/components/settings/index.ts (100%) rename front/{resources/ts => src}/components/settings/messages.ts (87%) rename front/{resources/ts => src}/components/stop.ts (86%) rename front/{resources/ts => src}/components/tooltip.ts (97%) rename front/{resources/ts => src}/components/trip.ts (94%) rename front/{resources/ts => src}/components/ui/dialog.ts (99%) rename front/{resources/ts => src}/components/ui/icon.ts (98%) rename front/{resources/ts => src}/components/ui/index.ts (100%) rename front/{resources/ts => src}/components/ui/numeric-input.ts (94%) rename front/{resources/ts => src}/components/ui/switch.ts (87%) rename front/{resources/ts => src}/components/utils.ts (91%) rename front/{resources/ts => src}/decorators.ts (100%) rename front/{resources/ts => src}/filters.ts (100%) rename front/{resources/ts => src}/icons.ts (66%) rename front/{resources/ts => src}/model/common.ts (100%) rename front/{resources/ts => src}/model/departure.ts (100%) rename front/{resources/ts => src}/model/error.ts (100%) rename front/{resources/ts => src}/model/identity.ts (100%) rename front/{resources/ts => src}/model/index.ts (100%) rename front/{resources/ts => src}/model/line.ts (100%) rename front/{resources/ts => src}/model/message.ts (100%) rename front/{resources/ts => src}/model/provider.ts (100%) rename front/{resources/ts => src}/model/stop.ts (100%) rename front/{resources/ts => src}/model/trip.ts (100%) rename front/{resources/ts => src}/store/common.ts (100%) rename front/{resources/ts => src}/store/departures.ts (100%) rename front/{resources/ts => src}/store/favourites.ts (100%) rename front/{resources/ts => src}/store/history.ts (100%) rename front/{resources/ts => src}/store/index.ts (100%) rename front/{resources/ts => src}/store/messages.ts (100%) rename front/{resources/ts => src}/store/migrations.ts (100%) rename front/{resources/ts => src}/store/root.ts (100%) rename front/{resources/ts => src}/store/settings/departures.ts (100%) rename front/{resources/ts => src}/store/settings/messages.ts (100%) rename front/{resources/ts => src}/types/webpack.d.ts (100%) rename front/{resources/ts => src}/urls.ts (100%) rename front/{resources/ts => src}/utils.ts (100%) rename front/{resources => }/styles/_animations.scss (100%) rename front/{resources => }/styles/_common.scss (100%) rename front/{resources => }/styles/_controls.scss (100%) rename front/{resources => }/styles/_departure.scss (100%) rename front/{resources => }/styles/_dragscroll.scss (100%) rename front/{resources => }/styles/_favourites.scss (100%) rename front/{resources => }/styles/_form.scss (100%) rename front/{resources => }/styles/_line.scss (100%) rename front/{resources => }/styles/_map.scss (100%) rename front/{resources => }/styles/_stop.scss (100%) rename front/{resources => }/styles/_trigonometry.scss (100%) rename front/{resources => }/styles/_trip.scss (100%) rename front/{resources => }/styles/api.scss (100%) rename front/{resources => }/styles/main.scss (100%) rename front/{resources => }/styles/page/_provider-picker.scss (100%) rename front/{resources => }/styles/ui/_modal.scss (100%) rename front/{resources => }/styles/ui/_popup.scss (100%) rename front/{resources => }/styles/ui/_switch.scss (100%) rename front/{resources/components => templates}/departures.html (100%) rename front/{resources/components => templates}/departures/departure.html (100%) rename front/{resources/components => templates}/favourites.html (100%) rename front/{resources/components => templates}/favourites/save.html (100%) rename front/{resources/components => templates}/finder.html (100%) rename front/{resources/components => templates}/fold.html (100%) rename front/{resources/components => templates}/lazy.html (100%) rename front/{resources/components => templates}/line.html (100%) rename front/{resources/components => templates}/messages.html (100%) rename front/{resources/components => templates}/page/providers.html (100%) rename front/{resources/components => templates}/picker/stop.html (100%) rename front/{resources/components => templates}/settings/departures.html (100%) rename front/{resources/components => templates}/settings/messages.html (100%) rename front/{resources/components => templates}/stop.html (100%) rename front/{resources/components => templates}/stop/details.html (100%) rename front/{resources/components => templates}/stop/history.html (100%) rename front/{resources/components => templates}/stop/map.html (100%) rename front/{resources/components => templates}/tooltip.html (100%) rename front/{resources/components => templates}/trip.html (100%) rename front/{resources/components => templates}/ui/dialog.html (100%) rename front/{resources/components => templates}/ui/icon.html (100%) rename front/{resources/components => templates}/ui/numeric.html (100%) rename front/{resources/components => templates}/ui/switch.html (100%) diff --git a/api/templates/bundles/NelmioApiDocBundle/SwaggerUi/index.html.twig b/api/templates/bundles/NelmioApiDocBundle/SwaggerUi/index.html.twig index 0d4e685..ceb859e 100644 --- a/api/templates/bundles/NelmioApiDocBundle/SwaggerUi/index.html.twig +++ b/api/templates/bundles/NelmioApiDocBundle/SwaggerUi/index.html.twig @@ -5,5 +5,5 @@ {% block stylesheets %} {{ parent() }} - -{% endblock stylesheets %} \ No newline at end of file + +{% endblock stylesheets %} diff --git a/front/resources/ts/app.ts b/front/src/app.ts similarity index 100% rename from front/resources/ts/app.ts rename to front/src/app.ts diff --git a/front/resources/ts/components/app.ts b/front/src/components/app.ts similarity index 100% rename from front/resources/ts/components/app.ts rename to front/src/components/app.ts diff --git a/front/resources/ts/components/departures.ts b/front/src/components/departures.ts similarity index 92% rename from front/resources/ts/components/departures.ts rename to front/src/components/departures.ts index 19c00f8..3318ef5 100644 --- a/front/resources/ts/components/departures.ts +++ b/front/src/components/departures.ts @@ -7,12 +7,12 @@ import urls from "../urls"; import { Jsonified } from "../utils"; import * as moment from "moment"; -@Component({ template: require("../../components/departures.html"), store }) +@Component({ template: require("../../templates/departures.html"), store }) export class DeparturesComponent extends Vue { @Departures.State departures: Departure[]; } -@Component({ template: require("../../components/departures/departure.html"), store }) +@Component({ template: require("../../templates/departures/departure.html"), store }) export class DepartureComponent extends Vue { @Prop(Object) departure: Departure; scheduledTrip: Trip = null; diff --git a/front/resources/ts/components/favourites.ts b/front/src/components/favourites.ts similarity index 93% rename from front/resources/ts/components/favourites.ts rename to front/src/components/favourites.ts index a7e0fd1..2f89150 100644 --- a/front/resources/ts/components/favourites.ts +++ b/front/src/components/favourites.ts @@ -7,7 +7,7 @@ import * as uuid from "uuid"; import { Favourites } from "../store"; -@Component({ template: require('../../components/favourites.html' )}) +@Component({ template: require('../../templates/favourites.html' )}) export class FavouritesComponent extends Vue { @Favourites.State favourites: Favourite[]; @Favourites.Mutation remove: (fav: Favourite) => void; @@ -26,7 +26,7 @@ function createFavouriteEntry(name: string, stops: Stop[]): Favourite { } } -@Component({ template: require('../../components/favourites/save.html' )}) +@Component({ template: require('../../templates/favourites/save.html' )}) export class FavouritesAdderComponent extends Vue { @State stops: Stop[]; diff --git a/front/resources/ts/components/history.ts b/front/src/components/history.ts similarity index 83% rename from front/resources/ts/components/history.ts rename to front/src/components/history.ts index 3f1260f..f7ee2b9 100644 --- a/front/resources/ts/components/history.ts +++ b/front/src/components/history.ts @@ -5,7 +5,7 @@ import { HistoryEntry } from "../store/history"; import { Mutation } from "vuex-class"; import { Stop } from "../model"; -@Component({ template: require('../../components/stop/history.html' )}) +@Component({ template: require('../../templates/stop/history.html' )}) export class StopHistory extends Vue { @History.Getter all: HistoryEntry[]; diff --git a/front/resources/ts/components/index.ts b/front/src/components/index.ts similarity index 100% rename from front/resources/ts/components/index.ts rename to front/src/components/index.ts diff --git a/front/resources/ts/components/line.ts b/front/src/components/line.ts similarity index 81% rename from front/resources/ts/components/line.ts rename to front/src/components/line.ts index 86ca509..30be33a 100644 --- a/front/resources/ts/components/line.ts +++ b/front/src/components/line.ts @@ -2,7 +2,7 @@ import Vue from 'vue' import { Component, Prop } from 'vue-property-decorator' import { Line } from "../model"; -@Component({ template: require('../../components/line.html' )}) +@Component({ template: require('../../templates/line.html' )}) export class LineComponent extends Vue { @Prop(Object) public line: Line; diff --git a/front/resources/ts/components/map.ts b/front/src/components/map.ts similarity index 100% rename from front/resources/ts/components/map.ts rename to front/src/components/map.ts diff --git a/front/resources/ts/components/messages.ts b/front/src/components/messages.ts similarity index 92% rename from front/resources/ts/components/messages.ts rename to front/src/components/messages.ts index e9f054c..0c50186 100644 --- a/front/resources/ts/components/messages.ts +++ b/front/src/components/messages.ts @@ -3,7 +3,7 @@ import { Component } from "vue-property-decorator"; import { Message } from "../model/message"; import store, { Messages, MessagesSettings } from '../store' -@Component({ template: require("../../components/messages.html"), store }) +@Component({ template: require("../../templates/messages.html"), store }) export class MessagesComponent extends Vue { @Messages.State('messages') public allMessages: Message[]; diff --git a/front/resources/ts/components/page/index.ts b/front/src/components/page/index.ts similarity index 100% rename from front/resources/ts/components/page/index.ts rename to front/src/components/page/index.ts diff --git a/front/resources/ts/components/page/providers.ts b/front/src/components/page/providers.ts similarity index 91% rename from front/resources/ts/components/page/providers.ts rename to front/src/components/page/providers.ts index 7e257ba..dc6b484 100644 --- a/front/resources/ts/components/page/providers.ts +++ b/front/src/components/page/providers.ts @@ -5,7 +5,7 @@ import { Jsonified } from "../../utils"; import * as moment from 'moment'; @Component({ - template: require('../../../components/page/providers.html'), + template: require('../../../templates/page/providers.html'), }) export class PageProviderList extends Vue { private providers: Provider[] = []; diff --git a/front/resources/ts/components/picker.ts b/front/src/components/picker.ts similarity index 96% rename from front/resources/ts/components/picker.ts rename to front/src/components/picker.ts index 2faa73a..3b7f072 100644 --- a/front/resources/ts/components/picker.ts +++ b/front/src/components/picker.ts @@ -9,7 +9,7 @@ import { Mutation } from "vuex-class"; import { HistoryEntry } from "../store/history"; import { StopHistory } from "./history"; -@Component({ template: require('../../components/picker/stop.html') }) +@Component({ template: require('../../templates/picker/stop.html') }) export class PickerStopComponent extends Vue { @Prop(Object) public stop: Stop; @@ -50,7 +50,7 @@ export class PickerStopComponent extends Vue { } @Component({ - template: require('../../components/finder.html'), + template: require('../../templates/finder.html'), components: { "PickerStop": PickerStopComponent, "StopHistory": StopHistory, diff --git a/front/resources/ts/components/settings/departures.ts b/front/src/components/settings/departures.ts similarity index 81% rename from front/resources/ts/components/settings/departures.ts rename to front/src/components/settings/departures.ts index 8625d0a..8e35873 100644 --- a/front/resources/ts/components/settings/departures.ts +++ b/front/src/components/settings/departures.ts @@ -1,9 +1,9 @@ -import { Component, Prop } from "vue-property-decorator"; +import { Component } from "vue-property-decorator"; import store, { DeparturesSettings } from "../../store"; import Vue from "vue"; import { DeparturesSettingsState } from "../../store/settings/departures"; -@Component({ template: require("../../../components/settings/departures.html"), store }) +@Component({ template: require("../../../templates/settings/departures.html"), store }) export class SettingsDepartures extends Vue { @DeparturesSettings.State public autorefresh: boolean; diff --git a/front/resources/ts/components/settings/index.ts b/front/src/components/settings/index.ts similarity index 100% rename from front/resources/ts/components/settings/index.ts rename to front/src/components/settings/index.ts diff --git a/front/resources/ts/components/settings/messages.ts b/front/src/components/settings/messages.ts similarity index 87% rename from front/resources/ts/components/settings/messages.ts rename to front/src/components/settings/messages.ts index 4f66700..fc2a268 100644 --- a/front/resources/ts/components/settings/messages.ts +++ b/front/src/components/settings/messages.ts @@ -3,7 +3,7 @@ import store, { MessagesSettings } from "../../store"; import Vue from "vue"; import { MessagesSettingsState } from "../../store/settings/messages"; -@Component({template: require("../../../components/settings/messages.html"), store}) +@Component({template: require("../../../templates/settings/messages.html"), store}) export class SettingsMessages extends Vue { @MessagesSettings.State public autorefresh: boolean; diff --git a/front/resources/ts/components/stop.ts b/front/src/components/stop.ts similarity index 86% rename from front/resources/ts/components/stop.ts rename to front/src/components/stop.ts index 1439564..0afd0b0 100644 --- a/front/resources/ts/components/stop.ts +++ b/front/src/components/stop.ts @@ -3,7 +3,7 @@ import { Line, Stop, Track } from "../model"; import Vue from 'vue'; import urls from "../urls"; -@Component({ template: require('../../components/stop/details.html') }) +@Component({ template: require('../../templates/stop/details.html') }) class StopDetailsComponent extends Vue { @Prop(Object) public stop: Stop; @@ -35,13 +35,13 @@ class StopDetailsComponent extends Vue { } } -@Component({ template: require('../../components/stop.html') }) +@Component({ template: require('../../templates/stop.html') }) export class StopComponent extends Vue { @Prop(Object) public stop: Stop; } -@Component({ template: require('../../components/stop/map.html') }) +@Component({ template: require('../../templates/stop/map.html') }) export class StopMapComponent extends Vue { @Prop(Object) public stop: Stop; diff --git a/front/resources/ts/components/tooltip.ts b/front/src/components/tooltip.ts similarity index 97% rename from front/resources/ts/components/tooltip.ts rename to front/src/components/tooltip.ts index 4bb6b9e..1276133 100644 --- a/front/resources/ts/components/tooltip.ts +++ b/front/src/components/tooltip.ts @@ -10,7 +10,7 @@ type Trigger = "hover" | "focus" | "long-press"; const longPressTimeout = 1000; -@Component({ template: require('../../components/tooltip.html') }) +@Component({ template: require('../../templates/tooltip.html') }) export class TooltipComponent extends Vue { @Prop({ type: String, default: "top" }) public placement: string; @Prop({ type: Number, default: 400 }) public delay: number; diff --git a/front/resources/ts/components/trip.ts b/front/src/components/trip.ts similarity index 94% rename from front/resources/ts/components/trip.ts rename to front/src/components/trip.ts index fb70e0e..584ba82 100644 --- a/front/resources/ts/components/trip.ts +++ b/front/src/components/trip.ts @@ -7,7 +7,7 @@ import * as moment from 'moment'; type ScheduledStopInfo = ScheduledStop & { visited: boolean, current: boolean }; -@Component({ template: require("../../components/trip.html") }) +@Component({ template: require("../../templates/trip.html") }) export class TripComponent extends Vue { @Prop(Array) public schedule: ScheduledStop[]; @Prop(Object) public current: Stop; diff --git a/front/resources/ts/components/ui/dialog.ts b/front/src/components/ui/dialog.ts similarity index 99% rename from front/resources/ts/components/ui/dialog.ts rename to front/src/components/ui/dialog.ts index 18580ba..d8be47f 100644 --- a/front/resources/ts/components/ui/dialog.ts +++ b/front/src/components/ui/dialog.ts @@ -34,7 +34,7 @@ function computeZIndexOfElement(element: HTMLElement): number { @Component({ inheritAttrs: false, - template: require('../../../components/ui/dialog.html'), + template: require('../../../templates/ui/dialog.html'), }) export default class UiDialog extends Vue { @Prop({ type: String, default: "popup" }) diff --git a/front/resources/ts/components/ui/icon.ts b/front/src/components/ui/icon.ts similarity index 98% rename from front/resources/ts/components/ui/icon.ts rename to front/src/components/ui/icon.ts index 6e80aa0..dc41d63 100644 --- a/front/resources/ts/components/ui/icon.ts +++ b/front/src/components/ui/icon.ts @@ -117,7 +117,7 @@ const extractAllIcons = (icons: Icon[]) => icons.map(icon => { library.add(...extractAllIcons(Object.values(definitions))); @Component({ - template: require('../../../components/ui/icon.html'), + template: require('../../../templates/ui/icon.html'), components: { fa: FontAwesomeIcon, faLayers: FontAwesomeLayers, diff --git a/front/resources/ts/components/ui/index.ts b/front/src/components/ui/index.ts similarity index 100% rename from front/resources/ts/components/ui/index.ts rename to front/src/components/ui/index.ts diff --git a/front/resources/ts/components/ui/numeric-input.ts b/front/src/components/ui/numeric-input.ts similarity index 94% rename from front/resources/ts/components/ui/numeric-input.ts rename to front/src/components/ui/numeric-input.ts index f8ef7e9..54e2192 100644 --- a/front/resources/ts/components/ui/numeric-input.ts +++ b/front/src/components/ui/numeric-input.ts @@ -3,7 +3,7 @@ import { Component, Prop } from 'vue-property-decorator' import * as uuid from "uuid"; @Component({ - template: require('../../../components/ui/numeric.html'), + template: require('../../../templates/ui/numeric.html'), inheritAttrs: false }) export class UiNumericInput extends Vue { diff --git a/front/resources/ts/components/ui/switch.ts b/front/src/components/ui/switch.ts similarity index 87% rename from front/resources/ts/components/ui/switch.ts rename to front/src/components/ui/switch.ts index d8a6dce..ff819b1 100644 --- a/front/resources/ts/components/ui/switch.ts +++ b/front/src/components/ui/switch.ts @@ -3,7 +3,7 @@ import { Component, Prop } from 'vue-property-decorator' import * as uuid from "uuid"; @Component({ - template: require('../../../components/ui/switch.html'), + template: require('../../../templates/ui/switch.html'), inheritAttrs: false }) export class UiSwitch extends Vue { diff --git a/front/resources/ts/components/utils.ts b/front/src/components/utils.ts similarity index 91% rename from front/resources/ts/components/utils.ts rename to front/src/components/utils.ts index 464fc68..edfd173 100644 --- a/front/resources/ts/components/utils.ts +++ b/front/src/components/utils.ts @@ -2,7 +2,7 @@ import Vue from 'vue'; import { Component, Prop, Watch } from "vue-property-decorator"; -@Component({ template: require('../../components/fold.html') }) +@Component({ template: require('../../templates/fold.html') }) export class FoldComponent extends Vue { private observer: MutationObserver; @@ -34,7 +34,7 @@ export class FoldComponent extends Vue { } } -@Component({ template: require("../../components/lazy.html") }) +@Component({ template: require("../../templates/lazy.html") }) export class LazyComponent extends Vue { @Prop(Boolean) public activate: boolean; diff --git a/front/resources/ts/decorators.ts b/front/src/decorators.ts similarity index 100% rename from front/resources/ts/decorators.ts rename to front/src/decorators.ts diff --git a/front/resources/ts/filters.ts b/front/src/filters.ts similarity index 100% rename from front/resources/ts/filters.ts rename to front/src/filters.ts diff --git a/front/resources/ts/icons.ts b/front/src/icons.ts similarity index 66% rename from front/resources/ts/icons.ts rename to front/src/icons.ts index 9dd6072..7684894 100644 --- a/front/resources/ts/icons.ts +++ b/front/src/icons.ts @@ -1,11 +1,11 @@ -import { IconPack, IconDefinition } from '@fortawesome/fontawesome-svg-core'; +import { IconDefinition, IconPack } from '@fortawesome/fontawesome-svg-core'; -import * as bus from "../icons/light/bus.svg"; -import * as tram from "../icons/light/tram.svg"; -import * as trolleybus from "../icons/light/trolleybus.svg"; -import * as metro from "../icons/light/metro.svg"; -import * as train from "../icons/light/train.svg"; -import * as unknown from "../icons/light/unknown.svg"; +import * as bus from "@resources/icons/light/bus.svg"; +import * as tram from "@resources/icons/light/tram.svg"; +import * as trolleybus from "@resources/icons/light/trolleybus.svg"; +import * as metro from "@resources/icons/light/metro.svg"; +import * as train from "@resources/icons/light/train.svg"; +import * as unknown from "@resources/icons/light/unknown.svg"; export const faBus: IconDefinition = { prefix: 'fac', @@ -45,4 +45,4 @@ export const faUnknown = { export const fac: IconPack = { faBus, faTram, faTrain, faTrolleybus, faMetro, faUnknown -}; \ No newline at end of file +}; diff --git a/front/resources/ts/model/common.ts b/front/src/model/common.ts similarity index 100% rename from front/resources/ts/model/common.ts rename to front/src/model/common.ts diff --git a/front/resources/ts/model/departure.ts b/front/src/model/departure.ts similarity index 100% rename from front/resources/ts/model/departure.ts rename to front/src/model/departure.ts diff --git a/front/resources/ts/model/error.ts b/front/src/model/error.ts similarity index 100% rename from front/resources/ts/model/error.ts rename to front/src/model/error.ts diff --git a/front/resources/ts/model/identity.ts b/front/src/model/identity.ts similarity index 100% rename from front/resources/ts/model/identity.ts rename to front/src/model/identity.ts diff --git a/front/resources/ts/model/index.ts b/front/src/model/index.ts similarity index 100% rename from front/resources/ts/model/index.ts rename to front/src/model/index.ts diff --git a/front/resources/ts/model/line.ts b/front/src/model/line.ts similarity index 100% rename from front/resources/ts/model/line.ts rename to front/src/model/line.ts diff --git a/front/resources/ts/model/message.ts b/front/src/model/message.ts similarity index 100% rename from front/resources/ts/model/message.ts rename to front/src/model/message.ts diff --git a/front/resources/ts/model/provider.ts b/front/src/model/provider.ts similarity index 100% rename from front/resources/ts/model/provider.ts rename to front/src/model/provider.ts diff --git a/front/resources/ts/model/stop.ts b/front/src/model/stop.ts similarity index 100% rename from front/resources/ts/model/stop.ts rename to front/src/model/stop.ts diff --git a/front/resources/ts/model/trip.ts b/front/src/model/trip.ts similarity index 100% rename from front/resources/ts/model/trip.ts rename to front/src/model/trip.ts diff --git a/front/resources/ts/store/common.ts b/front/src/store/common.ts similarity index 100% rename from front/resources/ts/store/common.ts rename to front/src/store/common.ts diff --git a/front/resources/ts/store/departures.ts b/front/src/store/departures.ts similarity index 100% rename from front/resources/ts/store/departures.ts rename to front/src/store/departures.ts diff --git a/front/resources/ts/store/favourites.ts b/front/src/store/favourites.ts similarity index 100% rename from front/resources/ts/store/favourites.ts rename to front/src/store/favourites.ts diff --git a/front/resources/ts/store/history.ts b/front/src/store/history.ts similarity index 100% rename from front/resources/ts/store/history.ts rename to front/src/store/history.ts diff --git a/front/resources/ts/store/index.ts b/front/src/store/index.ts similarity index 100% rename from front/resources/ts/store/index.ts rename to front/src/store/index.ts diff --git a/front/resources/ts/store/messages.ts b/front/src/store/messages.ts similarity index 100% rename from front/resources/ts/store/messages.ts rename to front/src/store/messages.ts diff --git a/front/resources/ts/store/migrations.ts b/front/src/store/migrations.ts similarity index 100% rename from front/resources/ts/store/migrations.ts rename to front/src/store/migrations.ts diff --git a/front/resources/ts/store/root.ts b/front/src/store/root.ts similarity index 100% rename from front/resources/ts/store/root.ts rename to front/src/store/root.ts diff --git a/front/resources/ts/store/settings/departures.ts b/front/src/store/settings/departures.ts similarity index 100% rename from front/resources/ts/store/settings/departures.ts rename to front/src/store/settings/departures.ts diff --git a/front/resources/ts/store/settings/messages.ts b/front/src/store/settings/messages.ts similarity index 100% rename from front/resources/ts/store/settings/messages.ts rename to front/src/store/settings/messages.ts diff --git a/front/resources/ts/types/webpack.d.ts b/front/src/types/webpack.d.ts similarity index 100% rename from front/resources/ts/types/webpack.d.ts rename to front/src/types/webpack.d.ts diff --git a/front/resources/ts/urls.ts b/front/src/urls.ts similarity index 100% rename from front/resources/ts/urls.ts rename to front/src/urls.ts diff --git a/front/resources/ts/utils.ts b/front/src/utils.ts similarity index 100% rename from front/resources/ts/utils.ts rename to front/src/utils.ts diff --git a/front/resources/styles/_animations.scss b/front/styles/_animations.scss similarity index 100% rename from front/resources/styles/_animations.scss rename to front/styles/_animations.scss diff --git a/front/resources/styles/_common.scss b/front/styles/_common.scss similarity index 100% rename from front/resources/styles/_common.scss rename to front/styles/_common.scss diff --git a/front/resources/styles/_controls.scss b/front/styles/_controls.scss similarity index 100% rename from front/resources/styles/_controls.scss rename to front/styles/_controls.scss diff --git a/front/resources/styles/_departure.scss b/front/styles/_departure.scss similarity index 100% rename from front/resources/styles/_departure.scss rename to front/styles/_departure.scss diff --git a/front/resources/styles/_dragscroll.scss b/front/styles/_dragscroll.scss similarity index 100% rename from front/resources/styles/_dragscroll.scss rename to front/styles/_dragscroll.scss diff --git a/front/resources/styles/_favourites.scss b/front/styles/_favourites.scss similarity index 100% rename from front/resources/styles/_favourites.scss rename to front/styles/_favourites.scss diff --git a/front/resources/styles/_form.scss b/front/styles/_form.scss similarity index 100% rename from front/resources/styles/_form.scss rename to front/styles/_form.scss diff --git a/front/resources/styles/_line.scss b/front/styles/_line.scss similarity index 100% rename from front/resources/styles/_line.scss rename to front/styles/_line.scss diff --git a/front/resources/styles/_map.scss b/front/styles/_map.scss similarity index 100% rename from front/resources/styles/_map.scss rename to front/styles/_map.scss diff --git a/front/resources/styles/_stop.scss b/front/styles/_stop.scss similarity index 100% rename from front/resources/styles/_stop.scss rename to front/styles/_stop.scss diff --git a/front/resources/styles/_trigonometry.scss b/front/styles/_trigonometry.scss similarity index 100% rename from front/resources/styles/_trigonometry.scss rename to front/styles/_trigonometry.scss diff --git a/front/resources/styles/_trip.scss b/front/styles/_trip.scss similarity index 100% rename from front/resources/styles/_trip.scss rename to front/styles/_trip.scss diff --git a/front/resources/styles/api.scss b/front/styles/api.scss similarity index 100% rename from front/resources/styles/api.scss rename to front/styles/api.scss diff --git a/front/resources/styles/main.scss b/front/styles/main.scss similarity index 100% rename from front/resources/styles/main.scss rename to front/styles/main.scss diff --git a/front/resources/styles/page/_provider-picker.scss b/front/styles/page/_provider-picker.scss similarity index 100% rename from front/resources/styles/page/_provider-picker.scss rename to front/styles/page/_provider-picker.scss diff --git a/front/resources/styles/ui/_modal.scss b/front/styles/ui/_modal.scss similarity index 100% rename from front/resources/styles/ui/_modal.scss rename to front/styles/ui/_modal.scss diff --git a/front/resources/styles/ui/_popup.scss b/front/styles/ui/_popup.scss similarity index 100% rename from front/resources/styles/ui/_popup.scss rename to front/styles/ui/_popup.scss diff --git a/front/resources/styles/ui/_switch.scss b/front/styles/ui/_switch.scss similarity index 100% rename from front/resources/styles/ui/_switch.scss rename to front/styles/ui/_switch.scss diff --git a/front/resources/components/departures.html b/front/templates/departures.html similarity index 100% rename from front/resources/components/departures.html rename to front/templates/departures.html diff --git a/front/resources/components/departures/departure.html b/front/templates/departures/departure.html similarity index 100% rename from front/resources/components/departures/departure.html rename to front/templates/departures/departure.html diff --git a/front/resources/components/favourites.html b/front/templates/favourites.html similarity index 100% rename from front/resources/components/favourites.html rename to front/templates/favourites.html diff --git a/front/resources/components/favourites/save.html b/front/templates/favourites/save.html similarity index 100% rename from front/resources/components/favourites/save.html rename to front/templates/favourites/save.html diff --git a/front/resources/components/finder.html b/front/templates/finder.html similarity index 100% rename from front/resources/components/finder.html rename to front/templates/finder.html diff --git a/front/resources/components/fold.html b/front/templates/fold.html similarity index 100% rename from front/resources/components/fold.html rename to front/templates/fold.html diff --git a/front/resources/components/lazy.html b/front/templates/lazy.html similarity index 100% rename from front/resources/components/lazy.html rename to front/templates/lazy.html diff --git a/front/resources/components/line.html b/front/templates/line.html similarity index 100% rename from front/resources/components/line.html rename to front/templates/line.html diff --git a/front/resources/components/messages.html b/front/templates/messages.html similarity index 100% rename from front/resources/components/messages.html rename to front/templates/messages.html diff --git a/front/resources/components/page/providers.html b/front/templates/page/providers.html similarity index 100% rename from front/resources/components/page/providers.html rename to front/templates/page/providers.html diff --git a/front/resources/components/picker/stop.html b/front/templates/picker/stop.html similarity index 100% rename from front/resources/components/picker/stop.html rename to front/templates/picker/stop.html diff --git a/front/resources/components/settings/departures.html b/front/templates/settings/departures.html similarity index 100% rename from front/resources/components/settings/departures.html rename to front/templates/settings/departures.html diff --git a/front/resources/components/settings/messages.html b/front/templates/settings/messages.html similarity index 100% rename from front/resources/components/settings/messages.html rename to front/templates/settings/messages.html diff --git a/front/resources/components/stop.html b/front/templates/stop.html similarity index 100% rename from front/resources/components/stop.html rename to front/templates/stop.html diff --git a/front/resources/components/stop/details.html b/front/templates/stop/details.html similarity index 100% rename from front/resources/components/stop/details.html rename to front/templates/stop/details.html diff --git a/front/resources/components/stop/history.html b/front/templates/stop/history.html similarity index 100% rename from front/resources/components/stop/history.html rename to front/templates/stop/history.html diff --git a/front/resources/components/stop/map.html b/front/templates/stop/map.html similarity index 100% rename from front/resources/components/stop/map.html rename to front/templates/stop/map.html diff --git a/front/resources/components/tooltip.html b/front/templates/tooltip.html similarity index 100% rename from front/resources/components/tooltip.html rename to front/templates/tooltip.html diff --git a/front/resources/components/trip.html b/front/templates/trip.html similarity index 100% rename from front/resources/components/trip.html rename to front/templates/trip.html diff --git a/front/resources/components/ui/dialog.html b/front/templates/ui/dialog.html similarity index 100% rename from front/resources/components/ui/dialog.html rename to front/templates/ui/dialog.html diff --git a/front/resources/components/ui/icon.html b/front/templates/ui/icon.html similarity index 100% rename from front/resources/components/ui/icon.html rename to front/templates/ui/icon.html diff --git a/front/resources/components/ui/numeric.html b/front/templates/ui/numeric.html similarity index 100% rename from front/resources/components/ui/numeric.html rename to front/templates/ui/numeric.html diff --git a/front/resources/components/ui/switch.html b/front/templates/ui/switch.html similarity index 100% rename from front/resources/components/ui/switch.html rename to front/templates/ui/switch.html diff --git a/front/tsconfig.json b/front/tsconfig.json index 3d3c4a9..62af5bd 100644 --- a/front/tsconfig.json +++ b/front/tsconfig.json @@ -7,8 +7,16 @@ "sourceMap": true, "noImplicitThis": true, "moduleResolution": "node", - "downlevelIteration": true + "downlevelIteration": true, + "allowSyntheticDefaultImports": true, + "baseUrl": "./", + "paths": { + "@templates/*": ["./templates/*"], + "@resources/*": ["./resources/*"], + "@styles/*": ["./styles/*"], + "@/*": ["./src/*"] + } }, - "files": ["resources/ts/app.ts"], - "include": ["resources/ts/**/*.ts"] + "files": ["src/app.ts"], + "include": ["src/**/*.ts"] } diff --git a/front/webpack.config.js b/front/webpack.config.js index 314ae97..1762344 100644 --- a/front/webpack.config.js +++ b/front/webpack.config.js @@ -7,8 +7,8 @@ const { GenerateSW } = require('workbox-webpack-plugin'); const config = { entry: { - main: ['./resources/ts/app.ts'], - api: ['./resources/styles/api.scss'] + main: ['./src/app.ts'], + api: ['./styles/api.scss'] }, output: { path: path.resolve('./public/dist/'), @@ -20,7 +20,11 @@ const config = { extensions: ['.tsx', '.ts', '.js'], alias: { 'vue$': 'vue/dist/vue.esm.js', - 'mapbox-gl$': 'mapbox-gl/dist/mapbox-gl-unminified' + 'mapbox-gl$': 'mapbox-gl/dist/mapbox-gl-unminified', + "@templates": path.resolve(__dirname, "./templates"), + "@resources": path.resolve(__dirname, "./resources"), + "@styles": path.resolve(__dirname, "./styles"), + "@/": path.resolve(__dirname, "/src"), } }, module: {