Adding inspect menus, API calls, sim data flows

Lots of changes to add most inspect menus and majority of interactive behavior, with most API calls and events needed to support v1. Not much simulation hooked up, but testing initial few sample implementations
starpeace-project · Dec 16, 2023 · 43bdf63 · 43bdf63
1 parent 10abdbc
commit 43bdf63
Show file tree

Hide file tree

Showing 280 changed files with 13,147 additions and 7,010 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,5 +1,5 @@
 
-## v0.3.13 - in progress - updated 2023-05-21
+## v0.3.14 - in progress - updated 2023-12-16
 ### platform
 * [done] improve API integration with galaxies [v0.3.1]
 * [done] document multiverse API integration [starpeace-server-multiverse-api]
@@ -32,9 +32,9 @@
 * [done] bookmarks manage and performance fixes [v0.3.11]
 * [done] tycoon details API [v0.3.12]
 * [done] fixed galaxy and research menu bugs  [v0.3.13]
-* [in progress] building inspect API [v0.3.13]
-* [in progress] improve auth and remember me token and error handling
-* [pending] player, building, and planet event handling
+* [done] building inspect API [v0.3.13]
+* [done] player and building event handling [v0.3.13]
+* [in progress] admin API [v0.3.14]
 
 ### assets
 * [done] finish initial language translation for assets [v0.3.1]
@@ -47,6 +47,7 @@
 * [done] building sign assets [v0.3.5]
 * [done] headquarters requirements for research per seal [v0.3.5]
 * [done] fixing building foundation configurations [v0.3.6]
+* [in progress] fix blur in created sprite spreets [v0.3.14]
 
 ### gameplay
 * [done] update UI and menus for better concept of universes and galaxies [v0.3.1]
@@ -69,6 +70,7 @@
 * [done] onscreen building text rendering on selection [v0.3.10]
 * [done] construction descriptions for commerce, real estate, and services [v0.3.10]
 * [done] tycoon details menu [v0.3.12]
-* [in progress] building inspect menu [v0.3.13]
-* [pending] city-specific ribbon ticker updates
-* [pending] integrate player and planet events with news ticker
+* [done] building inspect menu [v0.3.13]
+* [done] selected building text for IFEL buildings [v0.3.13]
+* [done] cashflow and construction included in selected building text [v0.3.13]
+* [done] integrate building events with news ticker [v0.3.13]
diff --git a/ROADMAP.md b/ROADMAP.md
@@ -4,6 +4,7 @@ Some of the tentative future features and rough planned version are outlined bel
 
 ## v0.5
 ### platform
+* [pending] improve auth and remember me token and error handling
 * [pending] minimum distance between buildings (statue and tower)
 * [pending] manage city zones API integration
 * [pending] follow tycoon support
@@ -19,13 +20,17 @@ Some of the tentative future features and rough planned version are outlined bel
 * [pending] tycoon company rename and disolve API
 * [pending] tycoon initial suppliers and IFEL products API
 * [pending] tycoon strategy API
+* [pending] inspect menu trade settings
+* [pending] fix construction hover image z-order
+* [pending] improve building metadata and details events in inspect menu
 
 ### assets
 * [pending] car assets
 * [pending] street light and intersection lamp assets
 * [pending] dedicated research buildings per category and seal
 
 ### gameplay
+* [pending] city-specific ribbon ticker updates
 * [pending] building stage support (timber, movies, farms)
 * [pending] limit seals unless required level or nobility
 * [pending] road proximity building construction rules
@@ -51,15 +56,13 @@ Some of the tentative future features and rough planned version are outlined bel
 * [pending] building negative-income tinting rendering
 * [pending] fixed table headers (inspect menus)
 * [pending] mayor townhall management (min wage)
-* [pending] building connect action support
 * [pending] planet capital and president politics inspect menu
 * [pending] improve townhall population label translations in inspect menu
 * [pending] improve products select in inspect menu (control and shift clicking)
 * [pending] construction descriptions for civics
 * [pending] add prestige to construction descriptions
-* [pending] selected building text for warehouses
-* [pending] selected building text for IFEL buildings
-* [pending] cashflow and status included in selected building text
 * [pending] footer menu company scroll support
 * [pending] tycoon details loans apply and repay
 * [pending] tycoon details corporation and company P&L
+* [pending] advanced status included in selected building text
+* [pending] selected building text for warehouses
diff --git a/assets/stylesheets/starpeace-bulma.sass b/assets/stylesheets/starpeace-bulma.sass
@@ -1,4 +1,13 @@
 
