Skip to content

Commit

Permalink
browsing -> OfflineBrowsing
Browse files Browse the repository at this point in the history
  • Loading branch information
RobDavenport committed Mar 26, 2024
1 parent 2194e03 commit 3135126
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions gamercade_app/src/local_directory/game.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -35,19 +35,19 @@ 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),
UNIQUE(game_id, release_name)
) 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)
Expand Down
2 changes: 1 addition & 1 deletion gamercade_app/src/local_directory/permission_level.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ impl DictionaryTrait<PermissionLevelId, PermissionLevelName>
}

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 {
Expand Down
2 changes: 1 addition & 1 deletion gamercade_app/src/local_directory/tag.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ impl DictionaryTrait<TagId, Tag> for Dictionary<TagId, Tag> {
}

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 {
Expand Down
2 changes: 1 addition & 1 deletion gamercade_app/src/local_directory/user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ impl DictionaryTrait<UserId, User> for Dictionary<UserId, User> {
}

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 {
Expand Down
2 changes: 1 addition & 1 deletion gamercade_app/src/view/login.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ impl LoginView {
}

if ui.button("Continue offline").clicked() {
return Some(ActiveView::browsing());
return Some(ActiveView::offline_browsing());
}

None
Expand Down
12 changes: 6 additions & 6 deletions gamercade_app/src/view/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ActiveView> {
ui.label("Browsing");
ui.label("Offline Browsing");

//TODO: Draw the browsing games list
directory.iter_games().for_each(|_game| {});
Expand Down

0 comments on commit 3135126

Please sign in to comment.