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
  • add_idea_configuration
  • interface_student
  • login_branch
  • main
4 results

Target

Select target project
  • Dojo_Project_Nguyen/ui/dojoweb
  • dojo_project/projects/ui/dojoweb
2 results
Select Git revision
  • add_idea_configuration
  • interface_student
  • login_branch
  • main
4 results
Show changes
Commits on Source (4)
Showing
with 364 additions and 335 deletions
.env
aws.xml aws.xml
workspace.xml workspace.xml
.gitlab-ci-local
Wiki/.idea
.env
############################ MacOS ############################ MacOS
# General # General
...@@ -346,3 +348,7 @@ Sessionx.vim ...@@ -346,3 +348,7 @@ Sessionx.vim
tags tags
# Persistent undo # Persistent undo
[._]*.un~ [._]*.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
...@@ -3,42 +3,14 @@ ...@@ -3,42 +3,14 @@
module.exports = function (config) { module.exports = function (config) {
config.set({ config.set({
basePath: '', 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: {
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 clearContext: false // leave Jasmine Spec Runner output visible in browser
}, }, files: [], preprocessors: {}, mime: {
files: [
],
preprocessors: {
},
mime: {
'text/x-typescript': [ 'ts', 'tsx' ] 'text/x-typescript': [ 'ts', 'tsx' ]
}, }, coverageIstanbulReporter: {
coverageIstanbulReporter: { dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ], fixWebpackSourcePaths: true
dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ], }, angularCli: {
fixWebpackSourcePaths: true
},
angularCli: {
environment: 'dev' 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
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
}); });
}; };
...@@ -4,27 +4,15 @@ ...@@ -4,27 +4,15 @@
const { SpecReporter } = require('jasmine-spec-reporter'); const { SpecReporter } = require('jasmine-spec-reporter');
exports.config = { exports.config = {
allScriptsTimeout: 11000, allScriptsTimeout: 11000, specs: [ './e2e/**/*.e2e-spec.ts' ], capabilities: {
specs: [
'./e2e/**/*.e2e-spec.ts'
],
capabilities: {
'browserName': 'chrome' 'browserName': 'chrome'
}, }, directConnect: true, baseUrl: 'http://localhost:4200/', framework: 'jasmine', jasmineNodeOpts: {
directConnect: true, showColors: true, defaultTimeoutInterval: 30000, print: function () {}
baseUrl: 'http://localhost:4200/', }, beforeLaunch: function () {
framework: 'jasmine',
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
print: function() {}
},
beforeLaunch: function() {
require('ts-node').register({ require('ts-node').register({
project: 'e2e/tsconfig.e2e.json' project: 'e2e/tsconfig.e2e.json'
}); });
}, }, onPrepare() {
onPrepare() {
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
} }
}; };
<router-outlet></router-outlet> <router-outlet></router-outlet>
import { TestBed, async } from '@angular/core/testing'; import { async, TestBed } from '@angular/core/testing';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
describe('AppComponent', () => { describe('AppComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ declarations: [ AppComponent ]
AppComponent
],
}).compileComponents(); }).compileComponents();
})); }));
......