DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5282 from betagouv/dev

Browse source 
2020-06-19-01
This commit is contained in:
LeSim 2020-06-19 16:29:42 +02:00 committed by GitHub
commit 5d6d334fb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 47 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/new_design/_colors.scss
View file

@ -5,16 +5,18 @@ $black: #333333;
$white: #FFFFFF; $white: #FFFFFF;
$grey: #888888; $grey: #888888;
$light-grey: #F8F8F8; $light-grey: #F8F8F8;
$dark-grey: #666666;
$border-grey: #CCCCCC; $border-grey: #CCCCCC;
$dark-red: #A10005; $dark-red: #A10005;
$medium-red: rgba(161, 0, 5, 0.9); $medium-red: rgba(161, 0, 5, 0.9);
$light-red: #ED1C24; $light-red: #ED1C24;
$lighter-red: #F52A2A; $lighter-red: #F52A2A;
$background-red: #FFDFDF; $background-red: #FFDFDF;
$green: #15AD70; $green: darken(#169862, 5%);
$lighter-green: lighten($green, 30%); $old-green: #15AD70;
$light-green: lighten($green, 25%); $lighter-green: lighten($old-green, 30%);
$dark-green: darken($green, 20%); $light-green: lighten($old-green, 25%);
$dark-green: darken($old-green, 20%);
$orange: #F28900; $orange: #F28900;
$orange-bg: lighten($orange, 35%); $orange-bg: lighten($orange, 35%);
$yellow: #FEF3B8; $yellow: #FEF3B8;

2
app/assets/stylesheets/new_design/autosave.scss
View file

@ -7,7 +7,7 @@
} }
.autosave-explanation { .autosave-explanation {
color: $grey; color: $dark-grey;
margin-left: 4px; margin-left: 4px;
} }

14
app/assets/stylesheets/new_design/avis.scss
View file

@ -20,14 +20,14 @@
} }
.confidentiel { .confidentiel {
color: $grey; color: $dark-grey;
font-weight: normal; font-weight: normal;
margin-bottom: 2 * $default-padding; margin-bottom: 2 * $default-padding;
} }
.date { .date {
font-size: 12px; font-size: 12px;
color: $grey; color: $dark-grey;
float: right; float: right;
} }
} }
@ -37,7 +37,7 @@
.avis-notice { .avis-notice {
font-size: 14px; font-size: 14px;
color: $grey; color: $dark-grey;
margin-bottom: 2 * $default-padding; margin-bottom: 2 * $default-padding;
} }
@ -50,7 +50,7 @@
} }
.confidentiel { .confidentiel {
color: $grey; color: $dark-grey;
font-weight: normal; font-weight: normal;
margin-bottom: 2 * $default-padding; margin-bottom: 2 * $default-padding;
} }
@ -68,7 +68,7 @@
.confidentiel-explanation { .confidentiel-explanation {
font-size: 14px; font-size: 14px;
color: $grey; color: $dark-grey;
margin-top: - $default-padding; margin-top: - $default-padding;
margin-bottom: 2 * $default-padding; margin-bottom: 2 * $default-padding;
} }
@ -116,7 +116,7 @@
} }
.confidentiel { .confidentiel {
color: $grey; color: $dark-grey;
font-size: 12px; font-size: 12px;
.lock { .lock {
@ -131,7 +131,7 @@
.date, .date,
.waiting { .waiting {
font-size: 12px; font-size: 12px;
color: $grey; color: $dark-grey;
} }
.date { .date {

6
app/assets/stylesheets/new_design/buttons.scss
View file

@ -195,7 +195,7 @@
.attestation { .attestation {
margin: $default-padding 0; margin: $default-padding 0;
color: $grey; color: $dark-grey;
} }
} }
} }
@ -204,7 +204,7 @@
li { li {
display: flex; display: flex;
padding: $default-padding; padding: $default-padding;
color: $grey; color: $dark-grey;
border-bottom: 1px solid $border-grey; border-bottom: 1px solid $border-grey;
font-size: 12px; font-size: 12px;
min-width: 300px; min-width: 300px;
@ -246,7 +246,7 @@
} }
a { a {
color: $grey; color: $dark-grey;
} }
// Make child links fill the whole clickable area // Make child links fill the whole clickable area

4
app/assets/stylesheets/new_design/demarches_index.scss
View file

@ -10,7 +10,7 @@
} }
.list-header { .list-header {
color: $grey; color: $dark-grey;
font-weight: bold; font-weight: bold;
margin-bottom: 10px; margin-bottom: 10px;
} }
@ -32,5 +32,5 @@
} }
.service-name { .service-name {
color: $grey; color: $dark-grey;
} }

