From 0e9b2570c21f08d0201e729f67bc2f95bcecb0fc Mon Sep 17 00:00:00 2001 From: Kanika1799 Date: Fri, 8 Mar 2019 15:32:33 +0530 Subject: [PATCH 1/4] signin page --- package-lock.json | 43 ++---- src/app/app.module.ts | 8 +- src/app/login-box/login-box.component.html | 0 src/app/login-box/login-box.component.scss | 71 ++++++++++ src/app/login-box/login-box.component.spec.ts | 25 ++++ src/app/login-box/login-box.component.ts | 15 ++ src/app/login/login.component.html | 128 +++++++++++++++++- src/app/login/login.component.scss | 71 ++++++++++ 8 files changed, 324 insertions(+), 37 deletions(-) create mode 100644 src/app/login-box/login-box.component.html create mode 100644 src/app/login-box/login-box.component.scss create mode 100644 src/app/login-box/login-box.component.spec.ts create mode 100644 src/app/login-box/login-box.component.ts diff --git a/package-lock.json b/package-lock.json index 3d523d4..0a7fcc7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "n2v", + "name": "edupro", "version": "0.0.0", "lockfileVersion": 1, "requires": true, @@ -3563,8 +3563,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -3585,14 +3584,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3607,20 +3604,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -3737,8 +3731,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -3750,7 +3743,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3765,7 +3757,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3773,14 +3764,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -3799,7 +3788,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -3880,8 +3868,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -3893,7 +3880,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -3979,8 +3965,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -4016,7 +4001,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4036,7 +4020,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4080,14 +4063,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d271ace..b826985 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -10,12 +10,13 @@ import { ContactComponent } from './contact/contact.component'; import { NavbarComponent } from './shared/navbar/navbar.component'; import { FooterComponent } from './shared/footer/footer.component'; import { ContactIconComponent } from './shared/contact-icon/contact-icon.component'; -import { LoginComponent } from './login/login.component'; import { CoursesComponent } from './courses/courses.component'; import { CoursesDescriptionComponent } from './courses-description/courses-description.component'; import { ForumComponent } from './forum/forum.component'; import { CoursePreviewComponent } from './course-preview/course-preview.component'; import { AboutComponent } from './about/about.component'; +import { LoginBoxComponent } from './login-box/login-box.component'; +import { LoginComponent } from './login/login.component'; @NgModule({ declarations: [ @@ -24,14 +25,15 @@ import { AboutComponent } from './about/about.component'; NavbarComponent, FooterComponent, ContactIconComponent, - LoginComponent, UserDashboardComponent, CoursesComponent, CoursesDescriptionComponent, ForumComponent, CoursePreviewComponent, ContactComponent, - AboutComponent + AboutComponent, + LoginBoxComponent, + LoginComponent ], imports: [BrowserModule, AppRoutingModule, NgbModule], providers: [], diff --git a/src/app/login-box/login-box.component.html b/src/app/login-box/login-box.component.html new file mode 100644 index 0000000..e69de29 diff --git a/src/app/login-box/login-box.component.scss b/src/app/login-box/login-box.component.scss new file mode 100644 index 0000000..323162f --- /dev/null +++ b/src/app/login-box/login-box.component.scss @@ -0,0 +1,71 @@ +.form-group { + padding-right: 20px; + padding-left: 20px; + width: 560px; + } + .section1 { + width: 550px; + height: 830px; + background-color: #EDF5E1; + margin-top: 50px; + margin-bottom: 50px; + float: right; + margin-right: 133px; + + + } + .section2 { + width: 550px; + height: 830px; + background-color: #EDF5E1; + margin-top: 50px; + margin-bottom: 50px; + float: left; + margin-left: 132px; + } + #one { + color: black; + + } + + + .input-group-text + { + height: 34px; + font-size: 14px; + + } + .form-check-label + { + padding-left: 20px; + + } + .new + { + + text-decoration: underline; + } + .forget { + text-decoration-line: none; + color: black; + } + .bgoogle { + background-color: #DD4B39; + color: white; + } + .bfacebook { + background-color: #3B5998; + color: white; + } + .picture { + align-content: center; + } + .body { + background-color: #44579a; + color: black; + } + .dob { + width: 510px; + height: 35px; + border-top-right-radius: none; + } \ No newline at end of file diff --git a/src/app/login-box/login-box.component.spec.ts b/src/app/login-box/login-box.component.spec.ts new file mode 100644 index 0000000..c93963e --- /dev/null +++ b/src/app/login-box/login-box.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LoginBoxComponent } from './login-box.component'; + +describe('LoginBoxComponent', () => { + let component: LoginBoxComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ LoginBoxComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(LoginBoxComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/login-box/login-box.component.ts b/src/app/login-box/login-box.component.ts new file mode 100644 index 0000000..7057345 --- /dev/null +++ b/src/app/login-box/login-box.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-login-box', + templateUrl: './login-box.component.html', + styleUrls: ['./login-box.component.scss'] +}) +export class LoginBoxComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html index cbdfa13..58af2c6 100644 --- a/src/app/login/login.component.html +++ b/src/app/login/login.component.html @@ -1,3 +1,125 @@ -

- login works! -

+ +
+ +
+

Sign-In With

+
+ + +

+ + +

OR

+
+
+ + +
+ + +We'll never share your email with anyone else. +
+
+ + +
+ +
+
+ + +
+
+ +Forget Password? +

+ +
+New Member? + +

+ +
+ +
+ + + + + +
+ + +
+

Sign Up

+
+
+
+ + +
+
+ + +We'll never share your email with anyone else. +
+
+ + +
+
+ + +
+
+
+ + +
+ + + +
+ +
+ +
+
+ +
+ + +
+ +
+ + +
+
+
+ + +
+
+ +

+Already a Member? +

+ + + +
+ diff --git a/src/app/login/login.component.scss b/src/app/login/login.component.scss index e69de29..bcb70a6 100644 --- a/src/app/login/login.component.scss +++ b/src/app/login/login.component.scss @@ -0,0 +1,71 @@ +.form-group { + padding-right: 20px; + padding-left: 20px; + width: 560px; + } + .section1 { + width: 550px; + height: 960px; + background-color: #EDF5E1; + margin-top: 50px; + margin-bottom: 50px; + float: right; + margin-right: 133px; + + + } + .section2 { + width: 550px; + height: 960px; + background-color: #EDF5E1; + margin-top: 50px; + margin-bottom: 50px; + float: left; + margin-left: 132px; + } + #one { + color: black; + + } + + + .input-group-text + { + height: 34px; + font-size: 14px; + + } + .form-check-label + { + padding-left: 20px; + + } + .new + { + + text-decoration: underline; + } + .forget { + text-decoration-line: none; + color: black; + } + .bgoogle { + background-color: #DD4B39; + color: white; + } + .bfacebook { + background-color: #3B5998; + color: white; + } + .picture { + align-content: center; + } + .body { + background-color: #44579a; + color: black; + } + .dob { + width: 510px; + height: 35px; + border-top-right-radius: none; + } \ No newline at end of file From 14c4c356f895a8b1b83603cf891ddcdec00cd203 Mon Sep 17 00:00:00 2001 From: Kanika1799 Date: Fri, 8 Mar 2019 15:39:02 +0530 Subject: [PATCH 2/4] newpage --- src/app/login/login.component.html | 10 +++++----- src/app/login/login.component.scss | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html index 58af2c6..d1c1e6b 100644 --- a/src/app/login/login.component.html +++ b/src/app/login/login.component.html @@ -1,4 +1,4 @@ - +

@@ -32,7 +32,7 @@

Sign-In With

- + @@ -68,7 +68,7 @@

Sign Up

- + We'll never share your email with anyone else.
@@ -99,12 +99,12 @@

Sign Up

- +
- +
diff --git a/src/app/login/login.component.scss b/src/app/login/login.component.scss index bcb70a6..c8a9e09 100644 --- a/src/app/login/login.component.scss +++ b/src/app/login/login.component.scss @@ -1,3 +1,6 @@ +.body { + background-color: #44579a; +} .form-group { padding-right: 20px; padding-left: 20px; From d4d1b32b51c93f42a43ec06b77f7fae116eaae4b Mon Sep 17 00:00:00 2001 From: Kanika1799 Date: Mon, 11 Mar 2019 20:32:21 +0530 Subject: [PATCH 3/4] firstchanges --- src/app/app-routing.module.ts | 4 +-- src/app/app.module.ts | 6 ++--- src/app/login/login.component.html | 41 +++++++++++++++--------------- src/app/login/login.component.scss | 25 ++++++++++++++++-- src/app/login/login.component.ts | 2 +- 5 files changed, 49 insertions(+), 29 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 421d29c..c9b77c0 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { HomeComponent } from './home/home.component'; -import { LoginComponent } from './login/login.component'; +import { loginComponent } from './login/login.component'; import { UserDashboardComponent } from './user-dashboard/user-dashboard.component'; import { CoursesComponent } from './courses/courses.component'; import { CoursesDescriptionComponent } from './courses-description/courses-description.component'; @@ -18,7 +18,7 @@ const routes: Routes = [ { path: 'course-preview', component: CoursePreviewComponent }, { path: 'courses-description', component: CoursesDescriptionComponent }, { path: 'forum', component: ForumComponent }, - { path: 'login', component: LoginComponent }, + { path: 'login', component: loginComponent }, { path: 'about', component: AboutComponent } ]; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index b826985..aaf166f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,7 +1,7 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; - +import { loginComponent } from './login/login.component'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { HomeComponent } from './home/home.component'; @@ -16,14 +16,13 @@ import { ForumComponent } from './forum/forum.component'; import { CoursePreviewComponent } from './course-preview/course-preview.component'; import { AboutComponent } from './about/about.component'; import { LoginBoxComponent } from './login-box/login-box.component'; -import { LoginComponent } from './login/login.component'; - @NgModule({ declarations: [ AppComponent, HomeComponent, NavbarComponent, FooterComponent, + loginComponent, ContactIconComponent, UserDashboardComponent, CoursesComponent, @@ -33,7 +32,6 @@ import { LoginComponent } from './login/login.component'; ContactComponent, AboutComponent, LoginBoxComponent, - LoginComponent ], imports: [BrowserModule, AppRoutingModule, NgbModule], providers: [], diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html index d1c1e6b..e21c7f3 100644 --- a/src/app/login/login.component.html +++ b/src/app/login/login.component.html @@ -1,36 +1,36 @@ - -
+
+

Sign-In With




-

OR

+

OR


- + We'll never share your email with anyone else.
- +
-
+
-Forget Password?

-
+

+Forget Password? +

New Member?

@@ -55,7 +56,7 @@

Sign-In With

-
+

@@ -63,47 +64,47 @@

Sign Up


- +
- + We'll never share your email with anyone else.
- +
-
+

- +
- +
- +
- +
@@ -122,4 +123,4 @@

Sign Up

- +
diff --git a/src/app/login/login.component.scss b/src/app/login/login.component.scss index c8a9e09..3b5efef 100644 --- a/src/app/login/login.component.scss +++ b/src/app/login/login.component.scss @@ -1,10 +1,31 @@ -.body { +.loginpage { background-color: #44579a; } +.label { + font-weight: bold; +} +#two { + text-align: center; +} +.btn-block { + width: 380px; +} +#one { + text-align: center; +} .form-group { padding-right: 20px; padding-left: 20px; width: 560px; + } + .forget { + text-align: center; + text-decoration: underline; + + + } + .remme{ + float: left; } .section1 { width: 550px; @@ -40,7 +61,7 @@ } .form-check-label { - padding-left: 20px; + padding-left: 2px; } .new diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index 12de138..180771d 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -5,7 +5,7 @@ import { Component, OnInit } from '@angular/core'; templateUrl: './login.component.html', styleUrls: ['./login.component.scss'] }) -export class LoginComponent implements OnInit { +export class loginComponent implements OnInit { constructor() { } From a2ec72a6fdbbcb68b4fdd7bfe2e42cc11c300e3e Mon Sep 17 00:00:00 2001 From: Kanika1799 Date: Wed, 13 Mar 2019 18:53:21 +0530 Subject: [PATCH 4/4] changes made --- src/app/login/login.component.html | 6 ++++-- src/app/login/login.component.ts | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html index e21c7f3..5cd0f10 100644 --- a/src/app/login/login.component.html +++ b/src/app/login/login.component.html @@ -1,3 +1,5 @@ + +
@@ -79,10 +81,10 @@

Sign Up

+

-
-
+

diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index 180771d..22a057a 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./login.component.scss'] }) export class loginComponent implements OnInit { - + constructor() { } ngOnInit() {