Consolidate images and files

CHDataManagement/CHDataManagementApp.swift

@@ -1,83 +0,0 @@
-import SwiftUI
-import SFSafeSymbols
-
-
-enum ContentDisplayType {
-    case markdown
-    case html
-    case rendered
-}
-
-@main
-struct CHDataManagementApp: App {
-
-    private var navigationTitle: String {
-        ""
-    }
-
-    @StateObject
-    private var content: Content = .init()
-
-    @State
-    private var selectedLanguage: ContentLanguage = .english
-
-    var body: some Scene {
-        WindowGroup {
-            TabView {
-                Tab("Posts", systemImage: SFSymbol.rectangleAndPencilAndEllipsis.rawValue) {
-                    PostList()
-                }
-                Tab("Pages", systemImage: SFSymbol.textBelowPhoto.rawValue) {
-                    PageListView()
-                }
-                Tab("Tags", systemImage: SFSymbol.tag.rawValue) {
-                    TagsListView()
-                }
-                Tab("Images", systemImage: SFSymbol.photo.rawValue) {
-                    ImagesView()
-                }
-                Tab("Files", systemImage: SFSymbol.doc.rawValue) {
-                    FilesView()
-                }
-                Tab("Settings", systemImage: SFSymbol.gear.rawValue) {
-                    SectionedSettingsView()
-                }
-            }
-            .environment(\.language, selectedLanguage)
-            .environmentObject(content)
-            .toolbar {
-                ToolbarItem(placement: .primaryAction) {
-                    Picker("", selection: $selectedLanguage) {
-                        Text("English")
-                            .tag(ContentLanguage.english)
-                        Text("German")
-                            .tag(ContentLanguage.german)
-                    }.pickerStyle(.segmented)
-                }
-                ToolbarItem(placement: .primaryAction) {
-                    Button(action: save) {
-                        Text("Save")
-                    }
-                }
-            }
-            .onAppear(perform: importOldContent)
-            .onReceive(Timer.publish(every: 60.0, on: .main, in: .common).autoconnect()) { _ in
-                save()
-            }
-        }
-    }
-
-    private func save() {
-        // Save all changed files
-        content.saveToDisk()
-    }
-
-    private func importOldContent() {
-        do {
-            try content.loadFromDisk()
-            //content.importOldContent()
-        } catch {
-            print("Failed to load content: \(error.localizedDescription)")
-        }
-    }
-}

CHDataManagement/Generator/ImageGenerator.swift

