Compare commits

..

No commits in common. "f86d7942390bf914baff1dce9d530e43f43b13a4" and "bb19bca9468b6bb42bb8ba37cdbd103f47c155bc" have entirely different histories.

4 changed files with 43 additions and 22 deletions

View File

@ -11,4 +11,9 @@ spring.datasource.username=sa
spring.datasource.password=password
spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
logging.level.org.hibernate.SQL=DEBUG
logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
logging.level.org.springframework.jdbc.core.JdbcTemplate=DEBUG
logging.level.org.springframework.jdbc.core.StatementCreatorUtils=TRACE
management.endpoints.web.exposure.include=*

View File

@ -1,7 +1,7 @@
<template>
<div>
<span class="bold">Légende</span>
<ol>
<ul>
<!-- <li v-for="axe in axes" :key="axe.identifier" :class="'axe-'+axe.identifier">{{ axe.shortTitle }}</li>-->
<li class="axe-1">Pouvoir d'agir</li>
<li class="axe-2">Multi-secteur</li>
@ -13,20 +13,38 @@
<li class="axe-8">Finances</li>
<li class="axe-9">Moyens de production</li>
<li class="axe-10">Travail</li>
</ol>
</ul>
</div>
</template>
<!--<script lang="ts">-->
<!--import { Component, Vue} from "nuxt-property-decorator";-->
<!--import {axeStore} from "~/utils/store-accessor";-->
<!--import {Axe} from "~/repositories/models/axe.model";-->
<!--@Component-->
<!--export default class Legend extends Vue {-->
<!-- async created() {-->
<!-- await axeStore.getAxes();-->
<!-- }-->
<!-- get axes(): Axe[] {-->
<!-- return axeStore.axes;-->
<!-- }-->
<!--}-->
<!--</script>-->
<style lang="scss" scoped>
@import "assets/css/color";
@import "assets/css/spacing";
ol {
ul {
list-style: none;
margin: 0;
position: relative;
}
ol li::before {
ul li::before {
content: "";
border: 0 solid;
@ -35,18 +53,16 @@ ol li::before {
width: 16px;
height: 16px;
position: absolute;
left: -22px;
margin-right: $xxx_small;
}
ol li+li {
ul li+li {
border-top: 1px solid #E8E8E8;
}
ol li {
ul li {
line-height: 16px;
padding: $xxx_small 0;
list-style-position: inside;
}
.axe-1::before { color: #CA8AE8; background: #CA8AE8 }

View File

@ -76,16 +76,16 @@ export default class PolarAreaChart extends Vue {
readonly chartData = {
labels: [
"1. Pouvoir d'agir",
"2. Multi-secteur",
"3. Local global",
"4. Utilité (sociale et écologique)",
"5. Communs",
"6. Démocratie",
"7. Coopération",
"8. Finances",
"9. Moyens de production",
"10. Travail"
"Pouvoir d'agir",
"Multi-secteur",
"Local global",
"Utilité (sociale et écologique)",
"Communs",
"Démocratie",
"Coopération",
"Finances",
"Moyens de production",
"Travail"
],
datasets: [
{

View File

@ -2,8 +2,8 @@
<div>
<Header/>
<form id="login_form" class="content login" @submit.prevent="authenticate">
<input v-model="username" type="text" required autocomplete="username" placeholder="Nom de l'équipe" aria-label="Nom de l'équipe"/>
<input id="code" v-model="password" type="password" required autocomplete="current-password" placeholder="Code" aria-label="Code"/>
<input v-model="username" type="text" required placeholder="Nom de l'équipe" aria-label="Nom de l'équipe"/>
<input id="code" v-model="password" type="password" required placeholder="Code" aria-label="Code"/>
<div>
<label>
<input v-model="conditionChecked" type="checkbox" required/>