Skip to content

Commit

Permalink
Merge pull request #19 from DadonStyle/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
DadonStyle authored Apr 2, 2024
2 parents 7e609a8 + 15e061e commit a7e4b00
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 16 deletions.
49 changes: 42 additions & 7 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@mui/icons-material": "^5.15.2",
"@mui/material": "^5.15.2",
"@types/node": "^20.10.6",
"@vercel/speed-insights": "^1.0.9",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.21.1",
Expand Down
2 changes: 2 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { BrowserRouter } from "react-router-dom";
import { ThemeProvider, createTheme } from "@mui/material";
import { SpeedInsights } from "@vercel/speed-insights/react";
import AppRoutes from "./routes/AppRoutes";
import "./App.css";

Expand Down Expand Up @@ -48,6 +49,7 @@ const theme = createTheme({
const App = () => (
<ThemeProvider theme={theme}>
<BrowserRouter>
<SpeedInsights />
<AppRoutes />
</BrowserRouter>
</ThemeProvider>
Expand Down
6 changes: 5 additions & 1 deletion src/components/MailDialog/MailDialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
padding: 0.5rem 1rem;
border-radius: 14px;
text-decoration: none;
background-color: #a2c5e4;
background-color: #a2aee4;
color: white;
&:hover {
color: black;
}
}
}
16 changes: 8 additions & 8 deletions src/constants/javascript.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
{
"id": 11,
"category": "JavaScript",
"description": "What is the role of 'localStorage' and'sessionStorage' in JavaScript? (Both are Web APIs)",
"description": "What is the difference between 'localStorage' and 'sessionStorage' in JavaScript?",
"answer": "'localStorage' persists data even after the browser is closed, while 'sessionStorage' stores data for the duration of the page session.",
"wrongAnswers": [
"'localStorage' and 'sessionStorage' are used for server-side storage, one for storing local variables and the other for the rest.",
Expand All @@ -123,12 +123,12 @@
{
"id": 12,
"category": "JavaScript",
"description": "What are JavaScript promises?",
"answer": "Promises are objects used to handle asynchronous operations in JavaScript. They represent a future value or error that will be available at some point.",
"description": "What JavaScript promises used for?",
"answer": "Promises are used to handle asynchronous operations.",
"wrongAnswers": [
"Promises are only used for synchronous operations.",
"Promises are not supported in JavaScript.",
"Promises can handle only a single asynchronous operation."
"Promises are used to handle both asynchronous and asynchronous operations.",
"Promises use to handle only a single asynchronous operation at a time."
]
},
{
Expand All @@ -137,9 +137,9 @@
"description": "What is the purpose of the 'map' method in JavaScript?",
"answer": "The 'map' method creates a new array by applying a function to each element of an existing array.",
"wrongAnswers": [
"The 'map' method modifies the original array.",
"The 'map' method cannot iterate over arrays.",
"The 'map' method only works on strings."
"The 'map' method modifies the original array than returns a new copy of it.",
"The 'map' method adds a key value pair to the array.",
"The 'map' method only works on strings and functions."
]
},
{
Expand Down

0 comments on commit a7e4b00

Please sign in to comment.