Update to Font Awesome 5 (Develop) #957

amosfolz · 2019-04-06T01:02:17Z

Most of the changes are simply updating the 'fa' tag to the new 'fas' convention.

I do not have a Font Awesome 5 Pro subscription so the bakery command still requires some testing.

…n FA5) Apply fix to AdminLTE to work with FA5

codecov · 2019-04-06T01:18:03Z

Codecov Report

Merging #957 into develop will increase coverage by 0.03%.
The diff coverage is 47.36%.

@@             Coverage Diff             @@
##             develop   #957      +/-   ##
===========================================
+ Coverage      66.96%    67%   +0.03%     
- Complexity      1918   1921       +3     
===========================================
  Files            160    161       +1     
  Lines           6693   6700       +7     
===========================================
+ Hits            4482   4489       +7     
  Misses          2211   2211

Impacted Files	Coverage Δ	Complexity Δ
app/sprinkles/core/src/Util/CheckEnvironment.php	`2.91% <0%> (ø)`	`41 <0> (ø)`	⬇️
...count/src/Database/Migrations/v400/GroupsTable.php	`100% <100%> (ø)`	`3 <0> (ø)`	⬇️
...sprinkles/admin/src/Controller/GroupController.php	`100% <100%> (ø)`	`55 <0> (ø)`	⬇️
...src/Database/Migrations/v430/UpdateGroupsTable.php	`100% <100%> (ø)`	`3 <3> (?)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 66df775...5a3d546. Read the comment docs.

Silic0nS0ldier

Few things here that will need to addressed from what I can see, also this will be a breaking change so release wise it'll be most likely part of 4.3.

app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php

app/sprinkles/core/src/Bakery/SetupFontAwesomeCommand.php

lcharette · 2019-04-06T02:47:12Z

Definitively something for 4.3.0 if it may break existing sprinkles.

lcharette · 2019-04-07T20:15:43Z

app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php

+    {
+        if ($this->schema->hasTable('groups')) {
+            $this->schema->table('groups', function (Blueprint $table) {
+                $table->string('icon', 100)->default('NULL')->change();


Should it be null, or an empty string? 🤔

I went with NULL based off this post: https://stackoverflow.com/questions/38351498/remove-default-in-migration

I also compared to the other columns in the table that did not have a default set when the migration ran, and they all showed NULL for the Default property. In mysql here is how the results of my testing:

Should be possible to do an export of the create table logic to see if the default value was truly reversed (the cleaner the better, leftovers attract edge cases).

Assuming I remember, I'll take a look at what the DDL ends up being.

Here is how "default" migration from \UserFrosting\Sprinkle\Account\Database\Migrations\v400\GroupsTable.php looks

Here is the result of proposed UpgradeGroupsTable.php migration up

Here is the result of proposed UpgradeGroupsTable.php migration down

I think the posted DDL is wrong. Or its mislabeled? I'll still have to look at this myself, but it works as a good reminder none-the-less, so thanks.

I am curious about what is wrong?

Other than ('fas fa-user') in this line, the down method returns the table to the 'original' state. I was not certain how to handle this but I thought it would be better to set the default to use the new fas convention rather than the fa.

I relabeled my pictures above that might help clear up any confusion.

amosfolz · 2019-06-21T02:25:56Z

@Silic0nS0ldier What can I do to help make this review easier for you?

Also, if it will help simplify things I can move the bakery command into a new branch and out of this PR.

Silic0nS0ldier · 2019-06-23T00:36:33Z

@amosfolz My main limitation at the moment is time, or more specifically whenever I have free time there is something jumping up and down screaming for my attention. There isn't much that can be done about that in the meantime unfortunately, however I will get to this (eventually).

One thing that would help however is if you could note that a given PR is ready for review. If I see added commits without a message once the work is done, I'll just end up assuming that isn't in a ready for final review state.

amosfolz · 2019-06-23T13:23:42Z

This is ready for review! :-)

lcharette

Found two places where the icons are missing :

I also get this error. Might be a conflict from the AdminLTE update?

[Error] SyntaxError: Unexpected token ';'. Expected ')' to end an argument list.
	(fonction anonyme) (AdminLTE.js:687)
[Error] TypeError: undefined is not an object (evaluating '$.AdminLTE')
	Code général (AdminLTE-custom.js:24)

And pro doesn't work :(

app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php

app/sprinkles/core/src/Bakery/SetupFontAwesomeCommand.php

amosfolz · 2019-07-14T13:49:31Z

Looks like 5.9 was released in June. Might as well update to the newest version while this is a work in progress? https://fontawesome.com/changelog/latest

Change to font awesome to version 5.9

update fa-trash-alt to fa-trash-o and fa-gear to fa-cog

amosfolz · 2019-07-14T18:18:34Z

Not sure what happened with AdminLTE.js but I am going to blame the linter on my office computer for screwing up that file somehow... The error is fixed in b5d8060.

Also needed to fix the following two icons:
fa-gear no longer exists, so using fa-cog as alternative.

fa-trash-o is now fa-trash-alt. Fixed these in 4ae024b

amosfolz · 2019-07-17T01:37:37Z

And pro doesn't work :(

Just leaving a note for myself if/when I come back to try to add in the bakery command...
I think the reason it didn't work is that you still need to manually update the asset-bundle with the pro file path and that was something that can't easily be done through bakery.

lcharette · 2019-07-17T01:39:42Z

FA Pro is probably something we can live with having only a guide in the doc on how to do it in your sprinkle.

amosfolz and others added 5 commits April 1, 2019 00:25

Replace FA4 with FA5. Replace aliased icons (aliasing is deprecated i…

51f2893

…n FA5) Apply fix to AdminLTE to work with FA5

Update FA5 icon prefix 'fa' to 'fas' to align with new conventions

0a9e12e

Update package.json

985f255

Begin work on new Font Awesome Pro bakery command

41f0e3c

Prompt asking if user wants to continue before asking for auth key.

8f01f2c

Silic0nS0ldier requested changes Apr 6, 2019

View reviewed changes

app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php Show resolved Hide resolved

app/sprinkles/core/src/Bakery/SetupFontAwesomeCommand.php Outdated Show resolved Hide resolved

Silic0nS0ldier added this to the 4.3.0 milestone Apr 6, 2019

Silic0nS0ldier changed the base branch from hotfix to develop April 6, 2019 01:37

Draft of UpdateGroupsTable.php migration

afbab20

lcharette reviewed Apr 7, 2019

View reviewed changes

amosfolz mentioned this pull request Apr 8, 2019

Allow null group assignment for users #867

Closed

amosfolz and others added 7 commits April 22, 2019 22:42

Minor style change

1aaaa5d

add nullable()

dbd2bff

merge userfrosting/develop

8dd1311

merge userfrosting/develop

d4afae5

Merge branch 'develop' into fa5

e89887e

StyleCi and confirmation prompt fix

c2be62b

Remove default(null) from up

11d018b

lcharette self-assigned this Jun 27, 2019

lcharette added Breaking Change Creates incompatibility with current version compatibility Compatibility issue with other framework, features frontend The frontend interface labels Jun 27, 2019

Merge remote-tracking branch 'upstream/develop' into fa5

5ed4892

amosfolz changed the title ~~Fa5~~ Update to Font Awesome 5 (Develop) Jul 12, 2019

Merge branch 'develop' into pr/957

706caa4

lcharette requested changes Jul 13, 2019

View reviewed changes

app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php Outdated Show resolved Hide resolved

app/sprinkles/core/src/Bakery/SetupFontAwesomeCommand.php Outdated Show resolved Hide resolved

amosfolz added 6 commits July 14, 2019 09:56

Update package.json

007e9cb

Change to font awesome to version 5.9

Merge branch 'fa5' into update-fa5

1e07b98

Update icons for Font Awesome 5

4ae024b

update fa-trash-alt to fa-trash-o and fa-gear to fa-cog

Update UpdateGroupsTable.php

c3dd512

Fix AdmiteLTE.js

b5d8060

Delete SetupFontAwesomeCommand.php

5a3d546

lcharette approved these changes Jul 17, 2019

View reviewed changes

lcharette merged commit d54c6a0 into userfrosting:develop Jul 17, 2019

amosfolz deleted the fa5 branch July 17, 2019 01:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to Font Awesome 5 (Develop) #957

Update to Font Awesome 5 (Develop) #957

amosfolz commented Apr 6, 2019

codecov bot commented Apr 6, 2019 •

edited

Loading

Silic0nS0ldier left a comment

lcharette commented Apr 6, 2019

lcharette Apr 7, 2019

amosfolz Apr 7, 2019

Silic0nS0ldier Apr 8, 2019

amosfolz Apr 22, 2019 •

edited

Loading

Silic0nS0ldier Apr 23, 2019

amosfolz Apr 24, 2019

amosfolz commented Jun 21, 2019

Silic0nS0ldier commented Jun 23, 2019

amosfolz commented Jun 23, 2019

lcharette left a comment •

edited

Loading

amosfolz commented Jul 14, 2019

amosfolz commented Jul 14, 2019

amosfolz commented Jul 17, 2019

lcharette commented Jul 17, 2019

Update to Font Awesome 5 (Develop) #957

Update to Font Awesome 5 (Develop) #957

Conversation

amosfolz commented Apr 6, 2019

codecov bot commented Apr 6, 2019 • edited Loading

Codecov Report

Silic0nS0ldier left a comment

Choose a reason for hiding this comment

lcharette commented Apr 6, 2019

lcharette Apr 7, 2019

Choose a reason for hiding this comment

amosfolz Apr 7, 2019

Choose a reason for hiding this comment

Silic0nS0ldier Apr 8, 2019

Choose a reason for hiding this comment

amosfolz Apr 22, 2019 • edited Loading

Choose a reason for hiding this comment

Silic0nS0ldier Apr 23, 2019

Choose a reason for hiding this comment

amosfolz Apr 24, 2019

Choose a reason for hiding this comment

amosfolz commented Jun 21, 2019

Silic0nS0ldier commented Jun 23, 2019

amosfolz commented Jun 23, 2019

lcharette left a comment • edited Loading

Choose a reason for hiding this comment

amosfolz commented Jul 14, 2019

amosfolz commented Jul 14, 2019

amosfolz commented Jul 17, 2019

lcharette commented Jul 17, 2019

codecov bot commented Apr 6, 2019 •

edited

Loading

amosfolz Apr 22, 2019 •

edited

Loading

lcharette left a comment •

edited

Loading