🩹 Fix details

jyboy · Apr 16, 2024 · 6678dd2 · 6678dd2
1 parent 2c45bbd
commit 6678dd2
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 12 deletions.
diff --git a/.prettierrc.cjs b/.prettierrc.cjs
@@ -4,6 +4,7 @@ module.exports = {
   trailingComma: 'none',
   semi: true,
   singleQuote: true,
+  importOrder: ['^@core/(.*)$', '^[./]'],
   plugins: [
     '@trivago/prettier-plugin-sort-imports',
     'prettier-plugin-css-order',

diff --git a/cypress/e2e/reservation.cy.js b/cypress/e2e/reservation.cy.js
@@ -1,4 +1,4 @@
-import getCurrentDate from '../../src/utils/getCurrentDate';
+import getToday from '../../src/utils/getToday';
 
 describe('The Table Reservation page', () => {
   it('enters valid information and clicks submit', () => {
@@ -14,7 +14,7 @@ describe('The Table Reservation page', () => {
     cy.url().should('include', '/reservation-success');
     cy.get('[data-testid="success-message"]').should(
       'include.text',
-      getCurrentDate() + ' at 18:00'
+      getToday() + ' at 18:00'
     );
   });
 

diff --git a/index.html b/index.html
@@ -13,6 +13,9 @@
   <meta name="og:description"
     content="We are a family owned Mediterranean restaurant, focused on traditional recipes served with a modern twist." />
   <meta name="og:image" content="/src/assets/restaurant-chef.jpg" />
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link href="https://fonts.googleapis.com/css2?family=Karla:ital,wght@0,200..800;1,200..800&family=Markazi+Text&display=swap" rel="stylesheet">
 </head>
 
 <body>

diff --git a/package.json b/package.json
@@ -12,7 +12,6 @@
     "format": "prettier --write \"{src,cypress}/**/*.{js,jsx,css}\"",
     "test": "vitest run",
     "test:ui": "cypress run",
-    "cypress:open": "cypress open",
     "prepare": "husky"
   },
   "dependencies": {

diff --git a/src/index.css b/src/index.css
@@ -8,7 +8,6 @@ body {
   min-height: 100vh;
   font-size: 16px;
   line-height: 1.5;
-  font-family: Karla, 'Helvetica Neue', Arial, sans-serif;
 }
 
 #root {

diff --git a/src/pages/TableReservation/TableReservation.jsx b/src/pages/TableReservation/TableReservation.jsx
@@ -4,7 +4,7 @@ import { useNavigate } from 'react-router-dom';
 import { object, string, number, date } from 'yup';
 import Button from '../../components/Button/Button';
 import useSubmit from '../../hooks/useSubmit';
-import getCurrentDate from '../../utils/getCurrentDate';
+import getToday from '../../utils/getToday';
 
 const TableReservation = () => {
   const navigate = useNavigate();
@@ -21,7 +21,7 @@ const TableReservation = () => {
 
   const formik = useFormik({
     initialValues: {
-      date: getCurrentDate(),
+      date: getToday(),
       time: '17:00',
       guests: 1,
       occasion: 'Birthday'

diff --git a/src/pages/UnderConstruction/UnderConstruction.jsx b/src/pages/UnderConstruction/UnderConstruction.jsx
@@ -2,11 +2,11 @@ import UnderConstructionImage from '../../assets/under-construction.svg';
 
 const UnderConstruction = () => {
   return (
-    <div className="flex flex-col items-center pt-20">
+    <div className="flex flex-col items-center pt-16">
       <img
         src={UnderConstructionImage}
         alt="Under Construction illustration"
-        className="w-96"
+        className="w-90"
       />
       <h1 className="mt-8 font-serif text-5.5xl text-olive">
         Under Construction

diff --git a/src/utils/getCurrentDate.js → src/utils/getToday.js b/src/utils/getCurrentDate.js → src/utils/getToday.js
@@ -1,9 +1,10 @@
-const getCurrentDate = () => {
+// TODO: JSDoc
+const getToday = () => {
   const date = new Date();
   const year = date.getFullYear();
   const month = (date.getMonth() + 1).toString().padStart(2, '0');
   const day = date.getDate().toString().padStart(2, '0');
   return `${year}-${month}-${day}`;
 };
 
-export default getCurrentDate;
+export default getToday;
diff --git a/src/utils/toStars.js b/src/utils/toStars.js
@@ -1,3 +1,4 @@
+// TODO: JSDoc
 const toStars = (rating) => {
   const fullStars = Math.floor(rating);
   const halfStar = rating % 1 !== 0 ? 0.5 : 0;

diff --git a/src/utils/wait.js b/src/utils/wait.js
@@ -1,3 +1,4 @@
+// TODO: JSDoc
 const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
 export default wait;
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -3,8 +3,8 @@ export default {
   content: ['./index.html', './src/**/*.{js,jsx}'],
   theme: {
     fontFamily: {
-      sans: ['Karla', 'Helvetica Neue', 'Arial', 'sans-serif'],
-      serif: ['Markazi Text', 'Georgia', 'Times New Roman', 'serif']
+      sans: ['Karla', 'Helvetica Neue', 'sans-serif'],
+      serif: ['Markazi Text', 'ui-serif', 'serif']
     },
     colors: {
       white: '#fff',