Skip to content

Commit

Permalink
Display fixes (#1707)
Browse files Browse the repository at this point in the history
* fix(graphql): coordinate with hasura

* fix(share): display error in dark mode

* fix(home): display error

* refactor(index): update links in footer

* fix(index): display error on mobile
  • Loading branch information
FranGuam authored Apr 3, 2024
1 parent 8cb90b8 commit 5d7ad6f
Show file tree
Hide file tree
Showing 9 changed files with 143 additions and 287 deletions.
5 changes: 1 addition & 4 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
<html lang="zh-cmn-Hans">
<head>
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=0, shrink-to-fit=no, maximum-scale=0"
/>
<meta name="viewport" content="width=465, initial-scale=1" />
<meta name="description" content="清华大学电子工程系学生科协" />
<meta name="theme-color" content="#027dcd" />
<meta name="apple-mobile-web-app-title" content="EESAST" />
Expand Down
57 changes: 5 additions & 52 deletions src/app/HomeSite/DivisionPage.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
import React from "react";
import { Tabs, Typography, Row, Col } from "antd";
import {
BugOutlined,
ToolOutlined,
UnorderedListOutlined,
ReadOutlined,
DesktopOutlined,
} from "@ant-design/icons";
import styled from "styled-components";
import Picture from "../Components/Picture";
import { PageProps } from "..";
Expand Down Expand Up @@ -35,15 +28,7 @@ const DivisionPage: React.FC<PageProps> = ({ mode, user }) => {
}}
tabPosition="left"
>
<TabPane
tab={
<span>
<BugOutlined />
软件部
</span>
}
key="software"
>
<TabPane tab="软件部" key="software">
<StyledTypography>
<Typography.Title level={2}>软件部</Typography.Title>
<Image
Expand Down Expand Up @@ -83,15 +68,7 @@ const DivisionPage: React.FC<PageProps> = ({ mode, user }) => {
</Row>
</StyledTypography>
</TabPane>
<TabPane
tab={
<span>
<ToolOutlined />
硬件部
</span>
}
key="hardware"
>
<TabPane tab="硬件部" key="hardware">
<StyledTypography>
<Typography.Title level={2}>硬件部</Typography.Title>
<Image
Expand Down Expand Up @@ -156,15 +133,7 @@ const DivisionPage: React.FC<PageProps> = ({ mode, user }) => {
</p>
</StyledTypography>
</TabPane>
<TabPane
tab={
<span>
<UnorderedListOutlined />
项目部
</span>
}
key="project"
>
<TabPane tab="项目部" key="project">
<StyledTypography>
<Typography.Title level={2}>项目部</Typography.Title>
<Row justify="space-around" align="middle">
Expand Down Expand Up @@ -196,15 +165,7 @@ const DivisionPage: React.FC<PageProps> = ({ mode, user }) => {
</p>
</StyledTypography>
</TabPane>
<TabPane
tab={
<span>
<ReadOutlined />
学培部
</span>
}
key="training"
>
<TabPane tab="学培部" key="training">
<StyledTypography>
<Typography.Title level={2}>学培部</Typography.Title>
<Italic>
Expand Down Expand Up @@ -252,15 +213,7 @@ const DivisionPage: React.FC<PageProps> = ({ mode, user }) => {
</p>
</StyledTypography>
</TabPane>
<TabPane
tab={
<span>
<DesktopOutlined />
宣策部
</span>
}
key="publicity"
>
<TabPane tab="宣策部" key="publicity">
<StyledTypography>
<Typography.Title level={2}>宣策部</Typography.Title>
<Row justify="space-between" align="middle">
Expand Down
6 changes: 5 additions & 1 deletion src/app/ShareSite/MinecraftPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ const MinecraftPage: React.FC<PageProps> = ({ mode, user }) => {
return (
<Space
direction="vertical"
style={{ margin: 0, padding: "1% 20%", backgroundColor: "white" }}
style={{
margin: 0,
padding: "20px 10%",
backgroundColor: mode === "light" ? `white` : `#141414`,
}}
>
<Typography>
<Title level={1}>
Expand Down
2 changes: 1 addition & 1 deletion src/app/ShareSite/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const ShareSite: React.FC<PageProps> = ({ mode, user }) => {
// },
{
key: "weekly",
label: <Link to={url.link("weekly")}>推送</Link>,
label: <Link to={url.link("weekly")}>Weekly</Link>,
},
{
key: "minecraft",
Expand Down
16 changes: 6 additions & 10 deletions src/app/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -442,20 +442,16 @@ const App: React.FC = () => {
<StyledFooter>
<h2>友情链接</h2>
<p>
<a href="https://docs.eesast.com">
DOCS <ExportOutlined />
<a href="https://www.tsinghua.edu.cn/">
清华大学官网 <ExportOutlined />
</a>
&nbsp;&nbsp;
<a href="https://overleaf.eesast.com">
OVERLEAF <ExportOutlined />
<a href="https://www.ee.tsinghua.edu.cn/">
电子工程系官网 <ExportOutlined />
</a>
&nbsp;&nbsp;
<a href="https://mc.eesast.com">
MINECRAFT <ExportOutlined />
</a>
&nbsp;&nbsp;
<a href="https://space.bilibili.com/687960301">
BILIBILI <ExportOutlined />
<a href="https://github.com/eesast">
科协GitHub仓库 <ExportOutlined />
</a>
</p>
<p>
Expand Down
Loading

0 comments on commit 5d7ad6f

Please sign in to comment.