Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

template.data.gouv.fr 1.3.1 #76

Merged
merged 1 commit into from
Nov 18, 2019
Merged

template.data.gouv.fr 1.3.1 #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions front/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion front/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"react-router-dom": "^4.3.1",
"react-scripts": "^2.1.3",
"react-tabs": "^2.3.0",
"template.data.gouv.fr": "^1.1.8",
"template.data.gouv.fr": "^1.3.1",
"unfetch": "^4.0.1",
"yup": "^0.26.6",
"zxcvbn": "^4.4.2"
Expand Down
4 changes: 4 additions & 0 deletions front/src/Header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@
.nav__item a.highlighted-button.active {
color: #fff;
}

.navbar {
border-bottom: 1px solid var(--theme-border-lighter);
}
10 changes: 10 additions & 0 deletions front/src/Home.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@
padding: 40px 0;
}

.hero__container {
min-height: 38vh;
}

.hero__white-background {
padding: 10px 1em;
background-color: white;
}

.footer__logo-text {
display: flex;
align-items: center;
Expand Down Expand Up @@ -44,3 +53,4 @@
}
}
}

8 changes: 4 additions & 4 deletions front/src/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,29 @@ import LazyLoad from "react-lazyload";
export default function Home() {
return (
<React.Fragment>
<div className="hero">
<div className="hero" role="banner">
<div className="hero__container">
<h1 className="hero__white-background">
Gérer la traçabilité des déchets en toute sécurité
</h1>
{localAuthService.isAuthenticated ? (
<p>
<Link to="/dashboard/slips" className="button large">
<Link to="/dashboard/slips" className="button">
Accéder à mon espace
</Link>
</p>
) : (
<p>
<Link
to="/signup"
className="button large warning"
className="button warning"
onClick={() => trackEvent("home", "cta-test")}
>
Je crée un compte
</Link>
<Link
to="/login"
className="button large"
className="button"
onClick={() => trackEvent("home", "cta-login")}
>
Je me connecte
Expand Down
20 changes: 20 additions & 0 deletions front/src/dashboard/account/Account.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,23 @@
max-width: 100%;
margin: 20px 0;
}

label {
margin-bottom: 0.5em;
}

.input__group {
align-items: stretch;

.icon-button {
padding: 0 0.7em;
margin: 0 0.7em;
}
}

}


.company__address {
font-style: normal;
margin-bottom: 1em;
Expand All @@ -21,3 +36,8 @@








2 changes: 1 addition & 1 deletion front/src/dashboard/account/Account.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export default withRouter(function Account({
</p>

{apiKey ? (
<div className="form__group">
<div className="form__group account__form">
<label>Token</label>
<div className="input__group">
<input type="text" value={apiKey} ref={tokenRef} readOnly />
Expand Down
2 changes: 1 addition & 1 deletion front/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "react-app-polyfill/ie11";

import React from "react";
import ReactDOM from "react-dom";
import "template.data.gouv.fr/dist/style/main.css";
import "template.data.gouv.fr/dist/main.min.css";
import "./index.scss";
import App from "./App";
import * as serviceWorker from "./serviceWorker";
Expand Down