2
app/assets/stylesheets/new_design/dossier_champs.scss
View file

@ -13,7 +13,7 @@
td.updated-at { td.updated-at {
font-size: 13px; font-size: 13px;
color: $grey; color: $dark-grey;
text-align: right; text-align: right;
width: 190px; width: 190px;

2
app/assets/stylesheets/new_design/dossier_show.scss
View file

@ -28,7 +28,7 @@
} }
h2 { h2 {
color: $grey; color: $dark-grey;
font-weight: bold; font-weight: bold;
} }

4
app/assets/stylesheets/new_design/forms.scss
View file

@ -23,7 +23,7 @@
@mixin notice-text-style { @mixin notice-text-style {
font-size: 16px; font-size: 16px;
color: $grey; color: $dark-grey;
} }
.mandatory { .mandatory {
@ -346,7 +346,7 @@
} }
input.aa-hint { input.aa-hint {
color: $grey; color: $dark-grey;
} }
.datetime { .datetime {

2
app/assets/stylesheets/new_design/france-connect-login.scss
View file

@ -24,5 +24,5 @@
.france-connect-login-separator { .france-connect-login-separator {
margin: 24px 0; margin: 24px 0;
font-size: 14px; font-size: 14px;
color: $grey; color: $dark-grey;
} }

2
app/assets/stylesheets/new_design/instructeur.scss
View file

@ -66,7 +66,7 @@
.menu-item { .menu-item {
align-items: center; align-items: center;
padding: 14px; padding: 14px;
color: $grey; color: $dark-grey;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

2
app/assets/stylesheets/new_design/labels.scss
View file

@ -4,7 +4,7 @@
.label { .label {
display: inline-block; display: inline-block;
padding: 4px $default-spacer; padding: 4px $default-spacer;
background: $grey; background: $dark-grey;
border: 1px solid transparent; border: 1px solid transparent;
color: #FFFFFF; color: #FFFFFF;
border-radius: 4px; border-radius: 4px;

2
app/assets/stylesheets/new_design/message.scss
View file

@ -28,7 +28,7 @@
.guest, .guest,
.date { .date {
font-size: 12px; font-size: 12px;
color: $grey; color: $dark-grey;
} }
.date { .date {

2
app/assets/stylesheets/new_design/motivation.scss
View file

@ -22,7 +22,7 @@
} }
.help { .help {
color: $grey; color: $dark-grey;
font-size: 11px; font-size: 11px;
margin-bottom: $default-spacer * 2; margin-bottom: $default-spacer * 2;
} }

2
app/assets/stylesheets/new_design/new_header.scss
View file

@ -224,7 +224,7 @@ $header-mobile-breakpoint: 550px;
.menu-item { .menu-item {
align-items: center; align-items: center;
padding: 14px; padding: 14px;
color: $grey; color: $dark-grey;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

2
app/assets/stylesheets/new_design/print.scss
View file

@ -21,7 +21,7 @@ body {
.subtitle { .subtitle {
margin-top: -20px; margin-top: -20px;
color: $grey; color: $dark-grey;
} }
th, th,

2
app/assets/stylesheets/new_design/procedure_list.scss
View file

@ -71,7 +71,7 @@
.stats-legend { .stats-legend {
font-size: 12px; font-size: 12px;
color: $grey; color: $dark-grey;
} }
} }

2
app/assets/stylesheets/new_design/status_overview.scss
View file

@ -31,7 +31,7 @@
} }
&.active ~ li { &.active ~ li {
color: $grey; color: $dark-grey;
} }
// Arrows // Arrows

17
app/javascript/components/MapEditor/index.js
View file

@ -152,20 +152,21 @@ function MapEditor({ featureCollection, url, preview, hasCadastres }) {
featureCollection, featureCollection,
'post' 'post'
); );
let inputs = [...importInputs]; let inputs = [...importInputs];
const setInputs = inputs.map((input) => { const setInputs = inputs.map((input) => {
if (input.id === inputId) { if (input.id === inputId) {
input.disabled = true; input.disabled = true;
input.hasValue = true; input.hasValue = true;
resultFeatureCollection.features.forEach((feature) => { resultFeatureCollection.features.forEach((resultFeature) => {
featureCollection.features.forEach((feature) => {
if ( if (
JSON.stringify(feature.geometry) === JSON.stringify(resultFeature.geometry) ===
JSON.stringify(featureCollection.features[0].geometry) JSON.stringify(feature.geometry)
) { ) {
input.featureId = feature.properties.id; input.featureIds.push(resultFeature.properties.id);
} }
}); });
});
} }
return input; return input;
}); });
@ -189,7 +190,7 @@ function MapEditor({ featureCollection, url, preview, hasCadastres }) {
inputs.push({ inputs.push({
id: generateId(), id: generateId(),
disabled: false, disabled: false,
featureId: null, featureIds: [],
hasValue: false hasValue: false
}); });
setImportInputs(inputs); setImportInputs(inputs);
@ -203,9 +204,9 @@ function MapEditor({ featureCollection, url, preview, hasCadastres }) {
const inputToRemove = inputs.find((input) => input.id === inputId); const inputToRemove = inputs.find((input) => input.id === inputId);
for (const feature of featureCollection.features) { for (const feature of featureCollection.features) {
if (inputToRemove.featureId === feature.properties.id) { if (inputToRemove.featureIds.includes(feature.properties.id)) {
const featureToRemove = draw.get(feature.id); const featureToRemove = draw.get(feature.id);
await getJSON(`${url}/${inputToRemove.featureId}`, null, 'delete'); await getJSON(`${url}/${feature.properties.id}`, null, 'delete');
draw.delete(feature.id).getAll(); draw.delete(feature.id).getAll();
updateFeaturesList([featureToRemove]); updateFeaturesList([featureToRemove]);
} }

2
app/views/shared/help/_help_dropdown_procedure.html.haml
View file

@ -1,5 +1,5 @@
.dropdown.help-dropdown .dropdown.help-dropdown
.button.primary.dropdown-button Aide %button.button.primary.dropdown-button Aide
.dropdown-content.fade-in-down .dropdown-content.fade-in-down
%ul.dropdown-items %ul.dropdown-items
- if procedure.service.present? - if procedure.service.present?

2
config/env.example
View file

@ -30,11 +30,9 @@ BASIC_AUTH_USERNAME=""
BASIC_AUTH_PASSWORD="" BASIC_AUTH_PASSWORD=""
# Object Storage pour les pièces jointes # Object Storage pour les pièces jointes
FOG_OPENSTACK_TENANT=""
FOG_OPENSTACK_API_KEY="" FOG_OPENSTACK_API_KEY=""
FOG_OPENSTACK_USERNAME="" FOG_OPENSTACK_USERNAME=""
FOG_OPENSTACK_URL="" FOG_OPENSTACK_URL=""
FOG_OPENSTACK_IDENTITY_API_VERSION=""
FOG_OPENSTACK_REGION="" FOG_OPENSTACK_REGION=""
FOG_ENABLED="" # valeur attendue: enabled FOG_ENABLED="" # valeur attendue: enabled
DS_PROXY_URL="" DS_PROXY_URL=""

2
config/initializers/active_storage.rb
View file

@ -45,7 +45,7 @@ require 'fog/openstack/auth/catalog/v3'
module Fog::OpenStack::Auth::Catalog module Fog::OpenStack::Auth::Catalog
class V3 class V3
def endpoint_url(endpoint, interface) def endpoint_url(endpoint, interface)
url = endpoint["#{interface}URL"] url = endpoint["url"]
if interface == 'public' if interface == 'public'
publicize(url) publicize(url)

4
config/storage.yml
View file

@ -8,10 +8,8 @@ openstack:
service: OpenStack service: OpenStack
container: "<%= ENV['FOG_ACTIVESTORAGE_DIRECTORY'] %>" container: "<%= ENV['FOG_ACTIVESTORAGE_DIRECTORY'] %>"
credentials: credentials:
openstack_tenant: "<%= ENV['FOG_OPENSTACK_TENANT'] %>" openstack_auth_url: "https://auth.cloud.ovh.net"
openstack_api_key: "<%= ENV['FOG_OPENSTACK_API_KEY'] %>" openstack_api_key: "<%= ENV['FOG_OPENSTACK_API_KEY'] %>"
openstack_username: "<%= ENV['FOG_OPENSTACK_USERNAME'] %>" openstack_username: "<%= ENV['FOG_OPENSTACK_USERNAME'] %>"
openstack_auth_url: "<%= ENV['FOG_OPENSTACK_URL'] %>"
openstack_identity_api_version: "<%= ENV['FOG_OPENSTACK_IDENTITY_API_VERSION'] %>"
openstack_region: "<%= ENV['FOG_OPENSTACK_REGION'] %>" openstack_region: "<%= ENV['FOG_OPENSTACK_REGION'] %>"
openstack_temp_url_key: "<%= ENV['FOG_OPENSTACK_TEMP_URL_KEY'] %>" openstack_temp_url_key: "<%= ENV['FOG_OPENSTACK_TEMP_URL_KEY'] %>"