diff --git a/.angular-cli.json b/.angular-cli.json index ba7f44a..61be52b 100644 --- a/.angular-cli.json +++ b/.angular-cli.json @@ -21,9 +21,11 @@ "styles": [ "styles.css", "../node_modules/bootstrap/dist/css/bootstrap.min.css", - "../node_modules/bootstrap/dist/css/bootstrap-theme.min.css" + "../node_modules/bootstrap/dist/css/bootstrap-theme.min.css", + "../node_modules/font-awesome/css/font-awesome.min.css" ], "scripts": [ + "../node_modules/jquery/dist/jquery.min.js", "../node_modules/bootstrap/dist/js/bootstrap.min.js" ], "environmentSource": "environments/environment.ts", diff --git a/package-lock.json b/package-lock.json index 396c8a5..5a1d03c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1734,6 +1734,11 @@ "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=", "dev": true }, + "font-awesome": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", + "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=" + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -3283,6 +3288,11 @@ "integrity": "sha1-2llSddGuYx3nNqwKfH2Fyfc+9lI=", "dev": true }, + "jquery": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz", + "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=" + }, "js-base64": { "version": "2.1.9", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz", diff --git a/package.json b/package.json index d30a1f8..c5f82ec 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,8 @@ "@angular/router": "^4.0.0", "bootstrap": "^3.3.7", "core-js": "^2.4.1", + "font-awesome": "^4.7.0", + "jquery": "^3.2.1", "rxjs": "^5.1.0", "zone.js": "^0.8.4" }, diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a4e8b76..b2933ba 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -7,8 +7,8 @@ import { ProjectsComponent } from './components/projects/projects.component'; const appRoutes: Routes = [ // { path: 'crisis-center', component: CrisisListComponent }, - { path: 'home', component: HomeComponent }, - { path: 'projects', component: ProjectsComponent }, + { path: 'home', component: HomeComponent }, + { path: 'projects', component: ProjectsComponent }, { path: '', redirectTo: '/home', pathMatch: 'full' }, { path: '**', component: AppComponent } ]; diff --git a/src/app/app.component.html b/src/app/app.component.html index 90c6b64..e6b9f04 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1 +1,20 @@ - \ No newline at end of file + +
+ + +
+
+
+ + + + +
+
+ +
+ + + + +
\ No newline at end of file diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 24978a0..dc8ae83 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -6,12 +6,14 @@ import { AppComponent } from './app.component'; import { AppRoutingModule } from './app-routing.module'; import { HomeComponent } from './components/home/home.component'; import { ProjectsComponent } from './components/projects/projects.component'; +import { ProjectComponent } from './components/project/project.component'; @NgModule({ declarations: [ AppComponent, HomeComponent, - ProjectsComponent + ProjectsComponent, + ProjectComponent ], imports: [ BrowserModule, diff --git a/src/app/components/home/home.component.html b/src/app/components/home/home.component.html index ce95294..986c0f0 100644 --- a/src/app/components/home/home.component.html +++ b/src/app/components/home/home.component.html @@ -1,10 +1,5 @@ -
-

Hello, world!

-

This is the home page of Joachim Nielandt

-
-
-
- Projects Photos CV +
+ These pages are a mish-mash of things that I'd like to keep safe. Descriptions and photos of projects, so I don't forget about them. Blog-style recollections of pieces of code, so I don't forget about them. Consider it a notepad of some kind.
\ No newline at end of file diff --git a/src/app/components/project/project.component.css b/src/app/components/project/project.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/components/project/project.component.html b/src/app/components/project/project.component.html new file mode 100644 index 0000000..9e3fa69 --- /dev/null +++ b/src/app/components/project/project.component.html @@ -0,0 +1,6 @@ +

+ +

+

+ +

\ No newline at end of file diff --git a/src/app/components/project/project.component.spec.ts b/src/app/components/project/project.component.spec.ts new file mode 100644 index 0000000..1cf2442 --- /dev/null +++ b/src/app/components/project/project.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ProjectComponent } from './project.component'; + +describe('ProjectComponent', () => { + let component: ProjectComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ProjectComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ProjectComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/project/project.component.ts b/src/app/components/project/project.component.ts new file mode 100644 index 0000000..85805ac --- /dev/null +++ b/src/app/components/project/project.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'project', + templateUrl: './project.component.html', + styleUrls: ['./project.component.css'] +}) +export class ProjectComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/components/projects/projects.component.html b/src/app/components/projects/projects.component.html index 545f4b1..c97a38e 100644 --- a/src/app/components/projects/projects.component.html +++ b/src/app/components/projects/projects.component.html @@ -1,28 +1,10 @@

These are the projects I have completed, am working on, got tired of... consider this to be a resume of work and hobbies. And also a little notebook for myself, in case I forget the specifics.

-
-
-

Project 1

+ +
+ The title of the project :)
-
- Panel content +
+ this is inner content of the project
-
- -
-
-

Project title

-
-
- Project content -
-
- -
-
-

Project title

-
-
- Panel content -
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/styles.css b/src/styles.css index 90d4ee0..8d8a782 100644 --- a/src/styles.css +++ b/src/styles.css @@ -1 +1,10 @@ /* You can add global styles to this file, and also import other style files */ + + +/*top menu*/ +#topmenu { + border-bottom: 1px solid gray; + margin-bottom: 15px; + padding-bottom: 8px; + padding-top: 8px; +} \ No newline at end of file