ch/ChWebsiteApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generate first tag pages

Browse Source
This commit is contained in:
Christoph Hagen
2024-12-09 17:47:03 +01:00
parent 4f08526978
commit 8183bc4903
35 changed files with 719 additions and 1105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHDataManagement/Views/Files/AddFileView.swift
View File

@ -85,9 +85,10 @@ struct AddFileView: View {
print("Skipping existing file \(file.uniqueId)")
continue
}
guard content.storage.copyFile(at: file.url, fileId: file.uniqueId) else {
print("Failed to import file '\(file.uniqueId)' at \(file.url.path())")
do {
try content.storage.copyFile(at: file.url, fileId: file.uniqueId)
} catch {
print("Failed to import file '\(file.uniqueId)' at \(file.url.path()): \(error)")
return
}

4
CHDataManagement/Views/Files/FileDetailView.swift
View File

@ -55,7 +55,9 @@ struct FileDetailView: View {
}
private func setNewId() {
guard file.content.storage.move(file: file.id, to: newId) else {
do {
try file.content.storage.move(file: file.id, to: newId)
} catch {
print("Failed to move file \(file.id)")
newId = file.id
return

1
CHDataManagement/Views/Pages/AddPageView.swift
View File

@ -67,6 +67,7 @@ struct AddPageView: View {
private func addNewPage() {
let page = Page(
content: content,
id: newPageId,
isDraft: true,
createdDate: .now,

31
CHDataManagement/Views/Pages/LocalizedPageContentView.swift
View File

@ -20,6 +20,9 @@ struct LocalizedPageContentView: View {
@State
private var pageContent: String = ""
@State
private var didLoadContent = false
init(pageId: String, page: LocalizedPage) {
self.pageId = pageId
self.page = page
@ -50,18 +53,32 @@ struct LocalizedPageContentView: View {
}
private func loadContent() {
let content = content.storage.pageContent(for: pageId, language: language)
guard content != "" else {
pageContent = "New file"
return
do {
let content = try content.storage.pageContent(for: pageId, language: language)
guard content != "" else {
pageContent = "New file"
didLoadContent = false
return
}
pageContent = content
didLoadContent = true
} catch {
print("Failed to load page content: \(error)")
pageContent = "Failed to load"
}
pageContent = content
}
private func saveContent() {
guard pageContent != "", pageContent != "New file" else {
guard didLoadContent else {
return
}
content.storage.save(pageContent: pageContent, for: pageId, language: language)
do {
try content.storage.save(pageContent: pageContent, for: pageId, language: language)
} catch {
print("Failed to save content: \(error)")
}
}
}

36
CHDataManagement/Views/Pages/PageDetailView.swift
View File

@ -14,8 +14,22 @@ struct PageDetailView: View {
@State
private var isGeneratingWebsite = false
@State
private var newId: String
init(page: Page) {
self.page = page
self.newId = page.id
}
private let allowedCharactersInPostId = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-")).inverted
private var idExists: Bool {
page.content.pages.contains { $0.id == newId }
}
private var containsInvalidCharacters: Bool {
newId.rangeOfCharacter(from: allowedCharactersInPostId) != nil
}
var body: some View {
@ -25,11 +39,13 @@ struct PageDetailView: View {
Text("Generate")
}
.disabled(isGeneratingWebsite)
Text("ID")
.font(.headline)
TextField("", text: $page.id)
.textFieldStyle(.roundedBorder)
.padding(.bottom)
HStack {
TextField("", text: $newId)
.textFieldStyle(.roundedBorder)
Button("Update", action: setNewId)
.disabled(newId.isEmpty || containsInvalidCharacters || idExists)
}
.padding(.bottom)
HStack {
Text("Draft")
@ -102,12 +118,20 @@ struct PageDetailView: View {
}
}
}
private func setNewId() {
guard page.update(id: newId) else {
newId = page.id
return
}
page.id = newId
}
}
extension PageDetailView: MainContentView {
init(item: Page) {
self.page = item
self.init(page: item)
}
static let itemDescription = "a page"

1
CHDataManagement/Views/Posts/AddPostView.swift
View File

@ -67,6 +67,7 @@ struct AddPostView: View {
private func addNewPost() {
let post = Post(
content: content,
id: newPostId,
isDraft: true,
createdDate: .now,

50
CHDataManagement/Views/Posts/PostDetailView.swift
View File

@ -34,10 +34,24 @@ struct PostDetailView: View {
private var language
@ObservedObject
private var item: Post
private var post: Post
@State
private var newId: String
init(post: Post) {
self.item = post
self.post = post
self.newId = post.id
}
private let allowedCharactersInPostId = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-")).inverted
private var idExists: Bool {
post.content.posts.contains { $0.id == newId }
}
private var containsInvalidCharacters: Bool {
newId.rangeOfCharacter(from: allowedCharactersInPostId) != nil
}
var body: some View {
@ -45,15 +59,19 @@ struct PostDetailView: View {
VStack(alignment: .leading) {
Text("ID")
.font(.headline)
TextField("", text: $item.id)
.textFieldStyle(.roundedBorder)
.padding(.bottom)
HStack {
TextField("", text: $newId)
.textFieldStyle(.roundedBorder)
Button("Update", action: setNewId)
.disabled(newId.isEmpty || containsInvalidCharacters || idExists)
}
.padding(.bottom)
HStack {
Text("Draft")
.font(.headline)
Spacer()
Toggle("", isOn: $item.isDraft)
Toggle("", isOn: $post.isDraft)
.toggleStyle(.switch)
}
.padding(.bottom)
@ -62,7 +80,7 @@ struct PostDetailView: View {
Text("Start")
.font(.headline)
Spacer()
DatePicker("", selection: $item.startDate, displayedComponents: .date)
DatePicker("", selection: $post.startDate, displayedComponents: .date)
.datePickerStyle(.compact)
.padding(.bottom)
}
@ -71,34 +89,42 @@ struct PostDetailView: View {
Text("Has end date")
.font(.headline)
Spacer()
Toggle("", isOn: $item.hasEndDate)
Toggle("", isOn: $post.hasEndDate)
.toggleStyle(.switch)
.padding(.bottom)
}
if item.hasEndDate {
if post.hasEndDate {
HStack(alignment: .firstTextBaseline) {
Text("End date")
.font(.headline)
Spacer()
DatePicker("", selection: $item.endDate, displayedComponents: .date)
DatePicker("", selection: $post.endDate, displayedComponents: .date)
.datePickerStyle(.compact)
.padding(.bottom)
}
}
LocalizedPostDetailView(post: item.localized(in: language))
LocalizedPostDetailView(post: post.localized(in: language))
}
.padding()
}
}
private func setNewId() {
guard post.update(id: newId) else {
newId = post.id
return
}
post.id = newId
}
}
extension PostDetailView: MainContentView {
init(item: Post) {
self.item = item
self.init(post: item)
}
static let itemDescription = "a post"