Compare commits
25 Commits
4a04834929
...
c913b32ddb
Author | SHA1 | Date |
---|---|---|
Jason Zhu | c913b32ddb | |
Jason Zhu | 3580e9b0b4 | |
Jason Zhu | 2319706d66 | |
Jason Zhu | 7f5df7cdf3 | |
Jason Zhu | 62e7510193 | |
Jason Zhu | 3414f20798 | |
Jason Zhu | a2d892793c | |
Jason Zhu | 943e22ffdb | |
Jason Zhu | 40b20ae730 | |
Jason Zhu | b71ce601d7 | |
Jason Zhu | dbb3d2f9b5 | |
Jason Zhu | fa83caf8a7 | |
Jason Zhu | f50dd73596 | |
Jason Zhu | a51437c7cc | |
Jason Zhu | 191d87662d | |
Jason Zhu | e87108a892 | |
Jason Zhu | f986272027 | |
Jason Zhu | 4f9e43b95e | |
Jason Zhu | 61660bf83d | |
Jason Zhu | 6d5af0a856 | |
Jason Zhu | 5c08042544 | |
Jason Zhu | 5b79adea19 | |
Jason Zhu | fbc2541230 | |
Jason Zhu | 7c3215867f | |
Jason Zhu | 4963def0bd |
|
@ -12,8 +12,10 @@
|
||||||
"@types/node": "^16.11.26",
|
"@types/node": "^16.11.26",
|
||||||
"@types/react": "^17.0.41",
|
"@types/react": "^17.0.41",
|
||||||
"@types/react-dom": "^17.0.14",
|
"@types/react-dom": "^17.0.14",
|
||||||
|
"history": "^5.3.0",
|
||||||
"react": "^17.0.2",
|
"react": "^17.0.2",
|
||||||
"react-dom": "^17.0.2",
|
"react-dom": "^17.0.2",
|
||||||
|
"react-router-dom": "^6.2.2",
|
||||||
"react-scripts": "5.0.0",
|
"react-scripts": "5.0.0",
|
||||||
"typescript": "^4.6.2",
|
"typescript": "^4.6.2",
|
||||||
"web-vitals": "^2.1.4"
|
"web-vitals": "^2.1.4"
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
/** @jsxImportSource @emotion/react */
|
||||||
|
import { css } from '@emotion/react';
|
||||||
|
|
||||||
|
import React from 'react';
|
||||||
|
import { AnswerData } from './QuestionsData';
|
||||||
|
import { gray3 } from './Styles';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
data: AnswerData;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Answer = ({ data }: Props) => (
|
||||||
|
<div
|
||||||
|
css={css`
|
||||||
|
padding: 10px 0px;
|
||||||
|
`}
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
css={css`
|
||||||
|
padding: 10px 0px;
|
||||||
|
font-size: 13px;
|
||||||
|
`}
|
||||||
|
>
|
||||||
|
{data.content}
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
css={css`
|
||||||
|
font-size: 12px;
|
||||||
|
font-style: italic;
|
||||||
|
color: ${gray3};
|
||||||
|
`}
|
||||||
|
>
|
||||||
|
{`Answered by ${
|
||||||
|
data.userName
|
||||||
|
} on ${data.created.toLocaleDateString()} ${data.created.toLocaleTimeString()}`}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
|
@ -0,0 +1,31 @@
|
||||||
|
/** @jsxImportSource @emotion/react */
|
||||||
|
import { css } from '@emotion/react';
|
||||||
|
import React from 'react';
|
||||||
|
import { AnswerData } from './QuestionsData';
|
||||||
|
import { Answer } from './Answer';
|
||||||
|
import { gray5 } from './Styles';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
data: AnswerData[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export const AnswerList = ({ data }: Props) => (
|
||||||
|
<ul
|
||||||
|
css={css`
|
||||||
|
list-style: none;
|
||||||
|
margin: 10px 0 0 0;
|
||||||
|
padding: 0;
|
||||||
|
`}
|
||||||
|
>
|
||||||
|
{data.map((answer) => (
|
||||||
|
<li
|
||||||
|
css={css`
|
||||||
|
border-top: 1px solid ${gray5};
|
||||||
|
`}
|
||||||
|
key={answer.answertId}
|
||||||
|
>
|
||||||
|
<Answer data={answer} />
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
);
|
|
@ -2,12 +2,22 @@
|
||||||
import { css } from '@emotion/react';
|
import { css } from '@emotion/react';
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
import { BrowserRouter, Routes, Route } from 'react-router-dom';
|
||||||
|
|
||||||
import { Header } from './Header';
|
import { Header } from './Header';
|
||||||
import { HomePage } from './HomePage';
|
import { HomePage } from './HomePage';
|
||||||
import { fontFamily, fontSize, gray2 } from './Styles';
|
import { fontFamily, fontSize, gray2 } from './Styles';
|
||||||
|
import { SearchPage } from './SearchPage';
|
||||||
|
import { SignInPage } from './SignInPage';
|
||||||
|
import { NotFoundPage } from './NotFoundPage';
|
||||||
|
import { QuestionPage } from './QuestionPage';
|
||||||
|
|
||||||
|
const AskPage = React.lazy(() => import('./AskPage'));
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
return (
|
return (
|
||||||
|
<BrowserRouter>
|
||||||
|
<Header />
|
||||||
<div
|
<div
|
||||||
css={css`
|
css={css`
|
||||||
font-family: ${fontFamily};
|
font-family: ${fontFamily};
|
||||||
|
@ -15,16 +25,35 @@ function App() {
|
||||||
color: ${gray2};
|
color: ${gray2};
|
||||||
`}
|
`}
|
||||||
>
|
>
|
||||||
<Header />
|
<Routes>
|
||||||
<HomePage />
|
<Route path="" element={<HomePage />} />
|
||||||
|
<Route path="search" element={<SearchPage />} />
|
||||||
|
<Route
|
||||||
|
path="ask"
|
||||||
|
element={
|
||||||
|
<React.Suspense
|
||||||
|
fallback={
|
||||||
|
<div
|
||||||
|
css={css`
|
||||||
|
margin-top: 100px;
|
||||||
|
text-align: center;
|
||||||
|
`}
|
||||||
|
>
|
||||||
|
Loading...
|
||||||
</div>
|
</div>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<AskPage />
|
||||||
|
</React.Suspense>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<Route path="signin" element={<SignInPage />} />
|
||||||
|
<Route path="questions/:questionId" element={<QuestionPage />} />
|
||||||
|
<Route path="*" element={<NotFoundPage />} />
|
||||||
|
</Routes>
|
||||||
|
</div>
|
||||||
|
</BrowserRouter>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
class ProblemComponent extends React.Component {
|
|
||||||
render() {
|
|
||||||
return <div ref="div" />;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default App;
|
export default App;
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
import React from 'react';
|
||||||
|
import { Page } from './Page';
|
||||||
|
|
||||||
|
export const AskPage = () => <Page title="Ask a question">{null}</Page>;
|
||||||
|
|
||||||
|
export default AskPage;
|
|
@ -1,9 +1,10 @@
|
||||||
/** @jsxImportSource @emotion/react */
|
/** @jsxImportSource @emotion/react */
|
||||||
import { css } from '@emotion/react';
|
import { css } from '@emotion/react';
|
||||||
import { fontFamily, fontSize, gray1, gray2, gray5 } from './Styles';
|
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
import { Link } from 'react-router-dom';
|
||||||
|
|
||||||
import { UserIcon } from './Icons';
|
import { UserIcon } from './Icons';
|
||||||
|
import { fontFamily, fontSize, gray1, gray2, gray5 } from './Styles';
|
||||||
|
|
||||||
export const Header = () => {
|
export const Header = () => {
|
||||||
const handleSearchInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
const handleSearchInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
|
@ -26,8 +27,8 @@ export const Header = () => {
|
||||||
box-shadow: 0 3px 7px 0 rgba(100, 112, 114, 0.21);
|
box-shadow: 0 3px 7px 0 rgba(100, 112, 114, 0.21);
|
||||||
`}
|
`}
|
||||||
>
|
>
|
||||||
<a
|
<Link
|
||||||
href="./"
|
to="/"
|
||||||
css={css`
|
css={css`
|
||||||
font-size: 24px;
|
font-size: 24px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
@ -36,7 +37,7 @@ export const Header = () => {
|
||||||
`}
|
`}
|
||||||
>
|
>
|
||||||
Q & A
|
Q & A
|
||||||
</a>
|
</Link>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
placeholder="Search ..."
|
placeholder="Search ..."
|
||||||
|
@ -57,8 +58,8 @@ export const Header = () => {
|
||||||
}
|
}
|
||||||
`}
|
`}
|
||||||
/>
|
/>
|
||||||
<a
|
<Link
|
||||||
href="./signin"
|
to="signin"
|
||||||
css={css`
|
css={css`
|
||||||
font-family: ${fontFamily};
|
font-family: ${fontFamily};
|
||||||
font-size: ${fontSize};
|
font-size: ${fontSize};
|
||||||
|
@ -76,14 +77,8 @@ export const Header = () => {
|
||||||
`}
|
`}
|
||||||
>
|
>
|
||||||
<UserIcon />
|
<UserIcon />
|
||||||
<span
|
<span>Sign In</span>
|
||||||
css={css`
|
</Link>
|
||||||
margin-left: 7px;
|
|
||||||
`}
|
|
||||||
>
|
|
||||||
Sign In
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
/** @jsxImportSource @emotion/react */
|
/** @jsxImportSource @emotion/react */
|
||||||
import { css } from '@emotion/react';
|
import { css } from '@emotion/react';
|
||||||
|
import { useNavigate } from 'react-router-dom';
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { PageTitle } from './PageTitle';
|
import { PageTitle } from './PageTitle';
|
||||||
|
@ -21,8 +22,9 @@ export const HomePage = () => {
|
||||||
doGetUnansweredQuestion();
|
doGetUnansweredQuestion();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
const navigate = useNavigate();
|
||||||
const handleAskQuestionClick = () => {
|
const handleAskQuestionClick = () => {
|
||||||
console.log('TODO - move to the AskPage');
|
navigate('ask');
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
import React from 'react';
|
||||||
|
import { Page } from './Page';
|
||||||
|
|
||||||
|
export const NotFoundPage = () => <Page title="Page Not Found">{null}</Page>;
|
|
@ -1,8 +1,9 @@
|
||||||
/** @jsxImportSource @emotion/react */
|
/** @jsxImportSource @emotion/react */
|
||||||
import { css } from '@emotion/react';
|
import { css } from '@emotion/react';
|
||||||
import { gray2, gray3 } from './Styles';
|
import { Link } from 'react-router-dom';
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
|
import { gray2, gray3 } from './Styles';
|
||||||
import { QuestionData } from './QuestionsData';
|
import { QuestionData } from './QuestionsData';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
|
@ -17,8 +18,16 @@ export const Question = ({ data, showContent }: Props) => (
|
||||||
padding: 10px 0px;
|
padding: 10px 0px;
|
||||||
font-size: 19px;
|
font-size: 19px;
|
||||||
`}
|
`}
|
||||||
|
>
|
||||||
|
<Link
|
||||||
|
css={css`
|
||||||
|
text-decoration: none;
|
||||||
|
color: ${gray2};
|
||||||
|
`}
|
||||||
|
to={`/questions/${data.questionId}`}
|
||||||
>
|
>
|
||||||
{data.title}
|
{data.title}
|
||||||
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
{showContent && (
|
{showContent && (
|
||||||
<div
|
<div
|
||||||
|
|
|
@ -0,0 +1,72 @@
|
||||||
|
/** @jsxImportSource @emotion/react */
|
||||||
|
import { css } from '@emotion/react';
|
||||||
|
import { gray3, gray6 } from './Styles';
|
||||||
|
|
||||||
|
import React from 'react';
|
||||||
|
import { useParams } from 'react-router-dom';
|
||||||
|
|
||||||
|
import { Page } from './Page';
|
||||||
|
import { QuestionData, getQuestion } from './QuestionsData';
|
||||||
|
import { AnswerList } from './AnswerList';
|
||||||
|
|
||||||
|
export const QuestionPage = () => {
|
||||||
|
const [question, setQuestion] = React.useState<QuestionData | null>(null);
|
||||||
|
const { questionId } = useParams();
|
||||||
|
React.useEffect(() => {
|
||||||
|
const doGetQuestion = async (questionId: number) => {
|
||||||
|
const foundQuestion = await getQuestion(questionId);
|
||||||
|
setQuestion(foundQuestion);
|
||||||
|
};
|
||||||
|
if (questionId) {
|
||||||
|
doGetQuestion(Number(questionId));
|
||||||
|
}
|
||||||
|
}, [questionId]);
|
||||||
|
return (
|
||||||
|
<Page>
|
||||||
|
<div
|
||||||
|
css={css`
|
||||||
|
background-color: white;
|
||||||
|
padding: 15px 20px 20px 20px;
|
||||||
|
border-radius: 4px;
|
||||||
|
border: 1px solid ${gray6};
|
||||||
|
box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.16);
|
||||||
|
`}
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
css={css`
|
||||||
|
font-size: 19px;
|
||||||
|
font-weight: bold;
|
||||||
|
margin: 10px 0px 5px;
|
||||||
|
`}
|
||||||
|
>
|
||||||
|
{question === null ? '' : question.title}
|
||||||
|
</div>
|
||||||
|
{question !== null && (
|
||||||
|
<React.Fragment>
|
||||||
|
<p
|
||||||
|
css={css`
|
||||||
|
margin-top: 0px;
|
||||||
|
background-color: white;
|
||||||
|
`}
|
||||||
|
>
|
||||||
|
{question.content}
|
||||||
|
</p>
|
||||||
|
<div
|
||||||
|
css={css`
|
||||||
|
font-size: 12px;
|
||||||
|
font-style: italic;
|
||||||
|
color: ${gray3};
|
||||||
|
`}
|
||||||
|
>
|
||||||
|
{`Asked by ${
|
||||||
|
question.userName
|
||||||
|
} on ${question.created.toLocaleDateString()} ${question.created.toLocaleTimeString()}`}
|
||||||
|
</div>
|
||||||
|
<AnswerList data={question.answers} />
|
||||||
|
</React.Fragment>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
Question Page {questionId}
|
||||||
|
</Page>
|
||||||
|
);
|
||||||
|
};
|
|
@ -56,3 +56,22 @@ export const getUnansweredQuestions = async (): Promise<QuestionData[]> => {
|
||||||
const wait = (ms: number): Promise<void> => {
|
const wait = (ms: number): Promise<void> => {
|
||||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getQuestion = async (
|
||||||
|
questionId: number,
|
||||||
|
): Promise<QuestionData | null> => {
|
||||||
|
await wait(500);
|
||||||
|
const results = questions.filter((q) => q.questionId === questionId);
|
||||||
|
return results.length === 0 ? null : results[0];
|
||||||
|
};
|
||||||
|
|
||||||
|
export const searchQuestions = async (
|
||||||
|
criteria: string,
|
||||||
|
): Promise<QuestionData[]> => {
|
||||||
|
await wait(500);
|
||||||
|
return questions.filter(
|
||||||
|
(q) =>
|
||||||
|
q.title.toLowerCase().indexOf(criteria.toLowerCase()) >= 0 ||
|
||||||
|
q.content.toLowerCase().indexOf(criteria.toLowerCase()) >= 0,
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
/** @jsxImportSource @emotion/react */
|
||||||
|
import { css } from '@emotion/react';
|
||||||
|
|
||||||
|
import React from 'react';
|
||||||
|
import { useSearchParams } from 'react-router-dom';
|
||||||
|
|
||||||
|
import { Page } from './Page';
|
||||||
|
import { QuestionList } from './QuestionList';
|
||||||
|
import { searchQuestions, QuestionData } from './QuestionsData';
|
||||||
|
|
||||||
|
export const SearchPage = () => {
|
||||||
|
const [searchParams] = useSearchParams();
|
||||||
|
const [questions, setQuestions] = React.useState<QuestionData[]>([]);
|
||||||
|
const search = searchParams.get('criteria') || '';
|
||||||
|
React.useEffect(() => {
|
||||||
|
const doSearch = async (criteria: string) => {
|
||||||
|
const foundResults = await searchQuestions(criteria);
|
||||||
|
setQuestions(foundResults);
|
||||||
|
};
|
||||||
|
doSearch(search);
|
||||||
|
}, [search]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Page title="Search Results">
|
||||||
|
{search && (
|
||||||
|
<p
|
||||||
|
css={css`
|
||||||
|
font-size: 16px;
|
||||||
|
font-style: italic;
|
||||||
|
margin-top: 0px;
|
||||||
|
`}
|
||||||
|
>
|
||||||
|
<QuestionList data={questions} />
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</Page>
|
||||||
|
);
|
||||||
|
};
|
|
@ -0,0 +1,4 @@
|
||||||
|
import React from 'react';
|
||||||
|
import { Page } from './Page';
|
||||||
|
|
||||||
|
export const SignInPage = () => <Page title="Sign In">{null}</Page>;
|
Loading…
Reference in New Issue