Commit 7a0be89a authored by Muhammad Saroosh Asif's avatar Muhammad Saroosh Asif
Browse files

update

parent 049a8196
......@@ -54,4 +54,4 @@
"tslint": "~6.1.0",
"typescript": "~3.9.5"
}
}
}
\ No newline at end of file
......@@ -20,18 +20,9 @@
flex: 1 1 auto;
}
.firstnavbtn {
font-size: 17.3333px !important;
color: black !important;
}
.secondnavbtn {
border: unset !important;
background: unset !important;
font-family: sans-serif !important;
color: white !important;
font-weight: bold !important;
mat-form-field.mat-form-field {
height: 60px;
color: #000;
}
.btndiv {
......@@ -39,10 +30,11 @@
}
.mat-icon-button {
width: auto;
padding: 10px;
width: auto;
padding: 10px;
}
.mat-icon {
font-size: 2em !important;
color: #000;
}
\ No newline at end of file
<!-- first header -->
<div class="mainheader">
<mat-toolbar class="firstnav">
<button mat-icon-button class="firstnavbtn">
PRESS
</button>
<button mat-icon-button class="firstnavbtn">
ALUMNI
</button>
<button mat-icon-button class=" firstnavbtn">
INTERNATIONAL
</button>
<button mat-icon-button class=" firstnavbtn">
BLOG
</button>
<span class="spacer"></span>
<mat-toolbar class="firstnav">
<app-select-language></app-select-language>
<form [style.fontSize.px]="15">
<mat-form-field appearance="outline">
<input matInput placeholder="Search">
</mat-form-field>
</form>
<mat-icon>search</mat-icon>
<span class="spacer"></span>
<button mat-icon-button class="firstnavbtn" routerLink="/login">
<mat-icon>person_outline</mat-icon>
<app-select-language></app-select-language>
<button mat-icon-button routerLink="/login">
<mat-icon routerLink="/login">person_outline</mat-icon>
</button>
</mat-toolbar>
</mat-toolbar>
<br>
<br>
<!-- 2nd header -->
<br>
<br>
<!-- 2nd header -->
<mat-toolbar class="secondnav">
<div>
<img src="assets/DIT-Logo.png" alt="DIT logo" height="50">
</div>
<span class="spacer"></span>
<div class="btndiv">
<button mat-icon-button class=" secondnavbtn" routerLink="/">
<mat-toolbar class="secondnav">
<div>
<img src="assets/DIT-Logo.png" alt="DIT logo" height="50">
</div>
<span class="spacer"></span>
<div class="btndiv">
<button mat-icon-button routerLink="/">
{{'cHomepage'|translate}}
</button>
<button mat-icon-button class=" secondnavbtn" routerLink="/navigation">
{{'cNavigation'|translate}}
<button mat-icon-button routerLink="/events">
{{'cEvents'|translate}}
</button>
<button mat-icon-button class=" secondnavbtn" routerLink="/rooms">
{{'cRooms'|translate}}
<button mat-icon-button routerLink="/internalinfo">
{{'cInfo'|translate}}
</button>
<button mat-icon-button class=" secondnavbtn" routerLink="/international">
<button mat-icon-button routerLink="/international">
{{'cInternational'|translate}}
</button>
<!-- <button mat-icon-button class=" secondnavbtn">
Research
</button>
<button mat-icon-button class=" secondnavbtn">
Further Education
<button mat-icon-button routerLink="/navigation">
{{'cNavigation'|translate}}
</button>
<button mat-icon-button class=" secondnavbtn">
Business
</button> -->
</div>
</mat-toolbar>
</div>
</mat-toolbar>
</div>
<router-outlet></router-outlet>
\ No newline at end of file
......@@ -48,7 +48,7 @@ import { MatSelectModule } from '@angular/material/select';
import { MatTableModule } from '@angular/material/table';
import { NewsComponent } from './news/news.component';
import { EventsComponent } from './events/events.component';
import { InternalInfoComponent } from './internal-info/internal-info.component';
import { InternalinfoComponent } from './internalinfo/internalinfo.component';
@NgModule({
......@@ -63,7 +63,7 @@ import { InternalInfoComponent } from './internal-info/internal-info.component';
AdminComponent,
NewsComponent,
EventsComponent,
InternalInfoComponent,
InternalinfoComponent,
],
imports: [
......@@ -79,7 +79,7 @@ import { InternalInfoComponent } from './internal-info/internal-info.component';
// { path: 'international', loadChildren: './international/international.module#InternationalModule' },
{ path: 'admin', component: AdminComponent, canActivate: [JwtGuard] },
{ path: 'login', component: LoginComponent },
{ path: 'internalinfo', component: InternalInfoComponent }
{ path: 'internalinfo', component: InternalinfoComponent }
]),
InternationalModule,
FlexLayoutModule,
......
<p>events works!</p>
<div class="evhd">
<h2>EVENTS</h2>
<br>
<br>
<hr class="line">
<div class="events">
<mat-grid-list cols="3" rowHeight="1:1" gutterSize="10px">
<mat-grid-tile>
<span class="big">26</span>
<span>NOV</span>
</mat-grid-tile>
<mat-grid-tile>
<span class="big">27</span>
<span>NOV</span>
</mat-grid-tile>
<mat-grid-tile>
<span class="big">28</span>
<span>NOV</span>
</mat-grid-tile>
</mat-grid-list>
</div>
</div>
\ No newline at end of file
<div class="heading">
<h1>Study & Research at DIT.</h1>
<h2>Discover our Pioneering and Vibrant University</h2>
<h1>{{ 'chomeheading1' | translate}}</h1>
<h2>{{ 'chomeheading2' | translate}}</h2>
</div>
<div class="text">
......@@ -47,32 +47,6 @@
<hr class="line">
<div class="evhd">
<h2>EVENTS</h2>
<br>
<br>
<div class="events">
<mat-grid-list cols="3" rowHeight="1:1" gutterSize="10px">
<mat-grid-tile>
<span class="big">26</span>
<span>NOV</span>
</mat-grid-tile>
<mat-grid-tile>
<span class="big">27</span>
<span>NOV</span>
</mat-grid-tile>
<mat-grid-tile>
<span class="big">28</span>
<span>NOV</span>
</mat-grid-tile>
</mat-grid-list>
</div>
</div>
<hr class="line">
<div class="evhd">
<h1>NEWS</h1>
......
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { InternalInfoComponent } from './internal-info.component';
import { InternalinfoComponent } from './internalinfo.component';
describe('InternalInfoComponent', () => {
let component: InternalInfoComponent;
let fixture: ComponentFixture<InternalInfoComponent>;
let component: InternalinfoComponent;
let fixture: ComponentFixture<InternalinfoComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ InternalInfoComponent ]
declarations: [ InternalinfoComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(InternalInfoComponent);
fixture = TestBed.createComponent(InternalinfoComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
......
......@@ -2,10 +2,10 @@ import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-internal-info',
templateUrl: './internal-info.component.html',
styleUrls: ['./internal-info.component.css']
templateUrl: './internalinfo.component.html',
styleUrls: ['./internalinfo.component.css']
})
export class InternalInfoComponent implements OnInit {
export class InternalinfoComponent implements OnInit {
constructor() { }
......
.grid {
width: 80%;
padding-left: 10%;
color: white;
}
.m3 {
background: #009fe3;
}
.m1 {
background: #1A4273;
}
.m2 {
background: #434343;
}
\ No newline at end of file
<p>{{'cInternationalText'|translate}}</p>
<div class="grid">
<mat-grid-list cols="3" rowHeight="1:1" gutterSize="3px">
<mat-grid-tile class="m1">
<pre><h1>EVENTS.</h1>
<h2>EXPLORE YOUR UNIVERSITY.</h2></pre>
</mat-grid-tile>
<mat-grid-tile class="m2">
<h1>CURRENT INFORMATION ABOUT THE CORONAVIRUS.</h1>
</mat-grid-tile>
<mat-grid-tile class="m3">
<h1>Apply Now.</h1>
</mat-grid-tile>
<mat-grid-tile class="m4">
<pre> <h1>BACHELOR.</h1>
<h1>MASTER.</h1></pre>
</mat-grid-tile>
<mat-grid-tile class="m5">
<h1>Research Groups</h1>
</mat-grid-tile>
<mat-grid-tile class="m6">
<h1>International students</h1>
</mat-grid-tile>
<mat-grid-tile class="m7">
<h1>INFORMATION</h1>
</mat-grid-tile>
<mat-grid-tile class="m8">
<h1>schedule</h1>
</mat-grid-tile>
<mat-grid-tile class="m9">
<h1>admissions</h1>
</mat-grid-tile>
</mat-grid-list>
</div>
\ No newline at end of file
......@@ -14,5 +14,7 @@
"cLoginText": "Bitte geben Sie Ihre E-Mail und das Passwort ein:",
"cInfo": "Interne Informationen",
"cNews": "Nachrichten",
"cEvents": "Veranstaltungen"
"cEvents": "Veranstaltungen",
"chomeheading1": "studieren & forschen an der thd.",
"chomeheading2": "innovativ und lebendig. entdecke deine hochschule"
}
\ No newline at end of file
......@@ -14,5 +14,7 @@
"cLoginText": "Please login with your e-mail and password:",
"cInfo": "Internal Information",
"cNews": "News",
"cEvents": "Events"
"cEvents": "Events",
"chomeheading1": "Study & Research at DIT.",
"chomeheading2": "Discover our Pioneering and Vibrant University"
}
\ No newline at end of file
// Custom Theming for Angular Material
// For more information: https://material.angular.io/guide/theming
@import '~@angular/material/theming';
// Plus imports for other components in your app.
// Include the common styles for Angular Material. We include this here so that you only
// have to load a single css file for Angular Material in your app.
// Be sure that you only ever include this mixin once!
@include mat-core();
// Define the palettes for your theme using the Material Design palettes available in palette.scss
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
// hue. Available color palettes: https://material.io/design/color/
$mit-ws-primary: mat-palette($mat-indigo);
$mit-ws-accent: mat-palette($mat-pink, A200, A100, A400);
// The warn palette is optional (defaults to red).
$mit-ws-warn: mat-palette($mat-red);
// Create the theme object. A theme consists of configurations for individual
// theming systems such as "color" or "typography".
$mit-ws-theme: mat-light-theme((
color: (
primary: $mit-ws-primary,
accent: $mit-ws-accent,
warn: $mit-ws-warn,
)
));
// Include theme styles for core and each component used in your app.
// Alternatively, you can import and @include the theme mixins for each component
// that you are using.
@include angular-material-theme($mit-ws-theme);
// Custom Theming for Angular Material
// For more information: https://material.angular.io/guide/theming
@import '~@angular/material/theming';
......
/* You can add global styles to this file, and also import other style files
html,
body {
height: 100%;
h1,h2 {
text-transform: uppercase;
}
body {
margin: 0;
font-family: Roboto, "Helvetica Neue", sans-serif;
all: unset
}/*
@font-face {
font-family: Orator_Std_Medium;
src: url(assets/Orator_Std_Medium/Orator_Std_Medium.ttf) format("opentype");
} */
/* html, body { padding: 0; margin: 0;} */
\ No newline at end of file
html, body { height: 100%; }
body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment