Commit dae84e7d authored by Guilhem CARRON's avatar Guilhem CARRON
Browse files

Merge branch 'dev' into 'master'

chore(release): 1.6.5

See merge request web-et-numerique/llle_project/ecolyo!536
parents 8a506d66 ac14c066
...@@ -2,6 +2,16 @@ ...@@ -2,6 +2,16 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
### [1.6.5](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.5.0...v1.6.5) (2022-01-13)
### Bug Fixes
- adjust height of content on desktop view ([684fbc1](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/684fbc175dc3af5cf1f19c643e8b091cd1642623))
- **assets:** ecogesture 34 has now a square image ([3a993d4](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/3a993d4fe180901a2aa5687ecf189163d4f7bdf4)
- **profileType:** display correctly the navigation in the profile type form for iphone 11 and above ([9d3d180](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/9d3d1809821b7c868be5bafa5ff5802b41b1bf7c))
- **profileType:** init correctly the date selection in profile type form ([264830c](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/264830c40e90bf898dbc91784fe337b525fe5901))
- **profileType:** issue with previous/next button in the profile type form ([cf957db](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/cf957db5f3759544fe8bac45a6ebdb771d19315e))
### [1.6.4](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.5.0...v1.6.4) (2022-01-11) ### [1.6.4](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.5.0...v1.6.4) (2022-01-11)
### Bug Fixes ### Bug Fixes
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"slug": "ecolyo", "slug": "ecolyo",
"icon": "icon.svg", "icon": "icon.svg",
"categories": ["energy"], "categories": ["energy"],
"version": "1.6.4", "version": "1.6.5",
"licence": "AGPL-3.0", "licence": "AGPL-3.0",
"editor": "Métropole de Lyon", "editor": "Métropole de Lyon",
"default_locale": "fr", "default_locale": "fr",
......
{ {
"name": "ecolyo", "name": "ecolyo",
"version": "1.6.4", "version": "1.6.5",
"scripts": { "scripts": {
"tx": "tx pull --all || true", "tx": "tx pull --all || true",
"lint": "yarn lint:js && yarn lint:styles", "lint": "yarn lint:js && yarn lint:styles",
......
...@@ -21,8 +21,10 @@ ...@@ -21,8 +21,10 @@
width: 45.75rem; width: 45.75rem;
box-sizing: border-box; box-sizing: border-box;
margin-top: 1rem; margin-top: 1rem;
margin-bottom: 2rem;
@media #{$large-phone} { @media #{$large-phone} {
width: 100%; width: 100%;
padding: 0rem 1rem 3rem 1rem; padding: 0rem 1rem 3rem 1rem;
margin-bottom: 0;
} }
} }
...@@ -25,8 +25,8 @@ interface ProfileTypeFormDateSelectionProps { ...@@ -25,8 +25,8 @@ interface ProfileTypeFormDateSelectionProps {
} }
interface SelectionMonth { interface SelectionMonth {
label: string label: string | null
value: number value: string
} }
const ProfileTypeFormDateSelection: React.FC<ProfileTypeFormDateSelectionProps> = ({ const ProfileTypeFormDateSelection: React.FC<ProfileTypeFormDateSelectionProps> = ({
...@@ -41,12 +41,14 @@ const ProfileTypeFormDateSelection: React.FC<ProfileTypeFormDateSelectionProps> ...@@ -41,12 +41,14 @@ const ProfileTypeFormDateSelection: React.FC<ProfileTypeFormDateSelectionProps>
const { t } = useI18n() const { t } = useI18n()
const [selectedMonth, setSelectedMonth] = useState<any>({ const [selectedMonth, setSelectedMonth] = useState<any>({
label: DateTime.now().toLocaleString({ month: 'long' }), label: DateTime.now().toLocaleString({ month: 'long' }),
value: DateTime.now().month, // Date.getMonth starts at 0 value: DateTime.now()
.month.toString()
.padStart(2, '0'), // Date.getMonth starts at 0
}) })
const [selectedYear, setSelectedYear] = useState<number>(DateTime.now().year) const [selectedYear, setSelectedYear] = useState<number>(DateTime.now().year)
const [answer, setAnswer] = useState<ProfileTypeAnswerChoices>('') const [answer, setAnswer] = useState<ProfileTypeAnswerChoices>('')
const selectMonths = [ const selectMonths: SelectionMonth[] = [
{ {
label: 'Janvier', label: 'Janvier',
value: '01', value: '01',
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
padding: 0 0 env(safe-area-inset-bottom) 0; padding: 0 0 env(safe-area-inset-bottom) 0;
@media (min-width: $width-tablet) { @media (min-width: $width-tablet) {
background: none; background: none;
position: absolute;
height: 3rem; height: 3rem;
} }
.rounded { .rounded {
......
...@@ -26,6 +26,10 @@ body { ...@@ -26,6 +26,10 @@ body {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-left: 0;
@media #{$large-phone} {
margin-left: 1.25rem;
}
} }
[role='banner'] .coz-bar-container { [role='banner'] .coz-bar-container {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment