Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
396 commits
Select commit Hold shift + click to select a range
cf02ee2
testing network
phortonssf Dec 14, 2018
b6bdca2
updated ionic serve for devapp console logging
phortonssf Dec 14, 2018
1f37c21
commited changes
gSoD17 Dec 14, 2018
4d633f2
added toast
phortonssf Dec 14, 2018
c822e1e
testing network offline settings
phortonssf Dec 14, 2018
f396b14
removed components module
phortonssf Dec 14, 2018
1d5e5f5
removed history page module
phortonssf Dec 14, 2018
36d337c
removed newspage, selfassementpage, resourcespage from app.module
phortonssf Dec 14, 2018
6cdd16d
updated config.xml id to com.ssf.reboot
phortonssf Dec 14, 2018
a84f4b5
updated cordova splash plugin
phortonssf Dec 15, 2018
4177f23
updated ionic cordova plugin
phortonssf Dec 15, 2018
4525e37
added brett's chartjs plugin
phortonssf Dec 15, 2018
a25b176
removed my ionic network because it worked in devapp but not in a rea…
phortonssf Dec 15, 2018
b8be793
added enum for offline
phortonssf Dec 15, 2018
b2590ad
added ionic forums solution for network provider
phortonssf Dec 15, 2018
7ea5c74
updated app.component.ts for ionic forums network solution
phortonssf Dec 15, 2018
bd1081a
updated nothing
phortonssf Dec 15, 2018
c43846c
updated bretts chartjs package
phortonssf Dec 15, 2018
03d353d
dev app network working
phortonssf Dec 15, 2018
1de7af2
dev app working but moved it all to constructor of network service
phortonssf Dec 15, 2018
0305981
moved recourses folder
phortonssf Dec 15, 2018
b9166ff
removed other network service in app.component
phortonssf Dec 15, 2018
af8f126
fixed homets curly
phortonssf Dec 15, 2018
a6ff857
update saveing charts with offline mode
robertlb4 Dec 15, 2018
2c52f19
adding offling http interceptor
robertlb4 Dec 18, 2018
245d4b2
merge with offline branch
robertlb4 Dec 18, 2018
3ff7714
moved top navbar for slides into its own grid row, modified wizard sa…
gSoD17 Dec 18, 2018
ad2068c
Merge branch '205-warren' of https://github.com/SoftStackFactory/rebo…
WarrenG8 Dec 18, 2018
84460a7
updated profile page and user model to match backend
benjaminalfred Dec 18, 2018
e90e685
added comments
raymondvooo Dec 18, 2018
eb1d618
comment news componenet
raymondvooo Dec 18, 2018
c5feca4
added comments to news page
raymondvooo Dec 18, 2018
a6174b8
Merge pull request #252 from SoftStackFactory/raymond-qa
khoadnguyen Dec 18, 2018
339d342
Merge branch 'dev' into 201-resource-raymond
khoadnguyen Dec 18, 2018
049fa0b
Merge pull request #253 from SoftStackFactory/201-resource-raymond
khoadnguyen Dec 18, 2018
03bee5a
revised to match data model
brettwray Dec 18, 2018
f17f249
Merge pull request #256 from SoftStackFactory/205-warren
khoadnguyen Dec 18, 2018
521414d
Profile changes
khoadnguyen Dec 18, 2018
c0c465f
Merge pull request #257 from SoftStackFactory/210-profile-2
khoadnguyen Dec 18, 2018
6650285
Merge pull request #254 from SoftStackFactory/brett-chart-resources
khoadnguyen Dec 18, 2018
00f8026
fixed header title for smaller screens using portrait media query, mo…
gSoD17 Dec 18, 2018
5b893e1
minor adjustments to nav, added no-padding to grid
gSoD17 Dec 18, 2018
4a6446e
fixed typo for assessment image in assets folder to correct broken im…
gSoD17 Dec 18, 2018
9515729
modified navbar to use flexbox, moved and formatted exit button to be…
gSoD17 Dec 18, 2018
0bd2aaa
commented out navbar
gSoD17 Dec 18, 2018
7658fd9
add offline interceptor
robertlb4 Dec 19, 2018
f932f98
begin to add funcitonality for login to handle interceptor message
robertlb4 Dec 19, 2018
50fd7c3
create interceptors
robertlb4 Dec 19, 2018
699c8a2
add interceptors to module
robertlb4 Dec 19, 2018
7f4a8a7
rename assessment.png to fix error
robertlb4 Dec 19, 2018
8a89ec2
fix misnamed service injection
robertlb4 Dec 19, 2018
7ab5c48
update methods to return the promist
robertlb4 Dec 19, 2018
43b74f6
remove uneeded code
robertlb4 Dec 19, 2018
9394ee7
add handling for empty/no charts
robertlb4 Dec 19, 2018
afe3109
switch to absolute pathing
robertlb4 Dec 19, 2018
1fbb49a
add ability to persist charts for session
robertlb4 Dec 19, 2018
bf4236d
prevent error when now chart history
robertlb4 Dec 19, 2018
1956e87
npm install
phortonssf Dec 19, 2018
3cca709
fixed merge conflict
phortonssf Dec 20, 2018
bccc4e9
added cordova network
phortonssf Dec 20, 2018
e700789
reformatted news page for desktop view
gSoD17 Dec 20, 2018
ff8dfb7
additional improvements to news page format for desktop view
gSoD17 Dec 20, 2018
2dc1f86
removed comment for new ion-content markup
gSoD17 Dec 20, 2018
4f4a427
add ability for internet detection for browser version
robertlb4 Dec 20, 2018
085d7c8
updated package.json for test
phortonssf Dec 20, 2018
6557e60
installed cordova plugins:
phortonssf Dec 20, 2018
11f973f
fix(errors): Fixing build errors
khoadnguyen Dec 20, 2018
0bc063e
fix(build): build issue
khoadnguyen Dec 20, 2018
b6e24cf
formatted self-assessment page for desktop view
gSoD17 Dec 20, 2018
bcae4ee
fixed environment variables
phortonssf Dec 20, 2018
1474cae
cleaned up app.module.ts
phortonssf Dec 20, 2018
26a2908
removed history page module
phortonssf Dec 20, 2018
ffb91ea
removed news pages module
phortonssf Dec 20, 2018
d702523
removed resources page module
phortonssf Dec 20, 2018
1bcafc8
removed assessment page module
phortonssf Dec 20, 2018
b223c98
fixed news-widget imports
phortonssf Dec 20, 2018
8814a98
imported timeline component to app.module.ts
phortonssf Dec 20, 2018
fe2c957
Login Pages is now home page:
phortonssf Dec 20, 2018
36098a8
merge with origin
robertlb4 Dec 20, 2018
d994df6
updated ionic id
phortonssf Dec 20, 2018
34f3207
updated ios provision id:
phortonssf Dec 20, 2018
43b6a9a
removed login page title
phortonssf Dec 20, 2018
fc9cf2a
fix ts error
robertlb4 Dec 20, 2018
ff01e83
fix conflicting package-lock.json
robertlb4 Dec 20, 2018
6be2380
merge local dev with remote
robertlb4 Dec 20, 2018
0fb5efc
merge dev branch
robertlb4 Dec 20, 2018
736420e
relocate resources directory to root of project
Dec 20, 2018
e523651
generate new resources
Dec 20, 2018
a1fd946
replace resources folder with version from working project
robertlb4 Dec 20, 2018
c1c2e97
test renaming file to force github to pick it up
robertlb4 Dec 20, 2018
2c30c56
test renaming file to force github to pick it up
robertlb4 Dec 20, 2018
e5c3812
Revert to original name not that github has files
robertlb4 Dec 20, 2018
4dc8f1e
comment out item in gitignore that was preventing resources/<platform…
robertlb4 Dec 20, 2018
0be99c8
disable side menu until log in
robertlb4 Dec 21, 2018
a8f8502
fix issue with missing data on profile page
robertlb4 Dec 21, 2018
6c89021
fix toast css to center text for all toasts with class =toaster imple…
robertlb4 Dec 21, 2018
08921cb
fix a few more display bugs on profile page
robertlb4 Dec 21, 2018
d0aa6e0
fix bug in datepicker to allow dates further in future
robertlb4 Dec 21, 2018
d05901a
improve toast handling for assesments taken on same day
robertlb4 Dec 21, 2018
e76608e
updated package.json build
phortonssf Dec 21, 2018
01c715a
Changed Social life to Social Life on History Page. Chart now accepts…
WarrenG8 Jan 3, 2019
8ad47e1
Lowest score on self assessment now takes last set of data
WarrenG8 Jan 3, 2019
73bcbff
Removed Login and Register pages from side menu
WarrenG8 Jan 3, 2019
f27624e
Added Action Item Provider. Displaying first step of timeline in Dash…
WarrenG8 Jan 4, 2019
38c4d02
Centered action item text
WarrenG8 Jan 4, 2019
ff4a4be
Replaced images with current app screenshot and removed the old ones
WarrenG8 Jan 4, 2019
68fa695
Updated the new images and made some spelling changes
WarrenG8 Jan 4, 2019
863a3e0
Removed Home page and unecessary code from other pages that were remo…
WarrenG8 Jan 4, 2019
5eea77b
Removed Home page and unecessary code from other pages that were remo…
WarrenG8 Jan 4, 2019
59c926c
Added side arrows to wizard and removed back and next buttons in header
WarrenG8 Jan 4, 2019
ab0e34f
Merge pull request #263 from SoftStackFactory/warren
phortonssf Jan 4, 2019
ac64eef
No changes
WarrenG8 Jan 4, 2019
184ef94
Merge branch 'dev' into warren
WarrenG8 Jan 4, 2019
e7456be
Wizard directional arrows fixed
WarrenG8 Jan 15, 2019
bc3be25
Left arrow no longer shows up on 1st slide when clicking back
WarrenG8 Jan 15, 2019
725e28e
Dashboard now has link to self assessment
WarrenG8 Jan 15, 2019
65a8772
minor adjustments
gSoD17 Jan 15, 2019
4ebbe0d
commented out timeline component sass on lines 138-140 to adjust chec…
gSoD17 Jan 16, 2019
29e3678
commented out timeline component sass on lines 146-152 to indent imme…
gSoD17 Jan 16, 2019
a49fe70
Removed officer rank insignia question
WarrenG8 Jan 16, 2019
9606d99
Cleaned up link to assessment to match the other links on page
WarrenG8 Jan 16, 2019
b08e8ef
added a new margin-left on line 72 for the timeline sass component
gSoD17 Jan 16, 2019
ff0501e
changed timeline sass component from 10% to 8% on line 72
gSoD17 Jan 16, 2019
52b7ea8
Login merged in
WarrenG8 Jan 16, 2019
3ffec6c
Merge branch 'newspage' into warren
WarrenG8 Jan 16, 2019
59ea260
Removed "
WarrenG8 Jan 16, 2019
1479a03
Merge branch 'gridselfassess' into warren
WarrenG8 Jan 16, 2019
3b1c0a1
Merged in grid changes. Removed Officer Rank Insignia completely.
WarrenG8 Jan 16, 2019
0a4e1f5
Created dropdown menu for rank instead of making the user type in the…
WarrenG8 Jan 16, 2019
831af3d
Merging in history grid changes
WarrenG8 Jan 16, 2019
44f2740
Min-height added to 2nd row of items in dashboard
WarrenG8 Jan 16, 2019
ff19d5c
Resources page grid now added
WarrenG8 Jan 16, 2019
1701ab6
modified green bullet point image, added new padding based on screen …
gSoD17 Jan 17, 2019
97ab4bf
Dashboard links are now placed in the bottom right corner of its card
WarrenG8 Jan 17, 2019
2c046cf
Please complete assessment text centered.
WarrenG8 Jan 17, 2019
d58c2d1
Made dashboard page responsive. Cards take up full width in iPad or i…
WarrenG8 Jan 17, 2019
f30569a
Fixed grid on self assessment page. Moved instructions to top of page
WarrenG8 Jan 17, 2019
d47153b
Fixed grid on self assessment page. Moved instructions to top of page
WarrenG8 Jan 17, 2019
5b9f905
Fixed grid for resources page. Created view to for user that has not …
WarrenG8 Jan 17, 2019
d4f1705
added new class to line 22 ion-label in timeline component html to ad…
gSoD17 Jan 17, 2019
4856ce9
Fixed grid on resources page for iPad and web views
WarrenG8 Jan 17, 2019
a31bb5e
Fixed grid on history page for iPad and web views
WarrenG8 Jan 17, 2019
e1043f7
Fixed swiping on wizard.
WarrenG8 Jan 17, 2019
464d4d1
Adjusted chart resizing and trimmed padding
AlexRingrose Jan 17, 2019
db56408
Merge branch 'warren' of https://github.com/SoftStackFactory/reboot i…
AlexRingrose Jan 17, 2019
381a350
Alex R fixed chart aspect to make chart size more appropriate.
WarrenG8 Jan 18, 2019
1a1d186
Merged
AlexRingrose Jan 18, 2019
b55c2df
generated and imported new component that would serve as a thermomete…
gSoD17 Jan 18, 2019
89f5b83
added functional progress bar
gSoD17 Jan 18, 2019
32d0f31
Resources now sort by lowest score to highest when an assessment has …
WarrenG8 Jan 18, 2019
12d70e1
Merge branch 'warren' of https://github.com/SoftStackFactory/reboot i…
WarrenG8 Jan 18, 2019
d7a8627
Fixed arrow bug
WarrenG8 Jan 18, 2019
42820ee
Fixed arrow bug. Refactored leftOrRightArrow
WarrenG8 Jan 18, 2019
af3a736
Refactored swipe locking logic. Added ionicChange methods to evauate …
WarrenG8 Jan 18, 2019
42e8254
Added comments
WarrenG8 Jan 18, 2019
20e397f
Fixed grid for iPad and web view
WarrenG8 Jan 18, 2019
35daafb
Changed question height in questionnaire to fit % disability question…
WarrenG8 Jan 18, 2019
e5ef469
Merge pull request #264 from SoftStackFactory/warren
phortonssf Jan 18, 2019
1e38097
added transition status to dashboard card
gSoD17 Jan 19, 2019
2020a7f
added mockup text for action item to transition card in dashboard
gSoD17 Jan 19, 2019
28854c6
added mockup timeline status img to timeline page and component, adde…
gSoD17 Jan 19, 2019
a8df8cf
fixed merge conflict updated gino changes
phortonssf Jan 19, 2019
3fcb19a
storage provider comment back in
phortonssf Jan 21, 2019
262290c
change development url to reboot-loopback
phortonssf Jan 21, 2019
4060a75
register test
phortonssf Jan 21, 2019
85fd0f9
interceptor test
phortonssf Jan 21, 2019
dad7efb
Fixed issue of 2nd date field populating when user selects veteran as…
WarrenG8 Jan 22, 2019
5b74a41
Fixed urls in another commit. Moved code back into subscribe block.
WarrenG8 Jan 22, 2019
35c7189
User credentials now stored in user provider. Methods in user provide…
WarrenG8 Jan 23, 2019
4e254ad
Last employed no longer shows up if user is currently employed. Activ…
WarrenG8 Jan 24, 2019
dc88db5
Changed vh property on row2 class so it lines up. Uncommented h1 to d…
WarrenG8 Jan 24, 2019
1bd8b06
Changed user provider to have uniform getUserCredential method. Chang…
WarrenG8 Jan 24, 2019
2438bd2
Changed getUserInfo method so that deepscan will pass.
WarrenG8 Jan 24, 2019
a2500ed
Merge pull request #267 from SoftStackFactory/warren
phortonssf Jan 24, 2019
5081f0f
removed storage comment
phortonssf Jan 24, 2019
2bffe22
resolved credentials storage errors
phortonssf Jan 24, 2019
0f5e325
logout user even on http logout fail
phortonssf Jan 25, 2019
860a8fc
fixed edit bug
phortonssf Jan 25, 2019
a7bc65d
removed caps creds const
phortonssf Jan 25, 2019
3005daa
uncommented service worker
phortonssf Jan 25, 2019
aa5195f
Delete enviornments.dev.ts
khoadnguyen Feb 5, 2019
e3ece5c
Fixed toast spam issue
Feb 14, 2019
88a9f29
toast issue update
Feb 14, 2019
453cbb1
Added fixes for login, wizard and logout pages
Feb 15, 2019
e267fe0
fixes for github deepscan
Feb 15, 2019
e8d3667
Adjusted colors and sizes for header
bdarey Feb 15, 2019
1969a8d
changed up css. colors and headers
bdarey Feb 15, 2019
08961d4
Make card displays 2 columns on large screen and 1 column on small sc…
KevinChheang Feb 17, 2019
cfc2584
Added a header and intro text for the self assessment page
KevinChheang Feb 18, 2019
f6cb305
Replace id with class attribute to avoid specificity
KevinChheang Feb 18, 2019
7207a88
Added text-center attribute to heading
KevinChheang Feb 18, 2019
eb831c4
Merge pull request #282 from SoftStackFactory/275-self-assessment
khoadnguyen Feb 19, 2019
caf03cf
Merge pull request #281 from SoftStackFactory/277-self-assessment
khoadnguyen Feb 19, 2019
4a9c867
Merge pull request #278 from SoftStackFactory/toast-issue
khoadnguyen Feb 19, 2019
c7be6d5
Merge pull request #279 from SoftStackFactory/login/wizard/logout-issues
khoadnguyen Feb 19, 2019
87fb423
Updated profile page editable fields to reflect the wizard selectable…
KevinChheang Feb 21, 2019
9852ec4
Added Grid and columnized upper cards
AlexRingrose Feb 21, 2019
c794658
Merge pull request #287 from SoftStackFactory/284-profile
khoadnguyen Feb 21, 2019
356330a
Removed password validation during login and changed email validation…
KevinChheang Feb 26, 2019
acbd2db
Only display last employment date when user select Unemployed
KevinChheang Feb 26, 2019
abb6621
Added logic to profile page when user edit email
KevinChheang Feb 26, 2019
52f770e
Changed to a square aspect ratio
AlexRingrose Feb 26, 2019
e7e8ec3
Added Grid & combined graph card with lowest score card
AlexRingrose Feb 26, 2019
6c9402a
Split catagories into two col
AlexRingrose Feb 26, 2019
e7acbd7
Changed card buttons/links
bdarey Feb 26, 2019
8e323a6
Merge pull request #295 from SoftStackFactory/292-profile-wizard-logic
khoadnguyen Feb 28, 2019
00a2b83
Removed card resizing at xl breakpoint
AlexRingrose Feb 28, 2019
f39ef95
fixing ids
bdarey Feb 28, 2019
5e0a2a2
Shorted blurb text to two lines
AlexRingrose Feb 28, 2019
081fb93
Get the validation text for email input to posiiton properly
KevinChheang Feb 28, 2019
9420bc3
Removed logic that is meant for other issue
KevinChheang Feb 28, 2019
1c8d0df
Merge pull request #286 from SoftStackFactory/273-dashboard
khoadnguyen Feb 28, 2019
6ee55fb
Added stock photos & attached them to resouce data
AlexRingrose Feb 28, 2019
e9dc044
Assigned new class to buttons and icons giving
bdarey Feb 28, 2019
57b7397
links on bottom adjusted. Might need a little more styling (font, col…
bdarey Feb 28, 2019
057f67d
Styling cards and imgs
AlexRingrose Feb 28, 2019
ad1075e
fixed spacing issue
bdarey Mar 5, 2019
bdac811
created conditions and meter that takes in an input
bdarey Mar 5, 2019
38e4436
Set up structure for conditions. Added a few descriptions
bdarey Mar 5, 2019
9298cc4
finished descrptions
bdarey Mar 5, 2019
8bfa5d9
added condition if they never took an assessment
bdarey Mar 6, 2019
773a690
Center wrapper & assorted tweeks
AlexRingrose Mar 6, 2019
2069728
Need to fix condition for if assessDate===0
bdarey Mar 6, 2019
45add89
put 'Transition Readiness Test' and 'Build Your Own Network' boxes in…
bdarey Mar 6, 2019
7aa1322
fixed condition where user hasn't taken assessment.
bdarey Mar 6, 2019
5d4b114
added descriptions to each condition
bdarey Mar 6, 2019
0106f73
Sort main resources array, removed second array & code formating
AlexRingrose Mar 6, 2019
d606a8e
Updates to Timeline UI and added timeline provider to handle API calls
Mar 7, 2019
00e0037
changed headers for when user does not take an assessment
bdarey Mar 7, 2019
2ee6bcd
fixing navbar header
AlexRingrose Mar 7, 2019
d66c1ad
Fixes for deepscan
Mar 7, 2019
9b831f6
Merge branch 'dev' into 274-dashboard-cta
khoadnguyen Mar 7, 2019
09c4622
Merge pull request #296 from SoftStackFactory/274-dashboard-cta
khoadnguyen Mar 7, 2019
4dd0314
Merge branch 'dev' into 297-dashboard-warning
khoadnguyen Mar 7, 2019
525c38d
Merge pull request #301 from SoftStackFactory/297-dashboard-warning
khoadnguyen Mar 7, 2019
d43623a
Merge pull request #300 from SoftStackFactory/283-Resources-two-col
khoadnguyen Mar 7, 2019
e414ee0
Merge branch 'dev' into 288-resources-array-logic
khoadnguyen Mar 7, 2019
e1c27ce
Merge pull request #302 from SoftStackFactory/288-resources-array-logic
khoadnguyen Mar 7, 2019
3017585
Merge pull request #303 from SoftStackFactory/timelineUpdate
khoadnguyen Mar 11, 2019
20931ed
Styling clean up
AlexRingrose Mar 11, 2019
9cfa636
Button change & spacing
AlexRingrose Mar 11, 2019
cf0e6f8
Modal button color change
AlexRingrose Mar 11, 2019
c8939b8
Heroku bug fix, added auto sliding segments
Mar 11, 2019
fe07f08
Changing id selectors to class selectors & removed unused css rules
AlexRingrose Mar 11, 2019
f50839c
Merge branch 'dev' into timelineUpdate
Avilpa1 Mar 11, 2019
457ed12
css tag renaming
AlexRingrose Mar 11, 2019
3214951
resolving spacing in lowest score card
AlexRingrose Mar 12, 2019
44431f4
Merge pull request #294 from SoftStackFactory/265-login-validation-pa…
khoadnguyen Mar 12, 2019
3eecd4e
Merge pull request #308 from SoftStackFactory/timelineUpdate
khoadnguyen Mar 12, 2019
117b564
Merge pull request #309 from SoftStackFactory/307-resource-restyle
khoadnguyen Mar 12, 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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ ASALocalRun/
.LSOverride

# Icon must end with two \r
Icon
#Icon

# Thumbnails
._*
Expand Down Expand Up @@ -616,4 +616,4 @@ config.codekit
config.codekit3
/min

/src/environments/environments.dev.ts
/src/environments/environment.dev.ts
6 changes: 5 additions & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.starter" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="com.ssf.reboot" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>reboot</name>
<description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
Expand Down Expand Up @@ -83,4 +83,8 @@
<plugin name="cordova-plugin-ionic-webview" spec="^2.0.0" />
<plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
<plugin name="cordova-sqlite-storage" spec="~2.5.0" />
<plugin name="cordova-plugin-inappbrowser" spec="~3.0.0" />
<plugin name="cordova-plugin-network-information" spec="~2.0.1" />
<engine name="ios" spec="~4.5.5" />
<engine name="android" spec="~7.1.4" />
</widget>
32 changes: 16 additions & 16 deletions config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,30 @@ var useDefaultConfig = require('@ionic/app-scripts/config/webpack.config.js');
var env = process.env.IONIC_ENV;

useDefaultConfig.prod.resolve.alias = {
"@app/env": path.resolve(environmentPath('prod'))
"@app/env": path.resolve(environmentPath('prod'))
};

useDefaultConfig.dev.resolve.alias = {
"@app/env": path.resolve(environmentPath('dev'))
"@app/env": path.resolve(environmentPath('dev'))
};

if (env !== 'prod' && env !== 'dev') {
// Default to dev config
useDefaultConfig[env] = useDefaultConfig.dev;
useDefaultConfig[env].resolve.alias = {
"@app/env": path.resolve(environmentPath(env))
};
// Default to dev config
useDefaultConfig[env] = useDefaultConfig.dev;
useDefaultConfig[env].resolve.alias = {
"@app/env": path.resolve(environmentPath(env))
};
}

function environmentPath(env) {
var filePath = './src/environments/environments' + (env === 'prod' ? '' : '.' + env) + '.ts';
if (!fs.existsSync(filePath)) {
console.log(chalk.red('\n' + filePath + ' does not exist!'));
} else {
return filePath;
}
var filePath = './src/environments/environment' + (env === 'prod' ? '' : '.' + env) + '.ts';
if (!fs.existsSync(filePath)) {
console.log(chalk.red('\n' + filePath + ' does not exist!'));
} else {
return filePath;
}
}

module.exports = function () {
return useDefaultConfig;
};
module.exports = function() {
return useDefaultConfig;
};
6 changes: 4 additions & 2 deletions ionic.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@
"cordova": {}
},
"type": "ionic-angular",
"pro_id": "605bbeba"
}
"pro_id": "605bbeba",
"id": "8391f3cc",
"app_id": ""
}
Empty file added origin
Empty file.
Loading