Skip to content

Commit

Permalink
Merge pull request #1 from MichaelOdumosu57/upgrade
Browse files Browse the repository at this point in the history
Upgrade
  • Loading branch information
Judimax authored May 3, 2023
2 parents 14257c0 + ea36dc5 commit 94e1547
Show file tree
Hide file tree
Showing 19 changed files with 2,347 additions and 17,996 deletions.
57 changes: 1 addition & 56 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,56 +1 @@

# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc
# Only exists if Bazel was run
/bazel-out

# dependencies
/node_modules

# profiling files
chrome-profiler-events*.json
speed-measure-plugin*.json

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings

# System Files
.DS_Store
Thumbs.db

# dev additons
vendor
node_modules
site-packages
AngularApp/issues
ignore
AngularApp/backend/python/__pycache__/*
*.pcap
ignore/
89 changes: 51 additions & 38 deletions AngularApp/.gitignore
Original file line number Diff line number Diff line change
@@ -1,46 +1,59 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
.DS_STORE

# compiled output
/dist
/tmp
/out-tsc
# Only exists if Bazel was run
/dist/
/bazel-out
/integration/bazel/bazel-*
*.log
node_modules/

# dependencies
/node_modules
# CircleCI temporary file for cache key computation.
# See `save_month_to_file` in `.circleci/config.yml`.
month.txt

# profiling files
chrome-profiler-events*.json
speed-measure-plugin*.json

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
# Include when developing application packages.
pubspec.lock
.c9
.idea/
.devcontainer/*
!.devcontainer/README.md
!.devcontainer/recommended-devcontainer.json
!.devcontainer/recommended-Dockerfile
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
.vscode/launch.json
.vscode/settings.json
.vscode/tasks.json
*.swo
*.swp
modules/.settings
modules/.vscode
.vimrc
.nvimrc

# Don't check in secret files
*secret.js

# Ignore npm/yarn debug log
npm-debug.log
yarn-error.log
testem.log
/typings

# System Files
.DS_Store
Thumbs.db
# build-analytics
.build-analytics

# rollup-test output
/modules/rollup-test/dist/

# User specific bazel settings
.bazelrc.user

# User specific ng-dev settings
.ng-dev.user*

.notes.md
baseline.json

# Ignore .history for the xyz.local-history VSCode extension
.history

# Husky
.husky/_
aio/content/examples/.DS_Store
36 changes: 10 additions & 26 deletions AngularApp/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@
"sourceRoot": "src",
"prefix": "app",
"architect": {
"judima": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
// "outputPath": "dist/AngularApp",
"outputPath":"../docs",
"outputPath": "../docs",
"fileReplacements": [
{
"replace": "src/app/website.ts",
Expand All @@ -41,19 +40,14 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": true,
"assets": [
"src/assets"
],
"styles": [
"src/styles.scss"
],
"assets": ["src/assets"],
"styles": ["src/styles.scss"],
"scripts": [
"backend/modernizr/modernizr.js",
"backend/polyfills/object.js",
"backend/polyfills/signaturePad.js",
"src/assets/scripts/pikaday.js",
"src/assets/scripts/vanillaTilt.js"

],
"optimization": false,
"sourceMap": true,
Expand All @@ -63,8 +57,8 @@
},
"configurations": {
"production": {
"baseHref":"/Facebook_Project/",
"deployUrl":"/Facebook_Project/",
"baseHref": "/Facebook_Project/",
"deployUrl": "/Facebook_Project/",
"fileReplacements": [
{
"replace": "src/app/website.ts",
Expand All @@ -75,9 +69,7 @@
"with": "src/environments/environment.facebook.prod.ts"
}
],
"assets": [
"src/assets"
],
"assets": ["src/assets"],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
Expand Down Expand Up @@ -122,9 +114,6 @@
}
]
}



}
},
"serve": {
Expand All @@ -133,7 +122,7 @@
"browserTarget": "AngularApp:judima:play",
"port": 4520,
"liveReload": true,
"hmr": false
"hmr": false
},
"configurations": {
"production": {
Expand All @@ -148,7 +137,6 @@
"port": 4521,
"browserTarget": "AngularApp:judima:facebook"
}

}
},
"extract-i18n": {
Expand All @@ -160,12 +148,8 @@
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json"
],
"exclude": [
"**/node_modules/**"
]
"tsConfig": ["tsconfig.app.json"],
"exclude": ["**/node_modules/**"]
}
}
}
Expand Down
Loading

0 comments on commit 94e1547

Please sign in to comment.