telboon/tapit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated web template handling of no template

Browse Source
This commit is contained in:
Samuel Pua
2019-07-08 11:12:34 +08:00
parent b518ba4ca6
commit 20d3045ce3
7 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
psql-start.sh
View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
sudo docker rm postgres --force sudo docker rm postgres --force
sudo docker run -d -p5432:5432 -e POSTGRES_USER="tapit" -e POSTGRES_PASSWORD="secret-tapit-password" -e POSTGRES_DB="tapit" --name postgres postgres sudo docker run -d -p5432:5432 -v `pwd`/postgres-data:/var/lib/postgresql/data -e POSTGRES_USER="tapit" -e POSTGRES_PASSWORD="secret-tapit-password" -e POSTGRES_DB="tapit" --name postgres postgres

10
tapit-backend/campaign.go
View File

@@ -206,13 +206,17 @@ func (tapit *Tapit) createCampaign(w http.ResponseWriter, r *http.Request) {
for _, record := range newRecords { for _, record := range newRecords {
var newJob Job var newJob Job
newJob.CurrentStatus = "Not Started" newJob.CurrentStatus = "Not Started"
newJob.WebStatus = "Not Visited"
newJob.ProviderTag = newCampaign.ProviderTag newJob.ProviderTag = newCampaign.ProviderTag
newJob.AccSID = newAccSID newJob.AccSID = newAccSID
newJob.AuthToken = newAuthToken newJob.AuthToken = newAuthToken
newJob.FromNum = newCampaign.FromNumber newJob.FromNum = newCampaign.FromNumber
newJob.WebRoute = tapit.generateWebTemplateRoute()
newJob.FullUrl = tapit.globalSettings.WebTemplatePrefix + newJob.WebRoute // handle web template only if given
if newCampaign.WebTemplateId != 0 {
newJob.WebStatus = "Not Visited"
newJob.WebRoute = tapit.generateWebTemplateRoute()
newJob.FullUrl = tapit.globalSettings.WebTemplatePrefix + newJob.WebRoute
}
// interpreting records // interpreting records
var newBodyText string var newBodyText string

BIN
tapit-backend/tapit-backend
View File

Binary file not shown.

2
tapit-backend/web-template.go
View File

@@ -422,7 +422,7 @@ func (tapit *Tapit) webTemplateRouteHandler(w http.ResponseWriter, r *http.Reque
newVisit.BodyContent = string(requestBody) newVisit.BodyContent = string(requestBody)
rawReqBytes, err := httputil.DumpRequest(r, true) rawReqBytes, err := httputil.DumpRequest(r, true)
if err == nil { if err == nil {
newVisit.RawRequest = string(rawReqBytes) newVisit.RawRequest = string(rawReqBytes) + string(requestBody)
} }
// Update visited status // Update visited status

2
tapit-build/static/main.js
View File

File diff suppressed because one or more lines are too long

BIN
tapit-build/tapit
View File

Binary file not shown.

5
tapit-frontend/src/app/web-template-new/web-template-new.component.html
View File

@@ -64,6 +64,11 @@
</div> </div>
</ng-container> </ng-container>
<div class="row">
<div class="col-12 d-flex">
<p *ngIf="router.url !== '/web-template/new'"><small><em>Note: Changing web template may affect your existing campaigns</em></small></p>
</div>
</div>
<div class="row mt-3"> <div class="row mt-3">
<div class="col-12 d-flex"> <div class="col-12 d-flex">
<button type="button" (click)="submitNewWebTemplate()" class="btn btn-primary ml-2">Save Web Template</button> <button type="button" (click)="submitNewWebTemplate()" class="btn btn-primary ml-2">Save Web Template</button>