diff --git a/gamercade_app/src/local_directory/game.rs b/gamercade_app/src/local_directory/game.rs index cf0ab4c7..dd4d8227 100644 --- a/gamercade_app/src/local_directory/game.rs +++ b/gamercade_app/src/local_directory/game.rs @@ -26,7 +26,7 @@ pub struct GameImage { const UPSERT_GAMES_QUERIES: &str = " BEGIN; CREATE TABLE IF NOT EXISTS games ( - id INT PRIMARY KEY, + id INTEGER PRIMARY KEY, title TEXT NOT NULL, short_description TEXT NOT NULL, long_description TEXT NOT NULL, @@ -35,9 +35,9 @@ CREATE TABLE IF NOT EXISTS games ( ) STRICT; CREATE TABLE IF NOT EXISTS releases( - id INT PRIMARY KEY, + id INTEGER PRIMARY KEY, file_checksum BLOB, - game_id INT NOT NULL, + game_id INTEGER NOT NULL, release_name TEXT NOT NULL, FOREIGN KEY (game_id) REFERENCES games (id), UNIQUE(game_id, file_checksum), @@ -45,9 +45,9 @@ CREATE TABLE IF NOT EXISTS releases( ) STRICT; CREATE TABLE IF NOT EXISTS game_tags( - id INT PRIMARY KEY, - game_id INT NOT NULL, - tag_id INT NOT NULL, + id INTEGER PRIMARY KEY, + game_id INTEGER NOT NULL, + tag_id INTEGER NOT NULL, FOREIGN KEY (game_id) REFERENCES games (id), FOREIGN KEY (tag_id) REFERENCES tags (pid), UNIQUE(game_id, tag_id) diff --git a/gamercade_app/src/local_directory/permission_level.rs b/gamercade_app/src/local_directory/permission_level.rs index 291cd204..b8867b1c 100644 --- a/gamercade_app/src/local_directory/permission_level.rs +++ b/gamercade_app/src/local_directory/permission_level.rs @@ -28,7 +28,7 @@ impl DictionaryTrait } fn upsert_table_query() -> &'static str { - "CREATE TABLE IF NOT EXISTS permission_levels(id INT PRIMARY KEY, level_name STRING NOT NULL) STRICT;" + "CREATE TABLE IF NOT EXISTS permission_levels(id INTEGER PRIMARY KEY, level_name TEXT NOT NULL) STRICT;" } fn drop_table_query() -> &'static str { diff --git a/gamercade_app/src/local_directory/tag.rs b/gamercade_app/src/local_directory/tag.rs index 032967ea..cd63c680 100644 --- a/gamercade_app/src/local_directory/tag.rs +++ b/gamercade_app/src/local_directory/tag.rs @@ -26,7 +26,7 @@ impl DictionaryTrait for Dictionary { } fn upsert_table_query() -> &'static str { - "CREATE TABLE IF NOT EXISTS tags(id INT PRIMARY KEY, tag_name STRING NOT NULL) STRICT;" + "CREATE TABLE IF NOT EXISTS tags(id INTEGER PRIMARY KEY, tag_name TEXT NOT NULL) STRICT;" } fn drop_table_query() -> &'static str { diff --git a/gamercade_app/src/local_directory/user.rs b/gamercade_app/src/local_directory/user.rs index 4d1fba51..d13a5b72 100644 --- a/gamercade_app/src/local_directory/user.rs +++ b/gamercade_app/src/local_directory/user.rs @@ -34,7 +34,7 @@ impl DictionaryTrait for Dictionary { } fn upsert_table_query() -> &'static str { - "CREATE TABLE IF NOT EXISTS users(id INT PRIMARY KEY, username STRING NOT NULL, avatar_last_updated INT) STRICT;" + "CREATE TABLE IF NOT EXISTS users(id INTEGER PRIMARY KEY, username TEXT NOT NULL, avatar_last_updated INTEGER) STRICT;" } fn drop_table_query() -> &'static str { diff --git a/gamercade_app/src/view/login.rs b/gamercade_app/src/view/login.rs index f234ccf6..86660bbc 100644 --- a/gamercade_app/src/view/login.rs +++ b/gamercade_app/src/view/login.rs @@ -53,7 +53,7 @@ impl LoginView { } if ui.button("Continue offline").clicked() { - return Some(ActiveView::browsing()); + return Some(ActiveView::offline_browsing()); } None diff --git a/gamercade_app/src/view/mod.rs b/gamercade_app/src/view/mod.rs index f5757275..6b145903 100644 --- a/gamercade_app/src/view/mod.rs +++ b/gamercade_app/src/view/mod.rs @@ -2,16 +2,16 @@ use eframe::egui::Ui; use crate::{auth::AuthClient, local_directory::LocalDirectory}; -use self::{browsing::BrowsingView, login::LoginView, sign_up::SignUpView}; +use self::{login::LoginView, offline_browsing::OfflineBrowsingView, sign_up::SignUpView}; -mod browsing; mod login; +mod offline_browsing; mod sign_up; pub enum ActiveView { Login(LoginView), SignUp(SignUpView), - Browsing(BrowsingView), + OfflineBrowsing(OfflineBrowsingView), } impl Default for ActiveView { @@ -29,15 +29,15 @@ impl ActiveView { Self::SignUp(SignUpView::default()) } - fn browsing() -> Self { - Self::Browsing(BrowsingView::default()) + fn offline_browsing() -> Self { + Self::OfflineBrowsing(OfflineBrowsingView::default()) } pub fn draw(&mut self, ui: &mut Ui, auth_client: &mut AuthClient, directory: &LocalDirectory) { if let Some(next) = match self { ActiveView::Login(view) => view.draw(ui, auth_client), ActiveView::SignUp(view) => view.draw(ui, auth_client), - ActiveView::Browsing(view) => view.draw(ui, directory), + ActiveView::OfflineBrowsing(view) => view.draw(ui, directory), } { *self = next; } diff --git a/gamercade_app/src/view/browsing.rs b/gamercade_app/src/view/offline_browsing.rs similarity index 83% rename from gamercade_app/src/view/browsing.rs rename to gamercade_app/src/view/offline_browsing.rs index ebf4c2af..f80194c0 100644 --- a/gamercade_app/src/view/browsing.rs +++ b/gamercade_app/src/view/offline_browsing.rs @@ -5,11 +5,11 @@ use crate::local_directory::LocalDirectory; use super::ActiveView; #[derive(Default)] -pub struct BrowsingView {} +pub struct OfflineBrowsingView {} -impl BrowsingView { +impl OfflineBrowsingView { pub fn draw(&mut self, ui: &mut Ui, directory: &LocalDirectory) -> Option { - ui.label("Browsing"); + ui.label("Offline Browsing"); //TODO: Draw the browsing games list directory.iter_games().for_each(|_game| {});