+@import 'bulma/sass/utilities/_all'
+@import 'bulma/sass/base/_all'
+@import 'bulma/sass/elements/_all'
+@import 'bulma/sass/form/_all'
+@import 'bulma/sass/components/_all'
+@import 'bulma/sass/grid/_all'
+@import 'bulma/sass/helpers/_all'
+@import 'bulma/sass/layout/_all'
+
 @import '~/assets/stylesheets/starpeace-variables'
 
 html
@@ -68,7 +77,7 @@ html
 
     &:before,
     &:after
-      content: ""
+      content: ''
       position: absolute
       background-image: -webkit-linear-gradient($sp-card-border-top, $sp-card-border-bottom)
       background-image: -moz-linear-gradient($sp-card-border-top, $sp-card-border-bottom)
@@ -176,7 +185,7 @@ html
 
   &:before,
   &:after
-    content: ""
+    content: ''
     position: absolute
     bottom: 0
     top: 0

diff --git a/assets/stylesheets/starpeace-inspect.sass b/assets/stylesheets/starpeace-inspect.sass
@@ -10,18 +10,33 @@
   top: calc(40% - 4rem)
   width: 8rem
 
+.loading-image-inline
+  background-size: 1.25rem
+  height: 1.25rem
+  width: 1.25rem
+
 
 .sp-slider
-  display: inline-flex
+  display: flex
+
+  input[type="range" i]
+    accent-color: $sp-primary
+    color: $sp-primary
+    width: 100%
 
   span
     margin-left: .5rem
 
 
 .basic-table
+  tr
+    &:not(:last-child)
+      th,
+      td
+        border-bottom: 1px solid $sp-dark-bg
+
   th,
   td
-    border-bottom: 1px solid $sp-dark-bg
     vertical-align: middle
 
     &:not(:first-child)
@@ -75,16 +90,23 @@
         border-bottom-color: $sp-dark-bg
         color: #fff
 
+    &:not(:first-child)
+      a
+        border-left: 1px solid $sp-dark-bg
+        border-right: 1px solid $sp-dark-bg
+
   a
     border-bottom-color: $sp-primary-bg
     color: $sp-primary
     letter-spacing: .05rem
+    padding: .5rem 1.5rem
     text-transform: uppercase
 
     &:active,
     &:hover
       background-color: $sp-primary-bg
       border-bottom-color: $sp-primary-bg
+      border-color: $sp-primary-bg
       color: #fff
 
 .inspect-body
@@ -93,13 +115,38 @@
   position: relative
   overflow: hidden
 
-  .column
-    &.extra-padding-left
-      padding-left: 2rem
-
-    &.extra-padding-right
-      padding-right: 2rem
-
   .button
     letter-spacing: .1rem
     text-transform: uppercase
+
+.sp-sub-tabs
+  direction: rtl
+  overflow-y: auto
+
+  .sp-tabs-menu
+    direction: ltr
+
+    ul
+      flex-direction: column
+
+      li
+        display: flex
+        justify-content: flex-end
+        text-align: right
+
+        a
+          border-radius: 0
+          color: $sp-primary
+          letter-spacing: .05rem
+          text-transform: uppercase
+
+          &:hover
+            color: $sp-light
+
+          &:active
+            color: lighten($sp-light, 10%)
+
+        &.is-active
+          a
+            background-color: $sp-dark-bg
+            color: #fff
diff --git a/assets/stylesheets/starpeace.sass b/assets/stylesheets/starpeace.sass
@@ -95,6 +95,26 @@ h3
     border-radius: 9999em
     box-shadow: rgba(255, 255, 255, 0.25) 0 0 1px 0 inset
 
+.sp-select
+  &::after
+    border-color: $sp-primary !important
+
+  select
+    background-color: $sp-dark-bg
+    border: 1px solid $sp-dark
+    color: $sp-light
+    outline: none !important
+
+    &:focus,
+    &:hover
+      outline: none !important
+      border: 1px solid $sp-dark
+
+  option
+    background-color: $sp-dark-bg
+    color: $sp-primary
+
+
 .sp-profile
   .profile-container
     padding-bottom: 150%
@@ -123,11 +143,29 @@ h3
   color: darken($sp-primary, 5%)
   font-size: .7rem
   letter-spacing: 0.05rem
+  position: relative
   text-transform: uppercase
+
 .sp-kv-value
   color: #ddd
   font-size: 1.1rem
   margin-left: .5rem
+  position: relative
+
+  &.centered
+    vertical-align: middle
+
+
+.sp-has-dark-background
+  background-color: $sp-dark-bg
+
+
+.sp-notification
+  &.is-warning
+    background-color: $sp-light-bg
+    color: #FFF
+
+
 
 // remove border around research tree component
 .vis-network

