Skip to content

Commit

Permalink
fix: Adjust components pathtree
Browse files Browse the repository at this point in the history
  • Loading branch information
plduthoit committed Oct 14, 2024
1 parent 81cdcd7 commit e9c79c9
Show file tree
Hide file tree
Showing 63 changed files with 202 additions and 298 deletions.
5 changes: 3 additions & 2 deletions vue/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@
<script setup lang="ts">
import { RouterView } from 'vue-router'
import { onBeforeMount } from 'vue';
import Header from '@/components/views-components/header/Header.vue';
import DialogController from '@/components/generic-components/global/DialogController.vue';
import Header from '@/views/_layout/header/Header.vue';
import DialogController from '@/components/global/DialogController.vue';
import { useApplicationStore } from '@/stores/applicationStore';
import { useActorsStore } from '@/stores/actorsStore';
import { useUserStore } from '@/stores/userStore';
import EditContentDialog from '@/views/actors/components/EditContentDialog.vue';
const appStore = useApplicationStore();
const actorsStore = useActorsStore();
Expand Down
5 changes: 0 additions & 5 deletions vue/src/assets/styles/views/actors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
&__dialog{
display: flex;
flex-direction: column;
width: 30vw;
height: 80vh;
background-color: white;
overflow-y: auto;
}
Expand Down Expand Up @@ -83,9 +81,6 @@
flex-direction: column;
max-width: 100%;
height: 100%;
padding: 15px;
margin-left: 25px;
margin-right: 25px;
}
}
}
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</template>

