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

Fire cards #2

Open
wants to merge 149 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
8f310dc
Initiated npm and angular project
ojha-url Oct 29, 2018
6956add
Added structure for metaprogramming
ojha-url Oct 29, 2018
b49fc6f
Updated angular seed, node packages & gulp task
ojha-url Oct 31, 2018
9f0e034
Added navigation structure for trial
ojha-url Oct 31, 2018
9a88445
Implemented lazy loading of decks
ojha-url Oct 31, 2018
02f4252
Added components & services structure
ojha-url Nov 7, 2018
0397ce0
Finished adding flood deck cards
ojha-url Nov 7, 2018
4e0553e
Added preloading for cards
ojha-url Nov 8, 2018
bf155f5
Refactored gulp tasks in es6, compiling with babel
ojha-url Nov 8, 2018
792c3c5
Fixed fetch environments task
ojha-url Nov 8, 2018
038b4d1
Added template environments for all deployments
ojha-url Nov 8, 2018
6d4978a
Added navigation controller service
ojha-url Nov 9, 2018
29a4491
Added card navigation logic
ojha-url Nov 9, 2018
1def784
Linked components
ojha-url Nov 9, 2018
847f825
Fixed lint errors in gulp env task, added report card service
ojha-url Nov 9, 2018
a0bc0dc
Added title box content
ojha-url Nov 9, 2018
02cfa38
Added review card child components
ojha-url Nov 9, 2018
cca151c
Added tasks for adding a new card deck
ojha-url Nov 13, 2018
b290465
Added tasks for adding a new card
ojha-url Nov 13, 2018
6694d78
Added tasks for adding a new deployment, *pending task to check existing
ojha-url Nov 14, 2018
2c9cfc4
fixes #1 missing environment file issue
matthewberryman Nov 24, 2018
a558592
Initialize fire decks with fire card
ilhamwahabi Dec 26, 2018
33ae7ec
Add fire card style
ilhamwahabi Dec 26, 2018
f4d1b23
Able hover to highlight img and btn
ilhamwahabi Dec 26, 2018
36fc69b
Add fire:firetype responsiveness
ilhamwahabi Dec 26, 2018
67c5310
Initialize thanks card
ilhamwahabi Dec 26, 2018
86f0365
Add thanks card style and responsiveness
ilhamwahabi Dec 26, 2018
375ba44
Initialize description card
ilhamwahabi Dec 26, 2018
b743ee8
Add desc card style and responsiveness
ilhamwahabi Dec 26, 2018
50aa6c1
Initialize text box comp.
ilhamwahabi Dec 26, 2018
21d669e
Initialize photo card
ilhamwahabi Dec 27, 2018
7cd6615
Install material icons
ilhamwahabi Dec 27, 2018
ca1f0f0
Styling image uploader comp.
ilhamwahabi Dec 27, 2018
42f07b0
Add responsiveness to image uploader comp.
ilhamwahabi Dec 27, 2018
4c68037
Add description divider icon and fix text box
ilhamwahabi Dec 28, 2018
1e34c05
Initialize review card and styling, responsive
ilhamwahabi Dec 28, 2018
96ee4d7
Initialize swipe button
ilhamwahabi Dec 28, 2018
b5dfddb
Initialize review report (for fire decks)
ilhamwahabi Dec 28, 2018
fa7453f
Initialize visibility card
ilhamwahabi Dec 28, 2018
946be99
Add visibility styling
ilhamwahabi Dec 28, 2018
3346a30
Add styled thumb and track
ilhamwahabi Dec 28, 2018
7292267
Add logic in visibility card when range is changed
ilhamwahabi Dec 29, 2018
16b0e8a
Initialize airquality card
ilhamwahabi Dec 29, 2018
cc7f08f
Able to show airquality facts
ilhamwahabi Dec 29, 2018
fd32a67
Highlight fact when range is changed
ilhamwahabi Dec 29, 2018
1bd8218
Adjust range and fact
ilhamwahabi Dec 29, 2018
b830689
Change range thumb based on value
ilhamwahabi Dec 29, 2018
db4ffec
Add nav button to airquality
ilhamwahabi Dec 29, 2018
a4e3288
Add gradient change to airqulity track
ilhamwahabi Dec 29, 2018
851b557
Able to show initial leaflet java map
ilhamwahabi Dec 29, 2018
d566aa8
Able to add current location, install fontawesome
ilhamwahabi Dec 30, 2018
929ecec
Able to toggle marker
ilhamwahabi Dec 30, 2018
19f2e91
Able to display navigation compass
ilhamwahabi Dec 30, 2018
73c9a57
Display navigation button and search box in location card
ilhamwahabi Dec 30, 2018
b2aa247
Responsive location card
ilhamwahabi Dec 30, 2018
c2cf124
Switch marker icon on drag and drop
ilhamwahabi Jan 5, 2019
542e687
Initially locate and put marker beside
ilhamwahabi Jan 5, 2019
490c5db
Init display distance length below line
ilhamwahabi Jan 5, 2019
3e21b61
Show distance text and refactor
ilhamwahabi Jan 6, 2019
8c1d075
Dynamically update distance text when dnd
ilhamwahabi Jan 6, 2019
aea39f7
Use current location and refactor
ilhamwahabi Jan 6, 2019
0ace378
Init fire estimate
ilhamwahabi Jan 6, 2019
eaa370f
Styling estimate marker and able to dnd
ilhamwahabi Jan 6, 2019
f3ff559
Fix hovering firetype, add basic mixins
ilhamwahabi Jan 6, 2019
907272c
Styling title header
ilhamwahabi Jan 6, 2019
04e4da5
Styling and use nav button
ilhamwahabi Jan 6, 2019
8f82b2d
Remove manually coded nav button
ilhamwahabi Jan 6, 2019
7e62248
Fix card height to fit nav btn
ilhamwahabi Jan 6, 2019
c67d203
Hide nav btn in firetype, and use d.i to navigate through firetype
ilhamwahabi Jan 6, 2019
b4d5007
Fix airquality mobile screen
ilhamwahabi Jan 7, 2019
d800810
Fix firetype mobile screen
ilhamwahabi Jan 7, 2019
06e101f
Revert to default appbar and nav button
ilhamwahabi Jan 10, 2019
eaa04af
Fix id text and typo
ilhamwahabi Jan 10, 2019
73e6311
Hide tabs bar in select type
ilhamwahabi Jan 10, 2019
5080381
Cursor to pointer in whole type comp.
ilhamwahabi Jan 10, 2019
34c5ece
Create fire service
ilhamwahabi Feb 3, 2019
edecc98
Create haze service
ilhamwahabi Feb 3, 2019
916154a
Fix textbox behavior
ilhamwahabi Feb 3, 2019
6eac736
Update .gitignore, change favicon
ilhamwahabi Feb 3, 2019
1cf04ee
Use hazeservice in airquality
ilhamwahabi Feb 5, 2019
0c14d55
Use hazeservice in visibility
ilhamwahabi Feb 5, 2019
6db3d1b
Add deck service
ilhamwahabi Feb 5, 2019
60aa3da
Use deckservice in firetype
ilhamwahabi Feb 5, 2019
331e1fd
Use deckservice in description
ilhamwahabi Feb 5, 2019
350034b
Use deckservice in photo
ilhamwahabi Feb 5, 2019
d381a69
Able delete preview img
ilhamwahabi Feb 5, 2019
81d9d95
Conditionally icon in photo
ilhamwahabi Feb 5, 2019
54292f2
Separate thank to different card
ilhamwahabi Feb 5, 2019
765ab64
Conditionally render thank img
ilhamwahabi Feb 5, 2019
496d3fc
Add indonesian card title
ilhamwahabi Feb 5, 2019
767aca7
Able to display photo in review, change from imgur to imgbb
ilhamwahabi Feb 5, 2019
cb9727c
Display desc in review, fix text-box
ilhamwahabi Feb 5, 2019
11e9354
Change nav button to identically in aurelia
ilhamwahabi Feb 6, 2019
651df10
Styling button, fix airquality
ilhamwahabi Feb 6, 2019
9da4008
Fix image rotate behaviour (not metadata yet)
ilhamwahabi Feb 6, 2019
451b23a
Resize preview image
ilhamwahabi Feb 6, 2019
bd1ef9d
Fix visibility current value
ilhamwahabi Feb 6, 2019
c56a664
Add hazeservice to location picker
ilhamwahabi Feb 6, 2019
1f5db11
Add fireservice to fire distance
ilhamwahabi Feb 6, 2019
0ff35b7
Add fireservice to fire estimate
ilhamwahabi Feb 6, 2019
354f3c6
Not locate if already have location
ilhamwahabi Feb 6, 2019
0ba70a3
Not locate if already have location for radius
ilhamwahabi Feb 6, 2019
119b212
Add earthquake deck and add eqtype
ilhamwahabi Feb 12, 2019
b2ba8fa
Fix assets problem
ilhamwahabi Mar 13, 2019
2a70788
Add title for earthquake cards
ilhamwahabi Mar 13, 2019
9257716
Add new deployment (id) and set it to default
ilhamwahabi Mar 13, 2019
fba4362
Add eqlocation card
ilhamwahabi Mar 13, 2019
16a273f
Add a11y card, init slider
ilhamwahabi Mar 13, 2019
217c5d0
Change a11y circle thumb
ilhamwahabi Mar 13, 2019
ff1c0d6
Change a11y track line color
ilhamwahabi Mar 13, 2019
9c85793
Add label to a11y range
ilhamwahabi Mar 13, 2019
0a26d03
Add condition card
ilhamwahabi Mar 13, 2019
755388f
Dynamic slider color
ilhamwahabi Mar 13, 2019
92fb527
Add structure card
ilhamwahabi Mar 13, 2019
cbd537c
Dynamic structure slider color
ilhamwahabi Mar 13, 2019
03d49d6
Change earthquake tabs color to orange
ilhamwahabi Mar 13, 2019
13a0907
Add road service
ilhamwahabi Mar 13, 2019
dbbc612
Use road.service add a11y card
ilhamwahabi Mar 13, 2019
2c61c53
Use road service add condition card
ilhamwahabi Mar 13, 2019
b8ed4f0
Use structure service add structure card
ilhamwahabi Mar 13, 2019
e2dfc06
Add marker icon for earthquake
ilhamwahabi Mar 13, 2019
07c28bc
Conditionally render photo, desc, review color
ilhamwahabi Mar 14, 2019
412428d
Add locales text for earthquake
ilhamwahabi Mar 14, 2019
79b1687
Add locales text for fire, fix title box
ilhamwahabi Mar 14, 2019
139e657
Add locales for photo, desc, review
ilhamwahabi Mar 14, 2019
6d1491d
Add thanks image for eartquake
ilhamwahabi Mar 14, 2019
984d738
Conditionally render thanks part-component based to deck
ilhamwahabi Mar 14, 2019
7033e92
Hide title box in thanks
ilhamwahabi Mar 14, 2019
ff7c27b
Repair thanks instruction style
ilhamwahabi Mar 14, 2019
44b8cba
Use proper placeholder image for review
ilhamwahabi Mar 14, 2019
62e7609
Calculate fire area
ilhamwahabi Mar 14, 2019
2a512c8
Fix fire area calculation
ilhamwahabi Mar 14, 2019
999a09f
Show haze air quality on review
ilhamwahabi Mar 14, 2019
42aaacf
Show haze visibility on review
ilhamwahabi Mar 14, 2019
50ceffa
Update locales for airquality and visibility
ilhamwahabi Mar 14, 2019
7275eb7
Show road a11y on review
ilhamwahabi Mar 14, 2019
56ca40f
Show road condition on review
ilhamwahabi Mar 14, 2019
5f372d1
Show structural failure on review
ilhamwahabi Mar 14, 2019
ba2c947
Refactor nav button and change prev btn theme
ilhamwahabi Mar 14, 2019
08ccff8
Add warning comp. when desc and photo not given
ilhamwahabi Mar 14, 2019
3833c42
Show warning comp. when desc not given in structure
ilhamwahabi Mar 14, 2019
f829256
Use roboto and sans-serif, repair nav button
ilhamwahabi Mar 14, 2019
ec979f1
Fix submit swipe button to proper one
ilhamwahabi Mar 14, 2019
102a48f
Try to use vanilla but failed
ilhamwahabi Mar 14, 2019
4d03df4
Repair review styling
ilhamwahabi Mar 14, 2019
00defb9
Add road review styling
ilhamwahabi Mar 14, 2019
3b7e56a
Update button styling
ilhamwahabi Mar 15, 2019
8528f7d
Repair fire review styling
ilhamwahabi Mar 15, 2019
9cbc633
Repair review and thanks styling
ilhamwahabi Mar 15, 2019
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
Prev Previous commit
Next Next commit
Fixed fetch environments task
ojha-url committed Nov 8, 2018

