Skip to content

Commit

Permalink
v0.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Mehver committed Apr 2, 2023
1 parent e393db9 commit 6f92234
Show file tree
Hide file tree
Showing 17 changed files with 40 additions and 31 deletions.
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
FROM node:16-alpine3.16
WORKDIR /usr/lib/timetender
COPY . .
RUN npm install --legacy-peer-deps \
&& npm run build \
&& rm -rf node_modules
RUN npm install --omit=dev --legacy-peer-deps \
&& npm install dos2unix -g \
&& dos2unix /usr/lib/timetender/init/init.sh
&& dos2unix /usr/lib/timetender/bin/init.sh
EXPOSE 8080
CMD [ "sh", "/usr/lib/timetender/init/init.sh" ]
CMD [ "sh", "/usr/lib/timetender/bin/init.sh" ]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="center">
<img src="https://github.com/TitanRGB/Timetender/raw/main/%23README/icon/256.png" width="20%"/>
<h1>Timetender <code>v0.1.1</code></h1>
<h1>Timetender <code>v0.1.2</code></h1>
<a href='https://github.com/TitanRGB/Timetender'><img src="https://img.shields.io/badge/-GitHub-3A3A3A?style=flat&amp;logo=GitHub&amp;logoColor=white" referrerpolicy="no-referrer" alt="GitHub"></a>
<a href='https://hub.docker.com/r/titanrgb/timetender'><img src="https://img.shields.io/badge/-DockerHub-1c90ed?style=flat&amp;logo=Docker&amp;logoColor=white" referrerpolicy="no-referrer" alt="DockerHub"></a>
<a href='https://quay.io/repository/titanrgb/timetender'><img src="https://img.shields.io/badge/-Quay.io-ee0000?style=flat&amp;logo=RedHat&amp;logoColor=white" referrerpolicy="no-referrer" alt="Quay.io"></a>
Expand Down
2 changes: 2 additions & 0 deletions bin/docker_windev_n16bs.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
set host_path=%cd%\..\
docker run -it --rm -v %host_path%:/docker_dev -w /docker_dev node:16-bullseye bash
2 changes: 2 additions & 0 deletions bin/docker_windev_n16bs_p3000.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
set host_path=%cd%\..\
docker run -it --rm -p 3000:3000 -v %host_path%:/docker_dev -w /docker_dev node:16-bullseye bash
2 changes: 2 additions & 0 deletions bin/docker_windev_n16bs_p8080.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
set host_path=%cd%\..\
docker run -it --rm -p 8080:8080 -v %host_path%:/docker_dev -w /docker_dev node:16-bullseye bash
19 changes: 19 additions & 0 deletions bin/init.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
if [ ! -f /usr/lib/timetender/config/timetender.json ]; then
cp /usr/lib/timetender/bin/init/config/timetender.json /usr/lib/timetender/config/timetender.json
fi
if [ ! -f /usr/lib/timetender/data/data.json ]; then
cp /usr/lib/timetender/bin/init/data/data.json /usr/lib/timetender/data/data.json
fi
if [ ! -f /usr/lib/timetender/data/data_auto-save.json ]; then
cp /usr/lib/timetender/bin/init/data/data_auto-save.json /usr/lib/timetender/data/data_auto-save.json
fi
if [ ! -f /usr/lib/timetender/data/event.json ]; then
cp /usr/lib/timetender/bin/init/data/event.json /usr/lib/timetender/data/event.json
fi
if [ ! -f /usr/lib/timetender/data/tag.json ]; then
cp /usr/lib/timetender/bin/init/data/tag.json /usr/lib/timetender/data/tag.json
fi
node /usr/lib/timetender/server.js



5 changes: 5 additions & 0 deletions bin/init/config/timetender.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[
{
"version": "0.1.2"
}
]
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion config/timetender.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[
{
"version": "0.1.1"
"version": "0.1.2"
}
]
5 changes: 0 additions & 5 deletions init/config/timetender.json

This file was deleted.

19 changes: 0 additions & 19 deletions init/init.sh

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Timetender",
"version": "0.1.1",
"version": "0.1.2",
"homepage": ".",
"private": true,
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/component/TopBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class TopBar extends React.Component {
return (
<>
<div id="topBar" style={topBarCss}>
<p style={titleCss}>Timetender&nbsp;v0.1.1</p>
<p style={titleCss}>Timetender&nbsp;v0.1.2</p>
</div>
</>
)
Expand Down
2 changes: 1 addition & 1 deletion src/component/Windows-Setting.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default class Setting extends React.Component {
backgroundColor: '#fff',
}}
/>
<p style={{fontSize: 25}}>Timetender v0.1.1</p>
<p style={{fontSize: 25}}>Timetender v0.1.2</p>
<p style={{fontSize: 20}}>GitHub@TitanRGB</p>
<p style={{fontSize: 10}}>https://github.com/TitanRGB/Timetender</p>
<p style={{fontSize: 15}}>Copyright © 2022-present Timetender</p>
Expand Down

0 comments on commit 6f92234

Please sign in to comment.