From f8cac67055de90042d6287e7dc1523e22a1909a6 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Fri, 22 Jan 2021 22:10:08 -0500 Subject: [PATCH 1/2] [+] Deploy server --- ProjectClock/AccountViewController.swift | 1 + ProjectClock/Net.swift | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ProjectClock/AccountViewController.swift b/ProjectClock/AccountViewController.swift index 51a9bc8..26ad71b 100644 --- a/ProjectClock/AccountViewController.swift +++ b/ProjectClock/AccountViewController.swift @@ -87,6 +87,7 @@ class LoginVC: UIViewController let errors = ["409 - [\"A0111\"]": "Account already exists, please login instead.", "401 -": "Incorrect username/password", "404 -": "Username does not exist in the database", + "406 - [\"A0101\"]": "Username invalid." ] // Send register request diff --git a/ProjectClock/Net.swift b/ProjectClock/Net.swift index d713088..803cc80 100644 --- a/ProjectClock/Net.swift +++ b/ProjectClock/Net.swift @@ -7,7 +7,7 @@ import Foundation /// Base URL of the HTTP server -let baseUrl = "http://localhost:8080" // TODO: Production settings +let baseUrl = "https://alarm-clock-api.hydev.org" /// Json class class JSON From 74870197f9500e9c9bdd9f6a0f55cdf82c366ce0 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sat, 23 Jan 2021 23:19:54 -0500 Subject: [PATCH 2/2] [F] Fix testing alarm --- ProjectClock/AlarmViewController.swift | 4 ++-- ProjectClock/TestingViewController.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ProjectClock/AlarmViewController.swift b/ProjectClock/AlarmViewController.swift index 9a90e00..2fe4a13 100644 --- a/ProjectClock/AlarmViewController.swift +++ b/ProjectClock/AlarmViewController.swift @@ -73,13 +73,13 @@ class AlarmTableCell: UITableViewCell time.text = alarm.minute < 10 ? "\(hour):0\(alarm.minute)" : "\(hour):\(alarm.minute)" // displays the specific days alarm is activated - let daysDict = [0: "Mon", 1: "Tues", 2: "Wed", 3: "Thurs", 4: "Fri", 5: "Sat", 6: "Sun"] + let daysDict = ["Sun", "Mon", "Tues", "Wed", "Thurs", "Fri", "Sat"] var daysActive : [String] = [] if alarm.oneTime {repeatText.text = "No Repeat"} else { for (index, element) in alarm.repeats.enumerated() { if element { - daysActive.append(daysDict[index] ?? "") + daysActive.append(daysDict[index]) } } repeatText.text = daysActive.joined(separator: ", ") diff --git a/ProjectClock/TestingViewController.swift b/ProjectClock/TestingViewController.swift index 4738236..7d8d169 100644 --- a/ProjectClock/TestingViewController.swift +++ b/ProjectClock/TestingViewController.swift @@ -58,7 +58,7 @@ class TestingViewController: UIViewController @IBAction func addAlarm(_ sender: Any) { let (h, m, _) = Date().getHMS() - Alarms.fromLocal().apply { $0.list.append(Alarm(hour: h, minute: m, text: "Test alarm - \(h * m)", wakeMethod: wvms[0], lastActivate: Date().added(.minute, -1))) }.localSave() + Alarms.fromLocal().apply { $0.list.append(Alarm(hour: h, minute: m, text: "Test alarm - \(h * m)", wakeMethod: wvms[0], repeats: [true, true, true, true, true, true, true], oneTime: true, lastActivate: Date().added(.minute, -1))) }.localSave() } @IBAction func deleteAlarm(_ sender: Any)