Compare commits

..

No commits in common. "75f7caf2cc57aa3b78e4e5a8a6274122d6a7d4f3" and "c75bf4f9fead600b8acb076670f4f291aa29f582" have entirely different histories.

9 changed files with 1861 additions and 3272 deletions

4
.env
View File

@ -1,9 +1,9 @@
#REACT_APP_IDENTITY_AUTHENTICATION_URL=http://localhost:5063/identity/authenticate?UserName={username}&Password={password} #REACT_APP_IDENTITY_AUTHENTICATION_URL=http://localhost:5063/identity/authenticate?UserName={username}&Password={password}
REACT_APP_IDENTITY_AUTHENTICATION_URL=https://lab.code-rove.com/identity-server-api/identity/authenticate?UserName={username}&Password={password} REACT_APP_IDENTITY_AUTHENTICATION_URL=https://toodle.ddns.net/identity-server-api/identity/authenticate?UserName={username}&Password={password}
REACT_APP_NETWORK_RESURRECTOR_API_URL=http://localhost:5064 REACT_APP_NETWORK_RESURRECTOR_API_URL=http://localhost:5064
#REACT_APP_NETWORK_RESURRECTOR_SERVER_URL=http://localhost:5062 #REACT_APP_NETWORK_RESURRECTOR_SERVER_URL=http://localhost:5062
#REACT_APP_NETWORK_RESURRECTOR_SERVER_URL=https://lab.code-rove.com/network-resurrector-server-api #REACT_APP_NETWORK_RESURRECTOR_SERVER_URL=https://toodle.ddns.net/network-resurrector-server-api
#600000 milliseconds = 10 minutes #600000 milliseconds = 10 minutes
REACT_APP_MACHINE_PING_INTERVAL=600000 REACT_APP_MACHINE_PING_INTERVAL=600000

View File

@ -1,6 +1,6 @@
PUBLIC_URL=/network-resurrector/ PUBLIC_URL=/network-resurrector/
REACT_APP_IDENTITY_AUTHENTICATION_URL=https://lab.code-rove.com/identity-server-api/identity/authenticate?UserName={username}&Password={password} REACT_APP_IDENTITY_AUTHENTICATION_URL=https://toodle.ddns.net/identity-server-api/identity/authenticate?UserName={username}&Password={password}
REACT_APP_NETWORK_RESURRECTOR_API_URL=https://lab.code-rove.com/network-resurrector-api REACT_APP_NETWORK_RESURRECTOR_API_URL=https://toodle.ddns.net/network-resurrector-api
#900000 milliseconds = 15 minutes #900000 milliseconds = 15 minutes
REACT_APP_MACHINE_PING_INTERVAL=900000 REACT_APP_MACHINE_PING_INTERVAL=900000

3
.gitignore vendored
View File

@ -24,6 +24,3 @@ yarn-error.log*
.eslintcache .eslintcache
debug.log debug.log
build.sh
buildx.sh

2
.npmrc
View File

@ -1 +1 @@
@flare:registry=https://lab.code-rove.com/public-node-registry @flare:registry=https://toodle.ddns.net/public-node-registry

View File

@ -5,7 +5,7 @@ version="1.1.0"
registryPass="***********" registryPass="***********"
echo "Create docker image with version $version." echo "Create docker image with version $version."
docker image build --build-arg APP_VERSION=$version -t "network-resurrector-frontend:$version" . docker image build -t "network-resurrector-frontend:$version" .
echo "Tag docker image with registry prefix." echo "Tag docker image with registry prefix."
docker tag network-resurrector-frontend:$version alpine-nexus:8500/network-resurrector/network-resurrector-frontend:$version docker tag network-resurrector-frontend:$version alpine-nexus:8500/network-resurrector/network-resurrector-frontend:$version

View File

@ -1,5 +1,5 @@
# build environment # build environment
FROM node:14-slim as builder FROM node:12-slim as builder
WORKDIR /app WORKDIR /app
COPY .npmrc .npmrc COPY .npmrc .npmrc
@ -11,7 +11,7 @@ COPY . ./
RUN npm run build RUN npm run build
# production environment # production environment
FROM node:14-slim FROM node:12-slim
RUN printf '\n\n- Copy application files\n' RUN printf '\n\n- Copy application files\n'
ARG APP_SUBFOLDER=network-resurrector ARG APP_SUBFOLDER=network-resurrector
@ -22,11 +22,6 @@ COPY --from=builder /app/build/index.html ./application/
#install static server #install static server
RUN npm install -g serve RUN npm install -g serve
# environment variables
ENV AUTHOR="Tudor Stanciu"
ARG APP_VERSION=0.0.0
ENV APP_VERSION=${APP_VERSION}
#set workdir to root #set workdir to root
WORKDIR / WORKDIR /

5105
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,11 @@
{ {
"name": "network-resurrector-frontend", "name": "network-resurrector-frontend",
"version": "1.1.1", "version": "1.1.0",
"description": "Frontend component of Network resurrector", "description": "Frontend component of Network resurrector",
"author": { "author": {
"name": "Tudor Stanciu", "name": "Tudor Stanciu",
"email": "tudor.stanciu94@gmail.com", "email": "tudor.stanciu94@gmail.com",
"url": "https://lab.code-rove.com/tsp" "url": "https://toodle.ddns.net/tsp"
}, },
"repository": { "repository": {
"type": "git", "type": "git",