diff --git a/.angular-cli.json b/.angular-cli.json index 61be52b..6eb2cf8 100644 --- a/.angular-cli.json +++ b/.angular-cli.json @@ -21,12 +21,12 @@ "styles": [ "styles.css", "../node_modules/bootstrap/dist/css/bootstrap.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" + "../node_modules/bootstrap/dist/js/bootstrap.min.js", + "../node_modules/popper.js/dist/popper.min.js" ], "environmentSource": "environments/environment.ts", "environments": { diff --git a/package-lock.json b/package-lock.json index b4bb7a8..152f5db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -802,9 +802,9 @@ } }, "bootstrap": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz", - "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E=" + "version": "4.0.0-beta.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0-beta.2.tgz", + "integrity": "sha512-DzGtdTlKbrMoGMpz0LigKSqJ+MgtFKxA791PU/q062OlRG0HybNZcTLH7rpDAmLS66Y3esN9yzKHLLbqa5UR3w==" }, "brace-expansion": { "version": "1.1.8", @@ -5618,6 +5618,11 @@ "pinkie": "2.0.4" } }, + "popper.js": { + "version": "1.12.9", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.12.9.tgz", + "integrity": "sha1-DfvC3/lsRRuzMu3Pz6r1ZtMx1bM=" + }, "portfinder": { "version": "1.0.13", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz", diff --git a/package.json b/package.json index 0d7c7b6..e1b902c 100644 --- a/package.json +++ b/package.json @@ -25,10 +25,11 @@ "@angular/platform-browser": "^4.4.6", "@angular/platform-browser-dynamic": "^4.4.6", "@angular/router": "^4.4.6", - "bootstrap": "^3.3.7", + "bootstrap": "^4.0.0-beta.2", "core-js": "^2.5.3", "font-awesome": "^4.7.0", "jquery": "^3.2.1", + "popper.js": "^1.12.9", "rxjs": "^5.5.6", "zone.js": "^0.8.19" }, diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index b85c313..b65c47c 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -4,13 +4,16 @@ import { RouterModule, Routes } from '@angular/router'; import { AppComponent } from './app.component'; import { HomeComponent } from './components/home/home.component'; import { PostsComponent } from './components/posts/posts.component'; +import { CvComponent } from './components/cv/cv.component'; const appRoutes: Routes = [ // { path: 'crisis-center', component: CrisisListComponent }, { path: 'home', component: HomeComponent }, { path: 'posts', component: PostsComponent }, + { path: 'cv', component: CvComponent }, { path: '', redirectTo: '/home', pathMatch: 'full' }, - { path: '**', component: AppComponent } + { path: '*', redirectTo: '/home', pathMatch: 'full' }, + // { path: '**', component: AppComponent } ]; @NgModule({ diff --git a/src/app/app.component.css b/src/app/app.component.css index e69de29..4f9dd8a 100644 --- a/src/app/app.component.css +++ b/src/app/app.component.css @@ -0,0 +1,5 @@ +.centercontents { + text-align: center; + margin-left: auto; + margin-right: auto +} \ No newline at end of file diff --git a/src/app/app.component.html b/src/app/app.component.html index af196b5..ddc46a6 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -3,11 +3,13 @@
+ cv works! +
diff --git a/src/app/components/cv/cv.component.spec.ts b/src/app/components/cv/cv.component.spec.ts new file mode 100644 index 0000000..5f1287f --- /dev/null +++ b/src/app/components/cv/cv.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CvComponent } from './cv.component'; + +describe('CvComponent', () => { + let component: CvComponent; + let fixture: ComponentFixture- post works! -
-- These are all the posts... put some filter buttons here or something? -
+All the previously made posts are shown below.
+This is a project post
Typically, all these project posts will have a number of paragraphs.
-Even images: 
\ No newline at end of file
diff --git a/src/styles.css b/src/styles.css
index 8d8a782..e50a47e 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -1,10 +1 @@
-/* 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
+/* You can add global styles to this file, and also import other style files */
\ No newline at end of file