Verified

This commit was signed with the committer’s verified signature.
marcelstanley Marcel Moura
commit 792c3c5caf01e705ad246b1aa778aecd1ba8d665
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
/tmp
/out-tsc
/tasks/**.js

/src/environments/**/*.ts

# dependencies
/node_modules
115 changes: 47 additions & 68 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -75,7 +75,6 @@
"@angular/compiler-cli": "^7.0.1",
"@angular/language-service": "^7.0.1",
"@types/geojson": "^7946.0.4",
"@types/gulp": "^4.0.5",
"@types/jasmine": "~2.8.3",
"@types/jasminewd2": "~2.0.2",
"@types/node": "^10.12.1",
@@ -87,6 +86,7 @@
"gulp": "^4.0.0",
"gulp-change": "^1.0.0",
"gulp-changed-in-place": "^2.3.0",
"gulp-if": "^2.0.2",
"gulp-rename": "^1.4.0",
"gulp-typedoc": "^2.2.0",
"jasmine-core": "^3.3.0",
1 change: 1 addition & 0 deletions src/typings.d.ts
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ interface NodeModule {
declare module 'gulp';
declare module 'minimist';
declare module 'del';
declare module 'gulp-if';
declare module 'gulp-change';
declare module 'gulp-changed-in-place';
declare module 'gulp-rename';
3 changes: 1 addition & 2 deletions tasks/clear-previous-assets/index.ts
Original file line number Diff line number Diff line change
@@ -8,8 +8,7 @@ export default gulp.task('clearPreviousAssets', (done) => {
'src/assets/locales',
'src/assets/logos',
'src/resources/*',
'src/index.html',
'src/environments/environment.ts'
'src/index.html'
], {force: true}); // Force deleting outside Current Working Directory

done();
Original file line number Diff line number Diff line change
@@ -2,15 +2,13 @@ import gulp from 'gulp';
import changedInPlace from 'gulp-changed-in-place';
import change from 'gulp-change';
import rename from 'gulp-rename';
import gulpif from 'gulp-if';
import parseArgs from 'minimist';

const args = parseArgs(process.argv.slice(2));
const dep = args.dep;
const stage = args.environment;

const compileCardRoutes = (content) => {
console.log(stage);

const env = JSON.parse(content.toString());
const decks = env.decks;

@@ -51,7 +49,12 @@ const compileCardRoutes = (content) => {
return 'export const environment = ' + JSON.stringify(env);
};

// Required for local development only using ng serve
const isDev = (file) => {
if (file.basename === 'environment.ts') return true;

return false;
};

export default gulp.task('fetchEnvironment', () => {
return gulp
.src([`src/environments/${dep}/*.json`])
@@ -60,5 +63,7 @@ export default gulp.task('fetchEnvironment', () => {
path.extname = '.ts'
}))
.pipe(changedInPlace({firstPass: true}))
.pipe(gulp.dest(`src/environments/${dep}`));
.pipe(gulp.dest(`src/environments/${dep}`))
// Required for local development when using ng serve
.pipe(gulpif(isDev, gulp.dest('src/environments')));
});
17 changes: 12 additions & 5 deletions tasks/index.js
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ var _del2 = _interopRequireDefault(_del);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

exports.default = _gulp2.default.task('clearPreviousAssets', function (done) {
(0, _del2.default)(['src/assets/icons', 'src/assets/images', 'src/assets/locales', 'src/assets/logos', 'src/resources/*', 'src/index.html', 'src/environments/environment.ts'], { force: true }); // Force deleting outside Current Working Directory
(0, _del2.default)(['src/assets/icons', 'src/assets/images', 'src/assets/locales', 'src/assets/logos', 'src/resources/*', 'src/index.html'], { force: true }); // Force deleting outside Current Working Directory

done();
});
@@ -67,6 +67,10 @@ var _gulpRename = require('gulp-rename');

var _gulpRename2 = _interopRequireDefault(_gulpRename);

var _gulpIf = require('gulp-if');

var _gulpIf2 = _interopRequireDefault(_gulpIf);

var _minimist = require('minimist');

var _minimist2 = _interopRequireDefault(_minimist);
@@ -75,11 +79,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de

var args = (0, _minimist2.default)(process.argv.slice(2));
var dep = args.dep;
var stage = args.environment;

var compileCardRoutes = function compileCardRoutes(content) {
console.log(stage);

var env = JSON.parse(content.toString());
var decks = env.decks;

@@ -177,11 +178,17 @@ var compileCardRoutes = function compileCardRoutes(content) {
return 'export const environment = ' + JSON.stringify(env);
};

var isDev = function isDev(file) {
if (file.basename === 'environment.ts') return true;

return false;
};

// Required for local development only using ng serve
exports.default = _gulp2.default.task('fetchEnvironment', function () {
return _gulp2.default.src(['src/environments/' + dep + '/*.json']).pipe((0, _gulpChange2.default)(compileCardRoutes)).pipe((0, _gulpRename2.default)(function (path) {
path.extname = '.ts';
})).pipe((0, _gulpChangedInPlace2.default)({ firstPass: true })).pipe(_gulp2.default.dest('src/environments/' + dep));
})).pipe((0, _gulpChangedInPlace2.default)({ firstPass: true })).pipe(_gulp2.default.dest('src/environments/' + dep)).pipe((0, _gulpIf2.default)(isDev, _gulp2.default.dest('src/environments')));
});
'use strict';