Skip to content

Commit

Permalink
🔖 chore(*): DSFR v1.9.2
Browse files Browse the repository at this point in the history
  • Loading branch information
lab9fr authored Apr 18, 2023
2 parents d14c877 + e18ce1e commit c5a447a
Show file tree
Hide file tree
Showing 82 changed files with 2,009 additions and 165 deletions.
7 changes: 7 additions & 0 deletions .auto-changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"output": "CHANGELOG.md",
"template": "changelog-template.hbs",
"unreleased": false,
"commitLimit": false,
"hideCredit": true
}
1,085 changes: 1,085 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Si vous souhaitez contribuer au DSFR, veuillez prendre connaissance des document
- [tests Sass](#tests-sass)
- [tests Accessibilité](#tests-accessibilité)
- [Lint](#lint)
- [Changelog](#changelog)

## Installation
### Installation locale
Expand Down Expand Up @@ -365,3 +366,21 @@ yarn build --test
```
La configuration est présente dans le fichier `.eslintrc.json`. Elle reprend en grande partie la configuration standard de esLint

#### Changelog
Outil en ligne de commande pour générer un journal des modifications `CHANGELOG.md` à partir des balises git et de l'historique des commits, nous utilisons [Auto-changelog](https://github.com/cookpete/auto-changelog).

Commande à executer à la racine du projet, `git log` est exécuté en arrière-plan afin d'analyser l'historique des commits, en lançant :

```
yarn version
```

Il faut ensuite renseigner le numéro de version de la prochaine release :
```
info Current version: x.x.x
question New version: [X.X.X]
```

La configuration est présente dans le fichier `.auto-changelog`.

La gestion de l'affichage du changelog est présente dans le template [Handlebars](https://handlebarsjs.com/) `changelog-template.hbs`.
40 changes: 40 additions & 0 deletions changelog-template.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Changelog du Système de design de l’État

Toutes les modifications notables apportées à ce projet seront documentées dans ce fichier.

Le format est basé sur [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
et ce projet respecte [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

Pour plus d’informations : [Voir la documentation](https://www.systeme-de-design.gouv.fr/)

{{#each releases}}
{{#if href}}
## [{{title}}]({{href}}){{#if tag}} - {{isoDate}}{{/if}}
{{else}}
## {{title}}{{#if tag}} - {{isoDate}}{{/if}}
{{/if}}

{{#if summary}}
{{summary}}
{{/if}}

{{#if merges}}
### Merged

{{#each merges}}
#### {{#if commit.breaking}}**Breaking change:** {{/if}}{{commit.message}} {{#if href}}[`#{{id}}`]({{href}}){{/if}}

{{/each}}
{{/if}}

{{#if fixes}}
### Fixed

{{#each fixes}}
#### {{#if commit.breaking}}**Breaking change:** {{/if}}{{commit.subject}}{{#each fixes}} {{#if href}}[`#{{id}}`]({{href}}){{/if}}{{/each}}

{{/each}}
{{/if}}

{{/each}}

Binary file renamed doc/Analytics-1.9.1.pdf → doc/Analytics-1.9.2.pdf
Binary file not shown.
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gouvfr/dsfr",
"version": "1.9.1",
"version": "1.9.2",
"description": "Système de Design de l'Etat - DSFR",
"repository": "git@github.com:GouvernementFR/dsfr.git",
"author": "Service d'Information du Gouvernement <jean-charles.hourdeaux@pm.gouv.fr>",
Expand All @@ -19,7 +19,8 @@
"release": "node tool/tool.js release",
"deploy": "node tool/tool.js deploy",
"standalone": "node tool/tool.js standalone",
"serve": "browser-sync start --server --port 8080 --startPath example/"
"serve": "browser-sync start --server --port 8080 --startPath example/",
"version": "auto-changelog -p"
},
"files": [
"/dist",
Expand All @@ -38,6 +39,7 @@
"@commitlint/config-conventional": "^15.0.0",
"@rollup/plugin-buble": "^0.21.3",
"@rollup/plugin-virtual": "^2.1.0",
"auto-changelog": "^2.4.0",
"browser-sync": "^2.27.10",
"browserslist": "^4.21.5",
"cssnano": "^5.1.15",
Expand Down
102 changes: 102 additions & 0 deletions src/analytics/example/spa/angular/_index.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.9/angular.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-route/1.8.3/angular-route.min.js"></script>
<script>
var app = angular.module("myApp", ["ngRoute"]);
app.config(function($routeProvider) {
$routeProvider
.when("/", {
template : '<div><h2>HOME</h2><p>lorem ipsum dolor sit amet</p></div>'
})
.when("/link", {
template : '<div><h2>LINK</h2><a href="#" data-<%= prefix %>-analytics-click="libellé du lien envoyé à l\'analytics" id="link-attr-click">test</a></div>'
})
.when("/button", {
template : '<div><h2>BUTTON</h2><button id="btn-3" class="<%= prefix %>-btn">Button</button></div>'
});
});
</script>

<div ng-app="myApp">

<header role="banner" class="fr-header" id="header-120">
<div class="fr-header__body">
<div class="fr-container">
<div class="fr-header__body-row">
<div class="fr-header__brand fr-enlarge-link">
<div class="fr-header__brand-top">
<div class="fr-header__logo">
<p class="fr-logo">
République <br/>
Française
</p>
</div>
<div class="fr-header__navbar">
<button class="fr-btn--search fr-btn" data-fr-opened="false" aria-controls="modal-122" id="button-123" title="Rechercher" >
Rechercher
</button>
<button class="fr-btn--menu fr-btn" data-fr-opened="false" aria-controls="modal-124" aria-haspopup="menu" id="button-125" title="Menu">
Menu
</button>
</div>
</div>
<div class="fr-header__service">
<a href="/" title="Accueil - [À MODIFIER - Nom du site / service] - [À MODIFIER - texte alternatif de l’image : nom de l'opérateur ou du site serviciel] - République Française">
<p class="fr-header__service-title">
Nom du site / service
</p>
</a>
<p class="fr-header__service-tagline">baseline - précisions sur l‘organisation</p>
</div>
</div>
<div class="fr-header__tools">
<div class="fr-header__tools-links">
<ul class="fr-btns-group">
<li>
<a id="to-home-1" class="fr-btn" href="#!">HOME</a>
</li>
</ul>
</div>
<div class="fr-header__search fr-modal" id="modal-122">
<div class="fr-container fr-container-lg--fluid">
<button class="fr-btn--close fr-btn" aria-controls="modal-122" id="button-130" title="Fermer">
Fermer
</button>
<div class="fr-search-bar" id="search-121" role="search">
<label class="fr-label" for="search-121-input">
Rechercher
</label>
<input class="fr-input" aria-describedby="search-121-input-messages" placeholder="Rechercher" id="search-121-input" type="search"/>
<div class="fr-messages-group" id="search-121-input-messages" aria-live="assertive">
</div>
<button class="fr-btn" id="search-btn-132" title="Rechercher">
Rechercher
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="fr-header__menu fr-modal" id="modal-124">
<div class="fr-container">
<button class="fr-btn--close fr-btn" aria-controls="modal-2414" id="button-2419" title="Fermer">
Fermer
</button>
<div class="fr-header__menu-links">
<ul class="fr-btns-group">
</ul>
</div>
<nav class="fr-nav" id="navigation-134" role="navigation" aria-label="Menu principal">
<ul class="fr-nav__list">
<li class="fr-nav__item"><a id="to-home-2" class="fr-nav__link" href="#!">HOME</a></li>
<li class="fr-nav__item"><a id="to-link-2" class="fr-nav__link" href="#!link">Link</a></li>
<li class="fr-nav__item"><a id="to-button-2" class="fr-nav__link" href="#!button">Button</a></li>
</ul>
</nav>
</div>
</div>
</header>

<div ng-view></div>
</div>
116 changes: 116 additions & 0 deletions src/analytics/example/spa/react/index.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
<div class="fr-container">
<div id="react-container">

</div>
</div>


<script src='https://unpkg.com/react@16.3.1/umd/react.production.min.js'></script>
<script src='https://unpkg.com/react-dom@16.3.1/umd/react-dom.production.min.js'></script>
<script src='https://unpkg.com/react-router-dom@5.0.0/umd/react-router-dom.min.js'></script>
<script src='https://unpkg.com/babel-standalone@6.26.0/babel.js'></script>


<script type='text/babel'>
const Link = ReactRouterDOM.Link,
Route = ReactRouterDOM.Route,
BrowserRouter = ReactRouterDOM.BrowserRouter;
const App = props => (
<div>
<header role="banner" class="fr-header" id="header-120">
<div class="fr-header__body">
<div class="fr-container">
<div class="fr-header__body-row">
<div class="fr-header__brand fr-enlarge-link">
<div class="fr-header__brand-top">
<div class="fr-header__logo">
<p class="fr-logo">
République <br/>
Française
</p>
</div>
<div class="fr-header__navbar">
<button class="fr-btn--search fr-btn" data-fr-opened="false" aria-controls="modal-122" id="button-123" title="Rechercher" >
Rechercher
</button>
<button class="fr-btn--menu fr-btn" data-fr-opened="false" aria-controls="modal-124" aria-haspopup="menu" id="button-125" title="Menu">
Menu
</button>
</div>
</div>
<div class="fr-header__service">
<a href="/" title="Accueil - [À MODIFIER - Nom du site / service] - [À MODIFIER - texte alternatif de l’image : nom de l'opérateur ou du site serviciel] - République Française">
<p class="fr-header__service-title">
Nom du site / service
</p>
</a>
<p class="fr-header__service-tagline">baseline - précisions sur l‘organisation</p>
</div>
</div>
<div class="fr-header__tools">
<div class="fr-header__tools-links">
<ul class="fr-btns-group">
<li>
<Link id="to-home-1" class="fr-btn" to="/example/analytics/spa/react/">HOME</Link>
</li>
</ul>
</div>
<div class="fr-header__search fr-modal" id="modal-122">
<div class="fr-container fr-container-lg--fluid">
<button class="fr-btn--close fr-btn" aria-controls="modal-122" id="button-130" title="Fermer">
Fermer
</button>
<div class="fr-search-bar" id="search-121" role="search">
<label class="fr-label" for="search-121-input">
Rechercher
</label>
<input class="fr-input" aria-describedby="search-121-input-messages" placeholder="Rechercher" id="search-121-input" type="search"/>
<div class="fr-messages-group" id="search-121-input-messages" aria-live="assertive">
</div>
<button class="fr-btn" id="search-btn-132" title="Rechercher">
Rechercher
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="fr-header__menu fr-modal" id="modal-124">
<div class="fr-container">
<button class="fr-btn--close fr-btn" aria-controls="modal-2414" id="button-2419" title="Fermer">
Fermer
</button>
<div class="fr-header__menu-links">
<ul class="fr-btns-group">
</ul>
</div>
<nav class="fr-nav" id="navigation-134" role="navigation" aria-label="Menu principal">
<ul class="fr-nav__list">
<li class="fr-nav__item"><Link id="to-home-2" class="fr-nav__link" to="/example/analytics/spa/react/">HOME</Link></li>
<li class="fr-nav__item"><Link id="to-link-2" class="fr-nav__link" to="/example/analytics/spa/react/link">Link</Link></li>
<li class="fr-nav__item"><Link id="to-button-2" class="fr-nav__link" to="/example/analytics/spa/react/button">Button</Link></li>
</ul>
</nav>
</div>
</div>
</header>
<div class="fr-container fr-mt-8v">
<Route path="/example/analytics/spa/react/" exact component={Home} />
<Route path="/example/analytics/spa/react/link" component={Links} />
<Route path="/example/analytics/spa/react/button" component={Button} />
</div>
</div>
)
const Home = props => <div><h2>HOME</h2><p>lorem ipsum dolor sit amet</p></div>
const Links = props => <div><h2>LINK</h2><a href="#" data-fr-analytics-click="libellé du lien envoyé à l'analytics" id="link-attr-click">test</a></div>
const Button = props => <div><h2>BUTTON</h2><button id="btn-3" class="<%= prefix %>-btn">Button</button></div>
ReactDOM.render(<ReactRouterDOM.BrowserRouter><App /></ReactRouterDOM.BrowserRouter>, document.querySelector('#react-container'));
</script>
Empty file.
Loading

0 comments on commit c5a447a

Please sign in to comment.