Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.7.0 #219

Merged
merged 2 commits into from
Nov 29, 2024
Merged

v1.7.0 #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd880a4
Split up character card for easier customization.
lynnfaraday Nov 29, 2024
c478602
Bump version.
lynnfaraday Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/components/char-card-custom-tabs-content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import Component from '@ember/component';

export default Component.extend({
tagName: ''
});
5 changes: 5 additions & 0 deletions app/components/char-card-custom-tabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import Component from '@ember/component';

export default Component.extend({
tagName: ''
});
4 changes: 4 additions & 0 deletions app/components/char-card-demo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import Component from '@ember/component';

export default Component.extend({
});
4 changes: 4 additions & 0 deletions app/components/char-card-fs3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import Component from '@ember/component';

export default Component.extend({
});
4 changes: 4 additions & 0 deletions app/components/char-card-profile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import Component from '@ember/component';

export default Component.extend({
});
Empty file added app/templates/components/char-card-custom-tabs-content.hbs
View file
Open in desktop
Empty file.
Empty file added app/templates/components/char-card-custom-tabs.hbs
View file
Open in desktop
Empty file.
23 changes: 23 additions & 0 deletions app/templates/components/char-card-demo.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<div class="scene-card-demo">
{{#if (not this.char.is_ooc)}}
{{#each this.char.demographics as |demo|}}
<div class="row">
<div class="col col-4">
<b>{{demo.name}}</b>
</div>
<div class="col col-8">
{{demo.value}}
</div>
</div>
{{/each}}
{{#if (not this.char.demographics)}}
No demographics available. Try reloading the scene page.
{{/if}}
{{/if}}

{{#if this.char.status_message}}
<div class="alert alert-info">
{{this.char.status_message}}
</div>
{{/if}}
</div>
71 changes: 71 additions & 0 deletions app/templates/components/char-card-fs3.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<div class="scene-card-fs3">
<div class="card-ability-title">
Attributes
</div>
<div class="card-abilities">
{{#each this.char.fs3.attributes as |ability|}}
<div class="card-ability">
<span class="card-ability-name">{{ability.name}}</span>
<Fs3Dots @rating={{ability.rating}} @max={{4}} />
</div>
{{/each}}
</div>

<div class="card-ability-title">
Action Skills
</div>
<div class="card-abilities">
{{#each this.char.fs3.action_skills as |ability|}}
<div class="card-ability">
<span class="card-ability-name">{{ability.name}}</span>
<Fs3Dots @rating={{ability.rating}} @max={{8}} />
</div>
{{/each}}
</div>

<div class="card-specialties">
{{#each this.char.fs3.action_skills as |ability|}}
{{#if ability.specialties}}
<div class="card-specialty">{{ability.name}}: {{ability.specialties}}</div>
{{/if}}
{{/each}}
</div>

<div class="card-ability-title">
Background Skills
</div>
<div class="card-abilities">
{{#each this.char.fs3.backgrounds as |ability|}}
<div class="card-ability">
<span class="card-ability-name">{{ability.name}}</span>
<Fs3Dots @rating={{ability.rating}} @max={{3}} />
</div>
{{/each}}
</div>

<div class="card-ability-title">
Languages
</div>
<div class="card-abilities">
{{#each this.char.fs3.languages as |ability|}}
<div class="card-ability">
<span class="card-ability-name">{{ability.name}}</span>
<Fs3Dots @rating={{ability.rating}} @max={{3}} />
</div>
{{/each}}
</div>

{{#if this.char.fs3.use_advantages}}
<div class="card-ability-title">
Advantages
</div>
<div class="card-abilities">
{{#each this.char.fs3.advantages as |ability|}}
<div class="card-ability">
<span class="card-ability-name">{{ability.name}}</span>
<Fs3Dots @rating={{ability.rating}} @max={{3}} />
</div>
{{/each}}
</div>
{{/if}}
</div>
8 changes: 8 additions & 0 deletions app/templates/components/char-card-profile.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<div class="scene-card-profile">
<CharIcon @char={{this.char}} />

{{#if this.char.id}}
<LinkTo @route="char" @model={{this.char.name}} target="_blank">View Full Profile</LinkTo>
{{/if}}

</div>
126 changes: 32 additions & 94 deletions app/templates/components/char-card.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,105 +1,43 @@
<div class="scene-card">
<div class="row">
<div class="col col-4">
<CharIcon @char={{this.char}} />

{{#if this.char.id}}
<LinkTo @route="char" @model={{this.char.name}} target="_blank">View Full Profile</LinkTo>
{{/if}}

</div>
<div class="col col-8">
{{#if (not this.char.is_ooc)}}
{{#each this.char.demographics as |demo|}}
<div class="row">
<div class="col col-3">
<b>{{demo.name}}</b>
</div>
<div class="col col-9">
{{demo.value}}
</div>
</div>
{{/each}}
{{#if (not this.char.demographics)}}
No demographics available. Try reloading the scene page.
{{/if}}
{{/if}}

{{#if this.char.status_message}}
<br>
<div class="alert alert-info">
{{this.char.status_message}}
<div class="row">
<div class="col col-4 col-xs-12 scene-card-profile">
<CharCardProfile @char={{this.char}} />
</div>
<div class="col col-8 col-xs-12 scene-card-demographics">
<CharCardDemo @char={{this.char}} />

</div>
{{/if}}


</div>
</div>

<hr>

{{#if this.char.description}}
<AnsiFormat @text={{this.char.description}} />
{{/if}}

<hr>

{{#if this.char.fs3}}

<div class="card-abilities">
{{#each this.char.fs3.attributes as |ability|}}
<div class="card-ability">
<span class="card-ability-name">{{ability.name}}</span>
<Fs3Dots @rating={{ability.rating}} @max={{4}} />
</div>
{{/each}}
</div>

<div class="card-abilities">
{{#each this.char.fs3.action_skills as |ability|}}
<div class="card-ability">
<span class="card-ability-name">{{ability.name}}</span>
<Fs3Dots @rating={{ability.rating}} @max={{8}} />
</div>
{{/each}}
</div>
{{#if (not this.char.is_ooc)}}
<hr>

<div class="card-specialties">
{{#each this.char.fs3.action_skills as |ability|}}
{{#if ability.specialties}}
<div class="card-specialty">{{ability.name}}: {{ability.specialties}}</div>
{{/if}}
{{/each}}
</div>
<ul class="nav nav-tabs" role="tablist">
{{#if this.char.description}}
<li class="nav-item"><a data-bs-toggle="tab" class="nav-link active" href="#description">Description</a></li>
{{/if}}

<div class="card-abilities">
{{#each this.char.fs3.backgrounds as |ability|}}
<div class="card-ability">
<span class="card-ability-name">{{ability.name}}</span>
<Fs3Dots @rating={{ability.rating}} @max={{3}} />
</div>
{{/each}}
</div>
{{#if this.char.fs3}}
<li class="nav-item"><a data-bs-toggle="tab" class="nav-link" href="#fs3abiliites">Abilities</a></li>
{{/if}}

<CharCardCustomTabs @char={{this.char}} />
</ul>

<div class="card-abilities">
{{#each this.char.fs3.languages as |ability|}}
<div class="card-ability">
<span class="card-ability-name">{{ability.name}}</span>
<Fs3Dots @rating={{ability.rating}} @max={{3}} />
</div>
{{/each}}
</div>
<div class="tab-content">
{{#if this.char.description}}
<div id="description" class="tab-pane fade show active">
<AnsiFormat @text={{this.char.description}} />
</div>
{{/if}}

{{#if this.char.fs3.use_advantages}}
<div class="card-abilities">
{{#each this.char.fs3.advantages as |ability|}}
<div class="card-ability">
<span class="card-ability-name">{{ability.name}}</span>
<Fs3Dots @rating={{ability.rating}} @max={{3}} />
{{#if this.char.fs3}}
<div id="fs3abiliites" class="tab-pane fade show">
<CharCardFs3 @char={{this.char}} />
</div>
{{/if}}

<CharCardCustomTabsContent @char={{this.char}} />
</div>
{{/each}}
</div>
{{/if}}

{{/if}}
</div>
2 changes: 1 addition & 1 deletion public/scripts/aresweb_version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
var aresweb_version = "1.6.0";
var aresweb_version = "1.7.0";
Loading