Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A bunch of changes back propagated to add-activity just for grins #35

Open
wants to merge 32 commits into
base: add-activity
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
548bb94
Change gridlist cols in activity grid w/ fxFlex
toddwseattle Oct 25, 2017
431fdba
Fix Activity Service Add accordian to home
toddwseattle Oct 26, 2017
1355b9d
Change width of activity image. Add to toolbar
toddwseattle Oct 26, 2017
1f1ae05
Change home text; Better Grid Text Color
toddwseattle Oct 26, 2017
ae56e7b
Implement Auth Skeleton; Do no harm
toddwseattle Oct 26, 2017
731698d
Update app.module for core module
toddwseattle Oct 26, 2017
3cb7508
Implement core module with firebase components
toddwseattle Oct 27, 2017
9eea403
Move /common/ folder to /core/ and coremodule
toddwseattle Oct 27, 2017
6405e56
Implment Login and Admin guard update routes #3
toddwseattle Oct 28, 2017
baf4816
Fix activity-grid for presentation special case
toddwseattle Oct 28, 2017
1678d78
Put activity editing in /admin lazy module
toddwseattle Oct 30, 2017
4b1d3d0
Install Firebase CLI tools; cleanup for production
toddwseattle Oct 31, 2017
2afd3ac
Change Service to use AngularFire App for storage
toddwseattle Nov 1, 2017
b934405
Add Activity-Detail, fix upload, fix title
toddwseattle Nov 1, 2017
86b9748
Implemented basic activity detail
toddwseattle Nov 1, 2017
a9ac809
Minor changes to activity detail
toddwseattle Nov 2, 2017
1ac45ba
Index activity properties in firebase
toddwseattle Nov 2, 2017
2d22935
Update to Angfire 5, Ang 5, New Material and Flex
toddwseattle Dec 13, 2017
d49e3e4
More fixes to for material and angularfire 5
toddwseattle Dec 14, 2017
808648a
Fixed upload so name is unique-ish
toddwseattle Dec 14, 2017
cc0f748
Remove dead codes / comments from act-service
toddwseattle Dec 14, 2017
e2a956e
Add Bio page and new profile pic
toddwseattle Feb 5, 2018
52137b1
Add consulting and divergent pages, improve bio
toddwseattle Feb 6, 2018
b18e9e6
Add GoogleTags service and use in a few places
toddwseattle Feb 6, 2018
904c714
Added console logging and tags code to index
toddwseattle Feb 6, 2018
0d2c1ec
Update Angular; fix upload committed
toddwseattle Jan 19, 2019
da7cdd8
Add angular.json
toddwseattle Jan 19, 2019
1156cc7
Add blog, Update add-activity and social nets page
toddwseattle Jan 19, 2019
54d6b65
Ignor firebase temp files
toddwseattle Jan 19, 2019
abaff6f
Upgrade to Angular 8
toddwseattle Feb 12, 2020
860671a
Bump handlebars from 4.0.12 to 4.7.7
dependabot[bot] May 6, 2021
b0d1e67
Merge pull request #45 from toddwseattle/dependabot/npm_and_yarn/hand…
toddwseattle May 6, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 0 additions & 58 deletions .angular-cli.json

This file was deleted.

5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "landingpage-1be8c"
}
}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,6 @@ testem.log
.DS_Store
Thumbs.db
# API Secrets
/secrets/*.*
/secrets/*.*
# firebase cruft
.firebase
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"typescript.tsdk": "node_modules\\typescript\\lib"
}
130 changes: 130 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"ng-landing": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"assets": [
"src/assets",
"src/images",
"src/favicon.ico"
],
"styles": [
"src/styles.scss"
],
"scripts": []
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "ng-landing:build"
},
"configurations": {
"production": {
"browserTarget": "ng-landing:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "ng-landing:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"scripts": [],
"styles": [
"src/styles.scss"
],
"assets": [
"src/assets",
"src/images",
"src/favicon.ico"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": []
}
}
}
},
"ng-landing-e2e": {
"root": "e2e",
"sourceRoot": "e2e",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "ng-landing:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"
],
"exclude": []
}
}
}
}
},
"defaultProject": "ng-landing",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "css"
},
"@schematics/angular:directive": {
"prefix": "app"
}
}
}
21 changes: 21 additions & 0 deletions database.rules.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"rules": {
".read": "true",
".write": "(root.child('users').child(auth.uid).child('admin').val() === true)",
"class": {
".indexOn": "name"
},
"devproject": {
".indexOn": "name"
},
"investments": {
".indexOn": "name"
},
"nonprofit": {
".indexOn": "name"
},
"presentation": {
".indexOn": "name"
}
}
}
22 changes: 22 additions & 0 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"database": {
"rules": "database.rules.json"
},
"hosting": {
"public": "dist",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
},
"storage": {
"rules": "storage.rules"
}
}
10 changes: 4 additions & 6 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,22 @@
module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular/cli'],
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma')
require('@angular-devkit/build-angular/plugins/karma')
],
client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ],
dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
fixWebpackSourcePaths: true
},
angularCli: {
environment: 'dev'
},

reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
Expand Down
Loading