Commit 8a3ae051 authored by i317280's avatar i317280

update

parent c912848f
<nav class="navbar navbar-toggleable-md fixed-top navbar-inverse bg-inverse" *ngIf="User.logined">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="#">Navbar</a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false"
aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" routerLink="">Navbar</a>
<div class="collapse navbar-collapse" id="navbarsExampleDefault">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="#">Disabled</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="http://example.com" id="dropdown01" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropdown</a>
<div class="dropdown-menu" aria-labelledby="dropdown01">
<a class="dropdown-item" href="#">Action</a>
<a class="dropdown-item" href="#">Another action</a>
<a class="dropdown-item" href="#">Something else here</a>
</div>
</li>
</ul>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="text" placeholder="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
</form>
</div>
</nav>
<div class="collapse navbar-collapse" id="navbarsExampleDefault">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" routerLink="">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link" routerLink="term">Term</a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="#">Disabled</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="http://example.com" id="dropdown01" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">Dropdown</a>
<div class="dropdown-menu" aria-labelledby="dropdown01">
<a class="dropdown-item" href="#">Action</a>
<a class="dropdown-item" href="#">Another action</a>
<a class="dropdown-item" href="#">Something else here</a>
</div>
</li>
</ul>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="text" placeholder="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
</form>
</div>
</nav>
......@@ -3,3 +3,7 @@ div, term-leftbar, term-body {
width: 100%;
padding: 0;
}
div {
top: 55px;
}
......@@ -7,6 +7,7 @@ declare let jQuery: any;
declare let Terminal: any;
import {AppService, DataStore} from '../app.service';
import {logger} from "codelyzer/util/logger";
export class Term {
nick: string;
......
/**
* Created by liuzheng on 2017/8/30.
*/
import {Injectable, NgModule} from '@angular/core';
import {Injectable} from '@angular/core';
import {Http, RequestOptionsArgs, Headers} from '@angular/http';
import {Cookie} from 'ng2-cookies/ng2-cookies';
import {Logger} from 'angular2-logger/core';
......@@ -113,6 +113,7 @@ export class HttpService {
options = {};
}
options.headers = this.headers;
this._http.get("/api/hello");
return this._http.get(url, options)
}
......@@ -206,7 +207,6 @@ export class AppService {
// DataStore.socket.emit('api', 'all');
});
this.checklogin();
this.browser()
}
......@@ -223,6 +223,7 @@ export class AppService {
}
// jQuery('angular2').show();
} else {
this.browser();
this._http.get('/api/checklogin')
.map(res => res.json())
.subscribe(
......@@ -300,8 +301,7 @@ export class AppService {
}
browser() {
this._http.headers.append("aa", "vvv");
this._http.post('/api/browser', JSON.stringify(Browser)).map(res => res.json())
this._http.post('/api/browser', JSON.stringify(Browser)).map(res => res.json()).subscribe()
}
//
......
......@@ -16,10 +16,6 @@ body {
width: 100%;
}
body {
padding-top: 56px;
}
footer {
padding: 30px 0;
}
......
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