Skip to content

Commit d5823ff

Browse files
cv5chgpascal123iqojessevzjessevz
authored
Dev (#453)
* - Refactored service injection in base datasource so that not all child classes have to pass the injected services again (#329) - Inject permissionService in base datasource so that datasources kann make permission Checks * Add LoginRedirectService to redirect user after login to the previous visited page or to the dashboard if users are changed. (#331) * Refactor permissionService to use LocalStorageService (#332) * URL navigation now works (#333) * Show checkmark icon after hashlist name in task table, if all hashes of this hashlist are cracked (#334) * 1414 bug taskid not correct on tasks page (#335) * Refactor task and taskwrapper model to one file and add enum for TaskType (task or supertask) * Fix ESLint errors * -Now use taskID instead of taskWrapperID for cracked links - Render supertask cracked as plain text * Fixed issue not being able to access cracked hashes of supertask (#336) * The status symbol is now set depending on the searched value. (#337) * Fix dropdown to close when moving mouse cursor outside (#338) * Refactor echarts (#339) * Various console errors fixed. (#341) * directive for disabling create user button (#340) * Basic Karma test fix (#342) * Refactored most code to new pagination * Fixed pagination in task-chunks * Add unittests for HomeComponent (#344) * Error when executing tests fixed. * disable while loading (#346) * deleted row click (#347) * Added Unit Tests for ui-settings.component * Add unittests for NewUserComponent (#348) * Add unittests for NewUserComponent * Add unittests for NewUserComponent * Added Unit Tests for ui-settings.component * 1291 enhancement add information or tooltip in the wordlistbulk section import supertask (#350) * wip banner or icon * added warning banner * Made it possible to disable pagination * Added tasks-agent table to have an unpagable table * Fixed pagination in files * Fix pagination for hashes of hashlist * Fixed pagination error in agent errors * AccountSettingsPage now showing field and form errors, fixed workflow and added unittests (#351) * Remove redirect to user page after account settings update (#352) * Changed agent binary type attribute to binaryType to conform to json:api standard and fix incompatibility with the serializer (#353) * Fixed ActionMenu errors when used as Context Menu due to failing mouse hover checks (#354) * Added unsortable columns * Fixed sorting in logs * Removed pagination from superhashlist detail page * The hashes are displayed again on the Hashes of Tasks page. (#355) * Website URL now refers to the correct domain. (#356) * should create test * title service test * Enhancement of UI settings tests. * wip test * test * minor fix * password str test * wip tests * test stubs * Removed EditNotification Component * reload() test * icon test * wip tests * more tests * wip * Fixed duplicate-theming-styles CSS warning by importing all-component-themes only once for light theme and importing only all-component-colors for dark-theme * wip * wip * wip * wip * wip * wip * wip * Add unittests for NewAgentComponent * Add CI workflow for Angular test and build (#364) * Configure GitLab Actions workflow to build the project and run tests * Update test.yml * Update test.yml * ChromeHeadless instead of ChromeHeadlessCustom * Karma config singleRun * Update test.yml * Set Karma Config TZ Europe/Berlin * Fix timing issue in test * Remove "ci-test" from workflow branches * Remove on push, because only pull requests are allowed * Add ESLint and prettier checks on push and pull requests (#365) * Add ESLint and prettier checks on push and pull requests * Remove checks for pushes * Add Unittests for New Hashlist Component and fix bug where isSalted a… (#367) * Add Unittests for New Hashlist Component and fix bug where isSalted attribute of hashtype was not respected due to incorrect filter * Remove duplicate test case definition * Fix failing test due to issue in form creation * Fix CI ESLInt and prettier script errors when having multiple files * Fix CI ESLInt and prettier script errors when having multiple files * Downgrade to ESLint 8 as 9 required .js config * Downgrade to ESLint 8 as 9 required .js config * Fixed pretasktable by checking if result keyspace estimation is null (#366) * Fixed pretasktable by checking if result keyspace estimation is null * Fix ESLint error * Get rid of "any" types and add proper typing to "estkeyspace_attack.ts" util --------- Co-authored-by: jessevz <jesse.van.zutphen@nfi.nl> Co-authored-by: cv5ch <176032962+cv5ch@users.noreply.github.com> * Fixed HTTP Response interceptor incorrectly showing "Token expired" i… (#368) * Fixed HTTP Response interceptor incorrectly showing "Token expired" in case wrong credentials were provided in login page. * Fix sometimes failing test * Add unittests for AuthComponent (#369) * Add unittests for AuthComponent * Add check for AuthService be called * wip * wip * wip * Make the "Reset chunk" action in the "Chunk activity" page do an actu… (#370) * Make the "Reset chunk" action in the "Chunk activity" page do an actual backend request and made the functionality a service to avoid code duplication * Fix error in test * Added error messages on form submit, if - based on whether paste or i… (#371) * Added error messages on form submit, if - based on whether paste or import is selected - no file is selected or no hashes are pasted in the input * Fixed ESLint error * clear filter * wip fix recursive * wip * wip * wip * clean up * Added URL validation to URL fields and fixed also no error text shown… (#372) * Added URL validation to URL fields and fixed also no error text shown when forms are built with the dynamic FormComponent * Once again try to fix unit test which sometimes runs, sometimes not... * Get rid of any typings... * working on fixing any * interface fixed pretty lint * clean up and fix * removed forgotten console.log * Add toast error message upon trying to submit the file upload form without specifying a file * Commented out the file upload via URL * Fixed file deletion not showing proper data in confirmation dialog and toasts in edit wordlist, rule, other pages * fixed id when copying pretask / task containing a file * 1498 bug error while to try to copy a pretask into a task (#375) * copy message * removed eslint breaking extension added gitlens * lint * fixed any * new message (#377) * Mod: add nginx security headers config * Fixed some issues regarding auth: (#378) * Fixed some issues regarding auth: - Password visibility button does not submitt form anymore - Token expiration is now checked in HTTP interceptor before each request and user logged out if expired - Token expiration is now checked when tabbing into the application from another browser tab * Fix ESLint errors * Changed ignoreErrors select options to use integer enum as id instead of string (#379) * Mod: remove strict transport header * 1506 bug intermittent no permissions error white screen (#381) * Try to fix the bug by adding app initializer and make permission guard async * Try to fix the bug by adding app initializer and make permission guard async * Fix ESLint Error * Moved auto-login to app initializer to avoid having a token but no user in the auth component (#382) * Improved wordlist generator validation and layout, separated concerns… (#383) * Improved wordlist generator validation and layout, seperated concerns into multiple files and added unittests * Moved Submit error message to ui config ts * Only one success message when updating configs (#384) * Re-render the password form after successful password change to reset form errors. (#385) * Added tests for new-cracker.component. * frontend changes to make it possible to upload files with url * New Preprocessor refactored. * Add unittests for NewFilesComponent (#389) * Added UnitTests for new-preprocessor.component. * Enhance URL Validator to allow only http: and https: as URL protocols (#392) * Removed config.json, Backend URL is now always loaded via environment's "prodAPIEndpoint" (#391) * Fix wrong bulk action menu label (#393) * replaced complex calculation from frontend with backend call * Fixed prettier suggestions * Fixed more lint suggestions * Fixed even more lint suggestions * Fixed prettier suggestion * Dont send POST to agentassignment when agentassignment hasnt changed (#396) Co-authored-by: jessevz <jesse.van.zutphen@nfi.nl> * Revert "Removed config.json, Backend URL is now always loaded via environment…" This reverts commit a0a4c57. * Removed unused hashes from request for report builder * Added URL Validation to the new-preprocessor.component and the unittests. (#398) * Fixed linter suggestions * Fixed more lintign * fixed wrong import * Fixed lint error * Fixed more lint errors * Changed naming of the Column from Name to Type. * Added description for Visual Graph * Fix: check for unassigned agent * Add Backend URL environment to devcontainer.json (#400) * Rename select label (#405) * Add missing Required validation to new task form and rework input-mul… (#406) * Add missing Required validation to new task form and rework input-multiselect to be able to visually render the required error * Get rid of anys * Rework ConfigService to load backend url from config.json only for production and for development from environment.ts * Fixed the assignment of agents to a task * Fixed lint suggestion * Fixed bug where normal tasks will do a query as if it was a pretask * Fixed lint siggestions * Changed formating of hashspeed for task detail (#407) Co-authored-by: jessevz <jesse.van.zutphen@nfi.nl> * Only isCracked=true Hashes were shown in the Hashes of task Table. (#411) * Fixed imports * Fixed linting errors again * 1357 enhancement auto update for several pages 1 (#412) * Add auto-reload to task and agent-status table * Fix some ESLint errors * Fix some ESLint errors * Fix missing import in test * 1401 feature filtering should be made using a backend query insted of directly on the loaded data (#386) * wip backend filtering * wip backend filter * wip new filter * wip * wip * wip * can take all collumns * added switch case for deafult * clean up created model * filter cleanup * clean up * started using filter model, updated filter params added to agents table * wip * agent backend filter * style fix * css fix * agent status backend filtering * taskfilter * backend filtering for pretask and task * superTask query * wip chunks table * 403 message * clean up console.log * hashlist table search * super hashlist backend search wip * super hashlist search * search hash * cracks table done and east egg service * backend filter for files * crackers backend filter * backedn filter pre process * agent-binary backend filter * health check filter * logs backend filter * user backend filter * Global Permission Groups backedn search * Access Groups backedn filter * agent error search * files attack table search * hashed search * notification fileter * task chuunk filter * clean up * clean upp removed old * fix * clean up * clean up * intial value for filter * improved selected column * fixed button bug * voucher serch render id * added debounce directive for filter input * wip * wip * agents table * agent status * filtering turned of for tasktable * pretask and key press enter * wip * wip * wip * wip * lint * lint * lint * lint * wip agents * filter wip * wip * new rewrite * clean up * agent filter ans lint * moved logic to a function * agents filter * agent status * supertask filter * files filter * chunks filtering * only search id * hashlist filter * super hashlist filter fixed constant path alias * clean up wip * wip lint * cracks filter * files table filter * crackers filer * prepro filter * agent binarys filter * hashtypes filter * hc filter * clear search box * logs table * user filter * perm filter * acc group filter * noti filter * agent erro filter * task chunks filter * clean up * disaled filtering for tables that dont need it * lint * lint * lint * more lint * lint * more lint * lint * lint --------- Co-authored-by: cv5ch <176032962+cv5ch@users.noreply.github.com> * Mod: restrict agent stats in agent overview to 24h due to performance problems * Mod: Simplify calculations * Mod: Simplify calculations * Mod: remove console.log * Mod: remove console.log * Mod: remove console.log * Add no-console eslint rule (#415) * Mod: remove console.log * Fix: remove type def any * - Edit Preprocessor and New Preprocessor have been combined into a new component. (#417) - Added unit-tests * Changed position of copy to clipboard button in tables * Fixed pagination by clearing pagination status when switching archived state in tasks overview and added checks for if a taskwrapper has a task object assigned to it * Fixed copilot suggestions * Fixed eslint suggestion * Added archiving and de-archiving of hashlist to frontend * - Green background for tasks with cracked hashes - Show the information how many hashes are left * Added more task validation to frontend * Fixed copilot spelling check * Fixed eslint suggestions * Reset pagination data when switching to archived state * Removed incorrect tooltip * Fixed health check agents table * Fixed eslint suggestions * Fixed using correct id for the cracker table * - Fixed Tests * - Fixed Type Error * Add next update counter and rework auto-refresh feature to a dedicate… (#427) * Add next update counter and rework auto-refresh feature to a dedicated service * Fix some linter errors * Remove unused css * Forward CSS colors * Move forward to _colors.scss * Fix forward * Fix forward * Use token.scss for color variables * Use token.scss for color variables * Add unittests for AutoRefresh service * Fixed cached information at detail pages * Fixed eslint * Fixed copilot suggestions * resolved last eslint suggestion * Added task name as required field * Fixed unsortable columns * Fix npm audit high severity issue (#432) * Ci npm audit (#433) * Add CI workflow for npm audit * Add ci-npm-audit branch to test CI workflow * Add ci-npm-audit branch to test CI workflow * Add ci-npm-audit branch to test CI workflow * Add ci-npm-audit branch to test CI workflow * Remove test branch * Set audit-level to medium * Set audit-level to medium * The icon is now fully displayed. * Bugfix tables showing last-updated (#436) * Fix dark mode not showing last-updated in dashboard (#437) * Assigned agents are now displayed in the table. If an agent becomes unassigned, it is removed from the table and becomes available again in the selection box. (#438) * The entries in the Agent Binaries table are now loaded correctly again. * Fix: remove unnecessary backend calls from agent status component * Fix: remove unnecessary backend calls from agent status component * 1634 enhancement supertask builder page improvements (#441) * - Added title - Changed the default value of benchmark type * Removed the check if at least one base file is selected. * Removed unused code. * Names modified accordingly. (#442) * Fix inconsistent error messages on invalid login credentials (#443) * Initial plan * Fix login error message consistency by using actual error message in toast Co-authored-by: ObsidianOracle <181829716+ObsidianOracle@users.noreply.github.com> * Fix: set error message for error handler * Fix: unit test --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: ObsidianOracle <181829716+ObsidianOracle@users.noreply.github.com> Co-authored-by: gluafamichl <> * Fixed retrieving cracks of a task (#444) * Fixed retrieving cracks of a task * Fixed eslint suggestions --------- Co-authored-by: jessevz <jesse.van.zutphen@nfi.nl> * Fix task name not shown in bulk action confirmation dialog and remove the ID from the dialog (#445) * - Created a Link in the cracked column, which directed users to the c… (#446) * - Created a Link in the cracked column, which directed users to the cracked hashes. - Removed the total cracks in the tasks table. * Tests fixed. * Fixed caching issue, by awaiting ht-table before loading the data (#447) * Fixed caching issue, by awaiting ht-table before loading the data * Fixed eslint suggestions --------- Co-authored-by: jessevz <jesse.van.zutphen@nfi.nl> * prepare for release * Changed Logo (#448) * Fix: npm audit problems by updating to latest possible versions without breaking changes (#449) Co-authored-by: gluafamichl <> * 1663-bug-memory-issues-with-speed-values-on-task-details (#451) * Fix: use new helper to get task speeds to avoid memory and performance problems on task detail page * Mod: do task speed calculation in frontend, fix sorting problems * Mod: do task speed calculation in frontend, fix sorting problems --------- Co-authored-by: gluafamichl <> * 1670-enhancement-ui---edit-task-page-sends-too-many-backend-requests (#452) * Fix: duplicate page loading Fix: only reload agent table and agent assignment input when agent assigment changes * Fix: duplicate agent reload * Fix: unused code removed --------- Co-authored-by: gluafamichl <> --------- Co-authored-by: gpascal123 <171025622+gpascal123@users.noreply.github.com> Co-authored-by: Iqo <niklas.brynolf@gmail.com> Co-authored-by: jessevz <jesse.van.zutphen@nfi.nl> Co-authored-by: gpascal123 <gpascal123@outlook.com> Co-authored-by: jessevz <jessevanzutphen7@hotmail.com> Co-authored-by: gluafamichl <> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: ObsidianOracle <181829716+ObsidianOracle@users.noreply.github.com> Co-authored-by: s3inlc <sein@coray.org> Co-authored-by: gluafamichl <86108041+gluafamichl@users.noreply.github.com>
1 parent 6316f20 commit d5823ff

File tree

584 files changed

+36616
-28128
lines changed

Some content is hidden

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

584 files changed

+36616
-28128
lines changed

.devcontainer/devcontainer.json

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
{
2-
"name": "Hashtopolis Web UI Devcontainer",
3-
"dockerComposeFile": "docker-compose.yml",
4-
"service": "hashtopolis-web-ui-dev",
2+
"name": "Hashtopolis Web UI Devcontainer",
3+
"dockerComposeFile": "docker-compose.yml",
4+
"service": "hashtopolis-web-ui-dev",
55

6-
"workspaceFolder": "/app",
6+
"workspaceFolder": "/app",
77

8-
// Features to add to the dev container. More info: https://containers.dev/features.
9-
// "features": {},
8+
// Features to add to the dev container. More info: https://containers.dev/features.
9+
// "features": {},
1010

11-
// Use 'forwardPorts' to make a list of ports inside the container available locally.
12-
// "forwardPorts": [],
11+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
12+
// "forwardPorts": [],
1313

14-
// Use 'postCreateCommand' to run commands after the container is created.
15-
// "postCreateCommand": "yarn install",
14+
// Use 'postCreateCommand' to run commands after the container is created.
15+
// "postCreateCommand": "yarn install",
1616

17-
// Configure tool-specific properties.
18-
"customizations": {
19-
"vscode": {
20-
"extensions": [
21-
"Angular.ng-template",
22-
"dbaeumer.vscode-eslint",
23-
"esbenp.prettier-vscode",
24-
"amatiasq.sort-imports",
25-
"firefox-devtools.vscode-firefox-debug",
26-
"github.vscode-pull-request-github",
27-
"ms-azuretools.vscode-docker"
28-
]
29-
}
30-
},
17+
// Configure tool-specific properties.
18+
"customizations": {
19+
"vscode": {
20+
"extensions": [
21+
"Angular.ng-template",
22+
"dbaeumer.vscode-eslint",
23+
"esbenp.prettier-vscode",
24+
"eamodio.gitlens",
25+
"firefox-devtools.vscode-firefox-debug",
26+
"github.vscode-pull-request-github",
27+
"ms-azuretools.vscode-docker"
28+
]
29+
}
30+
},
3131

32-
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
33-
// "remoteUser": "root"
32+
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
33+
// "remoteUser": "root"
3434

35-
"remoteEnv": {
36-
"NODE_OPTIONS": "--use-openssl-ca"
37-
},
35+
"remoteEnv": {
36+
"NODE_OPTIONS": "--use-openssl-ca",
37+
},
3838
"overrideCommand": false,
39-
"remoteUser": "node"
39+
"remoteUser": "node"
4040
}

.eslintrc.json

Lines changed: 66 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"overrides": [
55
{
66
"files": ["*.ts"],
7+
"plugins": ["import"],
78
"extends": [
89
"eslint:recommended",
910
"plugin:@typescript-eslint/recommended",
@@ -12,6 +13,19 @@
1213
"plugin:prettier/recommended"
1314
],
1415
"rules": {
16+
"@angular-eslint/prefer-standalone": "off",
17+
"no-console": ["error", { "allow": ["warn", "error"] }],
18+
"no-restricted-imports": [
19+
"error",
20+
{
21+
"patterns": [
22+
{
23+
"group": ["./*", "../*"],
24+
"message": "Relative imports are forbidden. Please use path aliases (e.g., '@models', '@services')."
25+
}
26+
]
27+
}
28+
],
1529
"prettier/prettier": ["error"],
1630
"@angular-eslint/directive-selector": [
1731
"error",
@@ -25,18 +39,67 @@
2539
"error",
2640
{
2741
"type": "element",
28-
"prefix": "app",
42+
"prefix": "",
2943
"style": "kebab-case"
3044
}
3145
],
3246
"sort-imports": [
3347
"error",
3448
{
3549
"ignoreCase": false,
36-
"ignoreDeclarationSort": false,
50+
"ignoreDeclarationSort": true,
3751
"ignoreMemberSort": false,
3852
"memberSyntaxSortOrder": ["none", "all", "multiple", "single"],
39-
"allowSeparatedGroups": false
53+
"allowSeparatedGroups": true
54+
}
55+
],
56+
"import/order": [
57+
"error",
58+
{
59+
"groups": [
60+
"builtin",
61+
"external",
62+
"internal",
63+
["sibling", "parent", "index"]
64+
],
65+
"pathGroups": [
66+
{
67+
"pattern": "@angular/**",
68+
"group": "external",
69+
"position": "after"
70+
},
71+
{
72+
"pattern": "@models/**",
73+
"group": "internal",
74+
"position": "before"
75+
},
76+
{
77+
"pattern": "@services/**",
78+
"group": "internal",
79+
"position": "after"
80+
},
81+
{
82+
"pattern": "@components/**",
83+
"group": "internal",
84+
"position": "after"
85+
},
86+
{
87+
"pattern": "@datasources/**",
88+
"group": "internal",
89+
"position": "after"
90+
},
91+
{
92+
"pattern": "@src/**",
93+
"group": "sibling",
94+
"position": "after"
95+
}
96+
],
97+
"pathGroupsExcludedImportTypes": ["builtin"],
98+
"alphabetize": {
99+
"order": "asc",
100+
"caseInsensitive": true
101+
},
102+
"newlines-between": "always"
40103
}
41104
]
42105
}

.github/workflows/audit.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: npm audit
2+
3+
on:
4+
pull_request: # on every PR to master/dev
5+
branches:
6+
- master
7+
- dev
8+
schedule:
9+
- cron: '0 3 * * *' # every day at 3am
10+
11+
12+
jobs:
13+
scan:
14+
name: npm audit
15+
runs-on: ubuntu-22.04
16+
steps:
17+
- name: Checkout source code
18+
uses: actions/checkout@v4
19+
20+
- name: Setup Node.js
21+
uses: actions/setup-node@v4
22+
with:
23+
node-version: 22.14.0
24+
cache: 'npm'
25+
cache-dependency-path: package-lock.json
26+
- uses: oke-py/npm-audit-action@v3
27+
with:
28+
audit_level: high
29+
github_token: ${{ secrets.GITHUB_TOKEN }}
30+
create_issues: 'false'
31+

.github/workflows/test.yml

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: Angular CI
2+
3+
on:
4+
pull_request:
5+
branches: [ "master", "dev" ] # trigger build on PR to dev/master
6+
7+
jobs:
8+
code-check:
9+
name: Lint & Prettier Check
10+
runs-on: ubuntu-22.04
11+
12+
steps:
13+
- name: Checkout source code
14+
uses: actions/checkout@v4
15+
16+
- name: Setup Node.js
17+
uses: actions/setup-node@v4
18+
with:
19+
node-version: 22.14.0
20+
cache: 'npm'
21+
cache-dependency-path: package-lock.json
22+
23+
- name: Install dependencies
24+
run: npm ci
25+
26+
- name: Fetch base branch (if needed)
27+
run: git fetch origin ${{ github.base_ref }} --depth=1 || true
28+
29+
- name: Get changed files
30+
id: changed-files
31+
uses: tj-actions/changed-files@v44
32+
with:
33+
files: |
34+
**/*.ts
35+
**/*.js
36+
!**/*.spec.ts
37+
38+
- name: Run ESLint on changed files
39+
if: steps.changed-files.outputs.all_changed_files != ''
40+
run: |
41+
FILES="${{ steps.changed-files.outputs.all_changed_files }}"
42+
echo "Linting files: $FILES"
43+
npx eslint $FILES
44+
45+
46+
- name: Run Prettier check on changed files
47+
if: steps.changed-files.outputs.all_changed_files != ''
48+
run: echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr ' ' '\n' | xargs npx prettier --check
49+
50+
build:
51+
name: Run Tests & Build
52+
runs-on: ubuntu-22.04
53+
54+
strategy:
55+
matrix:
56+
node-version: [ 22.14.0 ]
57+
58+
steps:
59+
- name: Checkout source code
60+
uses: actions/checkout@v4
61+
62+
- name: Setup Node.js ${{ matrix.node-version }}
63+
uses: actions/setup-node@v4
64+
with:
65+
node-version: ${{ matrix.node-version }}
66+
cache: 'npm'
67+
cache-dependency-path: package-lock.json
68+
69+
- name: Install dependencies
70+
run: npm ci
71+
72+
- name: Run tests with Karma using ChromeHeadless
73+
run: npm run test:ci
74+
75+
- name: Build the project
76+
run: npm run build --if-present

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v22.14.0

.prettierrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
2+
"printWidth": 120,
23
"singleQuote": true,
34
"trailingComma": "none",
45
"endOfLine": "auto",
56
"tabWidth": 2,
67
"semi:": false,
78
"bracketSameLine:": true,
89
"arrowParens": "always"
9-
}
10+
}

Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:18.15-bullseye as hashtopolis-web-ui-base
1+
FROM node:22.14.0-bookworm AS hashtopolis-web-ui-base
22
ENV PUPPETEER_SKIP_DOWNLOAD='true'
33
EXPOSE 4200
44

@@ -24,7 +24,7 @@ COPY docker-entrypoint.sh /usr/local/bin
2424

2525
# BUILD Image
2626
#----BEGIN----
27-
FROM hashtopolis-web-ui-base as hashtopolis-web-ui-build
27+
FROM hashtopolis-web-ui-base AS hashtopolis-web-ui-build
2828
# Coping the app into the container
2929
COPY . ./
3030

@@ -38,11 +38,11 @@ RUN npm run build
3838

3939
# DEVELOPMENT Image
4040
# ----BEGIN----
41-
FROM hashtopolis-web-ui-base as hashtopolis-web-ui-dev
41+
FROM hashtopolis-web-ui-base AS hashtopolis-web-ui-dev
4242
# Enable tooling like 'ng' for regular users
4343
RUN echo "export PATH=/app/node_modules/.bin:${PATH}" >> /etc/profile.d/npm.inc.sh
4444

45-
# Install required tooling envsubst
45+
# Install required tooling envsubst
4646
RUN apt-get update && apt-get -y install --no-install-recommends gettext-base 2>&1
4747

4848
USER node
@@ -52,9 +52,10 @@ ENTRYPOINT [ "/bin/bash", "/usr/local/bin/docker-entrypoint.sh", "development" ]
5252

5353
# PRODUCTION Image
5454
# ----BEGIN----
55-
FROM nginx:bullseye as hashtopolis-web-ui-prod
55+
FROM nginx:bookworm AS hashtopolis-web-ui-prod
5656
COPY --from=hashtopolis-web-ui-build /app/dist/ /usr/share/nginx/html
5757
COPY --from=hashtopolis-web-ui-build /usr/local/bin/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
58+
COPY ./nginx/header.conf /etc/nginx/conf.d/header.conf
5859

5960
ENTRYPOINT [ "/bin/bash", "/usr/local/bin/docker-entrypoint.sh", "production" ]
6061
# ----END----

0 commit comments

Comments
 (0)