Skip to content

Commit f74b491

Browse files
authored
Merge pull request #63 from coder-mind-project/develop
Stable version released - 2.0.2
2 parents 968869b + 55f6a96 commit f74b491

File tree

7 files changed

+993
-795
lines changed

7 files changed

+993
-795
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

Dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM node:latest as node
2+
WORKDIR /app
3+
ENV PATH /app/node_modules/.bin:$PATH
4+
COPY package.json ./
5+
COPY yarn.lock ./
6+
RUN npm install react-scripts -g
7+
RUN yarn install
8+
COPY . ./
9+
RUN yarn build
10+
11+
FROM nginx:stable-alpine
12+
COPY --from=node /app/build /usr/share/nginx/html
13+
COPY nginx.conf /etc/nginx/conf.d/default.conf
14+
EXPOSE 80
15+
CMD ["nginx", "-g", "daemon off;"]

nginx.conf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
server {
2+
listen 80;
3+
4+
location / {
5+
root /usr/share/nginx/html;
6+
index index.html index.htm;
7+
try_files $uri $uri/ /index.html;
8+
}
9+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "coder-mind-panel",
3-
"version": "2.0.1",
3+
"version": "2.0.2",
44
"description": "Coder Mind Panel",
55
"author": "Allan Wanderley Alves",
66
"license": "BSD-3-Clause",

src/components/Articles/Articles.jsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ function Articles(props) {
8989
{
9090
title: <ArticleHeaderTableCell icon="label" label="Status" />,
9191
field: 'state',
92+
render: (rowData) => {
93+
const { state, color, icon } = getArticleState(rowData);
94+
return (<Chip className="cm-chip" text={state} icon={icon} color={color} size="small" sizeIcon="small" />);
95+
},
9296
},
9397
{
9498
title: <ArticleHeaderTableCell icon="bookmark" label="Tema" />,
@@ -99,6 +103,7 @@ function Articles(props) {
99103
field: 'category.name',
100104
},
101105
];
106+
102107
const adminColumns = [
103108
{
104109
title: <ArticleHeaderTableCell icon="article" label="Artigo" />,

src/config/dataProperties.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ export const LIMIT_LABEL = 'Limite: ';
4242
export const DISPLAYED_ROWS = (value) =>
4343
`${value.from}-${value.to} de ${value.count}`;
4444

45-
export const APP_VERSION = '2.0.1';
46-
export const APP_BUILD = 'Alpha';
45+
export const APP_VERSION = '2.0.2';
46+
export const APP_BUILD = 'Stable';
4747
export const APP_DEPENDENCIES = 'https://github.com/coder-mind-project/panel/blob/master/package.json';
4848
export const APP_REPORT_US = 'https://github.com/coder-mind-project/coder-mind-panel/issues/new';
4949

yarn.lock

Lines changed: 960 additions & 792 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)