Compare commits
4 Commits
master
...
sohail/dev
Author | SHA1 | Date | |
---|---|---|---|
1f97590857 | |||
3b4701e98c | |||
bdaafab005 | |||
22bc50b0dd |
@ -1,3 +1,2 @@
|
|||||||
.idea/
|
.idea/
|
||||||
dist/
|
|
||||||
node_modules/
|
node_modules/
|
||||||
|
5
Dockerfile.local-build
Normal file
5
Dockerfile.local-build
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
FROM nginx:mainline-alpine
|
||||||
|
|
||||||
|
COPY ./dist/cic-staff-client /usr/share/nginx/html
|
||||||
|
|
||||||
|
EXPOSE 80
|
13
README.md
13
README.md
@ -4,6 +4,19 @@ An angular admin web client for managing users and transactions in the CIC netwo
|
|||||||
|
|
||||||
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 10.2.0.
|
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 10.2.0.
|
||||||
|
|
||||||
|
## Node 17 Specific Dev/Build Environment
|
||||||
|
|
||||||
|
* In `package.json:dependencies` -> `"cic-client-meta": "file:./tmp/cic-client-meta-0.0.7-alpha.6.tgz",`
|
||||||
|
* in `package.json:scripts` -> `"start:dev": "export NODE_OPTIONS=--openssl-legacy-provider; ng serve -c dev",`
|
||||||
|
|
||||||
|
Building Docker images:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# bump package if making a change
|
||||||
|
$ yarn build:prod
|
||||||
|
$ docker build -t cic-staff-client:latest -f Dockerfile.local-build .
|
||||||
|
```
|
||||||
|
|
||||||
## Angular CLI
|
## Angular CLI
|
||||||
|
|
||||||
Run `npm install -g @angular/cli` to install the angular CLI.
|
Run `npm install -g @angular/cli` to install the angular CLI.
|
||||||
|
14
package.json
14
package.json
@ -1,13 +1,13 @@
|
|||||||
{
|
{
|
||||||
"name": "cic-staff-client",
|
"name": "cic-staff-client",
|
||||||
"version": "0.0.0",
|
"version": "0.2.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"config:dev": "ts-node set-env.ts --environment=dev",
|
"config:dev": "ts-node set-env.ts --environment=dev",
|
||||||
"config:prod": "ts-node set-env.ts --environment=prod",
|
"config:prod": "ts-node set-env.ts --environment=prod",
|
||||||
"start:dev": "ng serve -c dev",
|
"start:dev": "export NODE_OPTIONS=--openssl-legacy-provider; ng serve -c dev",
|
||||||
"start:prod": "ng serve --prod",
|
"start:prod": "export NODE_OPTIONS=--openssl-legacy-provider; ng serve --prod",
|
||||||
"build:dev": "ng build -c dev",
|
"build:dev": "export NODE_OPTIONS=--openssl-legacy-provider; ng build -c dev",
|
||||||
"build:prod": "ng build --prod",
|
"build:prod": "export NODE_OPTIONS=--openssl-legacy-provider; ng build --prod",
|
||||||
"start:pwa": "npm run build:prod && http-server -p 4200 dist/cic-staff-client",
|
"start:pwa": "npm run build:prod && http-server -p 4200 dist/cic-staff-client",
|
||||||
"test": "ng test",
|
"test": "ng test",
|
||||||
"format:check": "prettier --config ./.prettierrc --list-different src/**/*.{ts,js,json,css,scss,html}",
|
"format:check": "prettier --config ./.prettierrc --list-different src/**/*.{ts,js,json,css,scss,html}",
|
||||||
@ -37,10 +37,10 @@
|
|||||||
"@angular/router": "~10.2.0",
|
"@angular/router": "~10.2.0",
|
||||||
"@angular/service-worker": "~10.2.0",
|
"@angular/service-worker": "~10.2.0",
|
||||||
"@cicnet/cic-client": "^0.1.6",
|
"@cicnet/cic-client": "^0.1.6",
|
||||||
"@cicnet/schemas-data-validator": "*",
|
"@cicnet/schemas-data-validator": "1.0.0-alpha.3",
|
||||||
"@popperjs/core": "^2.5.4",
|
"@popperjs/core": "^2.5.4",
|
||||||
"bootstrap": "^4.5.3",
|
"bootstrap": "^4.5.3",
|
||||||
"cic-client-meta": "0.0.7-alpha.6",
|
"cic-client-meta": "file:./pkg/cic-client-meta-0.0.7-alpha.6.tgz",
|
||||||
"ethers": "^5.0.31",
|
"ethers": "^5.0.31",
|
||||||
"http-server": "^0.12.3",
|
"http-server": "^0.12.3",
|
||||||
"jquery": "^3.5.1",
|
"jquery": "^3.5.1",
|
||||||
|
BIN
pkg/cic-client-meta-0.0.7-alpha.6.tgz
Normal file
BIN
pkg/cic-client-meta-0.0.7-alpha.6.tgz
Normal file
Binary file not shown.
@ -76,12 +76,15 @@ export class AuthService {
|
|||||||
};
|
};
|
||||||
const options = {
|
const options = {
|
||||||
headers,
|
headers,
|
||||||
|
credentials: 'include' as RequestCredentials,
|
||||||
};
|
};
|
||||||
return fetch(environment.cicMetaUrl, options);
|
return fetch(environment.cicMetaUrl, options);
|
||||||
}
|
}
|
||||||
|
|
||||||
getChallenge(): Promise<any> {
|
getChallenge(): Promise<any> {
|
||||||
return fetch(environment.cicMetaUrl).then((response) => {
|
return fetch(environment.cicMetaUrl, {
|
||||||
|
credentials: 'include',
|
||||||
|
}).then((response) => {
|
||||||
if (response.status === 401) {
|
if (response.status === 401) {
|
||||||
const authHeader: string = response.headers.get('WWW-Authenticate');
|
const authHeader: string = response.headers.get('WWW-Authenticate');
|
||||||
return hobaParseChallengeHeader(authHeader);
|
return hobaParseChallengeHeader(authHeader);
|
||||||
|
@ -6,7 +6,8 @@ export const environment = {
|
|||||||
logLevel: NgxLoggerLevel.DEBUG,
|
logLevel: NgxLoggerLevel.DEBUG,
|
||||||
serverLogLevel: NgxLoggerLevel.OFF,
|
serverLogLevel: NgxLoggerLevel.OFF,
|
||||||
loggingUrl: '',
|
loggingUrl: '',
|
||||||
cicMetaUrl: 'https://meta-auth.dev.grassrootseconomics.net:443',
|
// This should match the cic-auth-helper
|
||||||
|
cicMetaUrl: 'http://127.0.0.1:5555',
|
||||||
publicKeysUrl: 'https://dev.grassrootseconomics.net/.well-known/publickeys/',
|
publicKeysUrl: 'https://dev.grassrootseconomics.net/.well-known/publickeys/',
|
||||||
cicCacheUrl: 'https://cache.dev.grassrootseconomics.net',
|
cicCacheUrl: 'https://cache.dev.grassrootseconomics.net',
|
||||||
web3Provider: 'wss://bloxberg-ws.dev.grassrootseconomics.net',
|
web3Provider: 'wss://bloxberg-ws.dev.grassrootseconomics.net',
|
||||||
|
Loading…
Reference in New Issue
Block a user