<script setup lang="ts">
import Chip from '@/components/generic-components/content/Chip.vue';
import Chip from '@/components/content/Chip.vue';
interface Item {
id: any,
name: string,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
</template>

<script setup lang="ts">
import PageBanner from '@/components/generic-components/banners/PageBanner.vue';
import LikeButton from '@/components/generic-components/global/LikeButton.vue';
import ShareButton from '@/components/generic-components/global/ShareButton.vue';
import BasicCard from '@/components/generic-components/global/BasicCard.vue';
import PageBanner from '@/components/banners/PageBanner.vue';
import LikeButton from '@/components/global/LikeButton.vue';
import ShareButton from '@/components/global/ShareButton.vue';
import BasicCard from '@/components/global/BasicCard.vue';
import type { Actor } from '@/models/interfaces/Actor';
defineProps<{
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import { VScaleTransition } from 'vuetify/components';
import { useApplicationStore } from '@/stores/applicationStore';
import AuthSignIn from '@/components/views-components/auth/AuthSignIn.vue';
import AuthBecomeMember from '@/components/views-components/auth/AuthBecomeMember.vue';
import AuthBecomeMemberWhy from '@/components/views-components/auth/AuthBecomeMemberWhy.vue';
import AuthBecomeMemberThanks from '@/components/views-components/auth/AuthBecomeMemberThanks.vue';
import AuthForgotPassword from '@/components/views-components/auth/AuthForgotPassword.vue';
import AuthForgotPasswordOk from '@/components/views-components/auth/AuthForgotPasswordOk.vue';
import AuthSignIn from '@/views/auth/AuthSignIn.vue';
import AuthBecomeMember from '@/views/auth/AuthBecomeMember.vue';
import AuthBecomeMemberWhy from '@/views/auth/AuthBecomeMemberWhy.vue';
import AuthBecomeMemberThanks from '@/views/auth/AuthBecomeMemberThanks.vue';
import AuthForgotPassword from '@/views/auth/AuthForgotPassword.vue';
import AuthForgotPasswordOk from '@/views/auth/AuthForgotPasswordOk.vue';
import { DialogKey } from '@/models/enums/app/DialogKey';
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import { onMounted, watch, computed, ref, type Ref } from 'vue';
import maplibregl, { GeoJSONSource } from 'maplibre-gl';
import 'maplibre-gl/dist/maplibre-gl.css'
import ResetMapExtentControl from "@/components/generic-components/map-controls/ResetMapExtentControl";
import ToggleSidebarControl from '@/components/generic-components/map-controls/ToggleSidebarControl';
import ResetMapExtentControl from "@/components/map/controls/ResetMapExtentControl";
import ToggleSidebarControl from '@/components/map/controls/ToggleSidebarControl';
import { useApplicationStore } from '@/stores/applicationStore';
const applicationStore = useApplicationStore()
Expand Down
209 changes: 0 additions & 209 deletions vue/src/components/views-components/actors/ActorEditionForm.vue

This file was deleted.

27 changes: 12 additions & 15 deletions vue/src/router/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { createRouter, createWebHistory } from 'vue-router'
import HomeView from '@/components/views/HomeView.vue'
import HomeView from '@/views/home/HomeView.vue'
import { useApplicationStore } from '@/stores/applicationStore'
import ActorProfile from '@/components/views-components/actors/ActorProfile.vue'
import AdminMembers from '@/components/views-components/admin/AdminMembers.vue'
import AdminContent from '@/components/views-components/admin/AdminContent.vue'
import AdminComments from '@/components/views-components/admin/AdminComments.vue'
import ActorProfile from '@/views/actors/components/ActorProfile.vue'
import AdminMembers from '@/views/admin/components/AdminMembers.vue'
import AdminContent from '@/views/admin/components/AdminContent.vue'
import AdminComments from '@/views/admin/components/AdminComments.vue'
import { useAdminStore } from '@/stores/adminStore'
import { AdministrationPanels } from '@/models/enums/app/AdministrationPanels'
import { DialogKey } from '@/models/enums/app/DialogKey'
Expand All @@ -20,10 +20,7 @@ const router = createRouter({
{
path: '/actors',
name: 'actors',
// route level code-splitting
// this generates a separate chunk (About.[hash].js) for this route
// which is lazy-loaded when the route is visited.
component: () => import('../components/views/ActorsView.vue')
component: () => import('@/views/actors/ActorsView.vue')
},
{
path: '/actors/:name',
Expand All @@ -33,27 +30,27 @@ const router = createRouter({
{
path: '/projects',
name: 'projects',
component: () => import('../components/views/ProjectsView.vue')
component: () => import('@/views/projects/ProjectsView.vue')
},
{
path: '/resources',
name: 'resources',
component: () => import('../components/views/ResourcesView.vue')
component: () => import('@/views/resources/ResourcesView.vue')
},
{
path: '/services',
name: 'services',
component: () => import('../components/views/ServicesView.vue')
component: () => import('@/views/services/ServicesView.vue')
},
{
path: '/map',
name: 'map',
component: () => import('../components/views/MapView.vue')
component: () => import('@/views/map/MapView.vue')
},
{
path: '/members',
name: 'members',
component: () => import('../components/views/MemberView.vue')
component: () => import('@/views/member/MemberView.vue')
},
{
path: '/administration',
Expand All @@ -65,7 +62,7 @@ const router = createRouter({
path: '/administration/membersPanel'
}
},
component: () => import('../components/views/AdminView.vue'),
component: () => import('@/views/admin/AdminView.vue'),
children: [
{
path: 'membersPanel',
Expand Down
1 change: 0 additions & 1 deletion vue/src/services/actors/ActorsForm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { toTypedSchema } from "@vee-validate/zod";
import { useField, useForm } from "vee-validate";
import { z, ZodType } from "zod";
import { i18n } from "@/assets/plugins/i18n";
import { ActorsCategories } from '@/models/enums/contents/actors/ActorsCategories'
import type { SymfonyRelation } from "@/models/interfaces/SymfonyRelation";

export class ActorsFormService {
Expand Down
2 changes: 1 addition & 1 deletion vue/src/stores/actorsStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const useActorsStore = defineStore(StoresList.ACTORS, () => {
function setActorEditionMode(actor: Actor | null) {
actorEdition.actor = actor
actorEdition.active = true
useApplicationStore().showEditContentDialog = true
useApplicationStore().showEditContentDialog = actor == null ? false : true
}

async function createOrEditActor(actor: Actor, edit: boolean) {
Expand Down
File renamed without changes.
Loading

0 comments on commit e9c79c9

Please sign in to comment.