Skip to content

Commit 2c0d9a8

Browse files
horlahhorlah
authored
Complete dashboard rebuild to angular (#194)
* complete dashboard rebuild to angular * UI fixes and clean up
1 parent 28e19f4 commit 2c0d9a8

File tree

101 files changed

+14783
-19982
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+14783
-19982
lines changed

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM node:14 as node-env
33
WORKDIR /app
44
COPY ./web/ui/dashboard .
5-
RUN npm install --production
5+
RUN npm install
66
RUN npm run build
77

88
FROM golang:1.16 as build-env
@@ -12,7 +12,7 @@ COPY ./go.mod /go/src/frain-dev/convoy
1212
COPY ./go.sum /go/src/frain-dev/convoy
1313
COPY ./convoy.json /go/src/frain-dev/convoy
1414

15-
COPY --from=node-env /app/build /go/src/frain-dev/convoy/server/ui/build
15+
COPY --from=node-env /app/dist /go/src/frain-dev/convoy/server/ui/build
1616
# Get dependancies - will also be cached if we don't change mod/sum
1717
RUN go mod download
1818
RUN go mod verify

‎convoy.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ build_react_files()
2525
echo "==> Installing node js version $INSTALL_NODE_VER"
2626
nvm install $INSTALL_NODE_VER
2727

28-
exec_assert "npm install --production"
28+
exec_assert "npm install"
2929
exec_assert "npm run build"
30-
exec_assert "cp -r build/* $SCRIPT_DIR/server/ui/build"
31-
exec_assert "rm -rf build"
30+
exec_assert "cp -r dist/* $SCRIPT_DIR/server/ui/build"
31+
exec_assert "rm -rf dist"
3232
}
3333

3434
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

‎web/ui/dashboard/.browserslistrc

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
2+
# For additional information regarding the format and rule options, please see:
3+
# https://github.com/browserslist/browserslist#queries
4+
5+
# For the full list of supported browsers by the Angular framework, please see:
6+
# https://angular.io/guide/browser-support
7+
8+
# You can see what browsers were selected by your queries by running:
9+
# npx browserslist
10+
11+
last 1 Chrome version
12+
last 1 Firefox version
13+
last 2 Edge major versions
14+
last 2 Safari major versions
15+
last 2 iOS major versions
16+
Firefox ESR
17+
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

‎web/ui/dashboard/.editorconfig

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Editor configuration, see https://editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
indent_style = space
7+
indent_size = 4
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[*.ts]
12+
quote_type = single
13+
14+
[*.md]
15+
max_line_length = off
16+
trim_trailing_whitespace = false

‎web/ui/dashboard/.gitignore

+37-15
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,45 @@
1-
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
1+
# See http://help.github.com/ignore-files/ for more about ignoring files.
2+
3+
# compiled output
4+
/dist
5+
/tmp
6+
/out-tsc
7+
# Only exists if Bazel was run
8+
/bazel-out
29

310
# dependencies
411
/node_modules
5-
/.pnp
6-
.pnp.js
712

8-
# testing
9-
/coverage
13+
# profiling files
14+
chrome-profiler-events*.json
15+
16+
# IDEs and editors
17+
/.idea
18+
.project
19+
.classpath
20+
.c9/
21+
*.launch
22+
.settings/
23+
*.sublime-workspace
1024

11-
# production
12-
/build
25+
# IDE - VSCode
26+
.vscode/*
27+
!.vscode/settings.json
28+
!.vscode/tasks.json
29+
!.vscode/launch.json
30+
!.vscode/extensions.json
31+
.history/*
1332

1433
# misc
15-
.DS_Store
16-
.env.local
17-
.env.development.local
18-
.env.test.local
19-
.env.production.local
34+
/.sass-cache
35+
/connect.lock
36+
/coverage
37+
/libpeerconnection.log
38+
npm-debug.log
39+
yarn-error.log
40+
testem.log
41+
/typings
2042

21-
npm-debug.log*
22-
yarn-debug.log*
23-
yarn-error.log*
43+
# System Files
44+
.DS_Store
45+
Thumbs.db

‎web/ui/dashboard/.prettierrc

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"singleQuote": true,
3-
"tabWidth": 4,
4-
"printWidth": 210,
5-
"semi": true,
6-
"endOfLine": "auto",
7-
"arrowParens": "avoid",
8-
"bracketSpacing": true,
9-
"htmlWhitespaceSensitivity": "ignore",
10-
"insertPragma": false,
11-
"jsxBracketSameLine": true,
12-
"jsxSingleQuote": false,
13-
"proseWrap": "preserve",
14-
"quoteProps": "as-needed",
15-
"requirePragma": false,
16-
"trailingComma": "none",
17-
"useTabs": true,
18-
"vueIndentScriptAndStyle": false
2+
"singleQuote": true,
3+
"tabWidth": 4,
4+
"printWidth": 210,
5+
"semi": true,
6+
"endOfLine": "auto",
7+
"arrowParens": "avoid",
8+
"bracketSpacing": true,
9+
"htmlWhitespaceSensitivity": "ignore",
10+
"insertPragma": false,
11+
"jsxBracketSameLine": true,
12+
"jsxSingleQuote": false,
13+
"proseWrap": "preserve",
14+
"quoteProps": "as-needed",
15+
"requirePragma": false,
16+
"trailingComma": "none",
17+
"useTabs": true,
18+
"vueIndentScriptAndStyle": false
1919
}

0 commit comments

Comments
 (0)