Skip to content

Commit 323ea7b

Browse files
mark-robustellimark-robustelli
authored
Merge pull request #3 from FusionAuth/revert-1-main
Revert "Add mavern wrapper to stub-application"
2 parents 58170ea + d02bd44 commit 323ea7b

10 files changed

Lines changed: 56 additions & 55 deletions

File tree

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ This app was built using Java 17 and the maven wrapper. If you wish to use a dif
2020
The root of this project directory (next to this README) are two files [a Docker compose file](./docker-compose.yml) and an [environment variables configuration file](./.env). Assuming you have Docker installed on your machine, you can stand up FusionAuth up on your machine with:
2121

2222
```
23-
docker compose up -d
23+
docker-compose up -d
2424
```
2525

2626
The FusionAuth configuration files also make use of a unique feature of FusionAuth, called [Kickstart](https://fusionauth.io/docs/v1/tech/installation-guide/kickstart): when FusionAuth comes up for the first time, it will look at the [Kickstart file](./kickstart/kickstart.json) and mimic API calls to configure FusionAuth for use when it is first run.
2727

28-
> **NOTE**: If you ever want to reset the FusionAuth system, delete the volumes created by docker-compose by executing `docker compose down -v`.
28+
> **NOTE**: If you ever want to reset the FusionAuth system, delete the volumes created by docker-compose by executing `docker-compose down -v`.
2929
3030
FusionAuth will be initially configured with these settings:
3131

@@ -49,7 +49,7 @@ cd complete-application
4949
```
5050
Note: If you are on Windows swap `./mvnw` with `.\mvnw.cmd`
5151

52-
Now visit the SpringBoot app at [http://localhost:8080](http://localhost:8080)
52+
Now vist the SpringBoot app at [http://localhost:8080](http://localhost:8080)
5353
You can login with a user preconfigured during Kickstart, `richard@example.com` with the password of `password`.
5454

5555
### Further Information

‎complete-application/src/main/java/io/fusionauth/quickstart/springweb/model/Change.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
public class Change {
44
private String error;
5-
private String total = "";
6-
private Integer nickels = 0;
7-
private Integer pennies = 0;
5+
private String total;
6+
private Integer nickels;
7+
private Integer pennies;
88

99
public String getError() {
1010
return error;
@@ -39,6 +39,6 @@ public void setPennies(Integer pennies) {
3939
}
4040

4141
public String getMessage() {
42-
return String.format("We can make change for $%s with %s nickels and %s pennies!", getTotal(), getNickels(), getPennies());
42+
return String.format("We can make change for %s with %s nickels and %s pennies!", getTotal(), getNickels(), getPennies());
4343
}
4444
}

‎kickstart/css/styles.css‎

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:root {
22
--main-text-color: #424242;
3-
--main-accent-color: #096324;
3+
--main-accent-color: #083b94;
44
--input-background: #fbfbfb;
55
--body-background: #f7f7f7;
66
--tooltip-background: #e2e2e2;
@@ -48,6 +48,9 @@ body > main {
4848
body > main {
4949
padding-top: 0;
5050
}
51+
body > main header.app-header {
52+
display: none;
53+
}
5154
/* end help bar */
5255

5356

@@ -95,7 +98,7 @@ a:visited {
9598
.button.blue:hover {
9699
opacity: .8 !important;
97100
background: var(--main-accent-color) !important;
98-
}
101+
}
99102
.button.blue:focus {
100103
background: var(--main-accent-color) !important;
101104
box-shadow: inset 0 1px 2px rgba(0,0,0,0.4),0 0 0 2px rgba(57,152,219,0.4);
@@ -158,9 +161,9 @@ label.checkbox {
158161
margin: 1rem 0;
159162
font-weight: 400;
160163
}
161-
.input-addon-group,
162-
.input-addon-group > :last-child:not(.flat),
163-
.input-addon-group > .input:last-child:not(.flat),
164+
.input-addon-group,
165+
.input-addon-group > :last-child:not(.flat),
166+
.input-addon-group > .input:last-child:not(.flat),
164167
.input-addon-group > input:last-child:not(.flat) {
165168
color: var(--main-text-color); /* overriding typical text color for inputs */
166169
}
@@ -170,18 +173,18 @@ label.checkbox {
170173
input::placeholder {
171174
color: var(--main-text-color);
172175
}
173-
.input,
174-
input[type="email"],
175-
input[type="file"],
176-
input[type="number"],
177-
input[type="search"],
178-
input[type="text"],
179-
input[type="tel"],
180-
input[type="url"],
181-
input[type="password"],
182-
textarea,
176+
.input,
177+
input[type="email"],
178+
input[type="file"],
179+
input[type="number"],
180+
input[type="search"],
181+
input[type="text"],
182+
input[type="tel"],
183+
input[type="url"],
184+
input[type="password"],
185+
textarea,
183186
label.select select
184-
{
187+
{
185188
background: var(--input-background);
186189
border: 1px solid var(--border-color) !important;
187190
border-radius: .25rem !important;
@@ -401,7 +404,7 @@ table thead tr {
401404
background: var(--main-accent-color);
402405
height: 1rem;
403406
}
404-
hr,
407+
hr,
405408
.hr-container hr {
406409
border: none;
407410
height: 1px;
@@ -483,7 +486,7 @@ hr,
483486
#oauth-complete-reg .page-body > .row > .col-sm-8,
484487
#oauth-complete-reg .page-body > .row > .col-md-6,
485488
#oauth-complete-reg .page-body > .row > .col-lg-5,
486-
#oauth-complete-reg .page-body > .row > .col-xl-4,
489+
#oauth-complete-reg .page-body > .row > .col-xl-4,
487490
#oauth-child-reg .page-body > .row > .col-xs,
488491
#oauth-child-reg .page-body > .row > .col-sm-8,
489492
#oauth-child-reg .page-body > .row > .col-md-6,
@@ -493,47 +496,47 @@ hr,
493496
#oauth-child-reg-complete .page-body > .row > .col-sm-8,
494497
#oauth-child-reg-complete .page-body > .row > .col-md-6,
495498
#oauth-child-reg-complete .page-body > .row > .col-lg-5,
496-
#oauth-child-reg-complete .page-body > .row > .col-xl-4,
499+
#oauth-child-reg-complete .page-body > .row > .col-xl-4,
497500
#oauth-not-registered .page-body > .row > .col-xs,
498501
#oauth-not-registered .page-body > .row > .col-sm-8,
499502
#oauth-not-registered .page-body > .row > .col-md-6,
500503
#oauth-not-registered .page-body > .row > .col-lg-5,
501-
#oauth-not-registered .page-body > .row > .col-xl-4,
504+
#oauth-not-registered .page-body > .row > .col-xl-4,
502505
#oauth-error .page-body > .row > .col-xs,
503506
#oauth-error .page-body > .row > .col-sm-8,
504507
#oauth-error .page-body > .row > .col-md-6,
505508
#oauth-error .page-body > .row > .col-lg-5,
506-
#oauth-error .page-body > .row > .col-xl-4,
509+
#oauth-error .page-body > .row > .col-xl-4,
507510
#oauthstart-idp-link .page-body > .row > .col-xs,
508511
#oauthstart-idp-link .page-body > .row > .col-sm-8,
509512
#oauthstart-idp-link .page-body > .row > .col-md-6,
510513
#oauthstart-idp-link .page-body > .row > .col-lg-5,
511-
#oauthstart-idp-link .page-body > .row > .col-xl-4,
514+
#oauthstart-idp-link .page-body > .row > .col-xl-4,
512515
#oauth-wait .page-body > .row > .col-xs,
513516
#oauth-wait .page-body > .row > .col-sm-8,
514517
#oauth-wait .page-body > .row > .col-md-6,
515518
#oauth-wait .page-body > .row > .col-lg-5,
516-
#oauth-wait .page-body > .row > .col-xl-4,
519+
#oauth-wait .page-body > .row > .col-xl-4,
517520
#email-verification .page-body > .row > .col-xs,
518521
#email-verification .page-body > .row > .col-sm-8,
519522
#email-verification .page-body > .row > .col-md-6,
520523
#email-verification .page-body > .row > .col-lg-5,
521-
#email-verification .page-body > .row > .col-xl-4,
524+
#email-verification .page-body > .row > .col-xl-4,
522525
#email-ver-required .page-body > .row > .col-xs,
523526
#email-ver-required .page-body > .row > .col-sm-8,
524527
#email-ver-required .page-body > .row > .col-md-6,
525528
#email-ver-required .page-body > .row > .col-lg-5,
526-
#email-ver-required .page-body > .row > .col-xl-4,
529+
#email-ver-required .page-body > .row > .col-xl-4,
527530
#email-ver-complete .page-body > .row > .col-xs,
528531
#email-ver-complete .page-body > .row > .col-sm-8,
529532
#email-ver-complete .page-body > .row > .col-md-6,
530533
#email-ver-complete .page-body > .row > .col-lg-5,
531-
#email-ver-complete .page-body > .row > .col-xl-4,
534+
#email-ver-complete .page-body > .row > .col-xl-4,
532535
#email-ver-resent .page-body > .row > .col-xs,
533536
#email-ver-resent .page-body > .row > .col-sm-8,
534537
#email-ver-resent .page-body > .row > .col-md-6,
535538
#email-ver-resent .page-body > .row > .col-lg-5,
536-
#email-ver-resent .page-body > .row > .col-xl-4,
539+
#email-ver-resent .page-body > .row > .col-xl-4,
537540
#forgot-pwd .page-body > .row > .col-xs,
538541
#forgot-pwd .page-body > .row > .col-sm-8,
539542
#forgot-pwd .page-body > .row > .col-md-6,
@@ -567,7 +570,7 @@ hr,
567570
#acct-2fa-enable .page-body > .row > .col-xs-12,
568571
#acct-2fa-enable .page-body > .row > .col-sm-12,
569572
#acct-2fa-enable .page-body > .row > .col-md-10,
570-
#acct-2fa-enable .page-body > .row > .col-lg-8,
573+
#acct-2fa-enable .page-body > .row > .col-lg-8,
571574
#acct-2fa-disable .page-body > .row > .col-xs-12,
572575
#acct-2fa-disable .page-body > .row > .col-sm-12,
573576
#acct-2fa-disable .page-body > .row > .col-md-10,
@@ -578,12 +581,12 @@ hr,
578581
#unauthorized-page .page-body > .row > .col-xl-5,
579582
#change-pwd .page-body > .row > .col-xs,
580583
#change-pwd .page-body > .row > .col-sm-8,
581-
#change-pwd .page-body > .row > .col-md-6,
584+
#change-pwd .page-body > .row > .col-md-6,
582585
#change-pwd .page-body > .row > .col-lg-5,
583586
#change-pwd .page-body > .row > .col-xl-4,
584587
#change-pwd-complete .page-body > .row > .col-xs,
585588
#change-pwd-complete .page-body > .row > .col-sm-8,
586-
#change-pwd-complete .page-body > .row > .col-md-6,
589+
#change-pwd-complete .page-body > .row > .col-md-6,
587590
#change-pwd-complete .page-body > .row > .col-lg-5,
588591
#change-pwd-complete .page-body > .row > .col-xl-4 {
589592
flex-basis: 33rem;
@@ -635,7 +638,7 @@ hr,
635638
#oauth-complete-reg .page-body > .row > .col-sm-8,
636639
#oauth-complete-reg .page-body > .row > .col-md-6,
637640
#oauth-complete-reg .page-body > .row > .col-lg-5,
638-
#oauth-complete-reg .page-body > .row > .col-xl-4,
641+
#oauth-complete-reg .page-body > .row > .col-xl-4,
639642
#oauth-child-reg .page-body > .row > .col-xs,
640643
#oauth-child-reg .page-body > .row > .col-sm-8,
641644
#oauth-child-reg .page-body > .row > .col-md-6,
@@ -645,17 +648,17 @@ hr,
645648
#oauth-child-reg-complete .page-body > .row > .col-sm-8,
646649
#oauth-child-reg-complete .page-body > .row > .col-md-6,
647650
#oauth-child-reg-complete .page-body > .row > .col-lg-5,
648-
#oauth-child-reg-complete .page-body > .row > .col-xl-4,
651+
#oauth-child-reg-complete .page-body > .row > .col-xl-4,
649652
#oauth-not-registered .page-body > .row > .col-xs,
650653
#oauth-not-registered .page-body > .row > .col-sm-8,
651654
#oauth-not-registered .page-body > .row > .col-md-6,
652655
#oauth-not-registered .page-body > .row > .col-lg-5,
653-
#oauth-not-registered .page-body > .row > .col-xl-4,
656+
#oauth-not-registered .page-body > .row > .col-xl-4,
654657
#oauth-error .page-body > .row > .col-xs,
655658
#oauth-error .page-body > .row > .col-sm-8,
656659
#oauth-error .page-body > .row > .col-md-6,
657660
#oauth-error .page-body > .row > .col-lg-5,
658-
#oauth-error .page-body > .row > .col-xl-4,
661+
#oauth-error .page-body > .row > .col-xl-4,
659662
#oauthstart-idp-link .page-body > .row > .col-xs,
660663
#oauthstart-idp-link .page-body > .row > .col-sm-8,
661664
#oauthstart-idp-link .page-body > .row > .col-md-6,
@@ -665,27 +668,27 @@ hr,
665668
#oauth-wait .page-body > .row > .col-sm-8,
666669
#oauth-wait .page-body > .row > .col-md-6,
667670
#oauth-wait .page-body > .row > .col-lg-5,
668-
#oauth-wait .page-body > .row > .col-xl-4,
671+
#oauth-wait .page-body > .row > .col-xl-4,
669672
#email-verification .page-body > .row > .col-xs,
670673
#email-verification .page-body > .row > .col-sm-8,
671674
#email-verification .page-body > .row > .col-md-6,
672675
#email-verification .page-body > .row > .col-lg-5,
673-
#email-verification .page-body > .row > .col-xl-4,
676+
#email-verification .page-body > .row > .col-xl-4,
674677
#email-ver-required .page-body > .row > .col-xs,
675678
#email-ver-required .page-body > .row > .col-sm-8,
676679
#email-ver-required .page-body > .row > .col-md-6,
677680
#email-ver-required .page-body > .row > .col-lg-5,
678-
#email-ver-required .page-body > .row > .col-xl-4,
681+
#email-ver-required .page-body > .row > .col-xl-4,
679682
#email-ver-complete .page-body > .row > .col-xs,
680683
#email-ver-complete .page-body > .row > .col-sm-8,
681684
#email-ver-complete .page-body > .row > .col-md-6,
682685
#email-ver-complete .page-body > .row > .col-lg-5,
683-
#email-ver-complete .page-body > .row > .col-xl-4,
686+
#email-ver-complete .page-body > .row > .col-xl-4,
684687
#email-ver-resent .page-body > .row > .col-xs,
685688
#email-ver-resent .page-body > .row > .col-sm-8,
686689
#email-ver-resent .page-body > .row > .col-md-6,
687690
#email-ver-resent .page-body > .row > .col-lg-5,
688-
#email-ver-resent .page-body > .row > .col-xl-4,
691+
#email-ver-resent .page-body > .row > .col-xl-4,
689692
#forgot-pwd .page-body > .row > .col-xs,
690693
#forgot-pwd .page-body > .row > .col-sm-8,
691694
#forgot-pwd .page-body > .row > .col-md-6,
@@ -730,12 +733,12 @@ hr,
730733
#unauthorized-page .page-body > .row > .col-xl-5,
731734
#change-pwd .page-body > .row > .col-xs,
732735
#change-pwd .page-body > .row > .col-sm-8,
733-
#change-pwd .page-body > .row > .col-md-6,
736+
#change-pwd .page-body > .row > .col-md-6,
734737
#change-pwd .page-body > .row > .col-lg-5,
735738
#change-pwd .page-body > .row > .col-xl-4,
736739
#change-pwd-complete .page-body > .row > .col-xs,
737740
#change-pwd-complete .page-body > .row > .col-sm-8,
738-
#change-pwd-complete .page-body > .row > .col-md-6,
741+
#change-pwd-complete .page-body > .row > .col-md-6,
739742
#change-pwd-complete .page-body > .row > .col-lg-5,
740743
#change-pwd-complete .page-body > .row > .col-xl-4 {
741744
flex-basis: calc(100% - 30px);
@@ -759,7 +762,7 @@ hr,
759762
#acct-2fa-index .page-body > .row > .col-lg-8 {
760763
flex-basis: 54.125rem;
761764
max-width: 54.125rem;
762-
}
765+
}
763766
#acct-2fa-index .page-body > .row.center:last-of-type {
764767
width: 54.125rem;
765768
}
@@ -782,10 +785,10 @@ hr,
782785
#oauth-two-factor-methods .full,
783786
#oauth-two-factor-methods .blue.button,
784787
#oauth-authorize .panel > main > form > .form-row:first-of-type,
785-
#oauth-passwordless .panel > main > .full > .form-row:first-of-type,
788+
#oauth-passwordless .panel > main > .full > .form-row:first-of-type,
786789
#oauth-register .panel > main > .full > .form-row:first-of-type,
787790
#forgot-pwd .panel > main > .full fieldset,
788-
#forgot-pwd .panel .grecaptcha-msg,
791+
#forgot-pwd .panel .grecaptcha-msg,
789792
#change-pwd .panel > main .full > .form-row:first-of-type,
790793
#acct-2fa-index .panel > main > fieldset {
791794
margin-bottom: 0;
@@ -995,10 +998,10 @@ hr,
995998
#acct-index .page-body > .row:first-of-type > .col-lg-8 {
996999
flex-basis: 54.125rem;
9971000
max-width: 54.125rem;
998-
}
1001+
}
9991002
#acct-index .page-body > .row.center:last-of-type {
10001003
width: 54.125rem;
1001-
}
1004+
}
10021005
#acct-index .panel:before {
10031006
width: 6.25rem;
10041007
}

your-application/mvnw renamed to stub-application/mvnw

File renamed without changes.

your-application/mvnw.cmd renamed to stub-application/mvnw.cmd

File renamed without changes.

your-application/pom.xml renamed to stub-application/pom.xml

File renamed without changes.

your-application/src/main/java/io/fusionauth/quickstart/springweb/FusionAuthSpringApplication.java renamed to stub-application/src/main/java/io/fusionauth/quickstart/springweb/FusionAuthSpringApplication.java

File renamed without changes.

your-application/src/main/resources/application.properties renamed to stub-application/src/main/resources/application.properties

File renamed without changes.

‎your-application/.mvn/wrapper/maven-wrapper.jar‎

-57.4 KB
Binary file not shown.

‎your-application/.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)