Skip to content

Commit

Permalink
upgrade angular to v16 and spring boot to 3.1 (#14)
Browse files Browse the repository at this point in the history
- Spring boot upgrade to 3.1
- Angular upgrade to v16
- paginated search results
- java and node github workflows
  • Loading branch information
asdhammu authored Sep 27, 2023
1 parent 9675dce commit b234304
Show file tree
Hide file tree
Showing 100 changed files with 15,694 additions and 1,361 deletions.
62 changes: 62 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Java CI with Maven

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

jobs:
ui-build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [ 16.x, 18.x ]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
cache-dependency-path: FrontEnd/package-lock.json
- name: Install dependencies
run: |
cd FrontEnd
npm i
- name: Build
run: |
cd FrontEnd
npm run build --if-present
- name: Tests
run: |
cd FrontEnd
npm test
service-build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Build with Maven
run: |
cd Services
mvn -B package --file pom.xml
75 changes: 28 additions & 47 deletions FrontEnd/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
"outputPath": "dist/browser",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": ["zone.js"],
"tsConfig": "tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css"
"src/styles.css",
"src/theme.scss"
],
"scripts": []
},
Expand All @@ -38,7 +39,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand All @@ -51,8 +51,17 @@
"maximumError": "5mb"
}
]
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
}
}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
Expand All @@ -62,6 +71,9 @@
"configurations": {
"production": {
"browserTarget": "FrontEnd:build:production"
},
"development": {
"browserTarget": "FrontEnd:build:development"
}
}
},
Expand All @@ -74,26 +86,24 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"styles": [
"src/styles.css"
],
"scripts": [],
"polyfills": ["zone.js", "zone.js/testing"],
"tsConfig": "tsconfig.spec.json",
"assets": [
"src/favicon.ico",
"src/assets"
]
],
"styles": [
"src/styles.css"
],
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
"tsconfig.app.json",
"tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
Expand All @@ -105,7 +115,7 @@
"options": {
"outputPath": "dist/server",
"main": "src/main.server.ts",
"tsConfig": "src/tsconfig.server.json"
"tsConfig": "tsconfig.server.json"
},
"configurations": {
"production": {
Expand All @@ -119,35 +129,6 @@
}
}
}
},
"FrontEnd-e2e": {
"root": "e2e/",
"projectType": "application",
"prefix": "",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "FrontEnd:serve"
},
"configurations": {
"production": {
"devServerTarget": "FrontEnd:serve:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "FrontEnd"
}
}
15 changes: 0 additions & 15 deletions FrontEnd/e2e/app.e2e-spec.ts

This file was deleted.

13 changes: 0 additions & 13 deletions FrontEnd/e2e/tsconfig.json

This file was deleted.

41 changes: 0 additions & 41 deletions FrontEnd/karma.conf.js

This file was deleted.

Loading

0 comments on commit b234304

Please sign in to comment.