изменил расположение директорий и изменил файлы Jenkinsfile и gitignore
This commit is contained in:
gofnnp 2022-10-11 10:40:59 +04:00
parent 29d274e05b
commit 197c84f29c
116 changed files with 50 additions and 100 deletions

58
.gitignore vendored
View File

@ -1,42 +1,42 @@
# See http://help.github.com/ignore-files/ for more about ignoring files. # See http://help.github.com/ignore-files/ for more about ignoring files.
# Compiled output # Compiled output
/dist angular/dist
/tmp angular/tmp
/out-tsc angular/out-tsc
/bazel-out angular/bazel-out
# Node # Node
/node_modules angular/node_modules
npm-debug.log angular/npm-debug.log
yarn-error.log angular/yarn-error.log
# IDEs and editors # IDEs and editors
.idea/ angular/.idea/
.project angular/.project
.classpath angular/.classpath
.c9/ angular/.c9/
*.launch angular/*.launch
.settings/ angular/.settings/
*.sublime-workspace angular/*.sublime-workspace
# Visual Studio Code # Visual Studio Code
.vscode/* angular/.vscode/*
!.vscode/settings.json angular/!.vscode/settings.json
!.vscode/tasks.json angular/!.vscode/tasks.json
!.vscode/launch.json angular/!.vscode/launch.json
!.vscode/extensions.json angular/!.vscode/extensions.json
.history/* angular/.history/*
# Miscellaneous # Miscellaneous
/.angular/cache angular/.angular/cache
.sass-cache/ angular/.sass-cache/
/connect.lock angular/connect.lock
/coverage angular/coverage
/libpeerconnection.log angular/libpeerconnection.log
testem.log angular/testem.log
/typings angular/typings
# System files # System files
.DS_Store angular/.DS_Store
Thumbs.db angular/Thumbs.db

View File

@ -1,4 +0,0 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
"recommendations": ["angular.ng-template"]
}

20
.vscode/launch.json vendored
View File

@ -1,20 +0,0 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "ng serve",
"type": "pwa-chrome",
"request": "launch",
"preLaunchTask": "npm: start",
"url": "http://localhost:4200/"
},
{
"name": "ng test",
"type": "chrome",
"request": "launch",
"preLaunchTask": "npm: test",
"url": "http://localhost:9876/debug.html"
}
]
}

42
.vscode/tasks.json vendored
View File

@ -1,42 +0,0 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "start",
"isBackground": true,
"problemMatcher": {
"owner": "typescript",
"pattern": "$tsc",
"background": {
"activeOnStart": true,
"beginsPattern": {
"regexp": "(.*?)"
},
"endsPattern": {
"regexp": "bundle generation complete"
}
}
}
},
{
"type": "npm",
"script": "test",
"isBackground": true,
"problemMatcher": {
"owner": "typescript",
"pattern": "$tsc",
"background": {
"activeOnStart": true,
"beginsPattern": {
"regexp": "(.*?)"
},
"endsPattern": {
"regexp": "bundle generation complete"
}
}
}
}
]
}

6
Jenkinsfile vendored
View File

@ -16,8 +16,10 @@ node('Lithium'){
//sh "git submodule update --remote --merge" //sh "git submodule update --remote --merge"
} }
stage("build and publish"){ stage("build and publish"){
sh label: '', script: 'npm i' dir('angular'){
sh label: '', script: 'npm run build' sh label: '', script: 'npm i'
sh label: '', script: 'npm run build'
}
} }
} }

View File

@ -1,12 +1,12 @@
{ {
"name": "fashion-logica", "name": "fashion-logica",
"version": "0.0.0", "version": "0.0.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "fashion-logica", "name": "fashion-logica",
"version": "0.0.0", "version": "0.0.1",
"dependencies": { "dependencies": {
"@angular/animations": "^14.0.0", "@angular/animations": "^14.0.0",
"@angular/cdk": "^14.2.1", "@angular/cdk": "^14.2.1",

View File

@ -3,7 +3,7 @@
"version": "0.0.2", "version": "0.0.2",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve --host 192.168.0.179", "start": "ng serve --host 192.168.0.12",
"build": "ng build", "build": "ng build",
"watch": "ng build --watch --configuration development", "watch": "ng build --watch --configuration development",
"test": "ng test" "test": "ng test"

View File

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

Before

Width:  |  Height:  |  Size: 568 B

After

Width:  |  Height:  |  Size: 568 B

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

View File

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

View File

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

View File

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

View File

Before

Width:  |  Height:  |  Size: 992 B

After

Width:  |  Height:  |  Size: 992 B

View File

Before

Width:  |  Height:  |  Size: 861 B

After

Width:  |  Height:  |  Size: 861 B

View File

Before

Width:  |  Height:  |  Size: 992 B

After

Width:  |  Height:  |  Size: 992 B

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 992 B

After

Width:  |  Height:  |  Size: 992 B

View File

Before

Width:  |  Height:  |  Size: 666 B

After

Width:  |  Height:  |  Size: 666 B

Some files were not shown because too many files have changed in this diff Show More