Skip to content

Commit 143c092

Browse files
wburklundwburklund
authored
Merge pull request #254 from qccoders/develop
Prod deploy MVP.09
2 parents 96e248e + e1aedce commit 143c092

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+408
-592
lines changed

‎api/QCVOC.Api/Scans/Controller/ScansController.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ namespace QCVOC.Api.Scans.Controller
1010
using System.Linq;
1111
using Microsoft.AspNetCore.Authorization;
1212
using Microsoft.AspNetCore.Mvc;
13-
using Microsoft.AspNetCore.Mvc.ModelBinding;
1413
using QCVOC.Api.Common;
1514
using QCVOC.Api.Common.Data.Repository;
1615
using QCVOC.Api.Events.Data.Model;
@@ -108,7 +107,7 @@ public IActionResult Scan([FromBody]ScanRequest scan)
108107

109108
if (veteran == default(Veteran))
110109
{
111-
return StatusCode(404, "The specified Card Id doesn't match an enrolled Veteran.");
110+
return StatusCode(404, $"Card Number {scan.CardNumber} doesn't match an enrolled Veteran.");
112111
}
113112

114113
var scanRecord = new Scan()

‎api/QCVOC.Api/Security/Controller/SecurityController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public IActionResult CheckCredentials()
7777
[AllowAnonymous]
7878
[ProducesResponseType(typeof(TokenResponse), 200)]
7979
[ProducesResponseType(typeof(string), 400)]
80-
[ProducesResponseType(401)]
80+
[ProducesResponseType(typeof(string), 401)]
8181
[ProducesResponseType(typeof(Exception), 500)]
8282
public IActionResult Login([FromBody]TokenRequest credentials)
8383
{
@@ -93,7 +93,7 @@ public IActionResult Login([FromBody]TokenRequest credentials)
9393

9494
if (accountRecord == default(Account))
9595
{
96-
return Unauthorized();
96+
return StatusCode(401, "Login failed.");
9797
}
9898

9999
PurgeExpiredRefreshTokensFor(accountRecord.Id);

‎mobile-new/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ android {
1212
}
1313
buildTypes {
1414
release {
15-
minifyEnabled false
15+
minifyEnabled true
1616
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1717
}
1818
}

‎mobile-new/app/proguard-rules.pro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
# If your project uses WebView with JS, uncomment the following
99
# and specify the fully qualified class name to the JavaScript interface
1010
# class:
11-
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12-
# public *;
13-
#}
11+
-keepclassmembers class org.qccoders.qcvoc.MainActivity {
12+
public *;
13+
}
1414

1515
# Uncomment this to preserve the line number information for
1616
# debugging stack traces.

‎mobile-new/app/src/main/ic_launcher-web.png

31.5 KB
Loading

‎mobile-new/app/src/main/res/drawable/ic_launcher_background.xml

Lines changed: 70 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -1,170 +1,74 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<vector xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:width="108dp"
2+
<vector
43
android:height="108dp"
4+
android:width="108dp"
55
android:viewportHeight="108"
6-
android:viewportWidth="108">
7-
<path
8-
android:fillColor="#26A69A"
9-
android:pathData="M0,0h108v108h-108z" />
10-
<path
11-
android:fillColor="#00000000"
12-
android:pathData="M9,0L9,108"
13-
android:strokeColor="#33FFFFFF"
14-
android:strokeWidth="0.8" />
15-
<path
16-
android:fillColor="#00000000"
17-
android:pathData="M19,0L19,108"
18-
android:strokeColor="#33FFFFFF"
19-
android:strokeWidth="0.8" />
20-
<path
21-
android:fillColor="#00000000"
22-
android:pathData="M29,0L29,108"
23-
android:strokeColor="#33FFFFFF"
24-
android:strokeWidth="0.8" />
25-
<path
26-
android:fillColor="#00000000"
27-
android:pathData="M39,0L39,108"
28-
android:strokeColor="#33FFFFFF"
29-
android:strokeWidth="0.8" />
30-
<path
31-
android:fillColor="#00000000"
32-
android:pathData="M49,0L49,108"
33-
android:strokeColor="#33FFFFFF"
34-
android:strokeWidth="0.8" />
35-
<path
36-
android:fillColor="#00000000"
37-
android:pathData="M59,0L59,108"
38-
android:strokeColor="#33FFFFFF"
39-
android:strokeWidth="0.8" />
40-
<path
41-
android:fillColor="#00000000"
42-
android:pathData="M69,0L69,108"
43-
android:strokeColor="#33FFFFFF"
44-
android:strokeWidth="0.8" />
45-
<path
46-
android:fillColor="#00000000"
47-
android:pathData="M79,0L79,108"
48-
android:strokeColor="#33FFFFFF"
49-
android:strokeWidth="0.8" />
50-
<path
51-
android:fillColor="#00000000"
52-
android:pathData="M89,0L89,108"
53-
android:strokeColor="#33FFFFFF"
54-
android:strokeWidth="0.8" />
55-
<path
56-
android:fillColor="#00000000"
57-
android:pathData="M99,0L99,108"
58-
android:strokeColor="#33FFFFFF"
59-
android:strokeWidth="0.8" />
60-
<path
61-
android:fillColor="#00000000"
62-
android:pathData="M0,9L108,9"
63-
android:strokeColor="#33FFFFFF"
64-
android:strokeWidth="0.8" />
65-
<path
66-
android:fillColor="#00000000"
67-
android:pathData="M0,19L108,19"
68-
android:strokeColor="#33FFFFFF"
69-
android:strokeWidth="0.8" />
70-
<path
71-
android:fillColor="#00000000"
72-
android:pathData="M0,29L108,29"
73-
android:strokeColor="#33FFFFFF"
74-
android:strokeWidth="0.8" />
75-
<path
76-
android:fillColor="#00000000"
77-
android:pathData="M0,39L108,39"
78-
android:strokeColor="#33FFFFFF"
79-
android:strokeWidth="0.8" />
80-
<path
81-
android:fillColor="#00000000"
82-
android:pathData="M0,49L108,49"
83-
android:strokeColor="#33FFFFFF"
84-
android:strokeWidth="0.8" />
85-
<path
86-
android:fillColor="#00000000"
87-
android:pathData="M0,59L108,59"
88-
android:strokeColor="#33FFFFFF"
89-
android:strokeWidth="0.8" />
90-
<path
91-
android:fillColor="#00000000"
92-
android:pathData="M0,69L108,69"
93-
android:strokeColor="#33FFFFFF"
94-
android:strokeWidth="0.8" />
95-
<path
96-
android:fillColor="#00000000"
97-
android:pathData="M0,79L108,79"
98-
android:strokeColor="#33FFFFFF"
99-
android:strokeWidth="0.8" />
100-
<path
101-
android:fillColor="#00000000"
102-
android:pathData="M0,89L108,89"
103-
android:strokeColor="#33FFFFFF"
104-
android:strokeWidth="0.8" />
105-
<path
106-
android:fillColor="#00000000"
107-
android:pathData="M0,99L108,99"
108-
android:strokeColor="#33FFFFFF"
109-
android:strokeWidth="0.8" />
110-
<path
111-
android:fillColor="#00000000"
112-
android:pathData="M19,29L89,29"
113-
android:strokeColor="#33FFFFFF"
114-
android:strokeWidth="0.8" />
115-
<path
116-
android:fillColor="#00000000"
117-
android:pathData="M19,39L89,39"
118-
android:strokeColor="#33FFFFFF"
119-
android:strokeWidth="0.8" />
120-
<path
121-
android:fillColor="#00000000"
122-
android:pathData="M19,49L89,49"
123-
android:strokeColor="#33FFFFFF"
124-
android:strokeWidth="0.8" />
125-
<path
126-
android:fillColor="#00000000"
127-
android:pathData="M19,59L89,59"
128-
android:strokeColor="#33FFFFFF"
129-
android:strokeWidth="0.8" />
130-
<path
131-
android:fillColor="#00000000"
132-
android:pathData="M19,69L89,69"
133-
android:strokeColor="#33FFFFFF"
134-
android:strokeWidth="0.8" />
135-
<path
136-
android:fillColor="#00000000"
137-
android:pathData="M19,79L89,79"
138-
android:strokeColor="#33FFFFFF"
139-
android:strokeWidth="0.8" />
140-
<path
141-
android:fillColor="#00000000"
142-
android:pathData="M29,19L29,89"
143-
android:strokeColor="#33FFFFFF"
144-
android:strokeWidth="0.8" />
145-
<path
146-
android:fillColor="#00000000"
147-
android:pathData="M39,19L39,89"
148-
android:strokeColor="#33FFFFFF"
149-
android:strokeWidth="0.8" />
150-
<path
151-
android:fillColor="#00000000"
152-
android:pathData="M49,19L49,89"
153-
android:strokeColor="#33FFFFFF"
154-
android:strokeWidth="0.8" />
155-
<path
156-
android:fillColor="#00000000"
157-
android:pathData="M59,19L59,89"
158-
android:strokeColor="#33FFFFFF"
159-
android:strokeWidth="0.8" />
160-
<path
161-
android:fillColor="#00000000"
162-
android:pathData="M69,19L69,89"
163-
android:strokeColor="#33FFFFFF"
164-
android:strokeWidth="0.8" />
165-
<path
166-
android:fillColor="#00000000"
167-
android:pathData="M79,19L79,89"
168-
android:strokeColor="#33FFFFFF"
169-
android:strokeWidth="0.8" />
6+
android:viewportWidth="108"
7+
xmlns:android="http://schemas.android.com/apk/res/android">
8+
<path android:fillColor="#008577"
9+
android:pathData="M0,0h108v108h-108z"/>
10+
<path android:fillColor="#00000000" android:pathData="M9,0L9,108"
11+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
12+
<path android:fillColor="#00000000" android:pathData="M19,0L19,108"
13+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
14+
<path android:fillColor="#00000000" android:pathData="M29,0L29,108"
15+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
16+
<path android:fillColor="#00000000" android:pathData="M39,0L39,108"
17+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
18+
<path android:fillColor="#00000000" android:pathData="M49,0L49,108"
19+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
20+
<path android:fillColor="#00000000" android:pathData="M59,0L59,108"
21+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
22+
<path android:fillColor="#00000000" android:pathData="M69,0L69,108"
23+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
24+
<path android:fillColor="#00000000" android:pathData="M79,0L79,108"
25+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
26+
<path android:fillColor="#00000000" android:pathData="M89,0L89,108"
27+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
28+
<path android:fillColor="#00000000" android:pathData="M99,0L99,108"
29+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
30+
<path android:fillColor="#00000000" android:pathData="M0,9L108,9"
31+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
32+
<path android:fillColor="#00000000" android:pathData="M0,19L108,19"
33+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
34+
<path android:fillColor="#00000000" android:pathData="M0,29L108,29"
35+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
36+
<path android:fillColor="#00000000" android:pathData="M0,39L108,39"
37+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
38+
<path android:fillColor="#00000000" android:pathData="M0,49L108,49"
39+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
40+
<path android:fillColor="#00000000" android:pathData="M0,59L108,59"
41+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
42+
<path android:fillColor="#00000000" android:pathData="M0,69L108,69"
43+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
44+
<path android:fillColor="#00000000" android:pathData="M0,79L108,79"
45+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
46+
<path android:fillColor="#00000000" android:pathData="M0,89L108,89"
47+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
48+
<path android:fillColor="#00000000" android:pathData="M0,99L108,99"
49+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
50+
<path android:fillColor="#00000000" android:pathData="M19,29L89,29"
51+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
52+
<path android:fillColor="#00000000" android:pathData="M19,39L89,39"
53+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
54+
<path android:fillColor="#00000000" android:pathData="M19,49L89,49"
55+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
56+
<path android:fillColor="#00000000" android:pathData="M19,59L89,59"
57+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
58+
<path android:fillColor="#00000000" android:pathData="M19,69L89,69"
59+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
60+
<path android:fillColor="#00000000" android:pathData="M19,79L89,79"
61+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
62+
<path android:fillColor="#00000000" android:pathData="M29,19L29,89"
63+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
64+
<path android:fillColor="#00000000" android:pathData="M39,19L39,89"
65+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
66+
<path android:fillColor="#00000000" android:pathData="M49,19L49,89"
67+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
68+
<path android:fillColor="#00000000" android:pathData="M59,19L59,89"
69+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
70+
<path android:fillColor="#00000000" android:pathData="M69,19L69,89"
71+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
72+
<path android:fillColor="#00000000" android:pathData="M79,19L79,89"
73+
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
17074
</vector>

‎mobile-new/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@drawable/ic_launcher_background" />
4-
<foreground android:drawable="@drawable/ic_launcher_foreground" />
3+
<background android:drawable="@drawable/ic_launcher_background"/>
4+
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
55
</adaptive-icon>

‎mobile-new/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@drawable/ic_launcher_background" />
4-
<foreground android:drawable="@drawable/ic_launcher_foreground" />
3+
<background android:drawable="@drawable/ic_launcher_background"/>
4+
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
55
</adaptive-icon>

‎mobile-new/app/src/main/res/mipmap-hdpi/ic_launcher.png

246 Bytes
Loading

‎mobile-new/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png

4.37 KB
Loading

‎mobile-new/app/src/main/res/mipmap-hdpi/ic_launcher_round.png

282 Bytes
Loading

‎mobile-new/app/src/main/res/mipmap-mdpi/ic_launcher.png

85 Bytes
Loading

‎mobile-new/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png

2.62 KB
Loading

‎mobile-new/app/src/main/res/mipmap-mdpi/ic_launcher_round.png

259 Bytes
Loading

‎mobile-new/app/src/main/res/mipmap-xhdpi/ic_launcher.png

181 Bytes
Loading

‎mobile-new/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png

6.09 KB
Loading

‎mobile-new/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png

331 Bytes
Loading

‎mobile-new/app/src/main/res/mipmap-xxhdpi/ic_launcher.png

882 Bytes
Loading

‎mobile-new/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png

9.83 KB
Loading

‎mobile-new/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png

1012 Bytes
Loading

‎mobile-new/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

849 Bytes
Loading

‎mobile-new/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png

14.3 KB
Loading

‎mobile-new/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png

946 Bytes
Loading

0 commit comments

Comments
 (0)