Commit 5250e90e authored by Julien BOUYER's avatar Julien BOUYER
Browse files

Merge branch 'develop' into feature/front_backoffice

parents 48190251 989d8c0a
......@@ -106,9 +106,12 @@
"cleanup": "rimraf target/classes/static/",
"clean-www": "rimraf target/classes/static/app/{src,target/}",
"start": "npm run webpack:dev",
"start-app": "docker-compose -f src/main/docker/app.yml up",
"start-tls": "npm run webpack:dev -- --env.tls",
"serve": "npm run start",
"build": "npm run webpack:prod",
"build:java": "./mvnw package -Pprod -DskipTests -Dskip.npm jib:dockerBuild",
"java": "npm run build:java && npm run start-app",
"jest": "jest --coverage --logHeapUsage --maxWorkers=2 --no-cache --config src/test/javascript/jest.conf.js",
"jest:update": "npm run jest -- --updateSnapshot",
"webpack:build": "npm run cleanup && npm run webpack:build:main",
......
......@@ -13,12 +13,10 @@ import '../../../content/css/admin.css';
components: {
OaButton,
OaInput,
}
},
})
export default class Login extends Vue {
@Inject('accountService')
private accountService: () => AccountService;
@Inject('accountService') private accountService: () => AccountService;
public authenticationError = null;
......
......@@ -2,7 +2,6 @@ import { Prop } from 'vue-property-decorator';
import AbstractFormComponent from '@/components/forms/common/abstract-form.component';
export default abstract class AbstractEditableComponent extends AbstractFormComponent {
@Prop()
public placeholder: String;
}
......@@ -2,7 +2,6 @@ import Vue from 'vue';
import { Prop } from 'vue-property-decorator';
export default abstract class AbstractFormComponent extends Vue {
@Prop()
public id: String;
......
......@@ -4,7 +4,6 @@ import { Prop } from 'vue-property-decorator';
@Component
export default class OaLabel extends Vue {
@Prop()
public id: String;
......@@ -12,5 +11,5 @@ export default class OaLabel extends Vue {
public label: String;
@Prop()
public required: Boolean
public required: Boolean;
}
......@@ -6,10 +6,9 @@ import Icon from '@/components/icon/icon.vue';
@Component({
components: {
Icon,
}
},
})
export default class Panel extends Vue {
private panelScreensTmp = [
{
index: 1,
......@@ -24,5 +23,5 @@ export default class Panel extends Vue {
title: 'Écran 3',
current: true,
},
]
];
}
......@@ -12,12 +12,9 @@ import StepToolbar from '@/components/step-toolbar/step-toolbar.vue';
OaSelect,
OaTextarea,
StepToolbar,
}
},
})
export default class ScreenEdit extends Vue {
public selectValue: number = 1;
public selectOptions = [
{ value: 1, label: 'Hello' },
{ value: 2, label: 'World lorem' },
......
......@@ -12,7 +12,7 @@
helpText="Ceci est un input d'exemple"></oa-input>
<oa-select id="2"
label="Champ select 2"
:value="selectValue"
value="1"
:options="selectOptions"
helpText="Ceci est un select d'exmple"></oa-select>
<oa-textarea id="3"
......
......@@ -8,7 +8,6 @@ const FormSettingsComponent = () => import('@/views/form/form-settings.vue');
const FormShareComponent = () => import('@/views/form/form-share.vue');
const FormListComponent = () => import('@/views/form/form-list.vue');
const FormVariablesComponent = () => import('@/views/form/form-variables.vue');
const FormViewComponent = () => import('@/views/form/form-view.vue');
export default [
{
......@@ -59,10 +58,4 @@ export default [
component: FormVariablesComponent,
meta: { authorities: [Authority.ADMIN] },
},
{
path: '/admin/form/:idForm/view',
name: 'FormViewComponent',
component: FormViewComponent,
meta: { authorities: [Authority.ADMIN] },
},
];
import { Authority } from '@/shared/security/authority';
const OrganisationViewComponent = () => import('@/views/organisation/organisation-view.vue');
export default [
{
path: '/admin/organisation/:idOrganisation/view',
name: 'OrganisationViewComponent',
component: OrganisationViewComponent,
meta: { authorities: [Authority.ADMIN] },
},
];
......@@ -3,7 +3,6 @@ import { Authority } from '@/shared/security/authority';
const WorkspaceCreationComponent = () => import('@/views/workspace/workspace-creation.vue');
const WorkspaceSettingsComponent = () => import('@/views/workspace/workspace-settings.vue');
const WorkspaceListComponent = () => import('@/views/workspace/workspace-list.vue');
const WorkspaceViewComponent = () => import('@/views/workspace/workspace-view.vue');
export default [
{
......@@ -24,10 +23,4 @@ export default [
component: WorkspaceListComponent,
meta: { authorities: [Authority.ADMIN] },
},
{
path: '/admin/workspace/:idWorkspace/view',
name: 'WorkspaceViewComponent',
component: WorkspaceViewComponent,
meta: { authorities: [Authority.ADMIN] },
},
];
import { Authority } from '@/shared/security/authority';
import adminJhi from '@/router/admin-jhi'; // TODO à supprimer après dev back
import adminForm from '@/router/admin-form';
import adminOrganisation from '@/router/admin-organisation';
import adminUser from '@/router/admin-user';
import adminVariable from '@/router/admin-variable';
import adminWorkspace from '@/router/admin-workspace';
......@@ -25,7 +24,6 @@ export default [
meta: { authorities: [Authority.ADMIN] },
},
...adminForm,
...adminOrganisation,
...adminUser,
...adminVariable,
...adminWorkspace,
......@@ -33,6 +31,6 @@ export default [
...account,
...entities,
...userManagement,
]
}
],
},
];
......@@ -14,5 +14,5 @@ export const ROUTES = {
admin: {
path: '/admin',
name: 'AdminHome',
}
}
},
};
import Vue from 'vue';
import Component from 'vue-class-component';
@Component
export default class FormView extends Vue {
}
<template>
</template>
<script lang="ts" src="./form-view.component.ts"/>
import Vue from 'vue';
import Component from 'vue-class-component';
@Component
export default class OrganisationView extends Vue {
}
<template>
</template>
<script lang="ts" src="./organisation-view.component.ts"/>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment