[#7] Race

Cargo.toml

@@ -6,6 +6,7 @@ members = [
     "macro_ui",
     "rpg_tools_core",
     "rpg_tools_rendering",
+    "rpg_tools_ui",
     "rpg_tools_editor",
 ]
 resolver = "2"

macro_convert/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "macro_convert"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

macro_core/Cargo.toml

@@ -1,4 +1,4 @@
 [package]
 name = "macro_core"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"

macro_ui/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "macro_ui"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

resources/characters/characters.yaml

@@ -1,5 +1,6 @@
 - id: 0
   name: Elf
+  race: 1
   gender: Male
   appearance:
     type: Humanoid
@@ -88,6 +89,7 @@
       millimetre: 1500
 - id: 1
   name: Devil
+  race: 4
   gender: Male
   appearance:
     type: Humanoid
@@ -139,45 +141,8 @@
     height:
       millimetre: 2500
 - id: 2
-  name: Watcher
-  gender: Genderless
-  appearance:
-    type: HeadOnly
-    head:
-      ears:
-        type: None
-      eyes:
-        type: One
-        eye:
-          type: Normal
-          eye_shape: Circle
-          pupil_shape: VerticalSlit
-          pupil_color: Blue
-          background_color: White
-        eyebrows:
-          type: Normal
-          color: Fuchsia
-          shape: Curved
-          style: Even
-          width: Average
-      hair:
-        type: None
-      mouth:
-        type: Simple
-        beard:
-          type: None
-        width: Medium
-        teeth:
-          type: None
-        teeth_color: White
-      shape: Round
-      skin:
-        type: Scales
-        color: Purple
-    height:
-      millimetre: 1500
-- id: 3
   name: Vampire
+  race: 5
   gender: Female
   appearance:
     type: Humanoid
@@ -248,8 +213,9 @@
         color: White
     height:
       millimetre: 1500
-- id: 4
+- id: 3
   name: Orc
+  race: 2
   gender: Male
   appearance:
     type: Humanoid
@@ -320,8 +286,9 @@
         color: Green
     height:
       millimetre: 1500
-- id: 5
+- id: 4
   name: Dwarf
+  race: 3
   gender: Male
   appearance:
     type: Humanoid

resources/races.yaml

@@ -0,0 +1,18 @@
+- id: 0
+  name: Human
+  gender_option: TwoGenders
+- id: 1
+  name: Elf
+  gender_option: TwoGenders
+- id: 2
+  name: Orc
+  gender_option: TwoGenders
+- id: 3
+  name: Dwarf
+  gender_option: TwoGenders
+- id: 4
+  name: Devil
+  gender_option: NoGender
+- id: 5
+  name: Vampire
+  gender_option: TwoGenders

resources/templates/appearance_edit.html.tera

@@ -8,7 +8,7 @@
     <img id="preview" src="/appearance/preview/back.svg" alt="Back Preview" width="75%"/>
   </div>
   <div class="editor">
-    <form id="appearanceForm" action="/appearance/{{ id }}/preview" method="post">
+    <form id="appearanceForm" action="/appearance/preview/{{ id }}" method="post">
       <ul>
         <li>
           <b>Appearance:</b> {{ macros::add_select(name="appearance.type", options=[ "HeadOnly","Humanoid" ], selected=appearance.type, update=true) }}
@@ -1118,9 +1118,9 @@
           </ul>
         </li>
       </ul>
-      <button formaction="/appearance/{{ id }}/update" formmethod="post">Submit</button>
+      <button formaction="/appearance/update/{{ id }}" formmethod="post">Submit</button>
     </form>
-    <p><a href="/character/{{ id }}">Back</a></p>
+    <p><a href="/character/details/{{ id }}">Back</a></p>
   </div>
 </div>
 {% endblock content %}

resources/templates/character/all.html.tera

@@ -0,0 +1,20 @@
+{% extends "base" %}
+
+{% block content %}
+    <p><h1>Characters</h1></p>
+    <div class="text">
+      <p><b>Total:</b> {{ total }}</p>
+      <p><a href="/character/new">Add</a></p>
+    </div>
+    <div class="grid-container">
+    {% for c in characters %}
+      <div class="grid-item">
+        <a href="/character/details/{{ c.0 }}">
+          <div class="content">{{ c.1 }}</div>
+          <img src = "/appearance/render/{{ c.0 }}/front.svg" alt="Character {{ c.0 }}"/>
+        </a>
+      </div>
+    {% endfor %}
+    </div>
+    <p class="text"><a href="/">Back</a></p>
+{% endblock content %}

resources/templates/character/details.html.tera

@@ -0,0 +1,23 @@
+{% extends "base" %}
+
+{% block content %}
+<div class="left_right_container">
+  <p><h1>Character: {{ name }}</h1></p>
+  <p><h2>Data</h2></p>
+  <div class="text">
+    <p><b>Id:</b> {{ id }}</p>
+    <p><b>Race:</b> <a href="/race/details/{{ race_id }}">{{ race }}</a></p>
+    <p><b>Gender:</b> {{ gender }}</p>
+    <p><a href="/character/edit/{{ id }}">Edit Data</a></p>
+  </div>
+  <p><h2>Appearance</h2></p>
+  <center>
+    <img src = "/appearance/render/{{ id }}/front.svg" alt="Front View of the Character" width="25%"/>
+    <img src = "/appearance/render/{{ id }}/back.svg" alt="Back View of the Character" width="25%"/>
+  </center>
+  <div class="text">
+    <p><a href="/appearance/edit/{{ id }}">Edit Appearance</a></p>
+    <p><a href="/character/all">Back</a></p>
+  </div>
+</div>
+{% endblock content %}

resources/templates/character/edit.html.tera

@@ -0,0 +1,27 @@
+{% extends "base" %}
+
+{% block content %}
+    <p><h1>Edit data of {{ name }}</h1></p>
+    <div class="text">
+      <p><b>Id:</b> {{ id }}</p>
+      <form action="/character/update/{{ id }}" method="post">
+        <b><label for="name">Name:</label></b>
+        <input type="text" id="name" name="name" value="{{ name }}">
+        {% if name_error %}<br><label class="error">{{ name_error }}</label>{% endif %}
+        <br>
+        <br>
+        <b><label for="race">Race:</label></b>
+        {{ macros::add_select(name="race", options=races, selected=race) }}
+        {% if race_error %}<br><label class="error">{{ race_error }}</label>{% endif %}
+        <br>
+        <br>
+        <b><label for="gender">Gender:</label></b>
+        {{ macros::add_select(name="gender", options=genders, selected=gender) }}
+        {% if gender_error %}<br><label class="error">{{ gender_error }}</label>{% endif %}
+        <br>
+        <br>
+        <input type="submit" value="Submit">
+      </form>
+      <p><a href="/character/details/{{ id }}">Back</a></p>
+    </div>
+{% endblock content %}

resources/templates/home.html.tera

@@ -3,5 +3,8 @@
 {% block content %}
     <p><h1>RPG Tools - Editor</h1></p>
     <h2>Overview</h2>
-    <p><b>Characters:</b> <a href="/character">{{ characters }}</a></p>
+    <div class="text">
+      <p><b>Races:</b> <a href="/race/all">{{ races }}</a></p>
+      <p><b>Characters:</b> <a href="/character/all">{{ characters }}</a></p>
+    </div>
 {% endblock content %}

resources/templates/race/all.html.tera

@@ -0,0 +1,15 @@
+{% extends "base" %}
+
+{% block content %}
+    <p><h1>Races</h1></p>
+    <div class="text">
+      <p><b>Total:</b> {{ total }}</p>
+      <ul>
+      {% for r in races %}
+        <li><a href="/race/details/{{ r.0 }}">{{ r.1 }}</a></li>
+      {% endfor %}
+      </ul>
+      <p><a href="/race/new">Add</a></p>
+      <p><a href="/">Back</a></p>
+    </div>
+{% endblock content %}

resources/templates/race/details.html.tera

@@ -0,0 +1,22 @@
+{% extends "base" %}
+
+{% block content %}
+<div class="left_right_container">
+  <p><h1>Race: {{ name }}</h1></p>
+  <p><h2>Data</h2></p>
+  <div class="text">
+    <p><b>Id:</b> {{ id }}</p>
+    <p><b>Gender Option:</b> {{ gender_option }}</p>
+    <p><a href="/race/edit/{{ id }}">Edit Data</a></p>
+  </div>
+  <p><h2>Characters</h2></p>
+  <div class="text">
+    <ul>
+      {% for c in characters %}
+      <li><a href="/character/details/{{ c.0 }}">{{ c.1 }}</a></li>
+      {% endfor %}
+    </ul>
+    <p><a href="/race/all">Back</a></p>
+  </div>
+</div>
+{% endblock content %}

resources/templates/race/edit.html.tera

@@ -0,0 +1,22 @@
+{% extends "base" %}
+
+{% block content %}
+    <p><h1>Edit Race: {{ name }}</h1></p>
+    <div class="text">
+      <p><b>Id:</b> {{ id }}</p>
+      <form action="/race/update/{{ id }}" method="post">
+        <b><label for="name">Name:</label></b>
+        <input type="text" id="name" name="name" value="{{ name }}">
+        {% if name_error %}<br><label class="error">{{ name_error }}</label>{% endif %}
+        <br>
+        <br>
+        <b><label for="gender_option">Gender Option:</label></b>
+        {{ macros::add_select(name="gender_option", options=gender_options, selected=gender_option) }}
+        {% if gender_error %}<br><label class="error">{{ gender_error }}</label>{% endif %}
+        <br>
+        <br>
+        <input type="submit" value="Submit">
+      </form>
+      <p><a href="/race/details/{{ id }}">Back</a></p>
+    </div>
+{% endblock content %}

rpg_tools_core/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "rpg_tools_core"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+anyhow = "1.0"
 macro_core = { path = "../macro_core" }
 macro_convert = { path = "../macro_convert" }
 macro_ui = { path = "../macro_ui" }
-serde = { version = "1.0", features = ["derive"] }
-titlecase = "2.2"
+serde = { version = "1.0", features = ["derive"] }

rpg_tools_core/src/lib.rs

@@ -1,5 +1,5 @@
 pub mod model;
-pub mod ui;
+pub mod usecase;
 
 extern crate macro_core;
 extern crate macro_ui;