Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • Dojo_Project_Nguyen/ui/dojoweb
  • dojo_project/projects/ui/dojoweb
2 results
Select Git revision
Show changes
Commits on Source (4)
Showing
with 364 additions and 335 deletions
.env
aws.xml
workspace.xml
.gitlab-ci-local
Wiki/.idea
.env
############################ MacOS
# General
......@@ -346,3 +348,7 @@ Sessionx.vim
tags
# Persistent undo
[._]*.un~
########################### Angular
.angular/cache/
[submodule "AngularApp/.idea/jetbrainsConfiguration"]
path = AngularApp/.idea/jetbrainsConfiguration
url = ../../shared/jetbrains_configuration.git
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
DojoWeb
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/dist" />
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
jetbrainsConfiguration/codeStyles/
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CsvFileAttributes">
<option name="attributeMap">
<map>
<entry key="/a.csv">
<value>
<Attribute>
<option name="separator" value="," />
</Attribute>
</value>
</entry>
</map>
</option>
</component>
</project>
\ No newline at end of file
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
</profile>
</component>
\ No newline at end of file
jetbrainsConfiguration/inspectionProfiles/
\ No newline at end of file
Subproject commit b65b72f8c4b282721a26dcdcc6a5e1e6d5e8f6a2
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/DojoWeb.iml" filepath="$PROJECT_DIR$/.idea/DojoWeb.iml" />
</modules>
</component>
</project>
\ No newline at end of file
jetbrainsConfiguration/rootFiles/sqldialects.xml
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>
\ No newline at end of file
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"material-dashboard-angular": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"assets": [
"src/assets",
"src/favicon.ico"
],
"styles": [
"node_modules/perfect-scrollbar/css/perfect-scrollbar.css",
"src/assets/scss/material-dashboard.scss",
"src/assets/css/demo.css"
],
"scripts": [
"node_modules/jquery/dist/jquery.js",
"node_modules/popper.js/dist/umd/popper.js",
"node_modules/bootstrap-material-design/dist/js/bootstrap-material-design.min.js",
"node_modules/arrive/src/arrive.js",
"node_modules/moment/moment.js",
"node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js",
"node_modules/bootstrap-notify/bootstrap-notify.js",
"node_modules/chartist/dist/chartist.js"
],
"allowedCommonJsDependencies": [
"rxjs/add/operator/filter",
"jquery",
"chartist"
]
},
"configurations": {
"production": {
"optimization": {
"scripts": true,
"styles": {
"minify": false,
"inlineCritical": false
"$schema" : "./node_modules/@angular/cli/lib/config/schema.json",
"version" : 1,
"newProjectRoot": "projects",
"projects" : {
"material-dashboard-angular" : {
"root" : "",
"sourceRoot" : "src",
"projectType": "application",
"architect" : {
"build" : {
"builder" : "@angular-devkit/build-angular:browser",
"options" : {
"outputPath" : "dist",
"index" : "src/index.html",
"main" : "src/main.ts",
"tsConfig" : "src/tsconfig.app.json",
"polyfills" : "src/polyfills.ts",
"assets" : [
"src/assets",
"src/favicon.ico"
],
"styles" : [
"node_modules/perfect-scrollbar/css/perfect-scrollbar.css",
"src/assets/scss/material-dashboard.scss",
"src/assets/css/demo.css"
],
"scripts" : [
"node_modules/jquery/dist/jquery.js",
"node_modules/popper.js/dist/umd/popper.js",
"node_modules/bootstrap-material-design/dist/js/bootstrap-material-design.min.js",
"node_modules/arrive/src/arrive.js",
"node_modules/moment/moment.js",
"node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js",
"node_modules/bootstrap-notify/bootstrap-notify.js",
"node_modules/chartist/dist/chartist.js"
],
"allowedCommonJsDependencies": [
"rxjs/add/operator/filter",
"jquery",
"chartist"
]
},
"configurations": {
"production" : {
"optimization" : {
"scripts": true,
"styles" : {
"minify" : false,
"inlineCritical": false
},
"fonts" : true
},
"outputHashing" : "all",
"sourceMap" : false,
"namedChunks" : false,
"extractLicenses" : true,
"vendorChunk" : false,
"buildOptimizer" : true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with" : "src/environments/environment.prod.ts"
}
]
},
"development": {
"vendorChunk" : true,
"extractLicenses": false,
"namedChunks" : true,
"buildOptimizer" : false,
"sourceMap" : true,
"optimization" : {
"scripts": true,
"styles" : {
"minify" : false,
"inlineCritical": true
},
"fonts" : true
},
"outputHashing" : "all"
}
}
},
"fonts": true
},
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
]
},
"development": {
"vendorChunk": true,
"extractLicenses": false,
"namedChunks": true,
"buildOptimizer": false,
"sourceMap": true,
"optimization": {
"scripts": true,
"styles": {
"minify": false,
"inlineCritical": true
"serve" : {
"builder" : "@angular-devkit/build-angular:dev-server",
"options" : {
"browserTarget": "material-dashboard-angular:build"
},
"configurations" : {
"production" : {
"browserTarget": "material-dashboard-angular:build:production"
},
"development": {
"browserTarget": "material-dashboard-angular:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "material-dashboard-angular:build"
}
},
"test" : {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main" : "src/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills" : "src/polyfills.ts",
"tsConfig" : "src/tsconfig.spec.json",
"scripts" : [
"node_modules/jquery/dist/jquery.js",
"node_modules/popper.js/dist/umd/popper.js",
"node_modules/bootstrap-material-design/dist/js/bootstrap-material-design.min.js",
"node_modules/arrive/src/arrive.js",
"node_modules/moment/moment.js",
"node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js",
"node_modules/bootstrap-notify/bootstrap-notify.js",
"node_modules/chartist/dist/chartist.js"
],
"styles" : [
"node_modules/perfect-scrollbar/css/perfect-scrollbar.css",
"src/assets/scss/material-dashboard.scss",
"src/assets/css/demo.css"
],
"assets" : [
"src/assets",
"src/favicon.ico"
]
}
},
"fonts": true
},
"outputHashing": "all"
"lint" : {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude" : []
}
}
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "material-dashboard-angular:build"
},
"configurations": {
"production": {
"browserTarget": "material-dashboard-angular:build:production"
},
"development": {
"browserTarget": "material-dashboard-angular:build:development"
"material-dashboard-angular-e2e": {
"root" : "",
"sourceRoot" : "",
"projectType": "application",
"architect" : {
"e2e" : {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget" : "material-dashboard-angular:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"
],
"exclude" : []
}
}
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "material-dashboard-angular:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"scripts": [
"node_modules/jquery/dist/jquery.js",
"node_modules/popper.js/dist/umd/popper.js",
"node_modules/bootstrap-material-design/dist/js/bootstrap-material-design.min.js",
"node_modules/arrive/src/arrive.js",
"node_modules/moment/moment.js",
"node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js",
"node_modules/bootstrap-notify/bootstrap-notify.js",
"node_modules/chartist/dist/chartist.js"
],
"styles": [
"node_modules/perfect-scrollbar/css/perfect-scrollbar.css",
"src/assets/scss/material-dashboard.scss",
"src/assets/css/demo.css"
],
"assets": [
"src/assets",
"src/favicon.ico"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": []
}
}
}
},
"material-dashboard-angular-e2e": {
"root": "",
"sourceRoot": "",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "material-dashboard-angular:serve"
}
"defaultProject": "material-dashboard-angular",
"schematics" : {
"@schematics/angular:component": {
"prefix": "app",
"style" : "scss"
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"
],
"exclude": []
}
"@schematics/angular:directive": {
"prefix": "app"
}
}
}
},
"defaultProject": "material-dashboard-angular",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"style": "scss"
},
"@schematics/angular:directive": {
"prefix": "app"
"cli" : {
"analytics": false
}
},
"cli": {
"analytics": false
}
}
\ No newline at end of file
......@@ -2,43 +2,15 @@
// https://karma-runner.github.io/0.13/config/configuration-file.html
module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular-devkit/build-angular/plugins/karma')
],
client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
files: [
],
preprocessors: {
},
mime: {
'text/x-typescript': ['ts','tsx']
},
coverageIstanbulReporter: {
dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
fixWebpackSourcePaths: true
},
angularCli: {
environment: 'dev'
},
reporters: config.angularCli && config.angularCli.codeCoverage
? ['progress', 'coverage-istanbul']
: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false
});
config.set({
basePath: '', frameworks: [ 'jasmine', '@angular-devkit/build-angular' ], plugins: [ require('karma-jasmine'), require('karma-chrome-launcher'), require('karma-jasmine-html-reporter'), require('karma-coverage-istanbul-reporter'), require('@angular-devkit/build-angular/plugins/karma') ], client: {
clearContext: false // leave Jasmine Spec Runner output visible in browser
}, files: [], preprocessors: {}, mime: {
'text/x-typescript': [ 'ts', 'tsx' ]
}, coverageIstanbulReporter: {
dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ], fixWebpackSourcePaths: true
}, angularCli: {
environment: 'dev'
}, reporters: config.angularCli && config.angularCli.codeCoverage ? [ 'progress', 'coverage-istanbul' ] : [ 'progress', 'kjhtml' ], port: 9876, colors: true, logLevel: config.LOG_INFO, autoWatch: true, browsers: [ 'Chrome' ], singleRun: false
});
};
{
"name": "material-dashboard-angular",
"version": "2.8.0",
"license": "MIT",
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && ng serve -o"
},
"engines": {
"node": "6.11.1",
"npm": "3.10.9"
},
"private": true,
"dependencies": {
"@angular/animations": "^14.2.0",
"@angular/cdk": "^14.2.0",
"@angular/common": "^14.2.0",
"@angular/compiler": "^14.2.0",
"@angular/core": "^14.2.0",
"@angular/elements": "^14.2.0",
"@angular/forms": "^14.2.0",
"@angular/localize": "^14.2.0",
"@angular/material": "^14.2.0",
"@angular/platform-browser": "^14.2.0",
"@angular/platform-browser-dynamic": "^14.2.0",
"@angular/router": "^14.2.0",
"ajv": "8.11.0",
"arrive": "2.4.1",
"bootstrap": "4.6.1",
"bootstrap-material-design": "4.1.3",
"bootstrap-notify": "3.1.3",
"chartist": "0.11.4",
"classlist.js": "1.1.20150312",
"eslint": "^8.11.0",
"express": "4.17.3",
"googleapis": "99.0.0",
"hammerjs": "2.0.8",
"jquery": "3.6.0",
"moment": "2.29.1",
"perfect-scrollbar": "1.5.5",
"popper.js": "1.16.1",
"rxjs": "~7.5.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4",
"web-animations-js": "2.3.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "^14.2.7",
"@angular/cli": "~14.2.7",
"@angular/compiler-cli": "^14.2.0",
"@angular/language-service": "14.2.0",
"@types/jasmine": "~4.0.0",
"@types/jasminewd2": "~2.0.10",
"@types/node": "^17.0.21",
"@types/bootstrap": "4.5.0",
"@types/chartist": "0.11.1",
"@types/google.maps": "3.47.4",
"@types/jquery": "3.5.6",
"sass": "1.32.13",
"codelyzer": "6.0.2",
"jasmine-core": "~4.4.0",
"jasmine-spec-reporter": "~7.0.0",
"karma": "~6.4.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "~2.2.0",
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.0.0",
"protractor": "7.0.0",
"ts-node": "~10.9.1",
"typescript": "~4.7.2"
}
"name" : "material-dashboard-angular",
"version" : "2.8.0",
"license" : "MIT",
"scripts" : {
"ng" : "ng",
"start" : "ng serve",
"build" : "ng build",
"test" : "ng test",
"lint" : "ng lint",
"e2e" : "ng e2e",
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && ng serve -o"
},
"engines" : {
"node": "6.11.1",
"npm" : "3.10.9"
},
"private" : true,
"dependencies" : {
"@angular/animations" : "^14.2.0",
"@angular/cdk" : "^14.2.0",
"@angular/common" : "^14.2.0",
"@angular/compiler" : "^14.2.0",
"@angular/core" : "^14.2.0",
"@angular/elements" : "^14.2.0",
"@angular/forms" : "^14.2.0",
"@angular/localize" : "^14.2.0",
"@angular/material" : "^14.2.0",
"@angular/platform-browser" : "^14.2.0",
"@angular/platform-browser-dynamic": "^14.2.0",
"@angular/router" : "^14.2.0",
"ajv" : "8.11.0",
"arrive" : "2.4.1",
"bootstrap" : "4.6.1",
"bootstrap-material-design" : "4.1.3",
"bootstrap-notify" : "3.1.3",
"chartist" : "0.11.4",
"classlist.js" : "1.1.20150312",
"eslint" : "^8.11.0",
"express" : "4.17.3",
"googleapis" : "99.0.0",
"hammerjs" : "2.0.8",
"jquery" : "3.6.0",
"moment" : "2.29.1",
"perfect-scrollbar" : "1.5.5",
"popper.js" : "1.16.1",
"rxjs" : "~7.5.0",
"tslib" : "^2.3.0",
"zone.js" : "~0.11.4",
"web-animations-js" : "2.3.2"
},
"devDependencies": {
"@angular-devkit/build-angular" : "^14.2.7",
"@angular/cli" : "~14.2.7",
"@angular/compiler-cli" : "^14.2.0",
"@angular/language-service" : "14.2.0",
"@types/jasmine" : "~4.0.0",
"@types/jasminewd2" : "~2.0.10",
"@types/node" : "^17.0.21",
"@types/bootstrap" : "4.5.0",
"@types/chartist" : "0.11.1",
"@types/google.maps" : "3.47.4",
"@types/jquery" : "3.5.6",
"sass" : "1.32.13",
"codelyzer" : "6.0.2",
"jasmine-core" : "~4.4.0",
"jasmine-spec-reporter" : "~7.0.0",
"karma" : "~6.4.0",
"karma-chrome-launcher" : "~3.1.0",
"karma-coverage" : "~2.2.0",
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine" : "~5.1.0",
"karma-jasmine-html-reporter" : "~2.0.0",
"protractor" : "7.0.0",
"ts-node" : "~10.9.1",
"typescript" : "~4.7.2"
}
}
......@@ -4,27 +4,15 @@
const { SpecReporter } = require('jasmine-spec-reporter');
exports.config = {
allScriptsTimeout: 11000,
specs: [
'./e2e/**/*.e2e-spec.ts'
],
capabilities: {
'browserName': 'chrome'
},
directConnect: true,
baseUrl: 'http://localhost:4200/',
framework: 'jasmine',
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
print: function() {}
},
beforeLaunch: function() {
require('ts-node').register({
project: 'e2e/tsconfig.e2e.json'
});
},
onPrepare() {
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
}
allScriptsTimeout: 11000, specs: [ './e2e/**/*.e2e-spec.ts' ], capabilities: {
'browserName': 'chrome'
}, directConnect: true, baseUrl: 'http://localhost:4200/', framework: 'jasmine', jasmineNodeOpts: {
showColors: true, defaultTimeoutInterval: 30000, print: function () {}
}, beforeLaunch: function () {
require('ts-node').register({
project: 'e2e/tsconfig.e2e.json'
});
}, onPrepare() {
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
}
};
<router-outlet></router-outlet>
import { TestBed, async } from '@angular/core/testing';
import { async, TestBed } from '@angular/core/testing';
import { AppComponent } from './app.component';
describe('AppComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [
AppComponent
],
}).compileComponents();
}));
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ AppComponent ]
}).compileComponents();
}));
it('should create the app', async(() => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app).toBeTruthy();
}));
it('should create the app', async(() => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app).toBeTruthy();
}));
it(`should have as title 'app works!'`, async(() => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app.title).toEqual('app works!');
}));
it(`should have as title 'app works!'`, async(() => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app.title).toEqual('app works!');
}));
it('should render title in a h1 tag', async(() => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.debugElement.nativeElement;
expect(compiled.querySelector('h1').textContent).toContain('app works!');
}));
it('should render title in a h1 tag', async(() => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.debugElement.nativeElement;
expect(compiled.querySelector('h1').textContent).toContain('app works!');
}));
});