Skip to content
This repository was archived by the owner on Jan 24, 2024. It is now read-only.

Commit e432518

Browse files
committed
Bulk updates
1 parent 3890ff2 commit e432518

File tree

9 files changed

+87
-24
lines changed

9 files changed

+87
-24
lines changed

Dockerfile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
FROM node:latest
1+
from nginx:1.17
22

3-
RUN mkdir /app
4-
WORKDIR /app
5-
ADD . .
6-
7-
RUN npm install
3+
ADD build /var/www/html
4+
ADD nginx-prod.conf /etc/nginx/conf.d/default.conf

Dockerfile-dev

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM node:latest
2+
3+
RUN mkdir /app
4+
WORKDIR /app

nginx-prod.conf

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
server {
2+
listen 80;
3+
server_name aurora-admin-panel;
4+
5+
root /var/www/html;
6+
index index.html;
7+
8+
location /api {
9+
proxy_pass http://backend:8888/api;
10+
11+
proxy_set_header Host $host;
12+
proxy_set_header X-Real-IP $remote_addr;
13+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
14+
}
15+
16+
location / {
17+
try_files $uri /index.html;
18+
}
19+
20+
}

src/assets/img/profile.jpg

45.1 KB
Loading

src/icons/buttons.svg

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/icons/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { ReactComponent as ButtonsIcon } from './buttons.svg'
21
import { ReactComponent as CardsIcon } from './cards.svg'
32
import { ReactComponent as ChartsIcon } from './charts.svg'
43
import { ReactComponent as FormsIcon } from './forms.svg'
@@ -36,7 +35,6 @@ import { ReactComponent as TwoDotIcon } from './twoDot.svg'
3635

3736

3837
export {
39-
ButtonsIcon,
4038
CardsIcon,
4139
ChartsIcon,
4240
FormsIcon,

src/pages/About.js

Lines changed: 52 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,60 @@
1-
import React from 'react'
1+
import React from "react";
22

3-
import PageTitle from '../components/Typography/PageTitle'
3+
import Profile from "../assets/img/profile.jpg";
44

55
function About() {
66
return (
77
<>
8-
<PageTitle>About</PageTitle>
8+
<section class="text-gray-700 body-font">
9+
<div class="container mx-auto flex px-5 py-20 items-center justify-center flex-col">
10+
<img
11+
class="lg:w-1/6 md:w-2/6 w-3/6 mb-10 object-cover object-center rounded-lg"
12+
alt="hero"
13+
src={Profile}
14+
/>
15+
<div class="text-center lg:w-2/3 w-full">
16+
<h1 class="title-font sm:text-4xl md:text-3xl text-2xl mb-4 font-medium text-gray-900">
17+
极光面板 {process.env.REACT_APP_VERSION}
18+
</h1>
19+
<p class="mt-1 leading-relaxed">
20+
觉得不错的话,欢迎
21+
<a
22+
className="text-blue-500"
23+
href="https://github.com/aurora-admin-panel"
24+
>
25+
star
26+
</a>
27+
</p>
28+
<p class="mt-1 leading-relaxed">
29+
有什么问题,可以来
30+
<a
31+
className="text-blue-500"
32+
href="http://t.me/aurora_admin_panel"
33+
>
34+
telegram
35+
</a>
36+
讨论
37+
</p>
38+
<p class="mt-1 mb-5 leading-relaxed">当然,也可以请我喝杯咖啡</p>
39+
<div class="flex justify-center">
40+
<a
41+
class="inline-flex text-white bg-indigo-500 border-0 py-2 px-6 focus:outline-none hover:bg-indigo-600 rounded text-lg"
42+
href="https://paypal.me/leishi1313"
43+
>
44+
PayPal
45+
</a>
46+
<a
47+
class="ml-4 inline-flex text-gray-700 bg-gray-200 border-0 py-2 px-6 focus:outline-none hover:bg-gray-300 rounded text-lg"
48+
href="https://github.com/sponsors/LeiShi1313/"
49+
>
50+
Github
51+
</a>
52+
</div>
53+
</div>
54+
</div>
55+
</section>
956
</>
10-
)
57+
);
1158
}
1259

13-
export default About
60+
export default About;

src/redux/actions/utils.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1+
import { logout } from "./auth";
12
import { SHOW_BANNER, CLEAR_BANNER } from "../actionTypes";
23

34

45
export const handleError = (dispatch, error) => {
5-
console.log(error);
66
if (error.response) {
77
const response = error.response;
88
if (response.status === 500) {
99
dispatch({
1010
type: SHOW_BANNER,
1111
payload: { title: "Error", body: "Internal Server Error!" },
1212
});
13+
} else if (response.status === 401) {
14+
dispatch(logout())
1315
} else if (response.status >= 400 && response.status < 500) {
1416
const data = response.data;
1517
if (typeof data.detail === "string" || data.detail instanceof String) {

yarn.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9881,6 +9881,11 @@ performance-now@^2.1.0:
98819881
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
98829882
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
98839883

9884+
phosphor-react@^1.0.0:
9885+
version "1.1.1"
9886+
resolved "https://registry.yarnpkg.com/phosphor-react/-/phosphor-react-1.1.1.tgz#f5d8e11b4310f044ae94eb37c39d6fb72fc0c58a"
9887+
integrity sha512-FAFfz3BFvTjlm43Ay+oWQYdHlJgGZ3t1q9pxija3CpGDK4cNBWFeEzU+jYZPzAKNsWxhDZndAdV7Kut3yePRGg==
9888+
98849889
picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
98859890
version "2.2.2"
98869891
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"

0 commit comments

Comments
 (0)