From 4e58d2393f8ebf3d7f7a69cfaceb67271027defe Mon Sep 17 00:00:00 2001 From: Ruin <1830275783@qq.com> Date: Wed, 9 Mar 2022 11:59:45 +0800 Subject: [PATCH] commit --- angular.json | 27 +++++++++---------- src/app/app.module.ts | 2 +- .../{universalModel => model}/core.module.ts | 0 .../public.module.ts | 0 src/app/pages/home/home.module.ts | 5 +--- .../components/info/info.component.spec.ts | 25 ----------------- .../components/mine/mine.component.spec.ts | 25 ----------------- src/app/pages/user/user.module.ts | 5 ++-- 8 files changed, 16 insertions(+), 73 deletions(-) rename src/app/{universalModel => model}/core.module.ts (100%) rename src/app/{universalModel => model}/public.module.ts (100%) delete mode 100644 src/app/pages/user/components/info/info.component.spec.ts delete mode 100644 src/app/pages/user/components/mine/mine.component.spec.ts diff --git a/angular.json b/angular.json index 2b561db..03fd835 100644 --- a/angular.json +++ b/angular.json @@ -7,7 +7,14 @@ "projectType": "application", "schematics": { "@schematics/angular:component": { - "style": "scss" + "style": "scss", + "skipTests": true + }, + "@schematics/angular:module": { + "skipTests": true + }, + "@schematics/angular:service": { + "skipTests": true }, "@schematics/angular:application": { "strict": true @@ -26,13 +33,8 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] }, "configurations": { @@ -94,13 +96,8 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "src/styles.scss" - ], + "assets": ["src/favicon.ico", "src/assets"], + "styles": ["src/styles.scss"], "scripts": [] } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c550b45..0e2494f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -15,7 +15,7 @@ import { AppRoutingModule } from "./app-routing.module"; // 引入根组件 import { AppComponent } from "./app.component"; // @ngModule装饰器 @ngModule接受一个元数据对象 告诉angular如何编译和启动对象\ -import { CoreModule } from "./universalModel/core.module"; +import { CoreModule } from "./model/core.module"; // 在根模块中引入http模块 import { HttpClientModule } from "@angular/common/http"; diff --git a/src/app/universalModel/core.module.ts b/src/app/model/core.module.ts similarity index 100% rename from src/app/universalModel/core.module.ts rename to src/app/model/core.module.ts diff --git a/src/app/universalModel/public.module.ts b/src/app/model/public.module.ts similarity index 100% rename from src/app/universalModel/public.module.ts rename to src/app/model/public.module.ts diff --git a/src/app/pages/home/home.module.ts b/src/app/pages/home/home.module.ts index 09f4151..ddb9398 100644 --- a/src/app/pages/home/home.module.ts +++ b/src/app/pages/home/home.module.ts @@ -4,15 +4,12 @@ * @Author: Ruin 🍭 * @Date: 2022-03-03 17:06:01 * @LastEditors: 刘引 - * @LastEditTime: 2022-03-09 11:44:08 + * @LastEditTime: 2022-03-09 11:54:23 */ import { NgModule } from "@angular/core"; - import { HomeComponent } from "./home.component"; import { HeadComponent } from "./components/head/head.component"; import { BodyComponent } from "./components/body/body.component"; - -// import { AppRoutingModule } from "../../app-routing.module"; import { PublicModule } from "src/app/universalModel/public.module"; @NgModule({ declarations: [HomeComponent, HeadComponent, BodyComponent], diff --git a/src/app/pages/user/components/info/info.component.spec.ts b/src/app/pages/user/components/info/info.component.spec.ts deleted file mode 100644 index fead35b..0000000 --- a/src/app/pages/user/components/info/info.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { InfoComponent } from './info.component'; - -describe('InfoComponent', () => { - let component: InfoComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ InfoComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(InfoComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/user/components/mine/mine.component.spec.ts b/src/app/pages/user/components/mine/mine.component.spec.ts deleted file mode 100644 index d996c34..0000000 --- a/src/app/pages/user/components/mine/mine.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { MineComponent } from './mine.component'; - -describe('MineComponent', () => { - let component: MineComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ MineComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(MineComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/user/user.module.ts b/src/app/pages/user/user.module.ts index 37ece30..0eb3d7e 100644 --- a/src/app/pages/user/user.module.ts +++ b/src/app/pages/user/user.module.ts @@ -4,14 +4,13 @@ * @Author: Ruin 🍭 * @Date: 2022-03-04 10:42:33 * @LastEditors: 刘引 - * @LastEditTime: 2022-03-09 11:31:48 + * @LastEditTime: 2022-03-09 11:56:39 */ import { NgModule } from "@angular/core"; - import { InfoComponent } from "./components/info/info.component"; import { MineComponent } from "./components/mine/mine.component"; import { UserComponent } from "./user.component"; -import { PublicModule } from "src/app/universalModel/public.module"; +import { PublicModule } from "src/app/model/public.module"; @NgModule({ declarations: [InfoComponent, MineComponent, UserComponent], imports: [PublicModule],