Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

fix: resolve conflict

shuai58936ca4f5c8
diff --cc ui/src/pages/Questions/index.tsx
index 556cebaf,7c0cf5f0..cceb0fa6
--- a/ui/src/pages/Questions/index.tsx
+++ b/ui/src/pages/Questions/index.tsx
@@@ -44,46 -51,49 +51,47 @@@ const Questions: FC = () =>
usePageTags({ title: pageTitle, subtitle: slogan });
return (
- <Container className="pt-4 mt-2 mb-5">
- <Row className="justify-content-center">
- <Col xxl={7} lg={8} sm={12}>
- <QuestionList
- source="questions"
- data={listData}
- order={curOrder}
- isLoading={listLoading}
- />
- </Col>
- <Col xxl={3} lg={4} sm={12} className="mt-5 mt-lg-0">
- <CustomSidebar />
- {!loggedUser.username && (
- <div className="card mb-4">
- <div className="card-body">
- <h5 className="card-title">
- {t2('website_welcome', {
- site_name: siteInfo.name,
- })}
- </h5>
- <p className="card-text">{siteInfo.description}</p>
+ <Row className="pt-4 mb-5">
+ <Col className="flex-auto">
+ <QuestionList
+ source="questions"
+ data={listData}
++ order={curOrder}
+ isLoading={listLoading}
+ />
+ </Col>
+ <Col className="page-right-side mt-4 mt-xl-0">
+ <CustomSidebar />
+ {!loggedUser.username && (
+ <div className="card mb-4">
+ <div className="card-body">
+ <h5 className="card-title">
+ {t2('website_welcome', {
+ site_name: siteInfo.name,
+ })}
+ </h5>
+ <p className="card-text">{siteInfo.description}</p>
+ <Link
+ to={userCenter.getLoginUrl()}
+ className="btn btn-primary"
+ onClick={floppyNavigation.handleRouteLinkClick}>
+ {t('login', { keyPrefix: 'btns' })}
+ </Link>
+ {loginSetting.allow_new_registrations ? (
<Link
- to={userCenter.getLoginUrl()}
- className="btn btn-primary"
+ to={userCenter.getSignUpUrl()}
+ className="btn btn-link ms-2"
onClick={floppyNavigation.handleRouteLinkClick}>
- {t('login', { keyPrefix: 'btns' })}
+ {t('signup', { keyPrefix: 'btns' })}
</Link>
- {loginSetting.allow_new_registrations ? (
- <Link
- to={userCenter.getSignUpUrl()}
- className="btn btn-link ms-2"
- onClick={floppyNavigation.handleRouteLinkClick}>
- {t('signup', { keyPrefix: 'btns' })}
- </Link>
- ) : null}
- </div>
+ ) : null}
</div>
- )}
- {loggedUser.access_token && <FollowingTags />}
- <HotQuestions />
- </Col>
- </Row>
- </Container>
+ </div>
+ )}
+ {loggedUser.access_token && <FollowingTags />}
+ <HotQuestions />
+ </Col>
+ </Row>
);
};