🐛 répare les liens vers les pages règles

source/components/RuleLink.js

@@ -15,7 +15,7 @@ type Props = Règle & {
 }
 const RuleLink = ({ lien, nom, colours: { colour }, match, style }: Props) => (
 	<Link
-		to={match.path + '/' + lien}
+		to={match.path + lien}
 		className="rule-link"
 		style={{ color: colour, ...style }}>
 		{capitalise0(nom)}

source/components/RulePage.js

@@ -51,12 +51,15 @@ export default class RulePage extends Component {
 	}
 	renderRule(dottedName) {
 		return (
-			<div id="RulePage">
+			<div id="RulePage" className="ui__ container">
 				<div className="rule-page__header">
 					{!this.props.noUserInputSelector && (
 						<BackToSimulation colour={this.props.themeColours.colour} />
 					)}
-					<SearchButton className="rule-page__search" />
+					<SearchButton
+						className="rule-page__search"
+						rulePageBasePath="../règle"
+					/>
 				</div>
 				<Rule dottedName={dottedName} />
 			</div>

source/components/SearchBar.js

@@ -75,7 +75,9 @@ export default class SearchBar extends React.Component {
 		if (selectedOption != null) {
 			this.props.finally && this.props.finally()
 			return (
-				<Redirect to={'../règle/' + encodeRuleName(selectedOption.dottedName)} />
+				<Redirect
+					to={'../règle/' + encodeRuleName(selectedOption.dottedName)}
+				/>
 			)
 		}
 		return (
@@ -102,7 +104,12 @@ export default class SearchBar extends React.Component {
 						<ul>
 							{rules.map(rule => (
 								<li key={rule.dottedName}>
-									<Link to={'../règle/' + encodeRuleName(rule.name)}>
+									<Link
+										to={
+											this.props.rulePagesBasePath +
+											'/' +
+											encodeRuleName(rule.name)
+										}>
 										{rule.title || capitalise0(rule.name)}
 									</Link>
 								</li>

source/components/SearchButton.js

@@ -42,6 +42,7 @@ export default class SearchButton extends Component {
 					showDefaultList={false}
 					finally={this.close}
 					rules={flatRules}
+					rulePagesBasePath={this.props.rulePagesBasePath}
 				/>
 			</Overlay>
 		) : (

source/components/TargetSelection.js

@@ -157,7 +157,7 @@ let Header = ({
 
 			<span className="texts">
 				<span className="optionTitle">
-					<Link to={match.path + '/règle/' + encodeRuleName(target.dottedName)}>
+					<Link to={match.path + 'règle/' + encodeRuleName(target.dottedName)}>
 						{target.title || target.name}
 					</Link>
 				</span>

source/components/ui/Typography.css

@@ -11,10 +11,13 @@ body {
 	font-family: 'Roboto', sans-serif;
 }
 
+h1,
+h2 {
+	margin-top: 2.5rem;
+	margin-bottom: 1.5rem;
+}
 h1 {
 	font-size: 2.8rem;
-	margin-top: 1.5rem;
-	margin-bottom: 2rem;
 }
 h2 {
 	font-size: 2.1rem;

source/sites/embauche.gouv.fr/pages/RulesList.js

@@ -14,7 +14,11 @@ export default class RulesList extends Component {
 		return (
 			<div id="RulesList" className="ui__ container">
 				<h1>Explorez notre base de règles</h1>
-				<SearchBar showDefaultList={true} rules={flatRules} />
+				<SearchBar
+					showDefaultList={true}
+					rules={flatRules}
+					rulePagesBasePath="./règle"
+				/>
 			</div>
 		)
 	}

source/webpack.dev.js

@@ -16,11 +16,11 @@ module.exports = {
 					history({
 						rewrites: [
 							{
-								from: /^\/infrance\/.*$/,
+								from: /^\/infrance\/.*$|^\/infrance$/,
 								to: '/infrance.html'
 							},
 							{
-								from: /^\/embauche\/.*$/,
+								from: /^\/embauche\/.*$|^\/embauche$/,
 								to: '/embauche.html'
 							}
 						]