Skip to content

Commit d4c7cce

Browse files
authored
Merge pull request #44 from IntelliQ/ticket/042-phone-number-input
Ticket/042 phone number input
2 parents 1a186a9 + f2a8a70 commit d4c7cce

83 files changed

Lines changed: 1462 additions & 435 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Google App Engine generated folder
22
appengine-generated/
33
*.class
4-
.DS_Store
4+
.DS_Store
5+
keystore.properties

IntelliQ/backend/src/main/java/com/intelliq/appengine/ImageServlet.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.google.common.io.ByteStreams;
55
import com.intelliq.appengine.api.ApiRequest;
66
import com.intelliq.appengine.api.ApiResponse;
7-
import com.intelliq.appengine.api.PermissionSet;
87
import com.intelliq.appengine.datastore.BusinessHelper;
98
import com.intelliq.appengine.datastore.ImageHelper;
109
import com.intelliq.appengine.datastore.QueueHelper;

IntelliQ/backend/src/main/java/com/intelliq/appengine/ParserHelper.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
import java.util.regex.Matcher;
77
import java.util.regex.Pattern;
88

9-
import com.google.appengine.api.urlfetch.HTTPResponse;
10-
import com.google.appengine.api.urlfetch.URLFetchService;
11-
import com.google.appengine.api.urlfetch.URLFetchServiceFactory;
12-
139
public class ParserHelper {
1410

1511
public static final int MODE_FIRST_FIRST = 0;

IntelliQ/backend/src/main/java/com/intelliq/appengine/RequestFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
4040
if (path.startsWith("/static") || path.startsWith("/_ah") || path.startsWith("/intelliq")) {
4141
// preserve special routes
4242
filterChain.doFilter(request, response);
43-
} else if(uri.contains(".well-known/assetlinks.json")) {
43+
} else if (uri.contains(".well-known/assetlinks.json")) {
4444
// redirect to Digital Asset Links JSON file
4545
RequestDispatcher rd = request.getRequestDispatcher("/static/assetlinks.json");
4646
rd.forward(request, response);

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/ApiRequest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package com.intelliq.appengine.api;
22

3-
import java.util.logging.Logger;
4-
5-
import javax.servlet.http.HttpServletRequest;
6-
73
import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken.Payload;
84
import com.intelliq.appengine.ParserHelper;
9-
import com.intelliq.appengine.api.endpoint.EndpointManager;
105
import com.intelliq.appengine.datastore.UserHelper;
116
import com.intelliq.appengine.datastore.entries.UserEntry;
127

8+
import java.util.logging.Logger;
9+
10+
import javax.servlet.http.HttpServletRequest;
11+
1312
public class ApiRequest {
1413

1514
private static final Logger log = Logger.getLogger(ApiRequest.class.getName());

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/ApiResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.intelliq.appengine.api;
22

3-
import javax.servlet.http.HttpServletResponse;
4-
53
import com.google.gson.Gson;
64

5+
import javax.servlet.http.HttpServletResponse;
6+
77
public class ApiResponse {
88

99
int statusCode = HttpServletResponse.SC_OK;

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/PermissionSet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.intelliq.appengine.api;
22

3+
import com.intelliq.appengine.datastore.entries.PermissionEntry;
4+
35
import java.util.ArrayList;
46
import java.util.List;
57

6-
import com.intelliq.appengine.datastore.entries.PermissionEntry;
7-
88
public class PermissionSet {
99

1010
public static final byte REQUIRE_ANY = 0;

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/endpoint/Endpoint.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
package com.intelliq.appengine.api.endpoint;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
import java.util.logging.Logger;
6-
7-
import javax.servlet.http.HttpServletResponse;
8-
93
import com.intelliq.appengine.ParserHelper;
104
import com.intelliq.appengine.api.ApiRequest;
115
import com.intelliq.appengine.api.ApiResponse;
12-
import com.intelliq.appengine.api.ApiServlet;
136
import com.intelliq.appengine.api.PermissionSet;
14-
import com.intelliq.appengine.datastore.entries.PermissionEntry;
157
import com.intelliq.appengine.datastore.entries.UserEntry;
168

9+
import java.util.ArrayList;
10+
import java.util.List;
11+
import java.util.logging.Logger;
12+
13+
import javax.servlet.http.HttpServletResponse;
14+
1715
/**
1816
* Abstract endpoint that every API endpoint needs to extend.
1917
* Contains all basic methods and some that may need to be overwritten.

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/endpoint/EndpointManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.intelliq.appengine.api.endpoint;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
63
import com.intelliq.appengine.api.ApiRequest;
74
import com.intelliq.appengine.api.endpoint.business.BusinessEndpoint;
85
import com.intelliq.appengine.api.endpoint.queue.QueueEndpoint;
96
import com.intelliq.appengine.api.endpoint.queueitem.QueueItemEndpoint;
107
import com.intelliq.appengine.api.endpoint.user.UserEndpoint;
118

9+
import java.util.ArrayList;
10+
import java.util.List;
11+
1212
public final class EndpointManager {
1313

1414
public static final int API_VERSION = 1;

IntelliQ/backend/src/main/java/com/intelliq/appengine/api/endpoint/business/AddBusinessEndpoint.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
11
package com.intelliq.appengine.api.endpoint.business;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
6-
import javax.servlet.http.HttpServletResponse;
7-
8-
import java.util.logging.Logger;
9-
103
import com.google.appengine.api.datastore.Key;
11-
import com.intelliq.appengine.ParserHelper;
124
import com.intelliq.appengine.api.ApiRequest;
135
import com.intelliq.appengine.api.ApiResponse;
146
import com.intelliq.appengine.api.endpoint.Endpoint;
157
import com.intelliq.appengine.api.endpoint.EndpointManager;
168
import com.intelliq.appengine.datastore.BusinessHelper;
179
import com.intelliq.appengine.datastore.PermissionHelper;
1810
import com.intelliq.appengine.datastore.QueueHelper;
19-
import com.intelliq.appengine.datastore.QueueItemHelper;
2011
import com.intelliq.appengine.datastore.UserHelper;
2112
import com.intelliq.appengine.datastore.entries.BusinessEntry;
2213
import com.intelliq.appengine.datastore.entries.PermissionEntry;
2314
import com.intelliq.appengine.datastore.entries.QueueEntry;
24-
import com.intelliq.appengine.datastore.entries.QueueItemEntry;
2515
import com.intelliq.appengine.datastore.entries.UserEntry;
2616
import com.intelliq.appengine.logging.BusinessLogging;
2717

18+
import java.util.ArrayList;
19+
import java.util.List;
20+
import java.util.logging.Logger;
21+
22+
import javax.servlet.http.HttpServletResponse;
23+
2824

2925
public class AddBusinessEndpoint extends Endpoint {
3026

0 commit comments

Comments
 (0)