Skip to content

Commit

Permalink
Merge pull request #33 from Savage-Aim/import-char-fix
Browse files Browse the repository at this point in the history
Import char fix
  • Loading branch information
freyamade authored Jun 13, 2022
2 parents ecdaf3c + 2c07fbc commit 0d9d699
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 32 deletions.
1 change: 1 addition & 0 deletions backend/api/serializers/character.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@


class CharacterCollectionSerializer(serializers.ModelSerializer):
alias = serializers.CharField(allow_blank=True, required=False)
user_id = serializers.IntegerField(required=False)

class Meta:
Expand Down
2 changes: 1 addition & 1 deletion backend/backend/settings_live.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def sampler(context):
# If you wish to associate users to errors (assuming you are using
# django.contrib.auth) you may enable sending PII data.
send_default_pii=True,
release='savageaim@20220516',
release='savageaim@20220613',
)

# Channels
Expand Down
2 changes: 1 addition & 1 deletion frontend/.env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VUE_APP_VERSION="20220516"
VUE_APP_VERSION="20220613"
29 changes: 1 addition & 28 deletions frontend/src/components/modals/changelog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,10 @@
</div>
<div class="card-content content">
<h2 class="has-text-primary subtitle">{{ version }}</h2>
<div class="divider"><i class="material-icons icon">expand_more</i> BIS Lists Expansion Update <i class="material-icons icon">expand_more</i></div>
<p>The limit of one BIS List per Job has finally been removed! You can now have as many BIS Lists as you want per Job, allowing you to keep historical lists as you advance the tiers, or manage two current lists per Job for the current Tier, the options are endless!</p>
<p>You can also give each list a name, to help differentiate different BIS Lists of the same Job. The name will default to the name of the Job.</p>
<p>
Syncing Current Gear between BIS Lists of the same Job is also possible, in both directions.
<ul>
<li>When saving a BIS List you have the option to save the Current Gear to other BIS Lists of the same Job.</li>
<li>When creating / editing a BIS List you also have the option to pull Current Gear from another List of the same Job.</li>
</ul>
</p>
<p>
It is also now possible to import BIS Gear from Etro Gearsets by filling in the Extra URL of a BIS List.
<ul>
<li class="has-text-warning">Imports may not be perfect as to avoid maintaining a map for different names in the website, it compares names of Gear between Savage Aim and Etro and chooses the closest name.</li>
</ul>
</p>
<p>To help prevent over-population of pages, the Greed section of the Loot Manager page now uses popups to assign loot to a Greed BIS List instead of displaying all of the Lists for each Character directly on the page itself.</p>

<div class="divider"><i class="material-icons icon">expand_more</i> Minor Changes <i class="material-icons icon">expand_more</i></div>
<p>Minor changes to the display of breadcrumbs in the BIS Create / Edit pages.</p>
<p>Job icons on Team boxes now have a tooltip with the name / alias of the associated Character.</p>
<p>Minor design improvements in the Join a Team page.</p>
<p>The forms in the Loot History section of the Loot Manager page have been moved to the top of their related sections to prevent large amounts of unnecessary scrolling as History tables fill up.</p>
<p>Fixed an issue that prevented any new Characters from being created.</p>

<div class="divider"><i class="material-icons icon">expand_more</i> Database Additions <i class="material-icons icon">expand_more</i></div>
<p>
Added the following Gear for the release of 6.11;
<ul>
<li>Ultimate of the Heavens; Item Level 605 Weapons</li>
</ul>
</p>
</div>
</div>
</template>
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/interfaces/responses.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ export interface CreateResponse {

// Interface defining the potential error responses that can come from the Character.create method
export interface CharacterCreateErrors {
lodestone_id: string[]
lodestone_id?: string[]
[key: string]: string[]
}

// Information about deleting Characters
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Sentry.init({
Vue,
dsn: 'https://[email protected]/6180221',
logErrors: true,
release: 'savageaim@20220516',
release: 'savageaim@20220613',
})

new Vue({
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/views/new_char.vue
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ export default class NewChar extends SavageAimMixin {
if (json.lodestone_id != null) {
this.errors = json.lodestone_id
}
// Catch all error message for anything other than lodestone id
else if (Object.keys(json).length > 0) {
this.errors = ['Something went wrong that shouldn\'t have, please inform Eri on the Discord. Sorry for the inconvenience!']
}
}
}
catch (e) {
Expand Down

0 comments on commit 0d9d699

Please sign in to comment.