Skip to content

Commit

Permalink
Fully working
Browse files Browse the repository at this point in the history
  • Loading branch information
@sssynk
sssynk committed Jan 13, 2022
1 parent ed2fd94 commit 082ac03
Showing 1 changed file with 120 additions and 36 deletions.
156 changes: 120 additions & 36 deletions swiftapp/ContentView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,20 @@ import SwiftUI
import WebKit


struct Note: Identifiable {
struct Note: Identifiable, Equatable {
let id = UUID()
var noteid: String
var title: String
var contents: String
static func ==(lhs: Note, rhs: Note) -> Bool {
return lhs.noteid == rhs.noteid
}
}

class CurrentApp: ObservableObject {
@Published var token = ""
@Published var all_notes = [Note(title: "Start Typing on the Right to Make a Note!", contents: "")]
@Published var note = Note(title: "none", contents: "none")
@Published var all_notes = [Note(noteid: "", title: "Start Typing on the Right to Make a Note!", contents: "")]
@Published var note = Note(noteid: "", title: "none", contents: "none")
}

struct ContentView: View {
Expand Down Expand Up @@ -61,17 +65,6 @@ struct ContentView: View {
}
.padding(.top, 550)

Button("Close Window (Debug)") {
NSApplication.shared.keyWindow?.close()
let window = NSWindow(contentRect: NSRect(x: 20, y: 20, width: 480, height: 300), styleMask: [.titled, .closable, .miniaturizable, .resizable, .fullSizeContentView], backing: .buffered, defer: false)
window.center()
window.setFrameAutosaveName("Main Window")
window.contentView = NSHostingView(rootView: Login())
window.makeKeyAndOrderFront(nil)
}
.padding(.top, 550)
.hidden()

Text(errortext)
.foregroundColor(Color.orange)
.padding(.top, 600)
Expand All @@ -86,7 +79,7 @@ struct ContentView: View {
let request = requestLogin(username: username, password: password)
if (request == true) {
NSApplication.shared.keyWindow?.close()

//openURL(url)
let notes = getWithAuth(address: URL(string: "https://api.james.baby/s/notes")!)
print(notes["notes"]!)
Expand All @@ -95,7 +88,8 @@ struct ContentView: View {
for note in notes_arr {
let title = note["title"]
let content = note["contents"]
current_data.all_notes.append(Note(title: title ?? "Load Failed", contents: content ?? "Load Failed"))
let noteid = note["noteid"]
current_data.all_notes.append(Note(noteid: noteid ?? "load_failed", title: title ?? "Load Failed", contents: content ?? "Load Failed"))
}
}

Expand Down Expand Up @@ -147,13 +141,13 @@ struct ContentView: View {

let task = URLSession.shared.dataTask(with: url) {(data, response, error) in
guard let data = data, error == nil else {
print(error?.localizedDescription ?? "No data")
return
}
print(error?.localizedDescription ?? "No data")
return
}
let responseJSON = try? JSONSerialization.jsonObject(with: data, options: [])
if let responseJSON = responseJSON as? [String: Any] {
result = responseJSON
}
if let responseJSON = responseJSON as? [String: Any] {
result = responseJSON
}
semaphore.signal()
}

Expand All @@ -172,13 +166,13 @@ struct ContentView: View {

let task = URLSession.shared.dataTask(with: url) {(data, response, error) in
guard let data = data, error == nil else {
print(error?.localizedDescription ?? "No data")
return
}
print(error?.localizedDescription ?? "No data")
return
}
let responseJSON = try? JSONSerialization.jsonObject(with: data, options: [])
if let responseJSON = responseJSON as? [String: Any] {
result = responseJSON
}
if let responseJSON = responseJSON as? [String: Any] {
result = responseJSON
}
semaphore.signal()
}

Expand All @@ -190,29 +184,86 @@ struct ContentView: View {

struct Login: View {
@State var title: String = ""
@State var cont: String = ""
@State var currentNote: Note = Note(noteid: "n/a", title: "n/a", contents: "n/a")
@EnvironmentObject private var current_data: CurrentApp
var body: some View {
HStack {
List {
ForEach(current_data.all_notes) { note in
Button("\(note.title)\n\(note.contents)"){}.padding()
Button("\(note.title)\n\(note.contents)"){
loadNote(note: note)
}.padding()
.frame(maxWidth: .infinity, alignment: .leading)
.background(RoundedRectangle(cornerRadius: 8).fill(Color(red: 50 / 255, green: 50 / 255, blue: 50 / 255)))
.buttonStyle(PlainButtonStyle())
}
}
.frame(width: 300, height: 500, alignment: .leading)
ZStack {
HStack {
Button("New Note") {
newVis()
}
.padding(.bottom, 70)
Button("Save Note") {
handleSave()
}
.padding(.bottom, 70)
}
.frame(width: 500, height: 500, alignment: .topLeading)
.padding(.bottom, 80)
.padding(.top, 10)

TextField("Note Title", text: $title)
.frame(width: 500, height: 500, alignment: .topLeading)
TextEditor(text: .constant("Note Body"))
TextEditor(text: $cont)
.frame(width: 500, height: 500, alignment: .topLeading)
.padding(.top, 50)
}
}.onAppear(perform: {
print("loaded!")
})
}
func loadNote(note: Note) {
title = note.title
cont = note.contents
currentNote = note
}
func newVis() {
title = ""
cont = ""
currentNote = Note(noteid: "n/a", title: "", contents: "")
}
func handleSave() {
if(currentNote.noteid == "n/a") {
newNote(note: Note(noteid: "n/a", title: title, contents: cont))
} else {
updateNote(note: Note(noteid: currentNote.noteid, title: title, contents: cont))
}
}
func newNote(note: Note) { // no noteid required
let ret = postWithAuth(address: URL(string: "https://api.james.baby/s/notes")!, body: ["title": note.title, "contents": note.contents], req_type: "POST")
if(ret["status"] as! Int == 201) {
current_data.all_notes.append(Note(noteid: ret["note_id"] as! String, title: note.title, contents: note.contents))
currentNote = Note(noteid: ret["note_id"] as! String, title: note.title, contents: note.contents)
} else {
print(ret)
print("the funny occurred!!! (unable to make new note)")
}
}
func updateNote(note: Note) { // requires a noteid
let ret = postWithAuth(address: URL(string: "https://api.james.baby/s/notes/\(note.noteid)")!, body: ["title": note.title, "contents": note.contents], req_type: "PUT")
if(ret["status"] as! Int == 200) {
if let index = current_data.all_notes.firstIndex(of: note) {
current_data.all_notes.remove(at: index)
}
current_data.all_notes.append(Note(noteid: note.noteid, title: note.title, contents: note.contents))
currentNote = Note(noteid: note.noteid, title: note.title, contents: note.contents)
} else {
print("the funny occurred!!! (unable to update note)")
}
}
func getWithAuth(address: URL) -> [String: Any] {
var url = URLRequest(url: address)
url.setValue("https://james.baby", forHTTPHeaderField: "Origin")
Expand All @@ -224,20 +275,53 @@ struct Login: View {

let task = URLSession.shared.dataTask(with: url) {(data, response, error) in
guard let data = data, error == nil else {
print(error?.localizedDescription ?? "No data")
return
}
print(error?.localizedDescription ?? "No data")
return
}
let responseJSON = try? JSONSerialization.jsonObject(with: data, options: [])
if let responseJSON = responseJSON as? [String: Any] {
result = responseJSON
}
if let responseJSON = responseJSON as? [String: Any] {
result = responseJSON
}
semaphore.signal()
}

task.resume()
semaphore.wait()
return result!
}

func postWithAuth(address: URL, body: Dictionary<String, String>, req_type: String) -> [String: Any] {
var url = URLRequest(url: address)
do {
url.httpBody = try JSONSerialization.data(withJSONObject: body, options: .prettyPrinted)
} catch {
print(error.localizedDescription)
}
url.setValue("https://james.baby", forHTTPHeaderField: "Origin")
url.setValue(current_data.token, forHTTPHeaderField: "Authorization")
url.setValue("application/json", forHTTPHeaderField: "Content-Type")
url.httpMethod = req_type

let semaphore = DispatchSemaphore(value: 0)

var result: [String: Any]? = nil

let task = URLSession.shared.dataTask(with: url) {(data, response, error) in
guard let data = data, error == nil else {
print(error?.localizedDescription ?? "No data")
return
}
let responseJSON = try? JSONSerialization.jsonObject(with: data, options: [])
if let responseJSON = responseJSON as? [String: Any] {
result = responseJSON
}
semaphore.signal()
}

task.resume()
semaphore.wait()
return result ?? ["status": 200]
}
}


Expand Down

0 comments on commit 082ac03

Please sign in to comment.