Skip to content

GitLab

Commit 3385783f authored by mdsecurity's avatar mdsecurity
Browse files

changed a lot of stuff *git gods cringe*

parent cd8cb044
Expand all Hide whitespace changes
Inline Side-by-side
package.json
View file @ 3385783f
...@@ -2,46 +2,45 @@ ...@@ -2,46 +2,45 @@
"name": "whats-open-web", "name": "whats-open-web",
"version": "0.0.0", "version": "0.0.0",
"license": "MIT", "license": "MIT",
"angular-cli": {},
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
"build": "ng build",
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint",
"e2e": "ng e2e" "e2e": "ng e2e"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/common": "^2.4.0", "@angular/common": "^4.0.0",
"@angular/compiler": "^2.4.0", "@angular/compiler": "^4.0.0",
"@angular/core": "^2.4.0", "@angular/core": "^4.0.0",
"@angular/forms": "^2.4.0", "@angular/forms": "^4.0.0",
"@angular/http": "^2.4.0", "@angular/http": "^4.0.0",
"@angular/material": "^2.0.0-beta.2", "@angular/platform-browser": "^4.0.0",
"@angular/platform-browser": "^2.4.0", "@angular/platform-browser-dynamic": "^4.0.0",
"@angular/platform-browser-dynamic": "^2.4.0", "@angular/router": "^4.0.0",
"@angular/router": "^3.4.0",
"core-js": "^2.4.1", "core-js": "^2.4.1",
"rxjs": "^5.0.1", "rxjs": "^5.1.0",
"ts-helpers": "^1.1.1", "zone.js": "^0.8.4"
"zone.js": "^0.7.2"
}, },
"devDependencies": { "devDependencies": {
"@angular/cli": "^1.0.0-rc.4", "@angular/cli": "1.0.0",
"@angular/compiler-cli": "^2.4.0", "@angular/compiler-cli": "^4.0.0",
"@types/jasmine": "2.5.38", "@types/jasmine": "2.5.38",
"@types/node": "^6.0.42", "@types/node": "~6.0.60",
"codelyzer": "~2.0.0-beta.1", "codelyzer": "~2.0.0",
"jasmine-core": "2.5.2", "jasmine-core": "~2.5.2",
"jasmine-spec-reporter": "2.5.0", "jasmine-spec-reporter": "~3.2.0",
"karma": "1.2.0", "karma": "~1.4.1",
"karma-chrome-launcher": "^2.0.0", "karma-chrome-launcher": "~2.0.0",
"karma-cli": "^1.0.1", "karma-cli": "~1.0.1",
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "^0.2.2",
"karma-coverage-istanbul-reporter": "^0.2.0", "karma-coverage-istanbul-reporter": "^0.2.0",
"karma-jasmine": "^1.0.2",
"protractor": "~5.1.0", "protractor": "~5.1.0",
"ts-node": "1.2.1", "ts-node": "~2.0.0",
"tslint": "^4.3.0", "tslint": "~4.5.0",
"typescript": "~2.0.0" "typescript": "~2.2.0"
} }
} }
src/app/app.component.html
View file @ 3385783f
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<app-nav-bar></app-nav-bar> <app-nav-bar></app-nav-bar>
<div class="main-content"> <div class="main-content">
<app-search-bar></app-search-bar> <app-search-bar></app-search-bar>
<!--<div class="place-window"> <!--<div class="place-window">-->
<app-place-window></app-place-window> <app-place-window></app-place-window>
</div>--> <!--</div>-->
<!--<app-context-bar></app-context-bar>--> <!--<app-context-bar></app-context-bar>-->
</div> </div>
</div> </div>
src/app/app.module.ts
View file @ 3385783f
...@@ -17,6 +17,8 @@ import { AreaComponent } from './place-window/area/area.component'; ...@@ -17,6 +17,8 @@ import { AreaComponent } from './place-window/area/area.component';
import { ShowHideArrowComponent } from './context-bar/show-hide-arrow/show-hide-arrow.component'; import { ShowHideArrowComponent } from './context-bar/show-hide-arrow/show-hide-arrow.component';
import { FeedbackDialogComponent } from './place-window/area/place-card/feedback-dialog/feedback-dialog.component'; import { FeedbackDialogComponent } from './place-window/area/place-card/feedback-dialog/feedback-dialog.component';
import { SearchBarComponent } from './search-bar/search-bar.component'; import { SearchBarComponent } from './search-bar/search-bar.component';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
@NgModule({ @NgModule({
declarations: [ declarations: [
AppComponent, AppComponent,
...@@ -35,6 +37,7 @@ import { SearchBarComponent } from './search-bar/search-bar.component'; ...@@ -35,6 +37,7 @@ import { SearchBarComponent } from './search-bar/search-bar.component';
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
BrowserAnimationsModule,
FormsModule, FormsModule,
HttpModule, HttpModule,
MaterialModule.forRoot() MaterialModule.forRoot()
......
src/app/nav-bar/nav-bar.component.html
View file @ 3385783f
This diff is collapsed.
src/app/nav-bar/nav-bar.component.scss
View file @ 3385783f
@import "../../color-palette"; @import "../../global-styles";
@import "../../text-styles";
.nav-bar-background{ $vertical-displacement: 10px;
.nav-bar-background {
position: relative; position: relative;
width: 100%; width: 100%;
height:55%; top: 0px;
left: 0px;
height: 400px;
background: #ffffff;
box-shadow: 0px 8px 20px 0px $shadow-color;
}
.promo-background{
position:absolute;
width:43.35%;
height:100%;
top:0px; top:0px;
left:0px; right:0px;
background:#efefef;
overflow:hidden; overflow:hidden;
} }
.circle{
.phone-background{
position:absolute; position:absolute;
width:1080px; bottom:-150%;
height:1080px; left:30px;
width:400%;
height:400%;
background-color:#006633; background-color:#006633;
top:-248px;
left: 700px;
border-radius:100%; border-radius:100%;
// opacity:0; box-shadow: -3px 0px 6px 0px rgba(0,0,0,0.26),-10px 0px 20px 0px rgba(0,0,0,0.19);
&:before{
content: "";
background: url("../../assets/pattern.png") repeat;
background-size: 100px;
opacity: 0.10;
position:absolute;
top:0;
right:0;
width:100%;
height:100%;
border-radius:100%;
}
}
.close-nav-bar-button {
width: 30px;
height: 30px;
background-color: white;
margin: 5px auto 0px auto;
border-radius: 50%;
box-shadow: 0px 0px 0px 0px $shadow-color;
}
.close-nav-bar-button-container {
position: absolute;
left: 50%;
bottom: 0px;
width: 40px;
height: 20px;
border-top-left-radius: 40px;
border-top-right-radius: 40px;
background-color: $background-color;
margin-left: -20px;
box-shadow: inset 0px 0px 20px 0px $shadow-color;
z-index: 10001;
}
.nav-bar-background:before {
content: "";
background: url("../../assets/pattern.png") repeat;
background-size: 100px;
opacity: 0.04;
top: 0;
left: 0;
bottom: 0;
right: 0;
position: absolute;
}
.header-background {
width: 56.65%;
height: 100%;
position: absolute;
left: 0px;
top: 0px;
}
.long-container{
width:56.65%;
height:100%;
display:flex;
}
.links {
display: flex;
flex-direction: row;
width: 340px;
justify-content: space-between;
margin:auto;
}
.link-font {
font-family: NunitoSans-SemiBold;
font-size: 18px;
color:white; //#354052;
}
.check-code-button {
position: absolute;
top: 30px;
right: 30px;
height: 35px;
width: 160px;
// background-color:green;
border-color: #FFCC33;
border-style: solid;
border-width: 2px;
z-index: 1000;
border-radius: 50px;
opacity: 0.9;
font-family: NunitoSans-Regular;
font-size: 12px;
color: #FFFFFF;
text-align: center;
vertical-align: middle;
line-height: 35px;
}
.title-and-logo {
margin: auto;
position:relative;
}
.logo {
display: block;
margin: auto;
height: 85px;
}
.title {
font-family: Montserrat-Bold;
font-size: 56px;
color: #354052;
text-align:center;
}
.phone-background {
position: absolute;
height: 100%;
// background-color:#006633;
top: 0px;
right: 0px;
// border-radius: 84px 0px 0px 84px / 290px 0px 0px 290px;
}
.white-gradient {
z-index: 5;
position: absolute;
width: 43.35%;
height: 100%;
top: 0px;
right: 0px;
// background: #006633;
background-image: radial-gradient(48% 50%, rgba(255, 255, 255, 0.54) 51%, rgba(255, 255, 255, 0) 100%);
background-image: radial-gradient(52% 50%, rgba(255, 255, 255, 0.2) 47%, rgba(255, 255, 255, 0) 100%);
}
.phones {
width: 360px;
height: 340px;
right: 45px;
// top: 60px;
bottom: 0px;
overflow: hidden;
}
.phone-wrap--iphone {
width: 0.6 * 292px;
height: 0.6 * 610px;
left: 126px;
top: 62px;
z-index: 400;
} }
.white-gradient{ .phone-wrap--android {
z-index:5; width: 0.6 * 290px;
height: 0.6 * 574px;
left: 0;
top: 0;
z-index: 500;
}
.phone,
.phone-wrap,
.phones {
position: absolute;
}
.the-iphone {
position: relative;
width: 0.6 * 292px;
height: 0.6 * 610px;
background: #FFF;
box-shadow: 11px 15px 39px 0 rgba(31, 35, 61, 0.2), 0 2px 4px 0 rgba(88, 100, 177, 0.01), inset 0 0 4px 4px #dfe1ec;
border-radius: 0.6 * 40px;
z-index: 600;
}
.the-iphone-button,
.the-iphone-dot,
.the-iphone-line {
left: 50%;
transform: translate3d(-50%, 0, 0);
opacity: .5;
box-shadow: inset 0 1px 2px 0 #B3B8D0;
position: absolute;
}
.the-iphone-dot {
width: 0.6 * 8px;
height: 0.6 * 8px;
top: 0.6 * 22px;
border-radius: 50%;
background: #DAE1EA;
}
.the-iphone-line {
width: 0.6 * 44px;
height: 0.6 * 6px;
top: 0.6 * 36px;
border-radius: 0.6 * 5px;
background: #DAE1EA;
}
.the-iphone-screen {
width: 0.6 * 270px;
height: 0.6 * 479px;
border: 1px solid #E7E9F0;
background-color: #F3F4F8;
position: absolute;
left: 50%;
top: 0.6 * 60px;
border-radius: 0.6 * 4px;
transform: translate3d(-50%, 0, 0);
background-image: url(../../assets/JC.jpg);
background-size: 0.6 * 270px;
}
.the-iphone-button {
width: 0.6 * 40px;
height: 0.6 * 40px;
bottom: 0.6 * 18px;
border-radius: 50%;
background: #DAE1EA;
}
.the-android {
position: relative;
width: 0.6 * 290px;
height: 0.6 * 574px;
background: #FFF;
box-shadow: 11px 15px 39px 0 rgba(31, 35, 61, 0.2), 0 2px 4px 0 rgba(88, 100, 177, 0.01), inset 0 0 4px 4px #dfe1ec;
border-radius: 0.6 * 30px;
}
.the-android-button,
.the-android-dot,
.the-android-line {
opacity: .5;
box-shadow: inset 0 1px 2px 0 #B3B8D0;
}
.the-android-dot {
width: 0.6 * 7px;
height: 0.6 * 7px;
position: absolute;
left: 0.6 * 76px;
top: 0.6 * 25px;
border-radius: 50%;
background: #DAE1EA;
}
.the-android-button,
.the-android-line,
.the-android-screen {
position: absolute;
left: 50%;
transform: translate3d(-50%, 0, 0);
}
.the-android-line {
width: 0.6 * 94px;
height: 0.6 * 6px;
top: 0.6 * 25px;
border-radius: 0.6 * 5px;
background: #DAE1EA;
}
.the-android-screen {
width: 0.6 * 262px;
height: 0.6 * 466px;
border: 1px solid #E7E9F0;
background-color: #F3F4F8;
top: 0.6 * 50px;
border-radius: 0.6 * 4px;
background-image: url(../../assets/JC.jpg);
background-size: 0.6 * 262px;
}
.the-android-button {
width: 0.6 * 94px;
height: 0.6 * 6px;
bottom: 0.6 * 26px;
border-radius: 0.6 * 5px;
background: #DAE1EA;
}
.small-nav-background {
position:absolute; position:absolute;
width: 43%; top:0;
width: 100%;
height: 70px;
background-color: #006633;
z-index:-10;
}
.small-logo {
width: 60px;
height: 60px;
}
.small-title-container {
width:200px;
height:100%; height:100%;
top:0px; margin:0
right:0px;
background: #006633;
background-image: radial-gradient(48% 50%, rgba(255,255,255,0.54) 51%, rgba(255,255,255,0.00) 100%);
background-image: radial-gradient(52% 50%, rgba(255,255,255,0.20) 47%, rgba(255,255,255,0.00) 100%);
} }
.small-title {
font-family: Nunito-Bold;
font-size: 24px;
color: #FFFFFF;
}
.small-sub-title {
opacity: 0.75;
font-family: NunitoSans-Regular;
font-size: 15px;
color: #FFFFFF;
}
.small-links {
display: flex;
flex-direction: row;
justify-content: space-between;
width: 300px;
margin-left: 50px;
}
.small-link-font {
font-family: NunitoSans-Regular;
text-align: center;
line-height: 70px;
font-size: 18px;
color: #FFFFFF;
}
src/app/nav-bar/nav-bar.component.ts
View file @ 3385783f
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {
trigger,
state,
style,
animate,
transition,
keyframes
} from '@angular/animations';
@Component({ @Component({
selector: 'app-nav-bar', selector: 'app-nav-bar',
templateUrl: './nav-bar.component.html', templateUrl: './nav-bar.component.html',
styleUrls: ['./nav-bar.component.scss'] styleUrls: ['./nav-bar.component.scss'],
animations: [
trigger('toggle-large-bar', [
state('expanded', style({
transform: 'translateY(0px)'
})),
state('collapsed', style({
transform: 'translateY(-400px)'
})),
transition('expanded => collapsed', animate('300ms cubic-bezier(.35,0,.61,1)')),
transition('collapsed => expanded', animate('300ms ease-in-out'))
]),
trigger('toggle-small-bar', [
state('expanded', style({
})),
state('collapsed', style({
})),
transition('expanded => collapsed', animate('300ms 270ms ease-out')),
transition('collapsed => expanded', animate('300ms ease-out'))
])
]
}) })
export class NavBarComponent implements OnInit { export class NavBarComponent implements OnInit {
expanded:string = 'collapsed';
constructor() { } constructor() { }
ngOnInit() { ngOnInit() {
} }
toggleState():void{
if(this.expanded === 'expanded'){
this.expanded = 'collapsed';
}else{
this.expanded = 'expanded';
}
console.log('something happened')
}
} }
src/app/place-window/area/area.component.scss
View file @ 3385783f
...@@ -90,5 +90,6 @@ hr { ...@@ -90,5 +90,6 @@ hr {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-around; justify-content: center;
padding:0px 0px 0px 0px;
} }