Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

[337] chakra kickstarter #766

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions server/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ Amélioration du retour des intitulés ROME pour Matcha
Ajout d'une route sur l'intitulé ROME
Ajout du détail du code ROME sur les offres Matcha
Endpoint mise à jour email Bonne Boîte
[337] Essai ChakraUI

## 1.18.3 [23/02/2022]
Adaptation script pour SAVE update
Expand Down
2 changes: 1 addition & 1 deletion ui/components/HeaderForm/HeaderForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ const HeaderForm = ({ handleSearchSubmit, isHome }) => {
<div className="c-logobar-formgroup ml-md-1 ml-lg-3 border-0 c-logobar-submit-container">
<button
type="submit"
className={`d-block btn btn-lg btn-dark w-100 font-weight-bold c-regular-darkbtn c-logobar-submit is-home-${isHome}`}
className={`btn btn-lg btn-dark w-100 font-weight-bold c-regular-darkbtn c-logobar-submit is-home-${isHome}`}
disabled={isSubmitting}
alt="Lancer la recherche"
>
Expand Down
2 changes: 1 addition & 1 deletion ui/components/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const Footer = (props) => {
<Row>
<Col className="col-12 col-lg-3">
<img
src="/images/marianne.svg#svgView(viewBox(19 0 162 78))"
src="/images/marianne.svg#svgView(viewBox(0 0 162 78))"
alt="Logo république française"
width="290"
height="130"
Expand Down
36 changes: 20 additions & 16 deletions ui/context/Providers.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,29 @@ import SearchResultContextProvider from "./SearchResultContextProvider";
import ParameterContextProvider from "./ParameterContextProvider";
import DisplayContextProvider from "./DisplayContextProvider";
import PlausibleProvider from "next-plausible";
import { ChakraProvider } from '@chakra-ui/react'
import theme from '../theme/theme'

const Providers = ({ env, children }) => {
return (
<PlausibleProvider
domain={
env !== "production"
? "labonnealternance-recette2.apprentissage.beta.gouv.fr"
: "labonnealternance.apprentissage.beta.gouv.fr"
}
trackOutboundLinks={true}
trackLocalhost={true}
enabled={true}
>
<SearchResultContextProvider>
<ParameterContextProvider>
<DisplayContextProvider>{children}</DisplayContextProvider>
</ParameterContextProvider>
</SearchResultContextProvider>
</PlausibleProvider>
<ChakraProvider theme={theme}>
<PlausibleProvider
domain={
env !== "production"
? "labonnealternance-recette2.apprentissage.beta.gouv.fr"
: "labonnealternance.apprentissage.beta.gouv.fr"
}
trackOutboundLinks={true}
trackLocalhost={true}
enabled={true}
>
<SearchResultContextProvider>
<ParameterContextProvider>
<DisplayContextProvider>{children}</DisplayContextProvider>
</ParameterContextProvider>
</SearchResultContextProvider>
</PlausibleProvider>
</ChakraProvider>
);
};

Expand Down
4 changes: 4 additions & 0 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
},
"dependencies": {
"@appbaseio/reactivesearch": "^3.11.7",
"@chakra-ui/react": "2.3.5",
"@emotion/react": "^11",
"@emotion/styled": "^11",
"@fortawesome/fontawesome-svg-core": "^1.2.28",
"@fortawesome/free-regular-svg-icons": "^5.13.0",
"@fortawesome/free-solid-svg-icons": "^5.13.0",
Expand All @@ -48,6 +51,7 @@
"downshift": "5.2.0",
"email-misspelled": "3.3.9",
"formik": "^2.1.4",
"framer-motion": "^6",
"history": "^4.10.1",
"local-web-server": "4.2.0",
"lodash": "4.17.20",
Expand Down
2 changes: 1 addition & 1 deletion ui/public/styles/components/breadcrumb.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
}

.c-breadcrumb-separator {
margin-top: -5px;
margin-top: 3px;
}
2 changes: 1 addition & 1 deletion ui/public/styles/components/logo-idea.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@media only screen and (min-width: 1250px) {
.c-logoheader
{
display: inline-block;
display: flex;
}
}

Expand Down
3 changes: 3 additions & 0 deletions ui/public/styles/components/logobar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ form.c-logobar-form {
}

.c-regular-darkbtn.c-logobar-submit.is-home-true {
display: flex;
align-items: center;
justify-content: center;
@include media-breakpoint-up(xl) {
padding-left: 38px;
padding-right: 42px;
Expand Down
6 changes: 6 additions & 0 deletions ui/public/styles/components/navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
}
}

.c-navigation .navbar-brand {
display: flex;
align-items: center;
justify-content: center;
}

.c-marianne-header {
margin-right: 0.3rem;
@include media-breakpoint-up(md) {
Expand Down
11 changes: 11 additions & 0 deletions ui/theme/theme.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { extendTheme } from '@chakra-ui/react'

const theme = extendTheme({
colors: {
overcompiled: {
100: "#123FFF"
},
},
})

export default theme
Loading