Skip to content

Commit

Permalink
Switch from bootstrap v4 (4.6.2) to boostrap v5 (5.2.3)
Browse files Browse the repository at this point in the history
  • Loading branch information
@steinarb
steinarb committed Jan 13, 2024
1 parent 257086a commit 9d3431c
Show file tree
Hide file tree
Showing 20 changed files with 90 additions and 92 deletions.
24 changes: 12 additions & 12 deletions ukelonn.web.frontend/src/main/frontend/components/Admin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default function Admin() {
</div>
<form onSubmit={ e => { e.preventDefault(); }}>
<div className="container">
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="account-selector" className="col-form-label col-5">{text.chooseWhoToPayTo}:</label>
<div className="col-7">
<Accounts id="account-selector" className="form-control" />
Expand All @@ -47,19 +47,19 @@ export default function Admin() {
<div className="row">
<EarningsMessage />
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="account-balance" className="col-form-label col-5">{text.owedAmount}:</label>
<div className="col-7">
<input id="account-balance" className="form-control" type="text" value={balance} readOnly={true} />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="paymenttype-selector" className="col-form-label col-5">{text.paymentType}:</label>
<div className="col-7">
<Paymenttypes id="paymenttype-selector" className="form-control" />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="amount" className="col-form-label col-5">{text.amount}:</label>
<div className="col-7">
<input
Expand All @@ -70,7 +70,7 @@ export default function Admin() {
onChange={e => dispatch(MODIFY_PAYMENT_AMOUNT(e.target.value))} />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<div className="col-5" />
<div className="col-7">
<button
Expand All @@ -84,37 +84,37 @@ export default function Admin() {
</div>
</form>
<div className="container">
<Link className="btn btn-block btn-primary right-align-cell" to={performedjobs}>
<Link className="btn btn-block btn-primary right-align-cell mb-2" to={performedjobs}>
{text.performedJobs}
&nbsp;
<span className="oi oi-chevron-right" title="chevron right" aria-hidden="true"></span>
</Link>
<Link className="btn btn-block btn-primary right-align-cell" to={performedpayments}>
<Link className="btn btn-block btn-primary right-align-cell mb-2" to={performedpayments}>
{text.performedPayments}
&nbsp;
<span className="oi oi-chevron-right" title="chevron right" aria-hidden="true"></span>
</Link>
<Link className="btn btn-block btn-primary right-align-cell" to={statistics}>
<Link className="btn btn-block btn-primary right-align-cell mb-2" to={statistics}>
{text.statistics}
&nbsp;
<span className="oi oi-chevron-right" title="chevron right" aria-hidden="true"></span>
</Link>
<Link className="btn btn-block btn-primary right-align-cell" to="/ukelonn/admin/jobtypes">
<Link className="btn btn-block btn-primary right-align-cell mb-2" to="/ukelonn/admin/jobtypes">
{text.administrateJobsAndJobTypes}
&nbsp;
<span className="oi oi-chevron-right" title="chevron right" aria-hidden="true"></span>
</Link>
<Link className="btn btn-block btn-primary right-align-cell" to="/ukelonn/admin/paymenttypes">
<Link className="btn btn-block btn-primary right-align-cell mb-2" to="/ukelonn/admin/paymenttypes">
{text.administratePaymenttypes}
&nbsp;
<span className="oi oi-chevron-right" title="chevron right" aria-hidden="true"></span>
</Link>
<Link className="btn btn-block btn-primary right-align-cell" to="/ukelonn/admin/users">
<Link className="btn btn-block btn-primary right-align-cell mb-2" to="/ukelonn/admin/users">
{text.administrateUsers}
&nbsp;
<span className="oi oi-chevron-right" title="chevron right" aria-hidden="true"></span>
</Link>
<Link className="btn btn-block btn-primary right-align-cell" to="/ukelonn/admin/bonuses">
<Link className="btn btn-block btn-primary right-align-cell mb-2" to="/ukelonn/admin/bonuses">
{text.administrateBonuses}
&nbsp;
<span className="oi oi-chevron-right" title="chevron right" aria-hidden="true"></span>
Expand Down
14 changes: 7 additions & 7 deletions ukelonn.web.frontend/src/main/frontend/components/AdminBonusCreate.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default function AdminBonusCreate() {
</div>
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="iconurl" className="col-form-label col-5">{text.iconURL}</label>
<div className="col-7">
<input
Expand All @@ -64,7 +64,7 @@ export default function AdminBonusCreate() {
onChange={e => dispatch(MODIFY_BONUS_ICONURL(e.target.value))} />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="title" className="col-form-label col-5">{text.title}</label>
<div className="col-7">
<input
Expand All @@ -75,7 +75,7 @@ export default function AdminBonusCreate() {
onChange={e => dispatch(MODIFY_BONUS_TITLE(e.target.value))} />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="description" className="col-form-label col-5">{text.description}</label>
<div className="col-7">
<input
Expand All @@ -86,7 +86,7 @@ export default function AdminBonusCreate() {
onChange={e => dispatch(MODIFY_BONUS_DESCRIPTION(e.target.value))} />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="bonusfactor" className="col-form-label col-5">{text.bonusFactor}</label>
<div className="col-7">
<input
Expand All @@ -98,7 +98,7 @@ export default function AdminBonusCreate() {
onChange={e => dispatch(MODIFY_BONUS_FACTOR(e.target.value))} />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="startdate" className="col-form-label col-5">{text.startDate}</label>
<div className="col-7">
<input
Expand All @@ -110,7 +110,7 @@ export default function AdminBonusCreate() {
/>
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="enddate" className="col-form-label col-5">{text.endDate}</label>
<div className="col-7">
<input
Expand All @@ -122,7 +122,7 @@ export default function AdminBonusCreate() {
/>
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<div className="col-5"/>
<div className="col-7">
<button
Expand Down
8 changes: 4 additions & 4 deletions ukelonn.web.frontend/src/main/frontend/components/AdminBonusDelete.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function AdminBonusesDelete() {

<form onSubmit={ e => { e.preventDefault(); }}>
<div className="container">
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="bonus" className="col-form-label col-5">{text.chooseBonus}</label>
<div className="col-7">
<select id="bonus" className="form-control" value={bonusId} onChange={e => dispatch(SELECT_BONUS(parseInt(e.target.value)))}>
Expand All @@ -39,19 +39,19 @@ export default function AdminBonusesDelete() {
</select>
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="title" className="col-form-label col-5">{text.title}</label>
<div className="col-7">
<input readOnly id="title" className="form-control" type="text" value={bonusTitle} />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="description" className="col-form-label col-5">{text.description}</label>
<div className="col-7">
<input readOnly id="description" className="form-control" type="text" value={bonusDescription} />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<div className="col-5"/>
<div className="col-7">
<button
Expand Down
16 changes: 8 additions & 8 deletions ukelonn.web.frontend/src/main/frontend/components/AdminBonusModify.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default function AdminBonusesModify() {
</nav>
<form onSubmit={ e => { e.preventDefault(); }}>
<div className="container">
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="bonus" className="col-form-label col-5">{text.chooseBonus}</label>
<div className="col-7">
<select id="bonus" className="form-control" value={bonusId} onChange={e => dispatch(SELECT_BONUS(parseInt(e.target.value)))}>
Expand All @@ -63,7 +63,7 @@ export default function AdminBonusesModify() {
</div>
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="iconurl" className="col-form-label col-5">{text.iconURL}</label>
<div className="col-7">
<input
Expand All @@ -74,7 +74,7 @@ export default function AdminBonusesModify() {
onChange={e => dispatch(MODIFY_BONUS_ICONURL(e.target.value))} />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="title" className="col-form-label col-5">{text.title}</label>
<div className="col-7">
<input
Expand All @@ -85,7 +85,7 @@ export default function AdminBonusesModify() {
onChange={e => dispatch(MODIFY_BONUS_TITLE(e.target.value))} />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="description" className="col-form-label col-5">{text.description}</label>
<div className="col-7">
<input
Expand All @@ -96,7 +96,7 @@ export default function AdminBonusesModify() {
onChange={e => dispatch(MODIFY_BONUS_DESCRIPTION(e.target.value))} />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="bonusfactor" className="col-form-label col-5">{text.bonusFactor}</label>
<div className="col-7">
<input
Expand All @@ -108,7 +108,7 @@ export default function AdminBonusesModify() {
onChange={e => dispatch(MODIFY_BONUS_FACTOR(e.target.value))} />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="startdate" className="col-form-label col-5">{text.startDate}</label>
<div className="col-7">
<input
Expand All @@ -120,7 +120,7 @@ export default function AdminBonusesModify() {
/>
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="enddate" className="col-form-label col-5">{text.endDate}</label>
<div className="col-7">
<input
Expand All @@ -132,7 +132,7 @@ export default function AdminBonusesModify() {
/>
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<div className="col-5"/>
<div className="col-7">
<button
Expand Down
6 changes: 3 additions & 3 deletions ukelonn.web.frontend/src/main/frontend/components/AdminBonuses.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ export default function AdminBonuses() {
<Locale />
</nav>
<div>
<Link className="btn btn-block btn-primary right-align-cell" to="/ukelonn/admin/bonuses/modify">
<Link className="btn btn-block btn-primary right-align-cell mb-2" to="/ukelonn/admin/bonuses/modify">
{text.modifyBonuses}
&nbsp;
<span className="oi oi-chevron-right" title="chevron right" aria-hidden="true"></span>
</Link>
<Link className="btn btn-block btn-primary right-align-cell" to="/ukelonn/admin/bonuses/create">
<Link className="btn btn-block btn-primary right-align-cell mb-2" to="/ukelonn/admin/bonuses/create">
{text.createNewBonus}
&nbsp;
<span className="oi oi-chevron-right" title="chevron right" aria-hidden="true"></span>
</Link>
<Link className="btn btn-block btn-primary right-align-cell" to="/ukelonn/admin/bonuses/delete">
<Link className="btn btn-block btn-primary right-align-cell mb-2" to="/ukelonn/admin/bonuses/delete">
{text.deleteBonuses}
&nbsp;
<span className="oi oi-chevron-right" title="chevron right" aria-hidden="true"></span>
Expand Down
2 changes: 1 addition & 1 deletion ukelonn.web.frontend/src/main/frontend/components/AdminJobsDelete.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default function AdminJobsDelete() {
<em>{text.doNot}</em> {text.deleteJobsThatAreToBePaidFor}</p>

<div className="container">
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="account-selector" className="col-form-label col-5">{text.chooseAccount}:</label>
<div className="col-7">
<Accounts id="account-selector" />
Expand Down
8 changes: 4 additions & 4 deletions ukelonn.web.frontend/src/main/frontend/components/AdminJobsEdit.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function AdminJobsEdit() {


<div className="container">
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="account-selector" className="col-form-label col-5">{text.chooseAccount}:</label>
<div className="col-7">
<Accounts id="account-selector" className="form-control" />
Expand Down Expand Up @@ -63,19 +63,19 @@ export default function AdminJobsEdit() {
</div>
<h2>Endre jobb</h2>
<div className="container">
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="jobtype" className="col-form-label col-5">{text.jobType}</label>
<div className="col-7">
<Jobtypes id="jobtype" />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="amount" className="col-form-label col-5">{text.amount}</label>
<div className="col-7">
<input id="amount" type="text" value={transactionAmount} readOnly={true} />
</div>
</div>
<div className="form-group row">
<div className="form-group row mb-2">
<label htmlFor="date" className="col-form-label col-5">{text.date}</label>
<div className="col-7">
<input
Expand Down
8 changes: 4 additions & 4 deletions ukelonn.web.frontend/src/main/frontend/components/AdminJobtypes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ export default function AdminJobtypes() {
<Locale />
</nav>
<div className="container">
<Link className="btn btn-block btn-primary right-align-cell" to="/ukelonn/admin/jobtypes/modify">
<Link className="btn btn-block btn-primary right-align-cell mb-2" to="/ukelonn/admin/jobtypes/modify">
{text.modifyJobTypes}
&nbsp;
<span className="oi oi-chevron-right" title="chevron right" aria-hidden="true"></span>
</Link>
<Link className="btn btn-block btn-primary right-align-cell" to="/ukelonn/admin/jobtypes/create">
<Link className="btn btn-block btn-primary right-align-cell mb-2" to="/ukelonn/admin/jobtypes/create">
{text.createNewJobType}
&nbsp;
<span className="oi oi-chevron-right" title="chevron right" aria-hidden="true"></span>
</Link>
<Link className="btn btn-block btn-primary right-align-cell" to="/ukelonn/admin/jobs/delete">
<Link className="btn btn-block btn-primary right-align-cell mb-2" to="/ukelonn/admin/jobs/delete">
{text.deleteJobs}
&nbsp;
<span className="oi oi-chevron-right" title="chevron right" aria-hidden="true"></span>
</Link>
<Link className="btn btn-block btn-primary right-align-cell" to="/ukelonn/admin/jobs/edit">
<Link className="btn btn-block btn-primary right-align-cell mb-2" to="/ukelonn/admin/jobs/edit">
{text.modifyJobs}
&nbsp;
<span className="oi oi-chevron-right" title="chevron right" aria-hidden="true"></span>
Expand Down
Loading

0 comments on commit 9d3431c

Please sign in to comment.