style: NEUTRAL instead of ZINC (again)

LICENSE.md

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2025 Atiran
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,4 +1,14 @@
 # txtris
----
 
 This is the repository for the official server and client for txtris, a stacking game.
+
+The project is split into three distinct Cargo projects:
+- `server` - as you'd expect
+- `client` - also as you'd expect
+- `txcore` - contains shared code between the server and client
+
+## License
+Everything contained within this repository is covered by the [Apache License 2.0](./LICENSE.md).
+
+## Acknowledgements
+- [Ratatui](https://ratatui.rs) for everything related to UI

client/src/game.rs

@@ -1,96 +1,51 @@
-use color_eyre::Result;
 use ratatui::{
-    DefaultTerminal,
     buffer::Buffer,
-    crossterm::event::{self, Event, KeyEvent, KeyEventKind},
+    layout::{Constraint, Layout, Rect},
-    layout::{Constraint, Flex, Layout, Rect},
+    style::{Modifier, Style, palette::tailwind::NEUTRAL},
-    widgets::Widget,
+    symbols,
+    text::Line,
+    widgets::{Block, Borders, Widget},
 };
 
-use crate::menu;
+use crate::tui;
 
-#[derive(Clone)]
+const GAMEMODE_STYLE: Style = Style::new().bg(NEUTRAL.c700).add_modifier(Modifier::BOLD);
-pub enum Mode {
+const TITLE_STYLE: Style = Style::new()
-    Exit,
+    .fg(NEUTRAL.c800)
-    MainMenu(menu::OptionList),
+    .bg(NEUTRAL.c100)
-    FortyL,
+    .add_modifier(Modifier::BOLD);
-    Blitz,
+
-    TxLadder,
+pub fn render(mode: &mut tui::Mode, area: Rect, buf: &mut Buffer) {
-    Config,
+    let gamemode = format!(" {} ", match mode {
-}
+        tui::Mode::Blitz => "Blitz",
-
+        tui::Mode::FortyL => "40L",
-impl Default for Mode {
+        tui::Mode::TxLadder => "txLadder",
-    fn default() -> Self {
+        _ => "",
-        Mode::MainMenu(menu::OptionList::from_iter(["40L", "Blitz", "txLadder", "Config"]))
+    });
-    }
+
-}
+    let [mut hold_area, grid_area, mut next_area] =
-
+        Layout::horizontal(Constraint::from_percentages([25, 50, 25])).areas(area);
-impl Mode {
+
-    pub fn run(mut self, mut terminal: DefaultTerminal) -> Result<()> {
+    hold_area.height = 5;
-        loop {
+    next_area.height = 16;
-            match self {
+
-                Mode::Exit => {
+    Block::new()
-                    break
+        .title(Line::styled(" HOLD ", TITLE_STYLE).centered())
-                }
+        .borders(Borders::TOP | Borders::LEFT | Borders::BOTTOM)
-                _ => {
+        .render(hold_area, buf);
-                    terminal.draw(|frame| frame.render_widget(&mut self, frame.area()))?;
+
-                    if let Event::Key(key) = event::read()? {
+    Block::new()
-                        self = self.handle_key(key);
+        .title(Line::styled(gamemode, GAMEMODE_STYLE).centered())
-                    };
+        .border_set(symbols::border::Set {
-                }
+            top_left: symbols::line::NORMAL.horizontal_down,
-            }
+            top_right: symbols::line::NORMAL.horizontal_down,
-        }
+            ..symbols::border::PLAIN
-        Ok(())
+        })
-    }
+        .borders(Borders::ALL)
-
+        .render(grid_area, buf);
-    fn handle_key(self, key: KeyEvent) -> Mode {
+
-        if key.kind != KeyEventKind::Press {
+    Block::new()
-            return self 
+        .title(Line::styled(" NEXT ", TITLE_STYLE).centered())
-        }
+        .borders(Borders::TOP | Borders::RIGHT | Borders::BOTTOM)
-
+        .render(next_area, buf);
-        match self {
-            Mode::MainMenu(menu_list) => menu_list.handle_key(key),
-            _ => Mode::Exit,
-        }
-    }
-}
-
-fn center(area: Rect, horizontal: Constraint, vertical: Constraint) -> Rect {
-    let [area] = Layout::horizontal([horizontal])
-        .flex(Flex::Center)
-        .areas(area);
-    let [area] = Layout::vertical([vertical]).flex(Flex::Center).areas(area);
-    area
-}
-
-impl Widget for &mut Mode {
-    fn render(self, area: Rect, buf: &mut Buffer) {
-        let [header_area, main_area, footer_area] = Layout::vertical([
-            Constraint::Length(1),
-            Constraint::Fill(1),
-            Constraint::Length(2),
-        ])
-        .areas(area);
-
-        let center_area = center(
-            main_area,
-            Constraint::Length(50),
-            Constraint::Percentage(60),
-        );
-
-        let [profile_area, list_outer_area] =
-            Layout::vertical([Constraint::Percentage(50), Constraint::Percentage(50)])
-                .areas(center_area);
-
-        menu::render_header(header_area, buf);
-
-        match self {
-            Mode::MainMenu(menu_list) => {
-                menu::render_profile(profile_area, buf);
-                menu_list.render(list_outer_area, buf);
-            }
-            _ => {},
-        }
-        menu::render_footer(footer_area, buf);
-    }
 }

client/src/main.rs

@@ -1,12 +1,17 @@
+#![warn(clippy::pedantic)]
+#![allow(clippy::wildcard_imports)]
+
 use color_eyre::Result;
 
 mod game;
 mod menu;
+mod tui;
+mod util;
 
 fn main() -> Result<()> {
     color_eyre::install()?;
     let terminal = ratatui::init();
-    let app_result = game::Mode::default().run(terminal);
+    let app_result = tui::Mode::default().run(terminal);
     ratatui::restore();
     app_result
 }

client/src/menu.rs

@@ -2,17 +2,19 @@
 use ratatui::{
     buffer::Buffer,
     crossterm::event::{self, KeyCode, KeyEvent},
-    layout::Rect,
+    layout::{Constraint, Layout, Rect},
+    style::{
+        Modifier, Style, Stylize,
+        palette::tailwind::*,
+    },
     text::{Line, Span},
-    style::{Modifier, Style, Stylize, palette::tailwind::*},
     widgets::{
-        Block, Borders, HighlightSpacing, List,
+        Block, Borders, HighlightSpacing, List, ListState, Padding, Paragraph, StatefulWidget,
-        ListState, Padding, StatefulWidget, Paragraph
+        Widget,
     },
 };
-use ratatui::prelude::*;
 
-use crate::game;
+use crate::tui;
 
 const GAME_HEADER_STYLE: Style = Style::new()
     .fg(ZINC.c100)
@@ -24,7 +26,7 @@ const PROFILE_HEADER_STYLE: Style = Style::new()
     .add_modifier(Modifier::BOLD);
 
 const HEADER_STYLE: Style = Style::new().fg(ROSE.c500).add_modifier(Modifier::BOLD);
-const SELECTED_STYLE: Style = Style::new().bg(ZINC.c700).add_modifier(Modifier::BOLD);
+const SELECTED_STYLE: Style = Style::new().bg(NEUTRAL.c700).add_modifier(Modifier::BOLD);
 
 const FOOTER_LEFT_STYLE: Style = Style::new().fg(PURPLE.c400).add_modifier(Modifier::BOLD);
 const FOOTER_RIGHT_STYLE: Style = Style::new().fg(LIME.c400);
@@ -59,7 +61,7 @@ pub fn render_profile(area: Rect, buf: &mut Buffer) {
                 .centered()
                 .style(PROFILE_HEADER_STYLE),
         )
-        .padding(Padding::symmetric(2, 1))
+        .padding(Padding::symmetric(3, 1))
         .borders(Borders::ALL);
 
     let text = vec![
@@ -96,25 +98,31 @@ impl FromIterator<&'static str> for OptionList {
 }
 
 impl OptionList {
-    pub fn handle_key(mut self, key: KeyEvent) -> game::Mode {
+    pub fn handle_key(mut self, key: KeyEvent) -> tui::Mode {
         match key.code {
-            KeyCode::Char('q') | KeyCode::Esc => game::Mode::Exit,
+            KeyCode::Char('q') | KeyCode::Esc => tui::Mode::Exit,
             KeyCode::Char('j') | KeyCode::Down => {
                 self.select_next();
-                game::Mode::MainMenu(self)
+                tui::Mode::MainMenu(self)
             }
             KeyCode::Char('k') | KeyCode::Up => {
                 self.select_previous();
-                game::Mode::MainMenu(self)
+                tui::Mode::MainMenu(self)
             }
             KeyCode::Char('c') => {
                 if key.modifiers.contains(event::KeyModifiers::CONTROL) {
-                    game::Mode::Exit
+                    tui::Mode::Exit
                 } else {
-                    game::Mode::MainMenu(self)
+                    tui::Mode::MainMenu(self)
                 }
             }
-            _ => game::Mode::MainMenu(self),
+            KeyCode::Enter => match self.items.get(self.state.selected().unwrap_or_default()) {
+                Some(&"Blitz") => tui::Mode::Blitz,
+                Some(&"40L") => tui::Mode::FortyL,
+                Some(&"txLadder") => tui::Mode::TxLadder,
+                _ => tui::Mode::Exit,
+            },
+            _ => tui::Mode::MainMenu(self),
         }
     }
 
@@ -143,3 +151,12 @@ impl OptionList {
         StatefulWidget::render(list, area, buf, &mut self.state);
     }
 }
+
+pub fn render_menu(area: Rect, menu_list: &mut OptionList, buf: &mut Buffer) {
+    let [profile_area, list_outer_area] =
+        Layout::vertical([Constraint::Percentage(50), Constraint::Percentage(50)]).areas(area);
+
+    render_profile(profile_area, buf);
+
+    menu_list.render(list_outer_area, buf);
+}

client/src/tui.rs

@@ -0,0 +1,85 @@
+use color_eyre::Result;
+use ratatui::{
+    DefaultTerminal,
+    buffer::Buffer,
+    crossterm::event::{self, Event, KeyEvent, KeyEventKind},
+    layout::{Constraint, Layout, Rect},
+    widgets::Widget,
+};
+
+use crate::game;
+use crate::menu;
+use crate::util::center;
+
+#[derive(Clone)]
+pub enum Mode {
+    Exit,
+    MainMenu(menu::OptionList),
+    FortyL,
+    Blitz,
+    TxLadder,
+    Config,
+}
+
+impl Default for Mode {
+    fn default() -> Self {
+        Mode::MainMenu(menu::OptionList::from_iter([
+            "40L", "Blitz", "txLadder", "Config",
+        ]))
+    }
+}
+
+impl Mode {
+    pub fn run(mut self, mut terminal: DefaultTerminal) -> Result<()> {
+        loop {
+            if let Mode::Exit = self {
+                break;
+            }
+            terminal.draw(|frame| frame.render_widget(&mut self, frame.area()))?;
+            if let Event::Key(key) = event::read()? {
+                self = self.handle_key(key);
+            };
+        }
+        Ok(())
+    }
+
+    fn handle_key(self, key: KeyEvent) -> Mode {
+        if key.kind != KeyEventKind::Press {
+            return self;
+        }
+
+        match self {
+            Mode::MainMenu(menu_list) => menu_list.handle_key(key),
+            _ => Mode::Exit, // TODO: handle keys differently based on modes
+        }
+    }
+}
+
+impl Widget for &mut Mode {
+    fn render(self, area: Rect, buf: &mut Buffer) {
+        let [header_area, main_area, footer_area] = Layout::vertical([
+            Constraint::Length(1),
+            Constraint::Fill(1),
+            Constraint::Length(2),
+        ])
+        .areas(area);
+
+        let center_area = center(
+            main_area,
+            Constraint::Length(60),
+            Constraint::Percentage(60),
+        );
+
+        menu::render_header(header_area, buf);
+
+        match self {
+            Mode::MainMenu(menu_list) => {
+                menu::render_menu(center_area, menu_list, buf);
+            }
+            _ => {
+                game::render(self, center_area, buf);
+            }
+        }
+        menu::render_footer(footer_area, buf);
+    }
+}

client/src/util.rs

@@ -0,0 +1,9 @@
+use ratatui::layout::{Constraint, Flex, Layout, Rect};
+
+pub fn center(area: Rect, horizontal: Constraint, vertical: Constraint) -> Rect {
+    let [area] = Layout::horizontal([horizontal])
+        .flex(Flex::Center)
+        .areas(area);
+    let [area] = Layout::vertical([vertical]).flex(Flex::Center).areas(area);
+    area
+}