Revert "icons fix"

This reverts commit 10cefdc40d.
This commit is contained in:
LENOVO-YOGAI7\toks
2022-03-06 01:01:03 -08:00
parent 10cefdc40d
commit f1c51049d1
12 changed files with 192 additions and 16369 deletions
-8
View File
@@ -1,8 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
-8
View File
@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
-6
View File
@@ -1,6 +0,0 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
</profile>
</component>
-8
View File
@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/WrenchBoardMainSite.iml" filepath="$PROJECT_DIR$/.idea/WrenchBoardMainSite.iml" />
</modules>
</component>
</project>
Generated
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
+1 -1
View File
@@ -5,7 +5,7 @@ services:
context: .
dockerfile: docker/Dockerfile
restart: unless-stopped
#image: registry.chiefsoft.net/wrenchboardmainsite_wrenchboard-www:latest
image: registry.chiefsoft.net/wrenchboardmainsite_wrenchboard-www:latest
ports:
- 9081:3000
extra_hosts:
+102 -3
View File
@@ -1,5 +1,99 @@
# pull official base image
FROM node:13.12.0-alpine
FROM alpine:3.15
ENV NODE_VERSION 14.19.0
RUN addgroup -g 1000 node \
&& adduser -u 1000 -G node -s /bin/sh -D node \
&& apk add --no-cache \
libstdc++ \
&& apk add --no-cache --virtual .build-deps \
curl \
&& ARCH= && alpineArch="$(apk --print-arch)" \
&& case "${alpineArch##*-}" in \
x86_64) \
ARCH='x64' \
CHECKSUM="8d5e638d88b62de2f147dee812a5d74e4860a20468eb7ff32c41a02b58e2aebf" \
;; \
*) ;; \
esac \
&& if [ -n "${CHECKSUM}" ]; then \
set -eu; \
curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \
echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \
&& tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs; \
else \
echo "Building from source" \
# backup build
&& apk add --no-cache --virtual .build-deps-full \
binutils-gold \
g++ \
gcc \
gnupg \
libgcc \
linux-headers \
make \
python3 \
# gpg keys listed at https://github.com/nodejs/node#release-keys
&& for key in \
4ED778F539E3634C779C87C6D7062848A1AB005C \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
108F52B48DB57BB0CC439B2997B01419BD92F80A \
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
; do \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
done \
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
&& cd "node-v$NODE_VERSION" \
&& ./configure \
&& make -j$(getconf _NPROCESSORS_ONLN) V= \
&& make install \
&& apk del .build-deps-full \
&& cd .. \
&& rm -Rf "node-v$NODE_VERSION" \
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \
fi \
&& rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \
&& apk del .build-deps \
# smoke tests
&& node --version \
&& npm --version
ENV YARN_VERSION 1.22.17
RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
&& for key in \
6A010C5166006599AA17F08146C2130DFD2497F5 \
; do \
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
done \
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
&& mkdir -p /opt \
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
&& ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
&& apk del .build-deps-yarn \
# smoke test
&& yarn --version
COPY docker-entrypoint.sh /usr/local/bin/
ENTRYPOINT ["docker-entrypoint.sh"]
# set working directory
WORKDIR /app
@@ -12,9 +106,14 @@ COPY package.json ./
#COPY package-lock.json ./
RUN npm install --silent
RUN npm install react-scripts@3.4.1 -g --silent
RUN npm install -g serve
# add app
COPY . ./
# build app
RUN npm run-script build
# start app
CMD ["npm", "start"]
CMD ["serve", "-s", "build"]
+81 -16321
View File
File diff suppressed because it is too large Load Diff
+7 -7
View File
@@ -2351,8 +2351,8 @@ p {
width: 70px;
text-align: center;
line-height: 70px;
/*background: linear-gradient(135deg, #f8f9fa 0%, #f8f9fa 100%);
box-shadow: 0px 6px 10px 0px rgb(255, 255, 255);*/
background: linear-gradient(135deg, #84bcfa 0%, #2b70fa 100%);
box-shadow: 0px 6px 10px 0px rgba(16, 73, 189, 0.3);
position: relative;
}
.appie-single-service .icon > span {
@@ -2379,22 +2379,22 @@ p {
transform: translateY(-15px);
}
.appie-single-service.item-2 .icon {
/* background: linear-gradient(135deg, #f8f9fa 0%, #f8f9fa 100%);*/
background: linear-gradient(135deg, #f7b8af 0%, #f8452d 100%);
}
.appie-single-service.item-2 .icon span {
background: #f8452d;
}
.appie-single-service.item-3 .icon {
/*background: linear-gradient(135deg, #f8f9fa 0%, #f8f9fa 100%);*/
background: linear-gradient(135deg, #a0eac2 0%, #31c369 100%);
}
.appie-single-service.item-3 .icon span {
background: #60c176;
background: #31c369;
}
.appie-single-service.item-4 .icon {
/* background: linear-gradient(135deg, #d8aaff 0%, #9b2cfa 100%);*/
background: linear-gradient(135deg, #d8aaff 0%, #9b2cfa 100%);
}
.appie-single-service.item-4 .icon span {
background: #2b70fa;
background: #9b2cfa;
}
.appie-single-service.appie-single-services-3 {
background: transparent;
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

+1 -1
View File
@@ -1,7 +1,7 @@
import React from 'react';
import IconOne from '../../assets/images/icon/CreateAccount.png';
import IconTwo from '../../assets/images/icon/FindTask.png';
import IconThree from '../../assets/images/icon/completee.png';
import IconThree from '../../assets/images/icon/Organize.png';
import IconFour from '../../assets/images/icon/Money.png';
function ServicesHomeOne({ className }) {