Merge branch 'sprint/5' into task/6/tmc

Team-Tukka · Jan 6, 2020 · 6b49cc7 · 6b49cc7
2 parents 781fb80 + 80ffd19
commit 6b49cc7
Show file tree

Hide file tree

Showing 9 changed files with 138 additions and 34 deletions.
diff --git a/src/components/addNewScooter/AddNewScooter.js b/src/components/addNewScooter/AddNewScooter.js
@@ -218,7 +218,7 @@ function AddNewScooter() {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du elscooterens enhedsnummer. Fx AK-3761.
@@ -259,7 +259,7 @@ function AddNewScooter() {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du elscooterens navn. Fx HS-855 Hvid.
@@ -298,7 +298,7 @@ function AddNewScooter() {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du elscooterens pris uden moms i DKK. Fx 22999,95.
@@ -341,7 +341,7 @@ function AddNewScooter() {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du den unikke kode, der identificerer enheden. En
@@ -380,7 +380,7 @@ function AddNewScooter() {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du de ord, der kan identificere enheden. Ordene
@@ -419,7 +419,7 @@ function AddNewScooter() {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du elscooterens mærke. Fx C.T.M.
@@ -462,7 +462,7 @@ function AddNewScooter() {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du en fyldestgørende beskrivelse af enheden. Max 200

diff --git a/src/components/addNewSparepart/AddNewSparepart.js b/src/components/addNewSparepart/AddNewSparepart.js
@@ -134,7 +134,7 @@ function AddNewSparepart() {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du reservedelens enhedsnummer. Fx HL-372761.
@@ -175,7 +175,7 @@ function AddNewSparepart() {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du reservedelens enhedsnavn. Fx Armlæn Højre.
@@ -214,7 +214,7 @@ function AddNewSparepart() {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du reservedelens pris uden moms i DKK. Fx 99,95.

diff --git a/src/components/addNewUser/AddNewUser.js b/src/components/addNewUser/AddNewUser.js
@@ -236,7 +236,7 @@ function AddNewUser() {
  toggle={toggleAdminRole}
  style={{
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Bemærk! Hvis du checker af i dette felt, så bliver brugeren

diff --git a/src/components/editScooter/EditScooter.css b/src/components/editScooter/EditScooter.css
@@ -1 +1,17 @@
 @import url('../../assets/css/globalStyles.css');
+
+.inputGroupTextStyles {
+ margin-bottom: 0.5rem;
+ color: #1a1a1a !important;
+ background-color: #f8f8f8 !important;
+ border: 1px #f0f6ea solid !important;
+ border-radius: 0.4rem 0 0 0.4rem !important;
+ box-shadow: 1px 1px 2px #ececec;
+}
+
+.inputStylesEditScooter {
+ border: 1px #f0f6ea solid !important;
+ border-radius: 0 0.4rem 0.4rem 0 !important;
+ box-shadow: 1px 1px 2px #ececec;
+ margin-bottom: 0.5rem;
+}
diff --git a/src/components/editScooter/EditScooter.js b/src/components/editScooter/EditScooter.js
@@ -252,8 +252,16 @@ function EditScooter(props) {
  <Form className="form" onSubmit={handleSubmit}>
  <FormGroup>
  <InputGroup>
+ <InputGroupAddon addonType="prepend">
+ <InputGroupText
+ className="inputGroupTextStyles"
+ style={{ minWidth: '8.7rem' }}
+ >
+ Enhedsnummer
+ </InputGroupText>
+ </InputGroupAddon>
  <Input
- className="inputStyles"
+ className="inputStylesEditScooter"
  type="text"
  name="itemNo"
  id="scooterItemNo"
@@ -283,7 +291,7 @@ function EditScooter(props) {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du elscooterens enhedsnummer. Fx AK-3761.
@@ -292,8 +300,16 @@ function EditScooter(props) {
  </FormGroup>
  <FormGroup>
  <InputGroup>
+ <InputGroupAddon addonType="prepend">
+ <InputGroupText
+ className="inputGroupTextStyles"
+ style={{ minWidth: '8.7rem' }}
+ >
+ Enhedsnavn
+ </InputGroupText>
+ </InputGroupAddon>
  <Input
- className="inputStyles"
+ className="inputStylesEditScooter"
  type="text"
  name="name"
  id="scooterName"
@@ -323,7 +339,7 @@ function EditScooter(props) {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du elscooterens navn. Fx HS-855 Hvid.
@@ -332,8 +348,16 @@ function EditScooter(props) {
  </FormGroup>
  <FormGroup>
  <InputGroup>
+ <InputGroupAddon addonType="prepend">
+ <InputGroupText
+ className="inputGroupTextStyles"
+ style={{ minWidth: '8.7rem' }}
+ >
+ Pris uden moms
+ </InputGroupText>
+ </InputGroupAddon>
  <Input
- className="inputStyles"
+ className="inputStylesEditScooter"
  type="number"
  step={0.01}
  name="price"
@@ -364,7 +388,7 @@ function EditScooter(props) {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du elscooterens pris uden moms i DKK. Fx 22999,95.
@@ -378,8 +402,16 @@ function EditScooter(props) {
  </FormGroup>
  <FormGroup>
  <InputGroup>
+ <InputGroupAddon addonType="prepend">
+ <InputGroupText
+ className="inputGroupTextStyles"
+ style={{ minWidth: '8.7rem' }}
+ >
+ SKU
+ </InputGroupText>
+ </InputGroupAddon>
  <Input
- className="inputStyles"
+ className="inputStylesEditScooter"
  type="text"
  name="sku"
  id="scooterSku"
@@ -407,7 +439,7 @@ function EditScooter(props) {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du den unikke kode, der identificerer enheden. En
@@ -417,8 +449,16 @@ function EditScooter(props) {
  </FormGroup>
  <FormGroup>
  <InputGroup>
+ <InputGroupAddon addonType="prepend">
+ <InputGroupText
+ className="inputGroupTextStyles"
+ style={{ minWidth: '8.7rem' }}
+ >
+ Tags
+ </InputGroupText>
+ </InputGroupAddon>
  <Input
- className="inputStyles"
+ className="inputStylesEditScooter"
  type="text"
  name="tags"
  id="scooterTags"
@@ -446,7 +486,7 @@ function EditScooter(props) {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du de ord, der kan identificere enheden. Ordene
@@ -456,8 +496,16 @@ function EditScooter(props) {
  </FormGroup>
  <FormGroup>
  <InputGroup>
+ <InputGroupAddon addonType="prepend">
+ <InputGroupText
+ className="inputGroupTextStyles"
+ style={{ minWidth: '8.7rem' }}
+ >
+ Mærke
+ </InputGroupText>
+ </InputGroupAddon>
  <Input
- className="inputStyles"
+ className="inputStylesEditScooter"
  type="text"
  name="brand"
  id="scooterBrand"
@@ -485,7 +533,7 @@ function EditScooter(props) {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du elscooterens mærke. Fx C.T.M.
@@ -528,7 +576,7 @@ function EditScooter(props) {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du en fyldestgørende beskrivelse af enheden. Max 200

diff --git a/src/components/editSparepart/EditSparepart.css b/src/components/editSparepart/EditSparepart.css
@@ -1 +1,17 @@
 @import url('../../assets/css/globalStyles.css');
+
+.inputGroupTextStyles {
+ margin-bottom: 0.5rem;
+ color: #1a1a1a !important;
+ background-color: #f8f8f8 !important;
+ border: 1px #f0f6ea solid !important;
+ border-radius: 0.4rem 0 0 0.4rem !important;
+ box-shadow: 1px 1px 2px #ececec;
+}
+
+.inputStylesEditSparepart {
+ border: 1px #f0f6ea solid !important;
+ border-radius: 0 0.4rem 0.4rem 0 !important;
+ box-shadow: 1px 1px 2px #ececec;
+ margin-bottom: 0.5rem;
+}
diff --git a/src/components/editSparepart/EditSparepart.js b/src/components/editSparepart/EditSparepart.js
@@ -159,8 +159,16 @@ function EditSparepart(props) {
  <Form className="form" onSubmit={handleSubmit}>
  <FormGroup>
  <InputGroup>
+ <InputGroupAddon addonType="prepend">
+ <InputGroupText
+ className="inputGroupTextStyles"
+ style={{ minWidth: '8.7rem' }}
+ >
+ Enhedsnummer
+ </InputGroupText>
+ </InputGroupAddon>
  <Input
- className="inputStyles"
+ className="inputStylesEditSparepart"
  type="text"
  name="itemNo"
  id="sparepartItemNo"
@@ -190,7 +198,7 @@ function EditSparepart(props) {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du reservedelens enhedsnummer. Fx HL-372761.
@@ -199,8 +207,16 @@ function EditSparepart(props) {
  </FormGroup>
  <FormGroup>
  <InputGroup>
+ <InputGroupAddon addonType="prepend">
+ <InputGroupText
+ className="inputGroupTextStyles"
+ style={{ minWidth: '8.7rem' }}
+ >
+ Enhedsnavn
+ </InputGroupText>
+ </InputGroupAddon>
  <Input
- className="inputStyles"
+ className="inputStylesEditSparepart"
  type="text"
  name="name"
  id="sparepartName"
@@ -230,7 +246,7 @@ function EditSparepart(props) {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du reservedelens enhedsnavn. Fx Armlæn Højre.
@@ -239,8 +255,16 @@ function EditSparepart(props) {
  </FormGroup>
  <FormGroup>
  <InputGroup>
+ <InputGroupAddon addonType="prepend">
+ <InputGroupText
+ className="inputGroupTextStyles"
+ style={{ minWidth: '8.7rem' }}
+ >
+ Pris uden moms
+ </InputGroupText>
+ </InputGroupAddon>
  <Input
- className="inputStyles"
+ className="inputStylesEditSparepart"
  type="number"
  step={0.01}
  name="price"
@@ -271,7 +295,7 @@ function EditSparepart(props) {
  style={{
  padding: '0.5rem',
  whiteSpace: 'nowrap',
- minWidth: 'fit-content'
+ minWidth: 'min-content'
  }}
  >
  Her indtaster du reservedelens pris uden moms i DKK. Fx 99,95.