Skip to content

Commit

Permalink
Merge pull request #2 from asherhe/dev
Browse files Browse the repository at this point in the history
Add footer
  • Loading branch information
asherhe authored Apr 16, 2023
2 parents 609af89 + 97a5119 commit 3afd1b7
Show file tree
Hide file tree
Showing 8 changed files with 64 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Manage your time and boost your productivity with timeato!

timeato is a Pomodoro timer app that enables you to work with greater focus and efficiency. Split up your work time into 25-minute work intervals, taking 5-minute breaks in between to rest and refocus. With a clean and intuitive interface, timeato is distraction-free and simple to use.

<img src="screenshot.png" alt="timeato screenshot" width="80%" />
![Screenshot](screenshot.png)

## Contributing

Expand Down
27 changes: 14 additions & 13 deletions package-lock.json

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

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-brands-svg-icons": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"babel-plugin-macros": "^3.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-scripts": "5.0.1",
Expand Down
13 changes: 13 additions & 0 deletions src/components/app.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import React, { useState, useEffect, useCallback, useMemo } from "react";

import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faBug } from "@fortawesome/free-solid-svg-icons";
import { faGithub } from "@fortawesome/free-brands-svg-icons";

import TimerDisplay from "./timer-display";
import TimerControls from "./timer-controls";
import TypeControls from "./type-controls";
Expand Down Expand Up @@ -138,6 +142,15 @@ function App(props) {
active={!playing}
/>
</div>
<footer>
<div>Copyright © 2023 asherhe</div>
<a href="https://github.com/asherhe/timeato" title="GitHub repository">
<FontAwesomeIcon icon={faGithub} />
</a>
<a href="https://github.com/asherhe/timeato/issues/new/choose" title="Report a bug">
<FontAwesomeIcon icon={faBug} />
</a>
</footer>
</div>
);
}
Expand Down
5 changes: 0 additions & 5 deletions src/css/fonts.scss

This file was deleted.

11 changes: 11 additions & 0 deletions src/fonts.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@font-face {
font-family: "Noto Sans";
src: url("webfonts/NotoSans-ExtraBold.ttf");
font-weight: 800;
}

@font-face {
font-family: "Noto Sans";
src: url("webfonts/NotoSans-SemiBold.ttf");
font-weight: 600;
}
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import App from "./components/app";

import * as serviceWorkerRegistration from "./serviceWorkerRegistration";

import "./css/index.scss";
import "./index.scss";

const root = ReactDOM.createRoot(document.getElementById("root"));
root.render(
Expand Down
22 changes: 22 additions & 0 deletions src/css/index.scss → src/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ body {

.timer-display {
font-size: 6em;
font-weight: 800;
}

.timer-btn {
Expand Down Expand Up @@ -148,3 +149,24 @@ body {
background-color: #fff;
}
}

footer {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
gap: 0.5em;

position: absolute;
bottom: 0;

margin: 1em;

& > a {
color: #fff;
transition: 0.5s ease color;
&:hover {
color: #f5b6b3;
}
}
}

0 comments on commit 3afd1b7

Please sign in to comment.