Skip to content

Commit 5a7282e

Browse files
committed
solving import apostrophe issue
1 parent a4c5b99 commit 5a7282e

File tree

6 files changed

+31
-25
lines changed

6 files changed

+31
-25
lines changed

components/header/Header.js

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { useState } from 'react';
2-
import Image from 'next/image';
3-
import Link from 'next/link';
4-
import { useWindowWide } from 'lib/clock/useWindowWide';
5-
import { width } from 'lib/clock/data';
6-
import MenuMobile from 'components/menu/menuMobile';
7-
import HeaderNavigation from 'components/navigation/HeaderNavigation';
8-
import menu from 'public/icons8-menu-48.png'
9-
import help from 'public/icons8-help-48.png'
10-
import styles from './header.module.scss'
1+
import { useState } from "react";
2+
import Image from "next/image";
3+
import Link from "next/link";
4+
import { useWindowWide } from "lib/clock/useWindowWide";
5+
import { width } from "lib/clock/data";
6+
import MenuMobile from "components/menu/MenuMobile";
7+
import HeaderNavigation from "components/navigation/HeaderNavigation";
8+
import menu from "public/icons8-menu-48.png"
9+
import help from "public/icons8-help-48.png"
10+
import styles from "./header.module.scss"
1111

1212
export default function Header(){
1313
const [toggle, setToggle] = useState(false);
@@ -19,23 +19,27 @@ export default function Header(){
1919

2020
const navBar = !wide ?
2121
(
22-
<Image
23-
className={`${styles.image} icon`}
24-
layout="fixed"
25-
height={32}
26-
width={32}
27-
src={help}
28-
/>
22+
<Link href="/works">
23+
<Image
24+
className={`${styles.image} icon`}
25+
alt="Help icon"
26+
layout="fixed"
27+
height={32}
28+
width={32}
29+
src={help}
30+
/>
31+
</Link>
2932
) : (
3033
<HeaderNavigation styles={styles} />
3134
)
3235

3336
return(
3437
<>
3538
<header className={styles.header}>
36-
<div className={!wide ? "" : styles.header__desktop } >
39+
<div className={!wide ? null : styles.header__desktop } >
3740
<Image
3841
className="icon"
42+
alt="Open menu in mobile divices"
3943
layout="fixed"
4044
height={32}
4145
width={32}

components/menu/MenuMobile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export default function MenuMobile(props){
1212
<Image
1313
className="icon"
1414
layout="fixed"
15+
alt="Close menu"
1516
height={32}
1617
width={32}
1718
src={Close}

components/settingsForm/SettingForm.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default function SettingsFrom(props){
2929

3030
let formState, totalTime, shortBrakeCount, restTime;
3131
if(sendForm) {
32-
formState= <p>You've updated flow time. Please return to the clock to see the changes</p>
32+
formState= <p>You&apos;ve updated flow time. Please return to the clock to see the changes</p>
3333
}
3434

3535
if(form.time === "50") {
@@ -50,7 +50,8 @@ export default function SettingsFrom(props){
5050
<nav className={styles["nav-bar"]}>
5151
<h2 className={styles.title}>Settings</h2>
5252
<Link href="/">
53-
<Image
53+
<Image
54+
alt="Close setting modal window"
5455
layout="fixed"
5556
src={Close}
5657
/>
@@ -80,7 +81,7 @@ export default function SettingsFrom(props){
8081
/>
8182
<input type="submit" value="update" className={styles.submitButton} />
8283
<div>
83-
<p>You're going to start a flow of {totalTime}
84+
<p>You&apos;re going to start a flow of {totalTime}
8485
with {shortBrakeCount} possible short brakes. When you finish the flow you have {restTime} minuts for rest</p>
8586
</div>
8687
</form>

pages/about.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export default function AboutPage(){
77
<h2>About flow app</h2>
88
</div>
99
<section>
10-
<p>Flow app is a simple project inspired on other regular projectes, like pomodoro timer. But, we don't really like pomodoro's technique. Thus, we have developed a simple new solution that you can use working or studing.</p>
11-
<p>This solution is just a project part of a portfolio. Don't use it like a production software solution.</p>
10+
<p>Flow app is a simple project inspired on other regular projectes, like pomodoro timer. But, we don&apos;t really like pomodoro&apos;s technique. Thus, we have developed a simple new solution that you can use working or studing.</p>
11+
<p>This solution is just a project part of a portfolio. Don&apos;t use it like a production software solution.</p>
1212
</section>
1313
</>
1414
)

pages/flow.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default function FlowPage(){
1212
<ul>
1313
<li>Intense and focused concentration on the present moment</li>
1414
<li>A sense of personal control or agency over the situation or activity</li>
15-
<li>A distortion of temporal experience, as one's subjective experience of time is altered</li>
15+
<li>A distortion of temporal experience, as one&apos;s subjective experience of time is altered</li>
1616
<li>Experience of the activity as intrinsically rewarding, also referred to as autotelic experience</li>
1717
</ul>
1818
<p>To arrive to a flow state you need to spend much time that a 25 pomodoro regular time. Try to achive this is state with hour timer</p>

pages/works.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default function WorksPage(){
1010
<h3>There is some points about flow clock that you should know</h3>
1111
<ul>
1212
<li>You decide how and how much you work between a set of options: You have three intervals of time 50min, 1.30h or 2.10h</li>
13-
<li>You have a limited amount of short breakes depending on which interval you have choosen. Chose wisely when to stop: when you complete all the short breakes that has been recivied by you, you won't be able to stop the clock again</li>
13+
<li>You have a limited amount of short breakes depending on which interval you have choosen. Chose wisely when to stop: when you complete all the short breakes that has been recivied by you, you won&apos;t be able to stop the clock again</li>
1414
<li>You can choose how much time short brakes are between 1 and 5 minutes.</li>
1515
<li>When you finish, you have an interval called free time. The free time value is 20% of your working time. For example, if you have completed and internval of 50 min, you will have a free time break of 10 minuts. </li>
1616
<li>Try to work as much as you can (between the selected time)</li>

0 commit comments

Comments
 (0)