Skip to content
Snippets Groups Projects
Commit a8f3885b authored by Aleksander Aaboen's avatar Aleksander Aaboen
Browse files

More css changes and added allow headers on create profile

parent 1e6cf6e7
No related branches found
No related tags found
1 merge request!104Alex
Showing
with 144 additions and 94 deletions
......@@ -89,6 +89,8 @@ Function uses iterateProfiles
func createProfile(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json")
w.Header().Set("Access-Control-Allow-Origin", "*")
w.Header().Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE")
w.Header().Set("Access-Control-Allow-Headers", "Access-Control-Allow-Headers, Origin,Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers")
requestBody, err := io.ReadAll(r.Body) //Reads body
if !checkStruct(requestBody) {
......
......@@ -9,15 +9,13 @@
"@material-ui/icons": "^4.11.3",
"@mui/icons-material": "^5.6.2",
"bootstrap": "^5.1.3",
"date-fns": "^2.28.0",
"firebase": "^9.7.0",
"mapbox-gl": "^2.8.1",
"materialui-daterange-picker": "^1.1.92",
"react": "^18.1.0",
"react-bootstrap": "^2.2.3",
"react-bootstrap-daterangepicker": "^7.0.0",
"react-date-range": "^1.4.0",
"react-dates": "^21.8.0",
"react-datepicker": "^4.7.0",
"react-dater": "^1.6.0",
"react-dom": "^18.1.0",
"react-google-button": "^0.7.2",
"react-map-gl": "^7.0.11",
......@@ -29,7 +27,6 @@
"react-router": "^6.2.2",
"react-router-dom": "^6.3.0",
"react-scripts": "^5.0.1",
"rsuite": "^5.11.0",
"web-vitals": "^2.1.4"
},
"scripts": {
......
.scaffolding-input{
width: 400px;
}
.btn-add-scaffolding{
padding-top: 20px;
}
.input-fields{
display: flow;
margin-left: 35%;
margin-top: 10%;
width: 500px;
background-color: #9f9e9e;
align-content: center;
}
import React from 'react'
import postModel from "../../../modelData/postModel";
import {SCAFFOLDING_URL} from "../../../modelData/constantsFile";
import "./addScaffolding.css"
class AddScaffolding extends React.Component{
constructor(props) {
......@@ -23,17 +24,21 @@ class AddScaffolding extends React.Component{
scaffoldingInformation(){
return(
<div className={"input-fields"}>
<div className={"input-information"}>
<div>
<input type={"text"} className={"input-text-add"} onChange={event =>
<p className = {"input-sorting-text"}>Enter ID</p>
<input type={"text"} className={"form-control scaffolding-input"} onChange={event =>
{const scaffolding = {...this.state.scaffolding};
scaffolding.id = Number(event.target.value);
this.setState({scaffolding})}}/>
<p>Enter ID</p>
</div>
<div>
<span>Overfør til prosjekt:</span>
<select value={"Test"} onChange={(e) =>
<p className = {"input-sorting-text"}>Overfør til prosjekt:</p>
<select
className={"form-select"}
value={"Test"}
onChange={(e) =>
{const scaffolding = {...this.state.scaffolding};
scaffolding.type = e.target.value;
this.setState({scaffolding})}}>
......@@ -69,9 +74,12 @@ class AddScaffolding extends React.Component{
render() {
return(
<div>
<div className={"input-fields"}>
{this.scaffoldingInformation()}
<button onClick={() => this.postRequest()}>Next</button>
<div className={"btn-add-scaffolding"}>
<button className={"btn"} onClick={() => this.postRequest()}>Legg til</button>
</div>
</div>
......
......@@ -28,9 +28,11 @@
}
.card{
width: 450px;
margin-bottom: 20px;
Box-shadow:0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
}
@media (max-width: 800px){
......
......@@ -158,7 +158,7 @@ export default function InfoModalFunc(props) {
<h3>{e.type.toUpperCase()}</h3>
</section>
<section className={"image"}>
<img className={"img"} src={img} alt={""}/>
<img className={"img"} src={require(`../../scaffolding/images/${e.type.charAt(0).toUpperCase() + e.type.slice(1)}.jpg`)} alt={""}></img>
</section>
<input
className={"form-control"}
......
......@@ -6,6 +6,10 @@
}
.body {
background: black;
}
.name-btn{
display: flex;
list-style-type: none;
......@@ -125,4 +129,5 @@
.information-highlights{
padding-right: 35px;
padding-bottom: 30px;
}
......@@ -6,20 +6,6 @@ import {PROJECTS_WITH_SCAFFOLDING_URL} from "../../modelData/constantsFile";
import {GetDummyData} from "../../modelData/addData";
import {SpinnerDefault} from "../Spinner";
import 'react-date-range/dist/styles.css'; // main style file
import 'react-date-range/dist/theme/default.css'; // theme css file
import { DateRangePicker } from 'react-date-range';
import "react-dates/initialize";
//import { DateRangePicker } from "react-dates";
import "react-dates/lib/css/_datepicker.css";
/**
Class that will create an overview of the projects
*/
......@@ -41,10 +27,7 @@ export function Project(){
const formatDate = (inputDate) => {
const dateArray = inputDate.split('-')
return new Date(dateArray[2] + '-' + dateArray[1] + '-' + dateArray[0])
}
......@@ -175,3 +158,12 @@ export function Project(){
export function formatDate (inputDate) {
const dateArray = inputDate.split('-')
return new Date(dateArray[2] + '-' + dateArray[1] + '-' + dateArray[0])
}
export function formatDateToString (inputDate) {
const dateArray = inputDate.split('-')
return (dateArray[2] + '-' + dateArray[1] + '-' + dateArray[0])
}
......@@ -14,7 +14,7 @@ function CardElement(props){
<h3>{props.type.toUpperCase()}</h3>
</section>
<section className={"image"}>
<img className={"img"} src={require(`../images/${props.type}.jpg`)}></img>
<img className={"img"} src={require(`../images/${props.type.charAt(0).toUpperCase() + props.type.slice(1)}.jpg`)} alt={""}></img>
</section>
<section className={"information-highlights-cta"}>
<div className={"information-highlights"}>
......
......@@ -3,7 +3,7 @@ import React from "react";
function ScaffoldingProject(props){
return(
<div className={"scaffoldingElement"}>
<article className={"card project-card"}>
<article className={"card"}>
<section className={"header"}>
<h3>{props.type.toUpperCase()}</h3>
</section>
......@@ -32,11 +32,6 @@ function ScaffoldingProject(props){
</ul>
</div>
</section>
<section className={"card-btn"}>
<div className={"card-btns"}>
<button className={"btn"} type={"button"} >Mer informasjon</button>
</div>
</section>
</article>
</div>
)
......
......@@ -16,3 +16,4 @@
.appbar{
position: fixed;
}
......@@ -3,8 +3,8 @@ import './topBar.css';
import {
AppBar, Toolbar, Button
} from '@material-ui/core';
import {Link} from "react-router-dom";
import {DropdownButton} from "react-bootstrap";
import {Link, NavLink} from "react-router-dom";
import {DropdownButton, NavDropdown} from "react-bootstrap";
import DropdownItem from "react-bootstrap/DropdownItem";
import {useUserAuth} from "../../context/UserAuthContext";
import {auth} from "../../firebase"
......@@ -45,20 +45,31 @@ const TopBar = () => {
<Button className="button">Logistikk</Button>
</Link>*/}
<DropdownButton id="dropdown-button"
<NavDropdown id="basic-nav-dropdown"
title={"Logistikk"}
size="sm"
style={{textDecorationColor: "black"}}
>
<DropdownItem href="/addproject/">Legg til prosjekt</DropdownItem>
<DropdownItem href="/addscaffolding">Legg til stillasdel</DropdownItem>
</DropdownButton>
<DropdownItem>
<Link to={"/addproject/"}>Legg til prosjekt </Link>
</DropdownItem>
<DropdownItem>
<Link to={"/addscaffolding/"}>Legg til stillas</Link>
</DropdownItem>
</NavDropdown>
<DropdownButton id="dropdown-button"
title={"Bruker"}
size="sm"
>
<DropdownItem href="#/action-1">Bruker Informasjon</DropdownItem>
<DropdownItem>
<Link to={"/addscaffolding/"}>Bruker Informasjon</Link>
</DropdownItem>
<DropdownItem onClick={logOut}>Logg ut</DropdownItem>
</DropdownButton>
</Toolbar>
......@@ -67,11 +78,6 @@ const TopBar = () => {
}
}
export default TopBar;
import React from "react";
import { auth } from "../../firebase";
import {formatDate} from "../projects/projects";
function UserInfo(){
return(
<div className={"info-card"}>
<div className={"information-text"}>
<h3 className={"header-information"}>
</h3>
<h3 className={"under-information"}>
</h3>
</div>
</div>
)
}
......@@ -2,13 +2,12 @@ import { initializeApp } from "firebase/app";
import { getAuth } from "firebase/auth";
const firebaseConfig = {
apiKey: "AIzaSyBsymxf23p52Pe0pB9ZuD_7HI6yBMMWN8g",
authDomain: "cryptocurrency-7d594.firebaseapp.com",
projectId: "cryptocurrency-7d594",
storageBucket: "cryptocurrency-7d594.appspot.com",
messagingSenderId: "796346602164",
appId: "1:796346602164:web:e10a4f566951b0fd18fde1",
measurementId: "G-5SZ9MHB1DM"
apiKey: "AIzaSyB5XxJ-AIC_Bm38oOH4TjdeIBA0eNLRl7w",
authDomain: "stillas-16563.firebaseapp.com",
projectId: "stillas-16563",
storageBucket: "stillas-16563.appspot.com",
messagingSenderId: "586975019426",
appId: "1:586975019426:web:83a11475b6ae32ffbc32fb"
};
// Initialize Firebase
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment