Skip to content

Commit

Permalink
Merge pull request #547 from answerdev/feat/1.2.0/ui
Browse files Browse the repository at this point in the history
Feat/1.2.0/UI
  • Loading branch information
shuashuai authored Sep 25, 2023
2 parents 116d1e3 + 7f1186b commit 514217b
Show file tree
Hide file tree
Showing 11 changed files with 2,141 additions and 3,609 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ ARG TAGS="sqlite sqlite_unlock_notify"
ENV TAGS "bindata timetzdata $TAGS"
ARG CGO_EXTRA_CFLAGS

RUN chmod 755 answer
RUN ["/bin/bash","-c","script/build_plugin.sh"]
RUN cp answer /usr/bin/answer

COPY . ${BUILD_DIR}
WORKDIR ${BUILD_DIR}
RUN apk --no-cache add build-base git bash nodejs npm && npm install -g pnpm corepack \
&& make install-ui-packages clean build

RUN chmod 755 answer
RUN ["/bin/bash","-c","script/build_plugin.sh"]
RUN cp answer /usr/bin/answer

RUN mkdir -p /data/uploads && chmod 777 /data/uploads \
&& mkdir -p /data/i18n && cp -r i18n/*.yaml /data/i18n

Expand Down
2 changes: 1 addition & 1 deletion ui/.env.development
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
PUBLIC_URL
REACT_APP_API_URL = http://127.0.0.1
REACT_APP_API_URL = http://10.0.20.84:8080/
2 changes: 0 additions & 2 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
"clean": "rm -rf node_modules && rm -rf src/plugins/**/node_modules"
},
"dependencies": {
"answer-chart": "workspace:^",
"answer-formula": "workspace:^",
"axios": "^0.27.2",
"bootstrap": "^5.3.0",
"bootstrap-icons": "^1.10.5",
Expand Down
Loading

0 comments on commit 514217b

Please sign in to comment.