@@ -15,14 +15,14 @@ private struct ImageJob {
 
     let quality: CGFloat
 
-    let type: ImageType
+    let type: ImageFileType
 }
 
 final class ImageGenerator {
 
     private let storage: Storage
 
-    private let inputImageFolder: URL
+    //private let inputImageFolder: URL
 
     private let relativeImageOutputPath: String
 
@@ -30,9 +30,8 @@ final class ImageGenerator {
 
     private var jobs: [ImageJob] = []
 
-    init(storage: Storage, inputImageFolder: URL, relativeImageOutputPath: String) {
+    init(storage: Storage, relativeImageOutputPath: String) {
         self.storage = storage
-        self.inputImageFolder = inputImageFolder
         self.relativeImageOutputPath = relativeImageOutputPath
         self.generatedImages = storage.loadListOfGeneratedImages()
     }
@@ -64,14 +63,14 @@ final class ImageGenerator {
         storage.save(listOfGeneratedImages: generatedImages)
     }
 
-    private func versionFileName(image: String, type: ImageType, width: CGFloat, height: CGFloat) -> String {
+    private func versionFileName(image: String, type: ImageFileType, width: CGFloat, height: CGFloat) -> String {
         let fileName = image.fileNameAndExtension.fileName
         let prefix = "\(fileName)@\(Int(width))x\(Int(height))"
         return "\(prefix).\(type.fileExtension)"
     }
 
     func generateImageSet(for image: String, maxWidth: CGFloat, maxHeight: CGFloat, altText: String) -> FeedEntryData.Image {
-        let type = ImageType(fileExtension: image.fileExtension!)!
+        let type = ImageFileType(fileExtension: image.fileExtension!)!
 
         let width2x = maxWidth * 2
         let height2x = maxHeight * 2
@@ -92,7 +91,7 @@ final class ImageGenerator {
                      altText: altText)
     }
 
-    func generateVersion(for image: String, type: ImageType, maximumWidth: CGFloat, maximumHeight: CGFloat) -> String {
+    func generateVersion(for image: String, type: ImageFileType, maximumWidth: CGFloat, maximumHeight: CGFloat) -> String {
         let version = versionFileName(image: image, type: type, width: maximumWidth, height: maximumHeight)
         let fullPath = "/" + relativeImageOutputPath + "/" + version
         if exists(version) {
@@ -142,18 +141,12 @@ final class ImageGenerator {
         if hasPreviouslyGenerated(version: job.version, for: job.image), exists(job.version) {
             return true
         }
-        let inputPath = inputImageFolder.appendingPathComponent(job.image)
-        #warning("TODO: Read through security scope")
-        guard inputPath.exists else {
-            print("Missing image \(inputPath.path())")
-            return false
-        }
 
         let data: Data
         do {
-            data = try Data(contentsOf: inputPath)
+            data = try storage.fileData(for: job.image)
         } catch {
-            print("Failed to load image \(inputPath.path()): \(error)")
+            print("Failed to load image \(job.image): \(error)")
             return false
         }
 
@@ -231,7 +224,7 @@ final class ImageGenerator {
 
     // MARK: Avif images
 
-    private func create(image: NSBitmapImageRep, type: ImageType, quality: CGFloat) -> Data? {
+    private func create(image: NSBitmapImageRep, type: ImageFileType, quality: CGFloat) -> Data? {
         switch type {
         case .jpg:
             return image.representation(using: .jpeg, properties: [.compressionFactor: NSNumber(value: 0.6)])
@@ -243,6 +236,10 @@ final class ImageGenerator {
             return createWebp(image: image, quality: 0.8)
         case .gif:
             return image.representation(using: .gif, properties: [.compressionFactor: NSNumber(value: quality)])
+        case .svg:
+            return nil
+        case .tiff:
+            return nil
         }
     }
 

CHDataManagement/Generator/PageContentGenerator.swift

@@ -2,7 +2,7 @@ import Foundation
 import Ink
 import Splash
 
-typealias VideoSource = (url: String, type: VideoType)
+typealias VideoSource = (url: String, type: VideoFileType)
 
 final class PageContentParser {
 

CHDataManagement/Generator/WebsiteGenerator.swift

@@ -50,7 +50,6 @@ final class WebsiteGenerator {
         self.localizedSettings = content.settings.localized(in: language)
         self.imageGenerator = ImageGenerator(
             storage: content.storage,
-            inputImageFolder: content.storage.filesFolder,
             relativeImageOutputPath: "images")
     }
 
@@ -96,7 +95,7 @@ final class WebsiteGenerator {
             navigationItems: navigationItems)
     }
 
-    private func createImageSet(for image: ImageResource) -> FeedEntryData.Image {
+    private func createImageSet(for image: FileResource) -> FeedEntryData.Image {
         imageGenerator.generateImageSet(
             for: image.id,
             maxWidth: mainContentMaximumWidth,

CHDataManagement/Import/Importer.swift

@@ -104,7 +104,7 @@ final class Importer {
                 }
 
                 let type = FileType(fileExtension: fileExtension)
-                guard case .resource = type else {
+                guard case .other = type else {
                     self.ignoredFiles.append(url)
                     return nil
                 }

CHDataManagement/Main/MainContentView.swift

@@ -0,0 +1,10 @@
+import SwiftUI
+
+protocol MainContentView: View {
+
+    associatedtype Item: Identifiable
+
+    init(item: Item)
+
+    static var itemDescription: String { get }
+}

CHDataManagement/Main/MainView.swift

@@ -0,0 +1,185 @@
+import SwiftUI
+import SFSafeSymbols
+
+
+#warning("Consolidate images and files")
+#warning("Allow selection of pages as navigation bar items")
+#warning("Transfer images of posts to other language")
+
+@main
+struct MainView: App {
+
+    private let sidebarWidth: CGFloat = 250
+
+    private let detailWidth: CGFloat = 300
+
+    @StateObject
+    private var content: Content = .init()
+
+    @State
+    private var language: ContentLanguage = .english
+
+    @State
+    private var selectedTab: MainViewTab = .posts
+
+    @State
+    private var selectedPost: Post?
+
+    @State
+    private var selectedPage: Page?
+
+    @State
+    private var selectedTag: Tag?
+
+    @State
+    private var selectedImage: ImageResource?
+
+    @State
+    private var selectedFile: FileResource?
+
+    @State
+    private var selectedSection: SettingsSection? = .generation
+
+    @State
+    private var showAddSheet = false
+
+    @ViewBuilder
+    var sidebar: some View {
+        switch selectedTab {
+        case .posts:
+            PostListView(selectedPost: $selectedPost)
+        case .pages:
+            PageListView(selectedPage: $selectedPage)
+        case .tags:
+            TagListView(selectedTag: $selectedTag)
+        case .files:
+            FileListView(selectedFile: $selectedFile)
+        case .generation:
+            List(SettingsSection.allCases, selection: $selectedSection) { item in
+                Label(item.rawValue, systemSymbol: item.icon).tag(item)
+            }
+        }
+    }
+
+    @ViewBuilder
+    var viewContent: some View {
+        switch selectedTab {
+        case .posts:
+            SelectedContentView<PostContentView>(selected: $selectedPost)
+        case .pages:
+            SelectedContentView<PageContentView>(selected: $selectedPage)
+        case .tags:
+            SelectedContentView<TagContentView>(selected: $selectedTag)
+        case .files:
+            SelectedContentView<FileContentView>(selected: $selectedFile)
+        case .generation:
+            GenerationDetailView(section: selectedSection)
+        }
+    }
+
+    @ViewBuilder
+    var detail: some View {
+        switch selectedTab {
+        case .posts:
+            SelectedDetailView<PostDetailView>(selected: $selectedPost)
+        case .pages:
+            SelectedDetailView<PageDetailView>(selected: $selectedPage)
+        case .tags:
+            SelectedDetailView<TagDetailView>(selected: $selectedTag)
+        case .files:
+            SelectedDetailView<FileDetailView>(selected: $selectedFile)
+        case .generation:
+            Text("")
+        }
+    }
+
+    @ViewBuilder
+    var addItemSheet: some View {
+        switch selectedTab {
+        case .posts:
+            AddPostView(selected: $selectedPost)
+        case .pages:
+            AddPageView(selected: $selectedPage)
+        case .tags:
+            AddTagView(selected: $selectedTag)
+        case .files:
+            AddFileView(selectedImage: $selectedImage, selectedFile: $selectedFile)
+        case .generation:
+            Text("Not implemented")
+        }
+    }
+
+    var body: some Scene {
+        WindowGroup {
+            NavigationSplitView {
+                sidebar
+                    .toolbar {
+                        ToolbarItem(placement: .navigation) {
+                            Picker("", selection: $selectedTab) {
+                                Text("Posts").tag(MainViewTab.posts)
+                                Text("Pages").tag(MainViewTab.pages)
+                                Text("Tags").tag(MainViewTab.tags)
+                                Text("Files").tag(MainViewTab.files)
+                                Text("Generation").tag(MainViewTab.generation)
+                            }.pickerStyle(.segmented)
+                        }
+                    }
+                    .navigationSplitViewColumnWidth(min: sidebarWidth, ideal: sidebarWidth, max: sidebarWidth)
+                    .toolbar {
+                        ToolbarItem(placement: .primaryAction) {
+                            Button(action: { showAddSheet = true }) {
+                                Label("Add", systemSymbol: .plus)
+                            }
+                            .disabled(!selectedTab.canAddItems)
+                        }
+                    }
+            } content: {
+                viewContent
+            } detail: {
+                detail
+                    .navigationSplitViewColumnWidth(min: detailWidth, ideal: detailWidth, max: detailWidth)
+            }
+            .toolbar {
+                ToolbarItem(placement: .primaryAction) {
+                    Picker("", selection: $language) {
+                        Text("English")
+                            .tag(ContentLanguage.english)
+                        Text("German")
+                            .tag(ContentLanguage.german)
+                    }.pickerStyle(.segmented)
+                }
+                ToolbarItem(placement: .primaryAction) {
+                    Button(action: save) {
+                        Text("Save")
+                    }
+                }
+            }
+            .navigationTitle("")
+            .environment(\.language, language)
+            .environmentObject(content)
+            .onAppear(perform: loadContent)
+            .onReceive(Timer.publish(every: 60.0, on: .main, in: .common).autoconnect()) { _ in
+                save()
+            }
+            .sheet(isPresented: $showAddSheet) {
+                addItemSheet
+                    .environment(\.language, language)
+                    .environmentObject(content)
+            }
+        }
+    }
+
+    private func save() {
+        // Save all changed files
+        content.saveToDisk()
+    }
+
+    private func loadContent() {
+        do {
+            try content.loadFromDisk()
+        } catch {
+            print("Failed to load content: \(error.localizedDescription)")
+        }
+    }
+}
+

CHDataManagement/Main/SelectedContentView.swift

@@ -0,0 +1,25 @@
+import SwiftUI
+
+struct SelectedContentView<Contained>: View where Contained: MainContentView {
+
+    @Binding
+    var selected: Contained.Item?
+
+    init(selected: Binding<Contained.Item?>) {
+        self._selected = selected
+    }
+
+    var body: some View {
+        if let item = selected {
+            Contained(item: item)
+        } else {
+            HStack {
+                Spacer()
+                Text("Select \(Contained.itemDescription) from the sidebar")
+                    .font(.largeTitle)
+                    .foregroundColor(.secondary)
+                Spacer()
+            }
+        }
+    }
+}

CHDataManagement/Main/SelectedDetailView.swift

@@ -0,0 +1,20 @@
+import SwiftUI
+
+struct SelectedDetailView<Contained>: View where Contained: MainContentView {
+
+    @Binding
+    var selected: Contained.Item?
+
+    init(selected: Binding<Contained.Item?>) {
+        self._selected = selected
+    }
+
+    var body: some View {
+        if let item = selected {
+            Contained(item: item)
+                .id(item.id)
+        } else {
+            EmptyView()
+        }
+    }
+}

CHDataManagement/Main/TabSelection.swift

@@ -0,0 +1,18 @@
+import SwiftUI
+import SFSafeSymbols
+
+enum MainViewTab {
+    case posts
+    case pages
+    case tags
+    case files
+    case generation
+
+    var canAddItems: Bool {
+        if case .generation = self {
+            return false
+        }
+        return true
+    }
+}
+

CHDataManagement/Model/Content+Generation.swift

@@ -27,11 +27,11 @@ extension Content {
             return nil
         }
         #warning("Add files path to settings")
-        return "/files/\(file.uniqueId)"
+        return "/files/\(file.id)"
     }
 
-    func image(_ imageId: String) -> ImageResource? {
-        images.first { $0.id == imageId }
+    func image(_ imageId: String) -> FileResource? {
+        files.first { $0.id == imageId }
     }
 
     func imageLink(imageId: String) {

CHDataManagement/Model/Content+Load.swift

@@ -2,7 +2,7 @@ import Foundation
 
 extension Content {
 
-    private func convert(_ tag: LocalizedTagFile, images: [String : ImageResource]) -> LocalizedTag {
+    private func convert(_ tag: LocalizedTagFile, images: [String : FileResource]) -> LocalizedTag {
         LocalizedTag(
             urlComponent: tag.urlComponent,
             name: tag.name,
@@ -12,7 +12,7 @@ extension Content {
             originalUrl: tag.originalURL)
     }
 
-    private func convert(_ post: LocalizedPostFile, images: [String : ImageResource]) -> LocalizedPost {
+    private func convert(_ post: LocalizedPostFile, images: [String : FileResource]) -> LocalizedPost {
         LocalizedPost(
             title: post.title,
             content: post.content,
@@ -23,7 +23,7 @@ extension Content {
             linkPreviewDescription: post.linkPreviewDescription)
     }
 
-    private func convert(_ page: LocalizedPageFile, images: [String : ImageResource]) -> LocalizedPage {
+    private func convert(_ page: LocalizedPageFile, images: [String : FileResource]) -> LocalizedPage {
         LocalizedPage(
             urlString: page.url,
             title: page.title,
@@ -49,34 +49,26 @@ extension Content {
         let storage = Storage(baseFolder: URL(filePath: contentPath))
 
         let settings = try storage.loadSettings()
-        let imageDescriptions = storage.loadImageDescriptions().reduce(into: [:]) { descriptions, description in
-            descriptions[description.imageId] = description
+        let imageDescriptions = storage.loadFileDescriptions().reduce(into: [:]) { descriptions, description in
+            descriptions[description.fileId] = description
         }
 
         let tagData = try storage.loadAllTags()
         let pagesData = try storage.loadAllPages()
         let postsData = try storage.loadAllPosts()
-        let filesData = try storage.loadAllFiles()
+        let fileList = try storage.loadAllFiles()
 
-        var images: [String : ImageResource] = [:]
-        var files: [FileResource] = []
-
-        for (file, url) in filesData {
-            let ext = file.components(separatedBy: ".").last!.lowercased()
-            let type = FileType(fileExtension: ext)
-            if case .image(let type) = type {
-                let descriptions = imageDescriptions[file]
-                images[file] = ImageResource(
-                    type: type,
-                    uniqueId: file,
-                    en: descriptions?.english ?? "",
-                    de: descriptions?.german ?? "",
-                    fileUrl: url)
-            } else {
-                files.append(FileResource(type: type, uniqueId: file, description: ""))
-            }
+        let files: [String : FileResource] = fileList.reduce(into: [:]) { files, fileId in
+            let descriptions = imageDescriptions[fileId]
+            files[fileId] = FileResource(
+                content: self,
+                id: fileId,
+                en: descriptions?.english ?? "",
+                de: descriptions?.german ?? "")
         }
 
+        let images = files.filter { $0.value.type.isImage }
+
         let tags = tagData.reduce(into: [:]) { (tags, data) in
             tags[data.key] = Tag(
                 isVisible: data.value.isVisible,
@@ -105,8 +97,7 @@ extension Content {
 
         self.tags = tags.values.sorted()
         self.pages = pages.values.sorted(ascending: false) { $0.startDate }
-        self.files = files.sorted { $0.uniqueId }
-        self.images = images.values.sorted { $0.id }
+        self.files = files.values.sorted { $0.id }
         self.posts = posts.sorted(ascending: false) { $0.startDate }
         self.settings = makeSettings(settings, tags: tags)
     }
@@ -134,7 +125,7 @@ extension Content {
             english: convert(settings.english))
     }
 
-    private func loadPages(_ pagesData: [String : PageFile], tags: [String : Tag], images: [String : ImageResource]) -> [String : Page] {
+    private func loadPages(_ pagesData: [String : PageFile], tags: [String : Tag], images: [String : FileResource]) -> [String : Page] {
         pagesData.reduce(into: [:]) { pages, data in
             let (pageId, page) = data
             pages[pageId] = Page(

CHDataManagement/Model/Content+Save.swift

@@ -17,24 +17,23 @@ extension Content {
         }
         storage.save(settings: settings.file)
 
-        let imageDescriptions: [ImageDescriptions] = images.sorted().compactMap { image in
-            guard !image.englishDescription.isEmpty || !image.germanDescription.isEmpty else {
+        let fileDescriptions: [FileDescriptions] = files.sorted().compactMap { file in
+            guard !file.englishDescription.isEmpty || !file.germanDescription.isEmpty else {
                 return nil
             }
-            return ImageDescriptions(
-                imageId: image.id,
-                german: image.germanDescription.nonEmpty,
-                english: image.englishDescription.nonEmpty)
+            return FileDescriptions(
+                fileId: file.id,
+                german: file.germanDescription.nonEmpty,
+                english: file.englishDescription.nonEmpty)
         }
 
-        storage.save(imageDescriptions: imageDescriptions)
+        storage.save(fileDescriptions: fileDescriptions)
 
         do {
             try storage.deletePostFiles(notIn: posts.map { $0.id })
             try storage.deletePageFiles(notIn: pages.map { $0.id })
             try storage.deleteTagFiles(notIn: tags.map { $0.id })
-            let allFiles = files.map { $0.uniqueId } + images.map { $0.id }
-            try storage.deleteFiles(notIn: allFiles)
+            try storage.deleteFiles(notIn: files.map { $0.id })
         } catch {
             print("Failed to remove unused files: \(error)")
         }

CHDataManagement/Model/Content.swift

@@ -16,9 +16,6 @@ final class Content: ObservableObject {
     @Published
     var tags: [Tag]
 
-    @Published
-    var images: [ImageResource]
-
     @Published
     var files: [FileResource]
 
@@ -40,14 +37,12 @@ final class Content: ObservableObject {
          posts: [Post],
          pages: [Page],
          tags: [Tag],
-         images: [ImageResource],
          files: [FileResource],
          storedContentPath: String) {
         self.settings = settings
         self.posts = posts
         self.pages = pages
         self.tags = tags
-        self.images = images
         self.files = files
         self.storedContentPath = storedContentPath
         self.contentPath = storedContentPath
@@ -68,7 +63,6 @@ final class Content: ObservableObject {
         self.posts = []
         self.pages = []
         self.tags = []
-        self.images = []
         self.files = []
 
         contentPath = storedContentPath
@@ -95,4 +89,8 @@ final class Content: ObservableObject {
         }
         .store(in: &cancellables)
     }
+
+    var images: [FileResource] {
+        files.filter { $0.type.isImage }
+    }
 }

CHDataManagement/Model/FileResource.swift

@@ -1,44 +1,117 @@
 import Foundation
+import SwiftUI
 
 final class FileResource: ObservableObject {
 
+    unowned let content: Content
+
     let type: FileType
 
     /// Globally unique id
     @Published
-    var uniqueId: String
+    var id: String
 
     @Published
-    var description: String
+    var germanDescription: String
 
-    init(uniqueId: String, description: String) {
-        self.type = FileType(fileExtension: uniqueId.fileExtension)
-        self.uniqueId = uniqueId
-        self.description = description
+    @Published
+    var englishDescription: String
+
+    @Published
+    var size: CGSize = .zero
+
+    init(content: Content, id: String, en: String, de: String) {
+        self.content = content
+        self.id = id
+        self.type = FileType(fileExtension: id.fileExtension)
+        self.englishDescription = en
+        self.germanDescription = de
     }
 
-    init(type: FileType, uniqueId: String, description: String) {
-        self.type = type
-        self.uniqueId = uniqueId
-        self.description = description
+    /**
+     Only for bundle images
+     */
+    init(resourceImage: String, type: ImageFileType) {
+        self.content = .mock // TODO: Add images to mock
+        self.type = .image(type)
+        self.id = resourceImage
+        self.englishDescription = "A test image included in the bundle"
+        self.germanDescription = "Ein Testbild aus dem Bundle"
+    }
+
+    func getDescription(for language: ContentLanguage) -> String {
+        switch language {
+        case .english: return englishDescription
+        case .german: return germanDescription
+        }
+    }
+
+    // MARK: Text
+
+    func textContent() -> String {
+        do {
+            return try content.storage.fileContent(for: id)
+        } catch {
+            print("Failed to load text of file \(id): \(error)")
+            return ""
+        }
+    }
+
+    // MARK: Images
+
+    var aspectRatio: CGFloat {
+        guard size.height > 0 else {
+            return 0
+        }
+        return size.width / size.height
+    }
+
+    var imageToDisplay: Image {
+        let imageData: Data
+        do {
+            imageData = try content.storage.fileData(for: id)
+        } catch {
+            print("Failed to load data for image \(id): \(error)")
+            return failureImage
+        }
+        guard let loadedImage = NSImage(data: imageData) else {
+            print("Failed to create image \(id)")
+            return failureImage
+        }
+        if self.size == .zero && loadedImage.size != .zero {
+            DispatchQueue.main.async {
+                self.size = loadedImage.size
+            }
+        }
+        return .init(nsImage: loadedImage)
+    }
+
+    private var failureImage: Image {
+        Image(systemSymbol: .exclamationmarkTriangle)
     }
 }
 
 extension FileResource: Identifiable {
 
-    var id: String { uniqueId }
 }
 
 extension FileResource: Equatable {
 
     static func == (lhs: FileResource, rhs: FileResource) -> Bool {
-        lhs.uniqueId == rhs.uniqueId
+        lhs.id == rhs.id
     }
 }
 
 extension FileResource: Hashable {
     
     func hash(into hasher: inout Hasher) {
-        hasher.combine(uniqueId)
+        hasher.combine(id)
+    }
+}
+
+extension FileResource: Comparable {
+
+    static func < (lhs: FileResource, rhs: FileResource) -> Bool {
+        lhs.id < rhs.id
     }
 }

CHDataManagement/Model/ImageResource.swift

@@ -1,119 +0,0 @@
-import SwiftUI
-
-final class ImageResource: ObservableObject {
-
-    @Published
-    var type: ImageType
-
-    /// Globally unique id
-    @Published
-    var id: String
-
-    @Published
-    var germanDescription: String
-
-    @Published
-    var englishDescription: String
-
-    @Published
-    var size: CGSize = .zero
-
-    var aspectRatio: CGFloat {
-        guard size.height > 0 else {
-            return 0
-        }
-        return size.width / size.height
-    }
-
-    private let source: ImageSource
-
-    init(type: ImageType, uniqueId: String, en: String, de: String, fileUrl: URL) {
-        self.type = type
-        self.id = uniqueId
-        self.source = .file(fileUrl)
-        self.englishDescription = en
-        self.germanDescription = de
-    }
-
-    init(resourceName: String, type: ImageType) {
-        self.type = type
-        self.id = resourceName
-        self.source = .resource(resourceName)
-        self.englishDescription = "A test image included in the bundle"
-        self.germanDescription = "Ein Test-Image aus dem Bundle"
-    }
-
-    private enum ImageSource {
-        case file(URL)
-        case resource(String)
-    }
-
-    func getDescription(for language: ContentLanguage) -> String {
-        switch language {
-        case .english: return englishDescription
-        case .german: return germanDescription
-        }
-    }
-}
-
-extension ImageResource: Identifiable {
-
-}
-
-extension ImageResource: Comparable {
-
-    static func < (lhs: ImageResource, rhs: ImageResource) -> Bool {
-        lhs.id < rhs.id
-    }
-}
-
-extension ImageResource: Equatable {
-
-    static func == (lhs: ImageResource, rhs: ImageResource) -> Bool {
-        lhs.id == rhs.id
-    }
-}
-
-extension ImageResource: Hashable {
-
-    func hash(into hasher: inout Hasher) {
-        hasher.combine(id)
-    }
-}
-
-extension ImageResource {
-
-    var imageToDisplay: Image {
-        switch source {
-        case .file(let url):
-            return image(at: url)
-        case .resource(let name):
-            return .init(name)
-        }
-    }
-
-    private func image(at url: URL) -> Image {
-        let imageData: Data
-        do {
-            imageData = try Data(contentsOf: url)
-        } catch {
-            print("Failed to load image data from \(url.path): \(error)")
-            return failureImage
-        }
-        guard let loadedImage = NSImage(data: imageData) else {
-            print("Failed to create image from \(url.path)")
-            return failureImage
-        }
-        if self.size == .zero && loadedImage.size != .zero {
-            DispatchQueue.main.async {
-                self.size = loadedImage.size
-            }
-        }
-        return .init(nsImage: loadedImage)
-    }
-
-    private var failureImage: SwiftUI.Image {
-        Image(systemSymbol: .exclamationmarkTriangle)
-    }
-
-}

CHDataManagement/Model/LocalizedPage.swift

@@ -56,7 +56,7 @@ final class LocalizedPage: ObservableObject {
     var requiredFiles: Set<String> = []
 
     @Published
-    var linkPreviewImage: ImageResource?
+    var linkPreviewImage: FileResource?
 
     @Published
     var linkPreviewTitle: String?
@@ -71,7 +71,7 @@ final class LocalizedPage: ObservableObject {
          files: Set<String> = [],
          externalFiles: Set<String> = [],
          requiredFiles: Set<String> = [],
-         linkPreviewImage: ImageResource? = nil,
+         linkPreviewImage: FileResource? = nil,
          linkPreviewTitle: String? = nil,
          linkPreviewDescription: String? = nil) {
         self.urlString = urlString

CHDataManagement/Model/LocalizedPost.swift

@@ -13,10 +13,10 @@ final class LocalizedPost: ObservableObject {
     var lastModified: Date?
 
     @Published
-    var images: [ImageResource]
+    var images: [FileResource]
 
     @Published
-    var linkPreviewImage: ImageResource?
+    var linkPreviewImage: FileResource?
 
     @Published
     var linkPreviewTitle: String?
@@ -27,8 +27,8 @@ final class LocalizedPost: ObservableObject {
     init(title: String? = nil,
          content: String,
          lastModified: Date? = nil,
-         images: [ImageResource] = [],
-         linkPreviewImage: ImageResource? = nil,
+         images: [FileResource] = [],
+         linkPreviewImage: FileResource? = nil,
          linkPreviewTitle: String? = nil,
          linkPreviewDescription: String? = nil) {
         self.title = title ?? ""

CHDataManagement/Model/LocalizedTag.swift

@@ -17,7 +17,7 @@ final class LocalizedTag: ObservableObject {
 
     /// The image id of the thumbnail
     @Published
-    var thumbnail: ImageResource?
+    var thumbnail: FileResource?
 
     /// The original url in the previous site layout
     let originalUrl: String?
@@ -26,7 +26,7 @@ final class LocalizedTag: ObservableObject {
          name: String,
          subtitle: String? = nil,
          description: String? = nil,
-         thumbnail: ImageResource? = nil,
+         thumbnail: FileResource? = nil,
          originalUrl: String? = nil) {
         self.urlComponent = urlComponent
         self.name = name

CHDataManagement/Model/LocalizedText.swift

@@ -1,48 +0,0 @@
-import Foundation
-import SwiftUI
-
-/// A simple container for localized text
-
-final class LocalizedText: ObservableObject {
-
-    @Published
-    var en: String
-
-    @Published
-    var de: String
-
-    init(en: String, de: String) {
-        self.en = en
-        self.de = de
-    }
-
-    var id: String {
-        en
-    }
-
-    func set(text: String, for language: ContentLanguage) {
-        switch language {
-        case .english: self.en = text
-        case .german: self.de = text
-        }
-    }
-
-    func getText(for language: ContentLanguage) -> String {
-        switch language {
-        case .english: return en
-        case .german: return de
-        }
-    }
-
-    @MainActor
-    func text(for language: ContentLanguage) -> Binding<String> {
-        Binding(
-            get: {
-                self.getText(for: language)
-            },
-            set: { newValue in
-                self.set(text: newValue, for: language)
-            }
-        )
-    }
-}

CHDataManagement/Model/Types/CodeFileType.swift

@@ -0,0 +1,21 @@
+
+enum CodeFileType: String {
+
+    case html
+
+    case css
+
+    case js
+
+    case cpp
+
+    case swift
+
+    init?(fileExtension: String) {
+        self.init(rawValue: fileExtension)
+    }
+
+    var fileExtension: String {
+        rawValue
+    }
+}

CHDataManagement/Model/Types/FileType.swift

@@ -1,51 +1,71 @@
 import Foundation
 
+enum FileTypeCategory: String, CaseIterable {
+    case image
+    case code
+    case model
+    case text
+    case video
+    case resource
+
+    var text: String {
+        switch self {
+        case .image: return "Images"
+        case .code: return "Code"
+        case .model: return "Models"
+        case .text: return "Text"
+        case .video: return "Videos"
+        case .resource: return "Other"
+        }
+    }
+}
+
+extension FileTypeCategory: Hashable {
+    
+}
+
+extension FileTypeCategory: Identifiable {
+
+    var id: String {
+        rawValue
+    }
+}
+
 enum FileType {
-    case image(ImageType)
-
-    case file(String)
-    case video(VideoType)
-    case resource(String)
-
+    case image(ImageFileType)
+    case code(CodeFileType)
+    case model(ModelFileType)
+    case text(TextFileType)
+    case video(VideoFileType)
+    case other(ResourceFileType)
 
     init(fileExtension: String?) {
-        guard let ext = fileExtension?.lowercased() else {
-            self = .file("")
-            return
-        }
-        switch ext {
-        case "jpg", "jpeg":
-            self = .image(.jpg)
-        case "png":
-            self = .image(.png)
-        case "avif":
-            self = .image(.avif)
-        case "webp":
-            self = .image(.webp)
-        case "gif":
-            self = .image(.gif)
-        case "html", "stl", "f3d", "step", "f3z", "zip", "json", "conf", "css", "js", "cpp", "cddx", "svg", "glb", "mp3", "pdf", "swift":
-            self = .file(ext)
-        case "mp4":
-            self = .video(.mp4)
-        case "m4v":
-            self = .video(.m4v)
-        case "webm":
-            self = .video(.webm)
-        case "key", "psd":
-            self = .resource(ext)
-        default:
-            print("Unhandled file type: \(ext)")
-            self = .resource(ext)
+        let ext = fileExtension?.lowercased() ?? ""
+
+        if let image = ImageFileType(fileExtension: ext) {
+            self = .image(image)
+        } else if let code = CodeFileType(fileExtension: ext) {
+            self = .code(code)
+        } else if let model = ModelFileType(fileExtension: ext) {
+            self = .model(model)
+        } else if let text = TextFileType(fileExtension: ext) {
+            self = .text(text)
+        } else if let video = VideoFileType(fileExtension: ext) {
+            self = .video(video)
+        } else {
+            let resource = ResourceFileType(fileExtension: ext)
+            self = .other(resource)
         }
     }
 
     var fileExtension: String {
         switch self {
-        case .image(let imageType): return imageType.fileExtension
-        case .video(let videoType): return videoType.fileExtension
-        default:
-            return "" // TODO: Fix
+        case .image(let type): return type.fileExtension
+        case .code(let type): return type.fileExtension
+        case .model(let type): return type.fileExtension
+        case .text(let type): return type.fileExtension
+        case .video(let type): return type.fileExtension
+        case .other(let type): return type.fileExtension
         }
     }
 
@@ -63,7 +83,21 @@ enum FileType {
         return false
     }
 
-    var videoType: VideoType? {
+    var isTextFile: Bool {
+        switch self {
+        case .code, .text: return true
+        default: return false
+        }
+    }
+
+    var isOtherFile: Bool {
+        switch self {
+        case .model, .other: return true
+        default: return false
+        }
+    }
+
+    var videoType: VideoFileType? {
         if case .video(let videoType) = self {
             return videoType
         }

CHDataManagement/Model/Types/ImageFileType.swift

@@ -0,0 +1,41 @@
+import Foundation
+import AppKit
+
+enum ImageFileType: String {
+    
+    case jpg
+    case png
+    case avif
+    case webp
+    case gif
+    case svg
+    case tiff
+
+    init?(fileExtension: String) {
+        if fileExtension == "jpeg" {
+            self = .jpg
+            return
+        }
+        self.init(rawValue: fileExtension)
+    }
+
+    var fileExtension: String {
+        rawValue
+    }
+
+    var fileType: NSBitmapImageRep.FileType? {
+        switch self {
+        case .jpg:
+            return .jpeg
+        case .png, .avif, .webp:
+            return .png
+        case .gif: return .gif
+        case .tiff: return .tiff
+        case .svg: return nil
+        }
+    }
+}
+
+extension ImageFileType: CaseIterable {
+
+}

CHDataManagement/Model/Types/ImageType.swift

@@ -1,53 +0,0 @@
-import Foundation
-import AppKit
-
-enum ImageType {
-    case jpg
-    case png
-    case avif
-    case webp
-    case gif
-
-    var fileExtension: String {
-        switch self {
-        case .jpg: return "jpg"
-        case .png: return "png"
-        case .avif: return "avif"
-        case .webp: return "webp"
-        case .gif: return "gif"
-        }
-    }
-
-    var fileType: NSBitmapImageRep.FileType {
-        switch self {
-        case .jpg:
-            return .jpeg
-        case .png, .avif, .webp:
-            return .png
-        case .gif:
-            return .gif
-        }
-    }
-}
-
-extension ImageType: CaseIterable {
-
-}
-
-extension ImageType {
-
-    init?(fileExtension: String) {
-        switch fileExtension {
-        case "jpg", "jpeg":
-            self = .jpg
-        case "png":
-            self = .png
-        case "avif":
-            self = .avif
-        case "webp":
-            self = .webp
-        default:
-            return nil
-        }
-    }
-}

CHDataManagement/Model/Types/ModelFileType.swift

@@ -0,0 +1,21 @@
+
+enum ModelFileType: String {
+    
+    case stl
+
+    case f3d
+
+    case step
+
+    case glb
+
+    case f3z
+
+    init?(fileExtension: String) {
+        self.init(rawValue: fileExtension)
+    }
+
+    var fileExtension: String {
+        rawValue
+    }
+}

CHDataManagement/Model/Types/ResourceFileType.swift

@@ -0,0 +1,54 @@
+
+enum ResourceFileType {
+
+    case noExtension
+
+    case zip
+
+    case cddx
+
+    case mp3
+
+    case pdf
+
+    case key
+
+    case psd
+
+    case other(String)
+
+    init(fileExtension: String) {
+        switch fileExtension {
+        case "": self = .noExtension
+        case "zip": self = .zip
+        case "cddx": self = .cddx
+        case "mp3": self = .mp3
+        case "pdf": self = .pdf
+        case "key": self = .key
+        case "psd": self = .psd
+        default:
+            self = .other(fileExtension)
+        }
+    }
+
+    var fileExtension: String {
+        switch self {
+        case .noExtension:
+            return ""
+        case .zip:
+            return "zip"
+        case .cddx:
+            return "cddx"
+        case .mp3:
+            return "mp3"
+        case .pdf:
+            return "pdf"
+        case .key:
+            return "key"
+        case .psd:
+            return "psd"
+        case .other(let ext):
+            return ext
+        }
+    }
+}

CHDataManagement/Model/Types/TextFileType.swift

@@ -0,0 +1,18 @@
+
+enum TextFileType: String {
+    
+    case json
+
+    case conf
+
+    case yaml
+
+    init?(fileExtension: String) {
+        self.init(rawValue: fileExtension)
+    }
+
+    var fileExtension: String {
+        rawValue
+    }
+}
+

CHDataManagement/Model/Types/VideoFileType.swift

@@ -1,24 +1,18 @@
 
-enum VideoType: String {
+enum VideoFileType: String {
 
     case mp4
 
     case m4v
 
     case webm
-}
 
-extension VideoType {
+    init?(fileExtension: String) {
+        self.init(rawValue: fileExtension)
+    }
 
     var fileExtension: String {
-        switch self {
-        case .mp4:
-            return "mp4"
-        case .m4v:
-            return "m4v"
-        case .webm:
-            return "webm"
-        }
+        rawValue
     }
 
     var htmlType: String {
@@ -31,6 +25,6 @@ extension VideoType {
     }
 }
 
-extension VideoType: CaseIterable {
+extension VideoFileType: CaseIterable {
 
 }

CHDataManagement/Preview Content/Content+Mock.swift

@@ -19,7 +19,6 @@ extension Content {
         posts: [.empty, .mock, .fullMock],
         pages: [.empty],
         tags: [.hiking, .mountains, .nature, .sports],
-        images: [],
         files: [],
         storedContentPath: dbPath)
 }

CHDataManagement/Preview Content/File+Mock.swift

@@ -2,6 +2,6 @@
 extension FileResource {
 
     static var mock: FileResource {
-        .init(uniqueId: "my-file.txt", description: "Some text file")
+        .init(content: .mock, id: "my-file.txt", en: "Some text file", de: "Eine Textdatei")
     }
 }

CHDataManagement/Preview Content/MockImage.swift

@@ -5,9 +5,9 @@ struct MockImage {
 
     let name: String
 
-    static var images: [ImageResource] {
+    static var images: [FileResource] {
         ["image1", "image2", "image3", "image4"]
-            .map { ImageResource(resourceName: $0, type: .jpg) }
+            .map { FileResource(resourceImage: $0, type: .jpg) }
     }
 }
 

CHDataManagement/Preview Content/Tag+Mock.swift

@@ -34,7 +34,7 @@ extension LocalizedTag {
         name: "Electronics",
         subtitle: "Projects with electronics",
         description: "Some description of the tag",
-        thumbnail: ImageResource(resourceName: "image1", type: .jpg),
+        thumbnail: FileResource(resourceImage: "image1", type: .jpg),
         originalUrl: "projects/electronics")
 
     static let german = LocalizedTag(
@@ -42,6 +42,6 @@ extension LocalizedTag {
         name: "Elektronik",
         subtitle: "Projekte mit Elektronik",
         description: "Eine Beschreibung des Tags",
-        thumbnail: ImageResource(resourceName: "image2", type: .jpg),
+        thumbnail: FileResource(resourceImage: "image2", type: .jpg),
         originalUrl: "projects/electronics")
 }

CHDataManagement/Storage/Model/FileDescriptions.swift

@@ -0,0 +1,13 @@
+
+struct FileDescriptions {
+
+    let fileId: String
+
+    let german: String?
+
+    let english: String?
+}
+
+extension FileDescriptions: Codable {
+    
+}

CHDataManagement/Storage/Model/FileOnDisk.swift

@@ -10,7 +10,7 @@ struct FileOnDisk {
 
     init(image: String, url: URL) {
         let ext = image.fileExtension!
-        let type = ImageType(fileExtension: ext)!
+        let type = ImageFileType(fileExtension: ext)!
         self.type = .image(type)
         self.url = url
         self.name = image

CHDataManagement/Storage/Model/ImageDescriptions.swift

@@ -1,13 +0,0 @@
-
-struct ImageDescriptions {
-
-    let imageId: String
-
-    let german: String?
-
-    let english: String?
-}
-
-extension ImageDescriptions: Codable {
-    
-}

CHDataManagement/Storage/Storage.swift

@@ -101,16 +101,20 @@ final class Storage {
     }
 
     func createFolderStructure() throws {
-        try create(folder: pagesFolder)
-        try create(folder: filesFolder)
-        try create(folder: postsFolder)
-        try create(folder: tagsFolder)
+        try operate(in: .contentPath) { contentPath in
+            try create(folder: pagesFolder)
+            try create(folder: filesFolder(in: contentPath))
+            try create(folder: postsFolder)
+            try create(folder: tagsFolder)
+        }
     }
 
     // MARK: Pages
 
+    private let pagesFolderName = "pages"
+
     /// The folder path where the markdown and metadata files of the pages are stored (by their id/url component)
-    private var pagesFolder: URL { subFolder("pages") }
+    private var pagesFolder: URL { subFolder(pagesFolderName) }
 
     private func pageContentFileName(_ id: String, _ language: ContentLanguage) -> String {
         "\(id)-\(language.rawValue).md"
@@ -169,13 +173,15 @@ final class Storage {
         for language in ContentLanguage.allCases {
             files.formUnion(pages.map { pageContentFileName($0, language) })
         }
-        try deleteFiles(in: pagesFolder, notIn: files)
+        try deleteFiles(in: pagesFolderName, notIn: files)
     }
 
     // MARK: Posts
 
+    private let postsFolderName = "posts"
+
     /// The folder path where the markdown files of the posts are stored (by their unique id/url component)
-    private var postsFolder: URL { subFolder("posts") }
+    private var postsFolder: URL { subFolder(postsFolderName) }
 
     private func postFileUrl(postId: String) -> URL {
         postsFolder.appending(path: postId, directoryHint: .notDirectory).appendingPathExtension("json")
@@ -202,13 +208,15 @@ final class Storage {
 
     func deletePostFiles(notIn posts: [String]) throws {
         let files = Set(posts.map { $0 + ".json" })
-        try deleteFiles(in: postsFolder, notIn: files)
+        try deleteFiles(in: postsFolderName, notIn: files)
     }
 
     // MARK: Tags
 
+    private let tagsFolderName = "tags"
+
     /// The folder path where the source images are stored (by their unique name)
-    private var tagsFolder: URL { subFolder("tags") }
+    private var tagsFolder: URL { subFolder(tagsFolderName) }
 
     private func tagFileUrl(tagId: String) -> URL {
         tagsFolder.appending(path: tagId, directoryHint: .notDirectory)
@@ -230,44 +238,44 @@ final class Storage {
 
     func deleteTagFiles(notIn tags: [String]) throws {
         let files = Set(tags.map { $0 + ".json" })
-        try deleteFiles(in: tagsFolder, notIn: files)
+        try deleteFiles(in: tagsFolderName, notIn: files)
     }
 
-    // MARK: Files
+    // MARK: File descriptions
 
-    private var imageDescriptionFilename: String {
-        "image-descriptions.json"
-    }
+    private let fileDescriptionFilename = "file-descriptions.json"
 
-    private var imageDescriptionUrl: URL {
-        baseFolder.appending(path: "image-descriptions.json")
-    }
-
-    func loadImageDescriptions() -> [ImageDescriptions] {
+    func loadFileDescriptions() -> [FileDescriptions] {
         do {
-            return try read(relativePath: imageDescriptionFilename)
+            return try read(relativePath: fileDescriptionFilename)
         } catch {
-            print("Failed to read image descriptions: \(error)")
+            print("Failed to read file descriptions: \(error)")
             return []
         }
     }
 
     @discardableResult
-    func save(imageDescriptions: [ImageDescriptions]) -> Bool {
+    func save(fileDescriptions: [FileDescriptions]) -> Bool {
         do {
-            try writeIfChanged(imageDescriptions, to: imageDescriptionFilename)
+            try writeIfChanged(fileDescriptions, to: fileDescriptionFilename)
             return true
         } catch {
-            print("Failed to write image descriptions: \(error)")
+            print("Failed to write file descriptions: \(error)")
             return false
         }
     }
 
-    /// The folder path where other files are stored (by their unique name)
-    var filesFolder: URL { subFolder("files") }
+    // MARK: Files
 
-    private func fileUrl(file: String) -> URL {
-        filesFolder.appending(path: file, directoryHint: .notDirectory)
+    private let filesFolderName = "files"
+
+    /// The folder path where other files are stored (by their unique name)
+    func filesFolder(in folder: URL) -> URL {
+        folder.appending(path: filesFolderName, directoryHint: .isDirectory)
+    }
+
+    private func fileUrl(file: String, in folder: URL) -> URL {
+        filesFolder(in: folder).appending(path: file, directoryHint: .notDirectory)
     }
 
     /**
@@ -275,8 +283,30 @@ final class Storage {
      */
     @discardableResult
     func copyFile(at url: URL, fileId: String) -> Bool {
-        let contentUrl = fileUrl(file: fileId)
-        return copy(file: url, to: contentUrl, type: "file", id: fileId)
+        do {
+            try operate(in: .contentPath) { contentPath in
+                let destination = fileUrl(file: fileId, in: contentPath)
+                try fm.copyItem(at: url, to: destination)
+            }
+            return true
+        } catch {
+            print("Failed to copy external file \(url.path()) to \(fileId): \(error)")
+            return false
+        }
+    }
+
+    func move(file fileId: String, to newFile: String) -> Bool {
+        do {
+            try operate(in: .contentPath) { contentPath in
+                let source = fileUrl(file: fileId, in: contentPath)
+                let destination = fileUrl(file: newFile, in: contentPath)
+                try fm.moveItem(at: source, to: destination)
+            }
+            return true
+        } catch {
+            print("Failed to move file \(fileId) to \(newFile): \(error)")
+            return false
+        }
     }
 
     func copy(file fileId: String, to relativeOutputPath: String) -> Bool {
@@ -287,8 +317,9 @@ final class Storage {
                     if output.exists {
                         return
                     }
-                    let input = contentPath.appending(path: "files/\(fileId)", directoryHint: .notDirectory)
                     try output.ensureParentFolderExistence()
+
+                    let input = fileUrl(file: fileId, in: contentPath)
                     try FileManager.default.copyItem(at: input, to: output)
                 }
             }
@@ -299,14 +330,15 @@ final class Storage {
         }
     }
 
-    func loadAllFiles() throws -> [String : URL] {
-        try files(in: filesFolder).reduce(into: [:]) { files, url in
-            files[url.lastPathComponent] = url
+    func loadAllFiles() throws -> [String] {
+        try operate(in: .contentPath) { contentPath in
+            let folder = filesFolder(in: contentPath)
+            return try files(in: folder).map { $0.lastPathComponent }
         }
     }
 
     func deleteFiles(notIn fileSet: [String]) throws {
-        try deleteFiles(in: filesFolder, notIn: Set(fileSet))
+        try deleteFiles(in: filesFolderName, notIn: Set(fileSet))
     }
 
     func fileContent(for file: String) throws -> String {
@@ -318,6 +350,15 @@ final class Storage {
         }
     }
 
+    func fileData(for file: String) throws -> Data {
+        try operate(in: .contentPath) { folder in
+            let fileUrl = folder
+                .appending(path: "files", directoryHint: .isDirectory)
+                .appending(path: file, directoryHint: .notDirectory)
+            return try Data(contentsOf: fileUrl)
+        }
+    }
+
     // MARK: Website data
 
     private var settingsDataUrl: URL {
@@ -403,13 +444,16 @@ final class Storage {
 
     // MARK: Writing files
 
-    private func deleteFiles(in folder: URL, notIn fileSet: Set<String>) throws {
-        let filesToDelete = try files(in: folder)
-            .filter { !fileSet.contains($0.lastPathComponent) }
+    private func deleteFiles(in folder: String, notIn fileSet: Set<String>) throws {
+        try operate(in: .contentPath) { contentPath in
+            let subFolder = contentPath.appending(path: folder, directoryHint: .isDirectory)
+            let filesToDelete = try files(in: subFolder)
+                .filter { !fileSet.contains($0.lastPathComponent) }
 
-        for file in filesToDelete {
-            try fm.removeItem(at: file)
-            print("Deleted \(file.path())")
+            for file in filesToDelete {
+                try fm.removeItem(at: file)
+                print("Deleted \(file.path())")
+            }
         }
     }
 

CHDataManagement/Views/ColorPalette.swift

@@ -1,20 +0,0 @@
-import SwiftUI
-
-enum ColorPalette {
-
-    static let tagBackground = Color(r: 188, g: 188, b: 188) // Color(r: 9, g: 62, b: 103)
-
-    static let tagForeground = Color.primary // Color(r: 96, g: 186, b: 255)
-
-    static let listBackground = Color(r: 2, g: 15, b: 26)
-
-    static let postBackground = Color(r: 222, g: 222, b: 222) // Color(r: 4, g: 31, b: 52)
-
-    static let postText = Color(r: 221, g: 221, b: 221)
-
-    static let postDate = tagForeground
-
-    static let link = Color.blue
-
-}
-

CHDataManagement/Views/Files/AddFileView.swift

@@ -0,0 +1,109 @@
+import SwiftUI
+
+struct AddFileView: View {
+
+    @Environment(\.dismiss)
+    private var dismiss: DismissAction
+
+    @EnvironmentObject
+    private var content: Content
+
+    @Binding
+    var selectedFile: FileResource?
+
+    @Binding
+    var selectedImage: ImageResource?
+
+    @State
+    private var filesToAdd: [FileToAdd] = []
+
+    init(selectedImage: Binding<ImageResource?>, selectedFile: Binding<FileResource?>) {
+        _selectedFile = selectedFile
+        _selectedImage = selectedImage
+    }
+
+    var body: some View {
+        ScrollView {
+            Text("Select files to add")
+                .foregroundStyle(.secondary)
+            List {
+                ForEach(filesToAdd) { file in
+                    FileToAddView(file: file, delete: delete)
+                }
+            }.frame(minHeight: 300)
+            HStack {
+                Button("Cancel", role: .cancel) { dismiss() }
+                Button("Select more files", action: openFilePanel)
+                Button("Add selected", action: importSelectedFiles)
+                    .disabled(filesToAdd.isEmpty)
+            }
+        }
+        .padding()
+    }
+
+    private func openFilePanel() {
+        let panel = NSOpenPanel()
+
+        panel.canChooseFiles = true
+        panel.canChooseDirectories = false
+        panel.allowsMultipleSelection = true
+        panel.showsHiddenFiles = false
+        panel.title = "Select files to add"
+        panel.prompt = ""
+
+        let response = panel.runModal()
+        guard response == .OK else {
+            print("Failed to select files to import")
+            return
+        }
+
+        for url in panel.urls {
+            guard !filesToAdd.contains(where: { $0.url == url }) else {
+                print("Skipping already selected file \(url.path())")
+                continue
+            }
+            print("Selected file \(url.path())")
+            let newFile = FileToAdd(content: content, url: url)
+            filesToAdd.append(newFile)
+        }
+    }
+
+    private func delete(file: FileToAdd) {
+        guard let index = filesToAdd.firstIndex(of: file) else {
+            return
+        }
+        filesToAdd.remove(at: index)
+    }
+
+    private func importSelectedFiles() {
+        for file in filesToAdd {
+            guard file.isSelected else {
+                print("Skipping unselected file \(file.uniqueId)")
+                continue
+            }
+            guard !file.idAlreadyExists else {
+                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())")
+                return
+            }
+
+            let resource = FileResource(
+                content: content,
+                id: file.uniqueId,
+                en: "", de: "")
+            // TODO: Insert at correct index?
+            content.files.insert(resource, at: 0)
+            selectedFile = resource
+        }
+        dismiss()
+    }
+}
+
+#Preview {
+    AddFileView(selectedImage: .constant(nil),
+                selectedFile: .constant(nil))
+}

CHDataManagement/Views/Files/FileContentView.swift

@@ -1,37 +1,68 @@
 import SwiftUI
+import SFSafeSymbols
 
 struct FileContentView: View {
 
+    private let iconSize: CGFloat = 150
+
     @ObservedObject
     var file: FileResource
 
-    @EnvironmentObject
-    private var content: Content
-
     @State
     private var fileContent: String = ""
 
     var body: some View {
         VStack {
-            if fileContent != "" {
-                TextEditor(text: $fileContent)
-                    .font(.body.monospaced())
-                    .textEditorStyle(.plain)
-            } else {
-                Text("The file is not a text file")
-                    .onAppear(perform: loadFileContent)
+            switch file.type {
+            case .image:
+                file.imageToDisplay
+                    .resizable()
+                    .aspectRatio(contentMode: .fit)
+            case .model:
+                VStack {
+                    Image(systemSymbol: .cubeTransparent)
+                        .resizable()
+                        .aspectRatio(contentMode: .fit)
+                        .frame(width: iconSize)
+                    Text("No preview available")
+                        .font(.title)
+                }
+                .foregroundStyle(.secondary)
+            case .text, .code:
+                TextFileContentView(file: file)
+                    .id(file.id)
+            case .video:
+                VStack {
+                    Image(systemSymbol: .film)
+                        .resizable()
+                        .aspectRatio(contentMode: .fit)
+                        .frame(width: iconSize)
+                    Text("No preview available")
+                        .font(.title)
+                }
+                .foregroundStyle(.secondary)
+            case .other:
+                VStack {
+                    Image(systemSymbol: .docQuestionmark)
+                        .resizable()
+                        .aspectRatio(contentMode: .fit)
+                        .frame(width: iconSize)
+                    Text("No preview available")
+                        .font(.title)
+                }
+                .foregroundStyle(.secondary)
             }
         }.padding()
     }
+}
 
-    private func loadFileContent() {
-        do {
-            fileContent = try content.storage.fileContent(for: file.uniqueId)
-        } catch {
-            print(error)
-            fileContent = ""
-        }
+extension FileContentView: MainContentView {
+
+    init(item: FileResource) {
+        self.file = item
     }
+
+    static let itemDescription = "a file"
 }
 
 #Preview {

CHDataManagement/Views/Files/FileDetailView.swift

@@ -5,22 +5,75 @@ struct FileDetailView: View {
     @ObservedObject
     var file: FileResource
 
+    @State
+    private var newId: String
+
+    init(file: FileResource) {
+        self.file = file
+        self.newId = file.id
+    }
+
+    private let allowedCharactersInPostId = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-.")).inverted
+
+    private var idExists: Bool {
+        file.content.files.contains { $0.id == newId }
+    }
+
+    private var containsInvalidCharacters: Bool {
+        newId.rangeOfCharacter(from: allowedCharactersInPostId) != nil
+    }
+
     var body: some View {
         VStack(alignment: .leading) {
             Text("File Name")
                 .font(.headline)
-            TextField("", text: $file.uniqueId)
-                .textFieldStyle(.roundedBorder)
-                .padding(.bottom)
-                .disabled(true)
-            Text("Description")
+            HStack {
+                TextField("", text: $newId)
+                    .textFieldStyle(.roundedBorder)
+                Button(action: setNewId) {
+                    Text("Update")
+                }
+                .disabled(newId.isEmpty || containsInvalidCharacters || idExists)
+            }
+            Text("German Description")
                 .font(.headline)
-            TextField("", text: $file.description)
+            TextField("", text: $file.germanDescription)
                 .textFieldStyle(.roundedBorder)
+            Text("English Description")
+                .font(.headline)
+            TextField("", text: $file.englishDescription)
+                .textFieldStyle(.roundedBorder)
+            if file.type.isImage {
+                Text("Image size")
+                    .font(.headline)
+                Text("\(Int(file.size.width)) x \(Int(file.size.height)) (\(file.aspectRatio))")
+                    .foregroundStyle(.secondary)
+                #warning("Add button to show image versions")
+            }
+            Spacer()
         }.padding()
     }
+
+    private func setNewId() {
+        guard file.content.storage.move(file: file.id, to: newId) else {
+            print("Failed to move file \(file.id)")
+            newId = file.id
+            return
+        }
+        file.id = newId
+    }
 }
 
+extension FileDetailView: MainContentView {
+
+    init(item: FileResource) {
+        self.init(file: item)
+    }
+
+    static let itemDescription = "a file"
+}
+
+
 #Preview {
     FileDetailView(file: .mock)
 }

CHDataManagement/Views/Files/FileListView.swift

@@ -0,0 +1,100 @@
+import SwiftUI
+
+private enum FileFilterType: String, Hashable, CaseIterable, Identifiable {
+    case images
+    case text
+    case videos
+    case other
+
+    var text: String {
+        switch self {
+        case .images: return "Image"
+        case .text: return "Text"
+        case .videos: return "Video"
+        case .other: return "Other"
+        }
+    }
+
+    var id: String {
+        rawValue
+    }
+
+    func matches(_ type: FileType) -> Bool {
+        switch self {
+        case .images: return type.isImage
+        case .text: return type.isTextFile
+        case .videos: return type.isVideo
+        case .other: return type.isOtherFile
+        }
+    }
+}
+
+struct FileListView: View {
+
+    @EnvironmentObject
+    private var content: Content
+
+    @Binding
+    var selectedFile: FileResource?
+
+    @State
+    private var selectedFileType: FileFilterType = .images
+
+    @State
+    private var searchString = ""
+
+    var filesBySelectedType: [FileResource] {
+        content.files.filter { selectedFileType.matches($0.type) }
+    }
+
+    var filteredFiles: [FileResource] {
+        guard !searchString.isEmpty else {
+            return filesBySelectedType
+        }
+        return filesBySelectedType.filter { $0.id.contains(searchString) }
+    }
+
+    var body: some View {
+        VStack(alignment: .center) {
+            Picker("", selection: $selectedFileType) {
+                ForEach(FileFilterType.allCases) { type in
+                    Text(type.text).tag(type)
+                }
+            }
+            .pickerStyle(.segmented)
+            .padding(.trailing, 7)
+            TextField("", text: $searchString, prompt: Text("Search"))
+                .textFieldStyle(.roundedBorder)
+                .padding(.horizontal, 8)
+            List(filteredFiles, selection: $selectedFile) { file in
+                Text(file.id).tag(file)
+            }
+            .onChange(of: selectedFileType) { oldValue, newValue in
+                guard oldValue != newValue else {
+                    return
+                }
+                if let selectedFile,
+                   newValue.matches(selectedFile.type) {
+                    return
+                }
+                selectedFile = filteredFiles.first
+            }
+        }
+        .onAppear {
+            if selectedFile == nil {
+                selectedFile = content.files.first
+            }
+        }
+    }
+}
+
+#Preview {
+    NavigationSplitView {
+        FileListView(selectedFile: .constant(nil))
+            .environmentObject(Content.mock)
+            .navigationSplitViewColumnWidth(250)
+    } detail: {
+        Text("")
+            .frame(width: 50)
+    }
+}

CHDataManagement/Views/Files/FileToAdd.swift

@@ -0,0 +1,46 @@
+import Foundation
+
+final class FileToAdd: ObservableObject {
+
+    unowned let content: Content
+
+    let url: URL
+
+    @Published
+    var uniqueId: String
+
+    @Published
+    var isSelected: Bool = true
+
+    init(content: Content, url: URL) {
+        self.content = content
+        self.url = url
+        self.uniqueId = url.lastPathComponent
+    }
+
+    var idAlreadyExists: Bool {
+        content.files.contains { $0.id == uniqueId }
+    }
+}
+
+extension FileToAdd: Identifiable {
+
+    var id: URL {
+        url
+    }
+}
+
+extension FileToAdd: Equatable {
+
+    static func == (lhs: FileToAdd, rhs: FileToAdd) -> Bool {
+        lhs.url == rhs.url
+    }
+}
+
+extension FileToAdd: Hashable {
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(url)
+    }
+}
+

CHDataManagement/Views/Files/FileToAddView.swift

@@ -0,0 +1,45 @@
+import SwiftUI
+import SFSafeSymbols
+
+struct FileToAddView: View {
+
+    @ObservedObject
+    var file: FileToAdd
+
+    let delete: (FileToAdd) -> Void
+
+    var body: some View {
+        VStack(alignment: .leading) {
+            HStack {
+                Image(systemSymbol: file.isSelected ? .checkmarkCircleFill : .circle)
+                    .resizable()
+                    .frame(width: 20, height: 20)
+                    .foregroundStyle(.blue)
+                    .onTapGesture {
+                        file.isSelected.toggle()
+                    }
+                Image(systemSymbol: .trashCircleFill)
+                    .resizable()
+                    .frame(width: 20, height: 20)
+                    .foregroundStyle(.red)
+                    .onTapGesture {
+                        delete(file)
+                    }
+                TextField("", text: $file.uniqueId)
+                    .textFieldStyle(.roundedBorder)
+                    .frame(maxWidth: 200)
+
+            }
+            Text(file.url.path())
+                .foregroundStyle(.secondary)
+        }
+
+    }
+}
+
+#Preview {
+    List {
+        FileToAddView(file: .init(content: .mock, url: URL(fileURLWithPath: "/path/to/file.swift")), delete: { _ in })
+        FileToAddView(file: .init(content: .mock, url: URL(fileURLWithPath: "/path/to/file2.swift")), delete: { _ in })
+    }
+}

CHDataManagement/Views/Files/FilesView.swift

@@ -1,79 +0,0 @@
-import SwiftUI
-
-struct FilesView: View {
-
-    @EnvironmentObject
-    private var content: Content
-
-    @State
-    private var selected: FileResource? = nil
-
-    var body: some View {
-        NavigationSplitView {
-            List(content.files, selection: $selected) { file in
-                Text(file.uniqueId)
-                    .tag(file)
-            }
-            .toolbar {
-                ToolbarItem(placement: .primaryAction) {
-                    Button(action: openFilePanel) {
-                        Label("Add file", systemSymbol: .plus)
-                    }
-                }
-            }
-            .navigationSplitViewColumnWidth(min: 250, ideal: 250, max: 250)
-        } content: {
-            if let selected {
-                FileContentView(file: selected)
-                    .id(selected.uniqueId)
-            } else {
-                Text("Select a file")
-            }
-        } detail: {
-            if let selected {
-                FileDetailView(file: selected)
-            } else {
-                EmptyView()
-            }
-        }
-    }
-
-    private func openFilePanel() {
-        let panel = NSOpenPanel()
-        // Sets up so user can only select a single directory
-        panel.canChooseFiles = true
-        panel.canChooseDirectories = false
-        panel.allowsMultipleSelection = true
-        panel.showsHiddenFiles = false
-        panel.title = "Select files to add"
-        panel.prompt = ""
-
-        let response = panel.runModal()
-        guard response == .OK else {
-            print("Failed to select files to import")
-            return
-        }
-
-        for url in panel.urls {
-            let fileId = url.lastPathComponent
-            guard !content.files.contains(where: { $0.uniqueId == fileId }) else {
-                print("A file '\(fileId)' already exists")
-                continue
-            }
-            let type = FileType(fileExtension: fileId.fileExtension)
-            let file = FileResource(type: type, uniqueId: fileId, description: "")
-            guard content.storage.copyFile(at: url, fileId: fileId) else {
-                print("Failed to import file '\(fileId)'")
-                continue
-            }
-            content.files.insert(file, at: 0)
-        }
-    }
-
-
-}
-
-#Preview {
-    FilesView()
-        .environmentObject(Content.mock)
-}

CHDataManagement/Views/Files/TextFileContentView.swift

@@ -0,0 +1,38 @@
+import SwiftUI
+
+struct TextFileContentView: View {
+
+    @ObservedObject
+    var file: FileResource
+
+    @State
+    private var fileContent: String = ""
+
+    var body: some View {
+        if fileContent != "" {
+            TextEditor(text: $fileContent)
+                .font(.body.monospaced())
+                .textEditorStyle(.plain)
+                //.background(.clear)
+        } else {
+            VStack {
+                Image(systemSymbol: .docText)
+                    .resizable()
+                    .aspectRatio(contentMode: .fit)
+                    .frame(width: 150)
+                Text("No preview available")
+                    .font(.title)
+            }
+            .foregroundStyle(.secondary)
+            .onAppear(perform: loadFileContent)
+        }
+    }
+
+    private func loadFileContent() {
+        guard fileContent == "" else {
+            return
+        }
+        fileContent = file.textContent()
+        print("Loaded content of file \(file.id)")
+    }
+}

CHDataManagement/Views/Generic/NavigationIcon.swift

@@ -0,0 +1,21 @@
+import SwiftUI
+import SFSafeSymbols
+
+struct NavigationIcon: View {
+
+    let symbol: SFSymbol
+
+    let edge: Edge.Set
+
+    var body: some View {
+        SwiftUI.Image(systemSymbol: symbol)
+            .resizable()
+            .aspectRatio(contentMode: .fit)
+            .padding(5)
+            .padding(edge, 2)
+            .fontWeight(.light)
+            .foregroundStyle(Color.white.opacity(0.8))
+            .frame(width: 30, height: 30)
+            .background(Color.black.opacity(0.7).clipShape(Circle()))
+    }
+}

CHDataManagement/Views/Images/FlexibleColumnView.swift

@@ -1,49 +0,0 @@
-import SwiftUI
-
-struct FlexibleColumnView<Content, Inner>: View where Content: Identifiable, Inner: View {
-
-    @Binding
-    var items: [Content]
-
-    let maximumItemWidth: CGFloat
-
-    let spacing: CGFloat
-
-    private let content: (_ item: Content, _ width: CGFloat) -> Inner
-
-    init(items: Binding<[Content]>, maximumItemWidth: CGFloat = 300, spacing: CGFloat = 20, content: @escaping (_ item: Content, _ width: CGFloat) -> Inner) {
-        self._items = items
-        self.maximumItemWidth = maximumItemWidth
-        self.spacing = spacing
-        self.content = content
-    }
-
-    var body: some View {
-        GeometryReader { geometry in
-            let totalWidth = geometry.size.width
-            let columnCount = max(Int((totalWidth + spacing) / (maximumItemWidth + spacing)), 1)
-            let totalSpacing = spacing * CGFloat(columnCount + 1)
-            let trueItemWidth = (totalWidth - totalSpacing) / CGFloat(columnCount)
-
-            let columns = Array(repeating: GridItem(.flexible(), spacing: spacing), count: columnCount)
-
-            ScrollView {
-                LazyVGrid(columns: columns, spacing: spacing) {
-                    ForEach(items) { item in
-                        content(item, trueItemWidth)
-                    }
-                }
-                .padding(spacing)
-            }
-        }
-    }
-}
-
-#Preview {
-    FlexibleColumnView(items: .constant(MockImage.images), maximumItemWidth: 150) { image, width in
-        image.imageToDisplay
-            .resizable()
-            .aspectRatio(contentMode: .fit)
-            .frame(width: width)
-    }
-}

CHDataManagement/Views/Images/ImageContentView.swift

@@ -0,0 +1,26 @@
+import SwiftUI
+
+struct ImageContentView: View {
+
+    @ObservedObject
+    var image: FileResource
+
+    var body: some View {
+        image.imageToDisplay
+            .resizable()
+            .aspectRatio(contentMode: .fit)
+    }
+}
+
+extension ImageContentView: MainContentView {
+
+    init(item: FileResource) {
+        self.image = item
+    }
+
+    static let itemDescription = "an image"
+}
+
+#Preview {
+    ImageContentView(image: .init(resourceImage: "image1", type: .jpg))
+}

CHDataManagement/Views/Images/ImageDetailsView.swift

@@ -1,63 +0,0 @@
-import SwiftUI
-
-struct ImageDetailsView: View {
-
-    @Environment(\.language)
-    var language
-
-    @ObservedObject
-    var image: ImageResource
-
-    @State
-    private var newId: String
-
-    init(image: ImageResource) {
-        self.image = image
-        self.newId = image.id
-    }
-
-    var body: some View {
-        VStack(alignment: .leading) {
-            Text("Unique identifier")
-                .font(.headline)
-            HStack {
-                TextField("", text: $newId)
-                Button(action: setNewId) {
-                    Text("Update")
-                }
-            }
-            Text("German Description")
-                .font(.headline)
-            TextField("", text: $image.germanDescription)
-            Text("English Description")
-                .font(.headline)
-            TextField("", text: $image.englishDescription)
-            Text("Info")
-                .font(.headline)
-            HStack(alignment: .top) {
-                VStack(alignment: .leading) {
-                    Text("Original Size")
-                    Text("Aspect ratio")
-                }
-                VStack(alignment: .trailing) {
-                    Text("\(Int(image.size.width)) x \(Int(image.size.height))")
-                    Text("\(image.aspectRatio)")
-                }
-            }.padding(.vertical)
-            Text("Versions")
-                .font(.headline)
-            Spacer()
-        }
-        .padding()
-    }
-
-    private func setNewId() {
-        #warning("Check if ID is unique")
-        // TODO: Clean id
-        image.id = newId
-    }
-}
-
-#Preview {
-    ImageDetailsView(image: MockImage.images.first!)
-}

CHDataManagement/Views/Images/ImagesContentView.swift

@@ -1,17 +0,0 @@
-import SwiftUI
-
-struct ImagesContentView: View {
-
-    @ObservedObject
-    var image: ImageResource
-
-    var body: some View {
-        image.imageToDisplay
-            .resizable()
-            .aspectRatio(contentMode: .fit)
-    }
-}
-
-#Preview {
-    ImagesContentView(image: .init(resourceName: "image1", type: .jpg))
-}

CHDataManagement/Views/Images/ImagesView.swift

@@ -1,50 +0,0 @@
-import SwiftUI
-import SFSafeSymbols
-
-struct ImagesView: View {
-
-    @EnvironmentObject
-    var content: Content
-
-    let maximumItemWidth: CGFloat = 300
-
-    let aspectRatio: CGFloat = 1.5
-
-    let spacing: CGFloat = 20
-
-    @State
-    private var selectedImage: ImageResource?
-
-    @State
-    private var showImageDetails = false
-
-    var body: some View {
-        NavigationSplitView {
-            List(content.images, selection: $selectedImage) { image in
-                Text(image.id)
-                    .tag(image)
-            }
-        } content: {
-            if let selectedImage {
-                ImagesContentView(image: selectedImage)
-                    .layoutPriority(1)
-            } else {
-                Text("Select an image in the sidebar")
-            }
-        } detail: {
-            if let selectedImage {
-                ImageDetailsView(image: selectedImage)
-                    .frame(maxWidth: 350)
-            } else {
-                EmptyView()
-            }
-        }
-    }
-}
-
-#Preview {
-    let content = Content()
-    content.images = MockImage.images
-    return ImagesView()
-        .environmentObject(content)
-}

CHDataManagement/Views/Pages/AddPageView.swift

@@ -0,0 +1,93 @@
+import SwiftUI
+
+struct AddPageView: View {
+
+    @Environment(\.dismiss)
+    private var dismiss: DismissAction
+
+    @Environment(\.language)
+    private var language: ContentLanguage
+
+    @EnvironmentObject
+    private var content: Content
+
+    @Binding
+    var selectedPage: Page?
+
+    @State
+    private var newPageId = ""
+
+    private let allowedCharactersInPageId = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-")).inverted
+
+    init(selected: Binding<Page?>) {
+        self._selectedPage = selected
+    }
+
+    private var idExists: Bool {
+        content.pages.contains { $0.id == newPageId }
+    }
+
+    private var containsInvalidCharacters: Bool {
+        newPageId.rangeOfCharacter(from: allowedCharactersInPageId) != nil
+    }
+
+    var body: some View {
+        VStack {
+            Text("New page")
+                .font(.headline)
+
+            TextField("", text: $newPageId)
+                .textFieldStyle(.roundedBorder)
+                .frame(maxWidth: 350)
+            if newPageId.isEmpty {
+                Text("Enter the id of the new page to create")
+                    .foregroundStyle(.secondary)
+            } else if idExists {
+                Text("A page with the same id already exists")
+                    .foregroundStyle(Color.red)
+            } else if containsInvalidCharacters {
+                Text("The id contains invalid characters")
+                    .foregroundStyle(Color.red)
+            } else {
+                Text("Create a new page with the id")
+                    .foregroundStyle(.secondary)
+            }
+            HStack {
+                Button(role: .cancel, action: dismissSheet) {
+                    Text("Cancel")
+                }
+                Button(action: addNewPage) {
+                    Text("Create")
+                }
+                .disabled(newPageId.isEmpty || containsInvalidCharacters || idExists)
+            }
+        }
+        .padding()
+    }
+
+    private func addNewPage() {
+        let page = Page(
+            id: newPageId,
+            isDraft: true,
+            createdDate: .now,
+            startDate: .now,
+            endDate: nil,
+            german: .init(urlString: "seite",
+                          title: "Ein Titel"),
+            english: .init(urlString: "page",
+                           title: "A Title"),
+            tags: [])
+        content.pages.insert(page, at: 0)
+        selectedPage = page
+        dismissSheet()
+    }
+
+    private func dismissSheet() {
+        dismiss()
+    }
+}
+
+#Preview {
+    AddPageView(selected: .constant(nil))
+        .environmentObject(Content.mock)
+}

CHDataManagement/Views/Pages/LocalizedPageContentView.swift

@@ -0,0 +1,67 @@
+import SwiftUI
+import HighlightedTextEditor
+
+struct LocalizedPageContentView: View {
+
+    let pageId: String
+
+    @ObservedObject
+    var page: LocalizedPage
+
+    @Environment(\.language)
+    private var language
+
+    @EnvironmentObject
+    private var content: Content
+
+    @State
+    private var isGeneratingWebsite = false
+
+    @State
+    private var pageContent: String = ""
+
+    init(pageId: String, page: LocalizedPage) {
+        self.pageId = pageId
+        self.page = page
+    }
+
+    var body: some View {
+        VStack(alignment: .leading) {
+            TextField("", text: $page.title)
+                .font(.title)
+                .textFieldStyle(.plain)
+
+            HStack(alignment: .firstTextBaseline) {
+                Button(action: loadContent) {
+                    Text("Load")
+                }
+                Button(action: saveContent) {
+                    Text("Save")
+                }
+                Spacer()
+            }
+            HighlightedTextEditor(
+                text: $pageContent,
+                highlightRules: .markdown)
+        }
+        .padding()
+        .onAppear(perform: loadContent)
+        .onDisappear(perform: saveContent)
+    }
+
+    private func loadContent() {
+        let content = content.storage.pageContent(for: pageId, language: language)
+        guard content != "" else {
+            pageContent = "New file"
+            return
+        }
+        pageContent = content
+    }
+
+    private func saveContent() {
+        guard pageContent != "", pageContent != "New file" else {
+            return
+        }
+        content.storage.save(pageContent: pageContent, for: pageId, language: language)
+    }
+}

CHDataManagement/Views/Pages/LocalizedPageDetailView.swift

@@ -36,7 +36,7 @@ struct LocalizedPageDetailView: View {
                            size: 22,
                            color: .red) {
                     item.linkPreviewImage = nil
-                }
+                }.disabled(item.linkPreviewImage == nil)
                 Spacer()
             }
 

CHDataManagement/Views/Pages/PageContentView.swift

@@ -1,15 +1,25 @@
 import SwiftUI
 import HighlightedTextEditor
 
+struct PageTitleView: View {
+
+    @ObservedObject
+    var page: LocalizedPage
+
+    var body: some View {
+        TextField("", text: $page.title)
+            .font(.title)
+            .textFieldStyle(.plain)
+    }
+}
+
 struct PageContentView: View {
 
     @ObservedObject
     var page: Page
 
-    @ObservedObject
-    private var localized: LocalizedPage
-
-    let language: ContentLanguage
+    @Environment(\.language)
+    private var language
 
     @EnvironmentObject
     private var content: Content
@@ -17,87 +27,26 @@ struct PageContentView: View {
     @State
     private var isGeneratingWebsite = false
 
-    @State
-    private var pageContent: String = ""
-
-    init(page: Page, language: ContentLanguage) {
+    init(page: Page) {
         self.page = page
-        self.localized = page.localized(in: language)
-        self.language = language
     }
 
     var body: some View {
-        VStack(alignment: .leading) {
-            TextField("", text: $localized.title)
-                .font(.title)
-                .textFieldStyle(.plain)
-
-            HStack(alignment: .firstTextBaseline) {
-                Button(action: loadContent) {
-                    Text("Load")
-                }
-                Button(action: saveContent) {
-                    Text("Save")
-                }
-                Button(action: generate) {
-                    Text("Generate")
-                }
-                .disabled(isGeneratingWebsite)
-                Spacer()
-            }
-            HighlightedTextEditor(
-                text: $pageContent,
-                highlightRules: .markdown)
-        }
-        .padding()
-        .onAppear(perform: loadContent)
-        .onDisappear(perform: saveContent)
+        LocalizedPageContentView(pageId: page.id, page: page.localized(in: language))
+            .id(page.id + language.rawValue)
     }
 
-    private func loadContent() {
-        let content = content.storage.pageContent(for: page.id, language: language)
-        guard content != "" else {
-            pageContent = "New file"
-            return
-        }
-        pageContent = content
+}
+
+extension PageContentView: MainContentView {
+
+    init(item: Page) {
+        self.page = item
     }
 
-    private func saveContent() {
-        guard pageContent != "", pageContent != "New file" else {
-            return
-        }
-        content.storage.save(pageContent: pageContent, for: page.id, language: language)
-    }
-
-    private func generate() {
-        guard content.settings.outputDirectoryPath != "" else {
-            print("Invalid output path")
-            return
-        }
-        let url = URL(fileURLWithPath: content.settings.outputDirectoryPath)
-
-        guard FileManager.default.fileExists(atPath: url.path) else {
-            print("Missing output folder")
-            return
-        }
-        isGeneratingWebsite = true
-        print("Generating page")
-        DispatchQueue.global(qos: .userInitiated).async {
-            let generator = WebsiteGenerator(
-                content: content,
-                language: language)
-            if !generator.generate(page: page) {
-                print("Generation failed")
-            }
-            DispatchQueue.main.async {
-                isGeneratingWebsite = false
-                print("Done")
-            }
-        }
-    }
+    static let itemDescription = "a page"
 }
 
 #Preview {
-    PageContentView(page: .empty, language: .english)
+    PageContentView(page: .empty)
 }

CHDataManagement/Views/Pages/PageDetailView.swift

@@ -5,19 +5,29 @@ struct PageDetailView: View {
     @Environment(\.language)
     private var language
 
+    @EnvironmentObject
+    private var content: Content
+
     @ObservedObject
-    private var item: Page
+    private var page: Page
+
+    @State
+    private var isGeneratingWebsite = false
 
     init(page: Page) {
-        self.item = page
+        self.page = page
     }
 
     var body: some View {
         ScrollView {
             VStack(alignment: .leading) {
+                Button(action: generate) {
+                    Text("Generate")
+                }
+                .disabled(isGeneratingWebsite)
                 Text("ID")
                     .font(.headline)
-                TextField("", text: $item.id)
+                TextField("", text: $page.id)
                     .textFieldStyle(.roundedBorder)
                     .padding(.bottom)
 
@@ -25,7 +35,7 @@ struct PageDetailView: View {
                     Text("Draft")
                         .font(.headline)
                     Spacer()
-                    Toggle("", isOn: $item.isDraft)
+                    Toggle("", isOn: $page.isDraft)
                         .toggleStyle(.switch)
                 }
                 .padding(.bottom)
@@ -34,7 +44,7 @@ struct PageDetailView: View {
                     Text("Start")
                         .font(.headline)
                     Spacer()
-                    DatePicker("", selection: $item.startDate, displayedComponents: .date)
+                    DatePicker("", selection: $page.startDate, displayedComponents: .date)
                         .datePickerStyle(.compact)
                         .padding(.bottom)
                 }
@@ -43,30 +53,67 @@ struct PageDetailView: View {
                     Text("Has end date")
                         .font(.headline)
                     Spacer()
-                    Toggle("", isOn: $item.hasEndDate)
+                    Toggle("", isOn: $page.hasEndDate)
                         .toggleStyle(.switch)
                         .padding(.bottom)
                 }
 
-                if item.hasEndDate {
+                if page.hasEndDate {
                     HStack(alignment: .firstTextBaseline) {
                         Text("End date")
                             .font(.headline)
                         Spacer()
-                        DatePicker("", selection: $item.endDate, displayedComponents: .date)
+                        DatePicker("", selection: $page.endDate, displayedComponents: .date)
                             .datePickerStyle(.compact)
                             .padding(.bottom)
                     }
                 }
 
-                LocalizedPageDetailView(page: item.localized(in: language))
+                LocalizedPageDetailView(page: page.localized(in: language))
 
             }
             .padding()
         }
     }
+
+    private func generate() {
+        guard content.settings.outputDirectoryPath != "" else {
+            print("Invalid output path")
+            return
+        }
+        let url = URL(fileURLWithPath: content.settings.outputDirectoryPath)
+
+        guard FileManager.default.fileExists(atPath: url.path) else {
+            print("Missing output folder")
+            return
+        }
+        isGeneratingWebsite = true
+        print("Generating page")
+        DispatchQueue.global(qos: .userInitiated).async {
+            let generator = WebsiteGenerator(
+                content: content,
+                language: language)
+            if !generator.generate(page: page) {
+                print("Generation failed")
+            }
+            DispatchQueue.main.async {
+                isGeneratingWebsite = false
+                print("Done")
+            }
+        }
+    }
 }
 
+extension PageDetailView: MainContentView {
+
+    init(item: Page) {
+        self.page = item
+    }
+
+    static let itemDescription = "a page"
+}
+
+
 #Preview {
     PageDetailView(page: .empty)
 }

CHDataManagement/Views/Pages/PageListView.swift

@@ -8,108 +8,41 @@ struct PageListView: View {
     @EnvironmentObject
     private var content: Content
 
-    @State
-    private var selected: Page?
+    @Binding
+    private var selectedPage: Page?
 
     @State
-    private var showNewPageView = false
+    private var searchString = ""
 
-    @State
-    private var newPageId = ""
+    init(selectedPage: Binding<Page?>) {
+        self._selectedPage = selectedPage
+    }
 
-    @State
-    private var newPageIdIsValid = false
-
-    private let allowedCharactersInPageId = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-")).inverted
-
-    private var cleanPageId: String {
-        newPageId.trimmingCharacters(in: .whitespacesAndNewlines)
+    private var filteredPages: [Page] {
+        guard !searchString.isEmpty else {
+            return content.pages
+        }
+        return content.pages.filter { $0.localized(in: language).title.contains(searchString) }
     }
 
     var body: some View {
-        NavigationSplitView {
-            List(content.pages, selection: $selected) { page in
-                Text(page.localized(in: language).title)
-                    .tag(page)
-            }
-            .toolbar {
-                ToolbarItem(placement: .primaryAction) {
-                    Button(action: { showNewPageView = true }) {
-                        Label("New post", systemSymbol: .plus)
-                    }
-                }
-            }
-            .navigationSplitViewColumnWidth(min: 300, ideal: 300, max: 300)
-        } content: {
-            if let selected {
-                PageContentView(page: selected, language: language)
-                    .id(selected.id + language.rawValue)
-                    .layoutPriority(1)
-            } else {
-                // Fallback if no item is selected
-                Text("Select a page from the list")
-                    .font(.largeTitle)
-                    .foregroundColor(.secondary)
-            }
-        } detail: {
-            if let selected {
-                PageDetailView(page: selected)
-                    .frame(maxWidth: 350)
-            } else {
-                EmptyView()
-                    .frame(maxWidth: 350)
+        VStack {
+            TextField("", text: $searchString, prompt: Text("Search"))
+                .textFieldStyle(.roundedBorder)
+                .padding(.horizontal, 8)
+            List(filteredPages, selection: $selectedPage) { page in
+                Text(page.localized(in: language).title).tag(page)
             }
         }
         .onAppear {
-            if selected == nil {
-                selected = content.pages.first
+            if selectedPage == nil {
+                selectedPage = content.pages.first
             }
         }
-        .sheet(isPresented: $showNewPageView,
-               onDismiss: addNewPage) {
-            TextEntrySheet(
-                title: "Enter the id for the new page",
-                text: $newPageId,
-                isValid: $newPageIdIsValid)
-        }
-    }
-
-    private func isValid(id: String) -> Bool {
-        let id = cleanPageId
-        guard id != "" else {
-            return false
-        }
-
-        guard !content.pages.contains(where: { $0.id == id }) else {
-            return false
-        }
-        // Only allow alphanumeric characters and hyphens
-        return id.rangeOfCharacter(from: allowedCharactersInPageId) == nil
-    }
-
-    private func addNewPage() {
-        let id = cleanPageId
-        guard isValid(id: id) else {
-            return
-        }
-
-        let page = Page(
-            id: id,
-            isDraft: true,
-            createdDate: .now,
-            startDate: .now,
-            endDate: nil,
-            german: .init(urlString: "seite",
-                          title: "Ein Titel"),
-            english: .init(urlString: "page",
-                           title: "A Title"),
-            tags: [])
-        content.pages.insert(page, at: 0)
-        selected = page
     }
 }
 
 #Preview {
-    PageListView()
+    PageListView(selectedPage: .constant(nil))
         .environmentObject(Content.mock)
 }

CHDataManagement/Views/Posts/AddPostView.swift

@@ -0,0 +1,91 @@
+import SwiftUI
+
+struct AddPostView: View {
+
+    @Environment(\.dismiss)
+    private var dismiss: DismissAction
+
+    @Environment(\.language)
+    private var language: ContentLanguage
+
+    @EnvironmentObject
+    private var content: Content
+
+    @Binding
+    var selectedPost: Post?
+
+    @State
+    private var newPostId = ""
+
+    private let allowedCharactersInPostId = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-")).inverted
+
+    init(selected: Binding<Post?>) {
+        self._selectedPost = selected
+    }
+
+    private var idExists: Bool {
+        content.posts.contains { $0.id == newPostId }
+    }
+
+    private var containsInvalidCharacters: Bool {
+        newPostId.rangeOfCharacter(from: allowedCharactersInPostId) != nil
+    }
+
+    var body: some View {
+        VStack {
+            Text("New post")
+                .font(.headline)
+
+            TextField("", text: $newPostId)
+                .textFieldStyle(.roundedBorder)
+                .frame(maxWidth: 350)
+            if newPostId.isEmpty {
+                Text("Enter the id of the new post to create")
+                    .foregroundStyle(.secondary)
+            } else if idExists {
+                Text("A post with the same id already exists")
+                    .foregroundStyle(Color.red)
+            } else if containsInvalidCharacters {
+                Text("The id contains invalid characters")
+                    .foregroundStyle(Color.red)
+            } else {
+                Text("Create a new post with the id")
+                    .foregroundStyle(.secondary)
+            }
+            HStack {
+                Button(role: .cancel, action: dismissSheet) {
+                    Text("Cancel")
+                }
+                Button(action: addNewPost) {
+                    Text("Create")
+                }
+                .disabled(newPostId.isEmpty || containsInvalidCharacters || idExists)
+            }
+        }
+        .padding()
+    }
+
+    private func addNewPost() {
+        let post = Post(
+            id: newPostId,
+            isDraft: true,
+            createdDate: .now,
+            startDate: .now,
+            endDate: nil,
+            tags: [],
+            german: .init(title: "Titel", content: "Text"),
+            english: .init(title: "Title", content: "Text"))
+        content.posts.insert(post, at: 0)
+        selectedPost = post
+        dismissSheet()
+    }
+
+    private func dismissSheet() {
+        dismiss()
+    }
+}
+
+#Preview {
+    AddPostView(selected: .constant(nil))
+        .environmentObject(Content.mock)
+}

CHDataManagement/Views/Posts/ImagePickerView.swift

@@ -5,7 +5,7 @@ struct ImagePickerView: View {
     @Binding
     var showImagePicker: Bool
 
-    private let selected: (ImageResource) -> Void
+    private let selected: (FileResource) -> Void
 
     @EnvironmentObject
     private var content: Content
@@ -13,13 +13,13 @@ struct ImagePickerView: View {
     @Environment(\.language)
     private var language
 
-    init(showImagePicker: Binding<Bool>, selected: @escaping (ImageResource) -> Void) {
+    init(showImagePicker: Binding<Bool>, selected: @escaping (FileResource) -> Void) {
         self._showImagePicker = showImagePicker
         self.selected = selected
     }
 
     @State
-    private var selectedImage: ImageResource?
+    private var selectedImage: FileResource?
 
     var body: some View {
         VStack {

CHDataManagement/Views/Posts/LocalizedPostDetailView.swift

@@ -35,7 +35,7 @@ struct LocalizedPostDetailView: View {
                            size: 22,
                            color: .red) {
                     item.linkPreviewImage = nil
-                }
+                }.disabled(item.linkPreviewImage == nil)
                 Spacer()
             }
 

CHDataManagement/Views/Posts/PostContentView.swift

@@ -10,11 +10,24 @@ struct PostContentView: View {
     @Environment(\.language)
     private var language
 
+    init(post: Post) {
+        self.post = post
+    }
+
     var body: some View {
         LocalizedPostContentView(post: post)
     }
 }
 
+extension PostContentView: MainContentView {
+
+    init(item: Post) {
+        self.post = item
+    }
+
+    static let itemDescription = "a post"
+}
+
 private struct LocalizedTitle: View {
 
     @ObservedObject
@@ -44,9 +57,13 @@ private struct LocalizedContentEditor: View {
 
     var body: some View {
         TextEditor(text: $post.content)
-//        HighlightedTextEditor(
-//            text: $post.content,
-//            highlightRules: .markdown)
+            .font(.body)
+            .frame(minHeight: 150)
+            .textEditorStyle(.plain)
+            .padding(.vertical, 8)
+            .padding(.leading, 3)
+            .background(Color.gray.opacity(0.1))
+            .cornerRadius(8)
     }
 }
 
@@ -76,10 +93,7 @@ struct LocalizedPostContentView: View {
             LocalizedTitle(post: post.localized(in: language))
             FlowHStack {
                 ForEach(post.tags, id: \.id) { tag in
-                    TagView(tag: .init(
-                        en: tag.english.name,
-                        de: tag.german.name)
-                    )
+                    TagView(text: tag.localized(in: language).name)
                     .foregroundStyle(.white)
                 }
                 Button(action: { showTagPicker = true }) {

CHDataManagement/Views/Posts/PostDetailView.swift

@@ -95,6 +95,16 @@ struct PostDetailView: View {
     }
 }
 
+extension PostDetailView: MainContentView {
+
+    init(item: Post) {
+        self.item = item
+    }
+
+    static let itemDescription = "a post"
+}
+
+
 #Preview(traits: .fixedLayout(width: 270, height: 500)) {
     PostDetailView(post: .fullMock)
 }

CHDataManagement/Views/Posts/PostImageGalleryView.swift

@@ -1,147 +0,0 @@
-import SwiftUI
-import SFSafeSymbols
-
-struct NavigationIcon: View {
-
-    let symbol: SFSymbol
-
-    let edge: Edge.Set
-
-    var body: some View {
-        SwiftUI.Image(systemSymbol: symbol)
-            .resizable()
-            .aspectRatio(contentMode: .fit)
-            .padding(5)
-            .padding(edge, 2)
-            .fontWeight(.light)
-            .foregroundStyle(Color.white.opacity(0.8))
-            .frame(width: 30, height: 30)
-            .background(Color.black.opacity(0.7).clipShape(Circle()))
-    }
-}
-
-struct PostImageGalleryView: View {
-
-    @ObservedObject
-    var post: LocalizedPost
-
-    @State private var currentIndex = 0
-
-    @State
-    private var showImagePicker = false
-
-    private var imageAtCurrentIndex: Image? {
-        guard !post.images.isEmpty else {
-            return nil
-        }
-        guard currentIndex < post.images.count else {
-            return post.images.last?.imageToDisplay
-        }
-        return post.images[currentIndex].imageToDisplay
-    }
-
-    var body: some View {
-        ZStack(alignment: .center) {
-            ZStack(alignment: .bottomTrailing) {
-                ZStack(alignment: .bottom) {
-                    if let imageAtCurrentIndex {
-                        imageAtCurrentIndex
-                            .resizable()
-                            .scaledToFit()
-                    }
-                    if post.images.count > 1 {
-                        HStack(spacing: 8) {
-                            ForEach(0..<post.images.count, id: \.self) { index in
-                                Circle()
-                                    .fill(index == currentIndex ? Color.white : Color.gray)
-                                    .frame(width: 10, height: 10)
-                            }
-                        }
-                        .padding(.bottom, 10)
-                    }
-                }
-                HStack(spacing: 5) {
-                    Button(action: shiftBack) {
-                        NavigationIcon(symbol: .arrowTurnUpLeft, edge: .trailing)
-                    }
-                    Button(action: shiftForward) {
-                        NavigationIcon(symbol: .arrowTurnUpRight, edge: .leading)
-                    }
-                    Spacer()
-                    Button(action: { showImagePicker = true }) {
-                        NavigationIcon(symbol: .plus, edge: .all)
-                    }
-                    Button(action: removeImage) {
-                        NavigationIcon(symbol: .trash, edge: .all)
-                    }
-                }.padding()
-            }
-            .buttonStyle(.plain)
-            .foregroundStyle(.blue)
-            if post.images.count > 1 {
-                HStack {
-                    Button(action: previous) {
-                        NavigationIcon(symbol: .chevronLeft, edge: .trailing)
-                    }
-                    .buttonStyle(.plain)
-                    .padding()
-
-                    Spacer()
-                    Button(action: next) {
-                        NavigationIcon(symbol: .chevronRight, edge: .leading)
-                    }
-                    .buttonStyle(.plain)
-                    .padding()
-                }
-            }
-        }
-        .sheet(isPresented: $showImagePicker) {
-            ImagePickerView(showImagePicker: $showImagePicker) { image in
-                post.images.append(image)
-            }
-        }
-    }
-
-    private func previous() {
-        if currentIndex > 0 {
-            currentIndex -= 1
-        } else {
-            currentIndex = post.images.count - 1
-        }
-    }
-
-    private func next() {
-        if currentIndex < post.images.count - 1 {
-            currentIndex += 1
-        } else {
-            currentIndex = 0
-        }
-    }
-
-    private func shiftBack() {
-        guard currentIndex > 0 else {
-            return
-        }
-        post.images.swapAt(currentIndex, currentIndex-1)
-        currentIndex -= 1
-    }
-
-    private func shiftForward() {
-        guard currentIndex < post.images.count - 1 else {
-            return
-        }
-        post.images.swapAt(currentIndex, currentIndex+1)
-        currentIndex += 1
-    }
-
-    private func removeImage() {
-        post.images.remove(at: currentIndex)
-        if currentIndex >= post.images.count {
-            currentIndex = post.images.count - 1
-        }
-    }
-}
-
-#Preview(traits: .fixedLayout(width: 300, height: 250)) {
-    PostImageGalleryView(post: .german)
-}

CHDataManagement/Views/Posts/PostImagesView.swift

@@ -57,7 +57,7 @@ struct PostImagesView: View {
         }
     }
 
-    private func shiftLeft(_ image: ImageResource) {
+    private func shiftLeft(_ image: FileResource) {
         guard let index = post.images.firstIndex(of: image) else {
             return
         }
@@ -67,7 +67,7 @@ struct PostImagesView: View {
         post.images.swapAt(index, index - 1)
     }
 
-    private func shiftRight(_ image: ImageResource) {
+    private func shiftRight(_ image: FileResource) {
         guard let index = post.images.firstIndex(of: image) else {
             return
         }
@@ -77,7 +77,7 @@ struct PostImagesView: View {
         post.images.swapAt(index, index + 1)
     }
 
-    private func remove(_ image: ImageResource) {
+    private func remove(_ image: FileResource) {
         guard let index = post.images.firstIndex(of: image) else {
             return
         }

CHDataManagement/Views/Posts/PostList.swift

@@ -1,118 +0,0 @@
-import SwiftUI
-
-struct PostList: View {
-
-    @EnvironmentObject
-    private var content: Content
-
-    @Environment(\.language)
-    private var language: ContentLanguage
-
-    @State
-    private var selected: Post? = nil
-
-    @State
-    private var showNewPostView = false
-
-    @State
-    private var newPostId = ""
-
-    @State
-    private var newPostIdIsValid = false
-
-    private let allowedCharactersInPostId = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-")).inverted
-
-    private var cleanPostId: String {
-        newPostId.trimmingCharacters(in: .whitespacesAndNewlines)
-    }
-
-    var body: some View {
-        NavigationSplitView {
-            List(content.posts, selection: $selected) { post in
-                Text(post.localized(in: language).title)
-                    .tag(post)
-            }
-            .toolbar {
-                ToolbarItem(placement: .primaryAction) {
-                    Button(action: { showNewPostView = true }) {
-                        Label("New post", systemSymbol: .plus)
-                    }
-                }
-            }
-            .navigationSplitViewColumnWidth(min: 250, ideal: 250, max: 250)
-        } content: {
-            if let selected {
-                PostContentView(post: selected)
-                    .layoutPriority(1)
-            } else {
-                HStack {
-                    Spacer()
-                    Text("Select a post to show the content")
-                        .font(.largeTitle)
-                        .foregroundColor(.secondary)
-                    Spacer()
-                }.layoutPriority(1)
-            }
-        } detail: {
-            if let selected {
-                PostDetailView(post: selected)
-                    .frame(minWidth: 280)
-            } else {
-                Text("No post selected")
-                    .frame(minWidth: 280)
-            }
-        }
-        .sheet(isPresented: $showNewPostView,
-               onDismiss: addNewPost) {
-            TextEntrySheet(
-                title: "Enter the id for the new post",
-                text: $newPostId,
-                isValid: $newPostIdIsValid)
-        }
-        .onChange(of: newPostId) { _, newValue in
-            newPostIdIsValid = isValid(id: newValue)
-        }
-        .onAppear {
-            if selected == nil {
-                selected = content.posts.first
-            }
-        }
-    }
-
-    private func isValid(id: String) -> Bool {
-        let id = cleanPostId
-        guard id != "" else {
-            return false
-        }
-
-        guard !content.posts.contains(where: { $0.id == id }) else {
-            return false
-        }
-        // Only allow alphanumeric characters and hyphens
-        return id.rangeOfCharacter(from: allowedCharactersInPostId) == nil
-    }
-
-    private func addNewPost() {
-        let id = cleanPostId
-        guard isValid(id: id) else {
-            return
-        }
-
-        let post = Post(
-            id: id,
-            isDraft: true,
-            createdDate: .now,
-            startDate: .now,
-            endDate: nil,
-            tags: [],
-            german: .init(title: "Titel", content: "Text"),
-            english: .init(title: "Title", content: "Text"))
-        content.posts.insert(post, at: 0)
-        selected = post
-    }
-}
-
-#Preview {
-    PostList()
-        .environmentObject(Content())
-}

CHDataManagement/Views/Posts/PostListView.swift

@@ -0,0 +1,42 @@
+import SwiftUI
+
+struct PostListView: View {
+
+    @Environment(\.language)
+    private var language
+
+    @EnvironmentObject
+    private var content: Content
+
+    @Binding
+    private var selectedPost: Post?
+
+    @State
+    private var searchString = ""
+
+    init(selectedPost: Binding<Post?>) {
+        self._selectedPost = selectedPost
+    }
+
+    private var filteredPosts: [Post] {
+        guard !searchString.isEmpty else {
+            return content.posts
+        }
+        return content.posts.filter { $0.localized(in: language).title.contains(searchString) }
+    }
+
+    var body: some View {
+        VStack {
+            TextField("", text: $searchString, prompt: Text("Search"))
+                .textFieldStyle(.roundedBorder)
+                .padding(.horizontal, 8)
+            List(filteredPosts, selection: $selectedPost) { post in
+                Text(post.localized(in: language).title).tag(post)
+            }
+        }.onAppear {
+            if selectedPost == nil {
+                selectedPost = content.posts.first
+            }
+        }
+    }
+}

CHDataManagement/Views/Posts/PostView.swift

@@ -1,127 +0,0 @@
-import SwiftUI
-import SFSafeSymbols
-
-struct PostView: View {
-
-    @ObservedObject
-    var post: Post
-
-    @Environment(\.language)
-    private var language
-
-    var body: some View {
-        LocalizedPostView(post: post, localized: post.localized(in: language))
-    }
-}
-
-
-struct LocalizedPostView: View {
-
-    @ObservedObject
-    var post: Post
-
-    @ObservedObject
-    var localized: LocalizedPost
-
-    @State
-    private var showDatePicker = false
-
-    @State
-    private var showImagePicker = false
-
-    @State
-    private var showTagPicker = false
-
-    @Environment(\.language)
-    private var language
-
-    @EnvironmentObject
-    private var content: Content
-
-    var body: some View {
-        VStack(alignment: .center) {
-            if localized.images.isEmpty {
-                Button(action: { showImagePicker = true }) {
-                    Text("Add image")
-                }
-                .buttonStyle(.plain)
-                .foregroundStyle(.blue)
-                .padding(.top)
-            } else {
-                PostImageGalleryView(post: localized)
-                    .aspectRatio(1.33, contentMode: .fill)
-            }
-            VStack(alignment: .leading) {
-                Text(post.dateText(in: language))
-                    .font(.system(size: 19, weight: .semibold))
-                    .foregroundStyle(.secondary)
-                TextField("", text: $localized.title)
-                    .font(.system(size: 24, weight: .bold))
-                    .foregroundStyle(Color.primary)
-                    .textFieldStyle(.plain)
-                    .lineLimit(2)
-                FlowHStack {
-                    ForEach(post.tags, id: \.id) { tag in
-                        TagView(tag: .init(
-                            en: tag.english.name,
-                            de: tag.german.name)
-                        )
-                        .foregroundStyle(.white)
-                    }
-                    Button(action: { showTagPicker = true }) {
-                        Image(systemSymbol: .squareAndPencilCircleFill)
-                            .resizable()
-                            .aspectRatio(1, contentMode: .fit)
-                            .frame(height: 22)
-                            .foregroundColor(Color.blue)
-                            .background(Circle()
-                                .fill(Color.white)
-                                .padding(1))
-                    }
-                    .buttonStyle(.plain)
-                }
-                TextEditor(text: $localized.content)
-                    .font(.body)
-                    .foregroundStyle(.secondary)
-                    .textEditorStyle(.plain)
-                    .padding(.leading, -5)
-                    .scrollDisabled(true)
-            }
-            .padding()
-        }
-        .background(Color(NSColor.windowBackgroundColor))
-        .cornerRadius(8)
-        .sheet(isPresented: $showDatePicker) {
-            DatePickerView(
-                post: post,
-                showDatePicker: $showDatePicker)
-        }
-        .sheet(isPresented: $showImagePicker) {
-            ImagePickerView(showImagePicker: $showImagePicker) { image in
-                localized.images.append(image)
-            }
-        }
-        .sheet(isPresented: $showTagPicker) {
-            TagSelectionView(
-                presented: $showTagPicker,
-                selected: $post.tags,
-                tags: $content.tags)
-        }
-    }
-
-    private func remove(tag: Tag) {
-        post.tags = post.tags.filter {$0.id != tag.id }
-    }
-}
-
-#Preview(traits: .fixedLayout(width: 450, height: 600)) {
-    List {
-        PostView(post: .fullMock)
-            .listRowSeparator(.hidden)
-            .environment(\.language, ContentLanguage.german)
-        PostView(post: .mock)
-            .listRowSeparator(.hidden)
-    }
-    .environmentObject(Content.mock)
-    //.listStyle(.plain)
-}

CHDataManagement/Views/Posts/TagView.swift

@@ -4,22 +4,15 @@ import SFSafeSymbols
 
 struct TagView: View {
 
-    @Environment(\.language)
-    var language: ContentLanguage
+    let text: String
 
-    let tag: LocalizedText
-
-    init(tag: LocalizedText) {
-        self.tag = tag
-    }
-
-    static var add: TagView {
-        .init(tag: LocalizedText(en: "Add", de: "Mehr"))
+    init(text: String) {
+        self.text = text
     }
 
     var body: some View {
         HStack {
-            Text(tag.getText(for: language))
+            Text(text)
                 .font(.subheadline)
                 .padding(.leading, 2)
         }
@@ -33,10 +26,7 @@ struct TagView: View {
 
 #Preview {
     HStack {
-        TagView(tag: LocalizedText(en: "Some", de: "Etwas"))
-            .environment(\.language, ContentLanguage.german)
-        TagView(tag: LocalizedText(en: "Some", de: "Etwas"))
-            .environment(\.language, ContentLanguage.english)
-        TagView.add
+        TagView(text: "Some")
+        TagView(text: "Etwas")
     }.background(Color.secondary)
 }

CHDataManagement/Views/Settings/NavigationBarSettingsView.swift

@@ -53,10 +53,7 @@ struct NavigationBarSettingsView: View {
                     .font(.headline)
                 FlowHStack {
                     ForEach(content.settings.navigationBar.tags, id: \.id) { tag in
-                        TagView(tag: .init(
-                            en: tag.english.name,
-                            de: tag.german.name)
-                        )
+                        TagView(text: tag.localized(in: language).name)
                         .foregroundStyle(.white)
                     }
                     Button(action: { showTagPicker = true }) {

CHDataManagement/Views/Settings/SectionedSettingsView.swift

@@ -10,13 +10,13 @@ struct SectionedSettingsView: View {
             SettingsSidebar(selectedSection: $selectedSection)
                 .frame(minWidth: 200, idealWidth: 200, maxWidth: 200)
         } detail: {
-            DetailView(section: selectedSection)
+            GenerationDetailView(section: selectedSection)
         }
     }
 }
 
 
-struct DetailView: View {
+struct GenerationDetailView: View {
 
     let section: SettingsSection?
 
@@ -40,7 +40,7 @@ struct DetailView: View {
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
         .padding()
-        .navigationTitle(section?.rawValue ?? "")
+        .navigationTitle("")
     }
 }
 

CHDataManagement/Views/Tags/AddTagView.swift

@@ -0,0 +1,34 @@
+import SwiftUI
+
+struct AddTagView: View {
+
+    @Environment(\.language)
+    private var language
+
+    @EnvironmentObject
+    private var content: Content
+
+    @Environment(\.dismiss)
+    private var dismiss
+
+    @Binding
+    var selectedTag: Tag?
+
+    init(selected: Binding<Tag?>) {
+        self._selectedTag = selected
+    }
+
+    var body: some View {
+        Text("Creating tag...")
+            .onAppear(perform: addNewTag)
+    }
+
+    private func addNewTag() {
+        let newTag = Tag(isVisible: true,
+                         german: .init(urlComponent: "tag", name: "Neuer Tag"),
+                         english: .init(urlComponent: "tag-en", name: "New Tag"))
+        // Add to top of the list, and resort when changing the name
+        content.tags.insert(newTag, at: 0)
+        dismiss()
+    }
+}

CHDataManagement/Views/Tags/LocalizedTagDetailView.swift

@@ -0,0 +1,75 @@
+import SwiftUI
+
+struct LocalizedTagDetailView: View {
+
+    @Binding
+    var tagIsVisible: Bool
+
+    @ObservedObject
+    var tag: LocalizedTag
+
+    @EnvironmentObject
+    private var content: Content
+
+    @State
+    private var showImagePicker = false
+
+    var body: some View {
+        ScrollView {
+            VStack(alignment: .leading) {
+                Toggle("Appears in overviews", isOn: $tagIsVisible)
+                    .toggleStyle(.switch)
+                    .font(.callout)
+                    .foregroundStyle(.secondary)
+
+                Text("Name")
+                    .font(.callout)
+                    .foregroundStyle(.secondary)
+                TextField("", text: $tag.name)
+
+                Text("URL String")
+                    .font(.callout)
+                    .foregroundStyle(.secondary)
+                TextField("", text: $tag.urlComponent)
+
+                Text("Original url")
+                    .font(.callout)
+                    .foregroundStyle(.secondary)
+                Text(tag.originalUrl ?? "-")
+                    .padding(.top, 1)
+                    .padding(.bottom)
+
+                Text("Subtitle")
+                    .font(.callout)
+                    .foregroundStyle(.secondary)
+                OptionalTextField("", text: $tag.subtitle)
+
+                Text("Description")
+                    .font(.callout)
+                    .foregroundStyle(.secondary)
+                OptionalTextField("", text: $tag.description)
+
+                Text("Thumbnail")
+                    .font(.callout)
+                    .foregroundStyle(.secondary)
+                Button(action: { showImagePicker = true }) {
+                    Text(tag.thumbnail?.id ?? "Select")
+                }
+                .buttonStyle(.plain)
+                .foregroundStyle(.blue)
+            }
+            .padding()
+        }
+        .sheet(isPresented: $showImagePicker) {
+            ImagePickerView(showImagePicker: $showImagePicker) { image in
+                tag.thumbnail = image
+            }
+        }
+    }
+}
+
+#Preview {
+    LocalizedTagDetailView(
+        tagIsVisible: .constant(true),
+        tag: Tag.mock.english)
+}

CHDataManagement/Views/Tags/TagContentView.swift

@@ -57,6 +57,15 @@ struct TagContentView: View {
     }
 }
 
+extension TagContentView: MainContentView {
+
+    init(item: Tag) {
+        self.tag = item
+    }
+
+    static let itemDescription = "a tag"
+}
+
 #Preview {
     TagContentView(tag: .hiking)
         .environmentObject(Content.mock)

CHDataManagement/Views/Tags/TagDetailView.swift

@@ -1,75 +1,26 @@
 import SwiftUI
 
+
 struct TagDetailView: View {
 
-    @Binding
-    var tagIsVisible: Bool
+    @Environment(\.language)
+    private var language
 
     @ObservedObject
-    var tag: LocalizedTag
-
-    @EnvironmentObject
-    private var content: Content
-
-    @State
-    private var showImagePicker = false
+    var tag: Tag
 
     var body: some View {
-        ScrollView {
-            VStack(alignment: .leading) {
-                Toggle("Appears in overviews", isOn: $tagIsVisible)
-                    .toggleStyle(.switch)
-                    .font(.callout)
-                    .foregroundStyle(.secondary)
-
-                Text("Name")
-                    .font(.callout)
-                    .foregroundStyle(.secondary)
-                TextField("", text: $tag.name)
-
-                Text("URL String")
-                    .font(.callout)
-                    .foregroundStyle(.secondary)
-                TextField("", text: $tag.urlComponent)
-
-                Text("Original url")
-                    .font(.callout)
-                    .foregroundStyle(.secondary)
-                Text(tag.originalUrl ?? "-")
-                    .padding(.top, 1)
-                    .padding(.bottom)
-
-                Text("Subtitle")
-                    .font(.callout)
-                    .foregroundStyle(.secondary)
-                OptionalTextField("", text: $tag.subtitle)
-
-                Text("Description")
-                    .font(.callout)
-                    .foregroundStyle(.secondary)
-                OptionalTextField("", text: $tag.description)
-
-                Text("Thumbnail")
-                    .font(.callout)
-                    .foregroundStyle(.secondary)
-                Button(action: { showImagePicker = true }) {
-                    Text(tag.thumbnail?.id ?? "Select")
-                }
-                .buttonStyle(.plain)
-                .foregroundStyle(.blue)
-            }
-            .padding()
-        }
-        .sheet(isPresented: $showImagePicker) {
-            ImagePickerView(showImagePicker: $showImagePicker) { image in
-                tag.thumbnail = image
-            }
-        }
+        LocalizedTagDetailView(
+            tagIsVisible: $tag.isVisible,
+            tag: tag.localized(in: language))
     }
 }
 
-#Preview {
-    TagDetailView(
-        tagIsVisible: .constant(true),
-        tag: Tag.mock.english)
+extension TagDetailView: MainContentView {
+
+    init(item: Tag) {
+        self.tag = item
+    }
+
+    static let itemDescription = "a tag"
 }

CHDataManagement/Views/Tags/TagListView.swift

@@ -0,0 +1,42 @@
+import SwiftUI
+
+struct TagListView: View {
+
+    @Environment(\.language)
+    private var language
+
+    @EnvironmentObject
+    private var content: Content
+
+    @Binding
+    var selectedTag: Tag?
+
+    @State
+    private var searchString = ""
+
+    init(selectedTag: Binding<Tag?>) {
+        _selectedTag = selectedTag
+    }
+
+    private var filteredTags: [Tag] {
+        guard !searchString.isEmpty else {
+            return content.tags
+        }
+        return content.tags.filter { $0.localized(in: language).name.contains(searchString) }
+    }
+
+    var body: some View {
+        VStack {
+            TextField("", text: $searchString, prompt: Text("Search"))
+                .textFieldStyle(.roundedBorder)
+                .padding(.horizontal, 8)
+            List(filteredTags, selection: $selectedTag) { tag in
+                Text(tag.localized(in: language).name).tag(tag)
+            }
+        }.onAppear {
+            if selectedTag == nil {
+                selectedTag = content.tags.first
+            }
+        }
+    }
+}

CHDataManagement/Views/Tags/TagsListView.swift

@@ -1,78 +0,0 @@
-import SwiftUI
-
-private struct SelectedTagView: View {
-
-    @Environment(\.language)
-    private var language
-
-    @ObservedObject
-    var tag: Tag
-
-    var body: some View {
-        TagDetailView(
-            tagIsVisible: $tag.isVisible,
-            tag: tag.localized(in: language))
-    }
-}
-
-struct TagsListView: View {
-
-    @Environment(\.language)
-    var language
-
-    @EnvironmentObject
-    var content: Content
-
-    @State
-    var selectedTag: Tag?
-
-    var body: some View {
-        NavigationSplitView {
-            List(content.tags.sorted(), selection: $selectedTag) { tag in
-                Text(tag.localized(in: language).name)
-                    .tag(tag)
-            }
-        } content: {
-            if let selectedTag {
-                TagContentView(tag: selectedTag)
-                    .layoutPriority(1)
-            } else {
-                Text("Select a tag to show the details")
-                    .font(.largeTitle)
-                    .foregroundColor(.secondary)
-            }
-        } detail: {
-            if let selectedTag {
-                SelectedTagView(tag: selectedTag)
-                    .frame(maxWidth: 350)
-            } else {
-                EmptyView()
-            }
-        }
-        .onAppear {
-            if selectedTag == nil {
-                selectedTag = content.tags.first
-            }
-        }
-        .toolbar {
-            ToolbarItem(placement: .primaryAction) {
-                Button(action: addNewTag) {
-                    Label("New tag", systemSymbol: .plus)
-                }
-            }
-        }
-    }
-
-    private func addNewTag() {
-        let newTag = Tag(isVisible: true,
-                         german: .init(urlComponent: "tag", name: "Neuer Tag"),
-                         english: .init(urlComponent: "tag-en", name: "New Tag"))
-        // Add to top of the list, and resort when changing the name
-        content.tags.insert(newTag, at: 0)
-    }
-}
-
-#Preview {
-    PageListView()
-        .environmentObject(Content())
-}