Skip to content
This repository has been archived by the owner on Dec 26, 2023. It is now read-only.

Commit

Permalink
Merge pull request #11 from karenia-works/Professor_Page
Browse files Browse the repository at this point in the history
Professor page
  • Loading branch information
lynzrand authored Dec 17, 2019
2 parents 3b7a545 + e64a4e8 commit ee3f288
Show file tree
Hide file tree
Showing 10 changed files with 505 additions and 6 deletions.
7 changes: 7 additions & 0 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { MainpageComponent } from 'src/pages/mainpage/mainpage.component';
import { MainpageModule } from 'src/pages/mainpage/mainpage.module';
import { ProfessorpageComponent } from 'src/pages/professorpage/professorpage.component';
import { ProfessorpageModule } from 'src/pages/professorpage/professorpage.module';
import { SearchpageComponent } from 'src/pages/searchpage/searchpage.component';
import { ErrorPagesModule } from 'src/pages/error-pages/error-pages.module';
import { NotFoundPageComponent } from 'src/pages/error-pages/not-found-page/not-found-page.component';
Expand All @@ -27,6 +29,10 @@ const routes: Routes = [
path: 's',
component: SearchpageComponent,
},
{
path: 'p',
component: ProfessorpageComponent,
},
{
// Personal page
path: 'me',
Expand Down Expand Up @@ -74,6 +80,7 @@ const routes: Routes = [
MyFollowPageModule,
MyDownloadPageModule,
MyPaymentPageModule,
ProfessorpageModule,
MySettingPageModule,
],
exports: [RouterModule],
Expand Down
2 changes: 2 additions & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { MainpageModule } from 'src/pages/mainpage/mainpage.module';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { RouterOutlet } from '@angular/router';
import { SearchpageModule } from 'src/pages/searchpage/searchpage.module';
import { ProfessorpageModule } from 'src/pages/professorpage/professorpage.module';
import { HttpClientModule } from '@angular/common/http';

@NgModule({
Expand All @@ -19,6 +20,7 @@ import { HttpClientModule } from '@angular/common/http';
MainpageModule,
BrowserAnimationsModule,
SearchpageModule,
ProfessorpageModule,
HttpClientModule,
],
providers: [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@ searchbar-default-accent-color = var(--theme-accent)
}

.search-btn {
font-weight: 500!important
margin: var(--theme-pad-00) var(--theme-pad-03)!important
padding: var(--theme-pad-02) var(--theme-pad-04)!important
font-weight: 500
margin: var(--theme-pad-00) var(--theme-pad-03)
padding: var(--theme-pad-02) var(--theme-pad-04)

// --btn-border-color: var(--theme-accent-alter)
// --btn-background-color: var(--theme-base02)
// --btn-highlight-color: var(--theme-accent)
Expand Down
129 changes: 129 additions & 0 deletions src/pages/professorpage/professorpage.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
<div class="professorpage-banner inverted-color-theme" @banner-trigger></div>
<div class="top-rectangle"></div>
<div class="container">
<div class="left">
<div class="profile">
<div class="photo"></div>
<div class="name-title">
<div class="jumbotron">闫志全</div>
<div class="actions">
<div class="btn-ghost">
<div class="symbol-word">关注</div>
</div>
<div class="btn-ghost">
<div class="symbol-word">交流</div>
</div>
</div>
</div>
<div class="unit">北京航空航天大学</div>
<div class="description">
化学博士。现在在主攻社会行为学和生物学,以及化学物质在其中的作用。
</div>
<div class="personal-info">
<div class="row">
<div class="key">个人网站</div>
<div class="val">http://yan-zhiquan.com</div>
</div>
<div class="row">
<div class="key">微博</div>
<div class="val">@你家猫一米八</div>
</div>
</div>
<div class="tag-container">
<div class="tag">天然产物的有机合成</div>
<div class="tag">社会行为学</div>
<div class="tag">生物科学</div>
</div>
<div class="data-list">
<div class="data">
<div class="unit">发文</div>
<div class="number">30</div>
</div>
<div class="data">
<div class="unit">引用</div>
<div class="number">115</div>
</div>
<div class="data">
<div class="unit">下载</div>
<div class="number">65536</div>
</div>
</div>
</div>

<div class="result">
<!-- Articles -->
<div class="result-block articles">
<div class="title-block">
<h1>
文章
</h1>
<div class="link ghost-btn">
查看全部文章 (30)
</div>
</div>
<div class="abstract"></div>
</div>
<!-- Patents -->
<div class="result-block patents">
<div class="title-block">
<h1 class="type">
专利
</h1>
<div class="link ghost-btn">
查看全部专利 (0)
</div>
</div>
<div class="patent">这位专家似乎还没发过专利。</div>
</div>
<!-- Projects -->
<div class="result-block projects">
<div class="title-block">
<h1 class="type">
项目
</h1>
<div class="link ghost-btn">
查看所有项目 (12)
</div>
</div>
<div class="abstract">
<div class="title">二甲双胍的续命作用</div>
<div class="context">
二甲双胍的降糖作用是毋庸置疑的。但是,最近也有证据表明二甲双胍也有抵抗衰老、甚至修复细胞的功能。本项目将以蛙类为载体探索二甲双胍的续命作用。
</div>
</div>
</div>
<!-- Contacts -->
<div class="result-block contacts">
<div class="title-block">
<h1 class="type">
人脉
</h1>
<div class="link ghost-btn">
查看所有人脉信息
</div>
</div>
<div class="title-block">
<div class="quote">
他常引用
</div>
<div class="quote">
常引用他
</div>
</div>
</div>
</div>
</div>
<div class="right">
<div class="right-wrapper">
<div class="line"></div>
<div class="summary">
<div class="toc-fat">专家简介</div>
<div class="toc">文章 (30)</div>
<div class="toc">专利 (0)</div>
<div class="toc">项目 (12)</div>
<div class="toc">人脉</div>
<div class="toc">联系</div>
</div>
</div>
</div>
</div>
25 changes: 25 additions & 0 deletions src/pages/professorpage/professorpage.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { ProfessorpageComponent } from './professorpage.component';

describe('ProfessorpageComponent', () => {
let component: ProfessorpageComponent;
let fixture: ComponentFixture<ProfessorpageComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ProfessorpageComponent ]
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(ProfessorpageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
Loading

0 comments on commit ee3f288

Please sign in to comment.