diff --git a/buildspec.yml b/buildspec.yml
@@ -7,7 +7,6 @@ phases:
     commands:
       - echo Entered the install phase...
       - npm update -g npm
-      - npm install -g grunt-cli
 
   pre_build:
     commands:

diff --git a/components/application-desktop.vue b/components/application-desktop.vue
@@ -24,7 +24,7 @@ client-only
     menu-help(v-show="is_menu_visible('help')" :client_state='client_state')
     menu-rankings-main-menu(v-show="is_menu_visible('rankings')" :ajax_state='ajax_state' :client_state='client_state')
     menu-release-notes(v-show="is_menu_visible('release_notes')" :client_state='client_state')
-    menu-research-main-menu(v-show="is_menu_visible('research')" :ajax_state='ajax_state' :client_state='client_state')
+    menu-research-main-menu(v-show="is_menu_visible('research')" :client-state='client_state')
     menu-galaxy-menu(v-show="is_menu_visible('galaxy')" :ajax_state='ajax_state' :client_state='client_state')
     menu-town-search-main-menu(v-show="is_menu_visible('town_search')" :client_state='client_state')
     menu-tycoon-details-main-menu(v-show="is_menu_visible('tycoon')" :client_state='client_state')
@@ -37,7 +37,7 @@ client-only
     toolbar-overlay(:client_state='client_state')
     toolbar-minimap(:client_state='client_state')
     toolbar-ribbon(:client_state='client_state')
-    toolbar-inspect(:ajax_state='ajax_state' :client_state='client_state')
+    toolbar-inspect(:client-state='client_state')
     toolbar-menubar(:ajax_state='ajax_state' :client_state='client_state')
     toolbar-details(:ajax_state='ajax_state' :client_state='client_state')
 
@@ -48,7 +48,7 @@ client-only
 </template>
 
 <script lang='ts'>
-import Utils from '~/plugins/starpeace-client/utils/utils.coffee';
+import Utils from '~/plugins/starpeace-client/utils/utils.js';
 
 export default {
   data () {

diff --git a/components/application-mobile.vue b/components/application-mobile.vue
@@ -1,8 +1,8 @@
 <template lang='pug'>
-#application-container(:class='application_css_class', v-cloak=true)
+#application-container(:class='application_css_class' v-cloak=true)
   page-layout-header(:client_state='client_state')
-  misc-card-loading(:client_state='client_state' within-grid=true)
-  misc-modal-loading(:client_state='client_state' within-grid=true)
+  misc-card-loading(:client_state='client_state' within-grid)
+  misc-modal-loading(:client_state='client_state' within-grid)
   misc-card-webgl-warning(:client_state='client_state')
   workflow(:client_state='client_state')
   page-layout-render-container(:client_state='client_state')

diff --git a/components/menu/bookmarks/main-menu.vue b/components/menu/bookmarks/main-menu.vue
@@ -49,11 +49,11 @@
 </template>
 
 <script lang='ts'>
-import AjaxState from '~/plugins/starpeace-client/state/ajax-state.coffee';
-import ClientState from '~/plugins/starpeace-client/state/client-state.coffee';
-import BookmarkState from '~/plugins/starpeace-client/state/player/bookmark-state';
+import AjaxState from '~/plugins/starpeace-client/state/ajax-state.js';
+import ClientState from '~/plugins/starpeace-client/state/client-state';
+import BookmarkState from '~/plugins/starpeace-client/state/player/bookmark-state.js';
 
-import Bookmark from '~/plugins/starpeace-client/bookmark/bookmark';
+import Bookmark from '~/plugins/starpeace-client/bookmark/bookmark.js';
 
 export default {
   props: {
@@ -141,10 +141,10 @@ export default {
       if (!this.is_ready || !this.menu_visible || !this.hasCorporation) {
         return true;
       }
-      return this.ajax_state.request_mutex.bookmark_metadata?.[this.client_state.player.corporation_id] ||
-          this.ajax_state.request_mutex.update_bookmark?.[this.client_state.player.corporation_id] ||
-          this.ajax_state.request_mutex.new_bookmark_folder?.[this.client_state.player.corporation_id] ||
-          this.ajax_state.request_mutex.new_bookmark_item?.[this.client_state.player.corporation_id];
+      return this.ajax_state.requestMutexByTypeKey.bookmark_metadata?.[this.client_state.player.corporation_id] ||
+          this.ajax_state.requestMutexByTypeKey.update_bookmark?.[this.client_state.player.corporation_id] ||
+          this.ajax_state.requestMutexByTypeKey.new_bookmark_folder?.[this.client_state.player.corporation_id] ||
+          this.ajax_state.requestMutexByTypeKey.new_bookmark_item?.[this.client_state.player.corporation_id];
     }
   },