Skip to content

Commit

Permalink
Merge pull request #1 from Protocolelectronicsco/pages
Browse files Browse the repository at this point in the history
home page
  • Loading branch information
Protocolelectronicsco authored Sep 21, 2023
2 parents 116c20a + d5d79ed commit bf19b47
Show file tree
Hide file tree
Showing 62 changed files with 18,975 additions and 6,634 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.env
14,708 changes: 8,104 additions & 6,604 deletions package-lock.json

Large diffs are not rendered by default.

37 changes: 35 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,47 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@dile/dile-input": "^2.0.5",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@fortawesome/fontawesome-free": "^6.4.2",
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-brands-svg-icons": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@mui/material": "^5.14.5",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.5.2",
"@types/node": "^16.18.38",
"@types/react": "^18.2.15",
"@types/react-dom": "^18.2.7",
"axios": "^1.5.0",
"cloudflared": "^0.5.0",
"cors": "^2.8.5",
"dotenv": "^16.3.1",
"lit": "^2.8.0",
"ngrok": "^5.0.0-beta.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-helmet": "^6.1.0",
"react-router-dom": "^6.14.2",
"react-scripts": "5.0.1",
"styled-components": "^6.0.7",
"twilio": "^4.16.0",
"twilio-client": "^1.15.0",
"typescript": "^4.9.5",
"web-vitals": "^2.1.4"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
"eject": "react-scripts eject",
"preinstall": "npm install --package-lock-only --ignore-scripts && npx npm-force-resolutions",
"server": "node-env-run server --exec nodemon | pino-colada",
"dev": "run-p server start"
},
"eslintConfig": {
"extends": [
Expand All @@ -39,5 +62,15 @@
"last 1 firefox version",
"last 1 safari version"
]
}
},
"devDependencies": {
"body-parser": "^1.20.2",
"express": "^4.18.2",
"express-pino-logger": "^7.0.0",
"node-env-run": "^4.0.2",
"nodemon": "^3.0.1",
"npm-run-all": "^4.1.5",
"pino-colada": "^2.2.2"
},
"proxy": "http://localhost:3001"
}
Empty file added public/css/analisisFisico.css
Empty file.
122 changes: 122 additions & 0 deletions public/css/home.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
* {
padding: 0;
margin: 0;
box-sizing: border-box;
font-family: 'Titillium Web', sans-serif;
text-align: center;
font-size: 16px;
}

a{
color: black;
font-weight: 600;
padding-bottom: 3%;
}

header {
display: flex;
justify-content: center;
}

.unicauca{
height: 20vh;

}

main {
display: flex;
flex-direction: column;
height: 90vh;
justify-content: space-evenly;
align-items: center;
}

main img{
height: 8vh;
padding-bottom: 3%;
}

.section-1{
display: flex;
width: 80vw;
flex-direction: column;
align-items: center;

}

footer {
background-color: #a5907e;
color: white;
padding: 20px;

bottom: 0;
width: 100%;
height:auto;
z-index: 2;
}

.container {
max-width: 1200px;
margin: 0 auto;
}

.footer-content {
display: flex;
justify-content: space-between;
align-items: center;
}

.footer-links a {
color: white;
margin-right: 20px;
text-decoration: none;
}

.footer-social a {
color: white;
margin-right: 10px;
text-decoration: none;
}

.footer-social i {
font-size: 18px;
}


@media (min-width: 768px) {
*{
font-size: 25px;
}
main img{
height: 15vh;
padding-bottom: 0;
padding-right:3vw;
}

.section-1{
display: flex;
flex-direction: row;
justify-content: center;
}
.columna{
display: flex;
flex-direction: column;
justify-content: center;
width: 20vw;
}
a{
padding-bottom: 0;
}
header {
display: flex;
justify-content:center ;

}

.unicauca{
height: 20vh;

}


}
81 changes: 81 additions & 0 deletions public/css/registerCaficultor.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
input[type=number]::-webkit-inner-spin-button,
input[type=number]::-webkit-outer-spin-button {
-webkit-appearance: none;
margin: 0;
}


input[type=number] { -moz-appearance:textfield; }

main{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
width: 60vw;
height: 80vh;

}

form{
width: 100%;
}

label{
width: 20vw;
}
header {
display: flex;
height: 15vh;
justify-content: center;
padding-bottom: 3%;
padding-top: 3%;
}
.unicauca{
height: 80%;
padding-bottom: 4vh;
}
body{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
width: 100vw;
height: 100vh;

}



.inputs{
width: 100%;
display: flex;
justify-content: space-between;
padding-bottom: 2vw;
}

.variedadArboles{
display: flex;
justify-content: space-between;
}

.checkboxess{
display: flex;
justify-content: space-around;
width: 100%;
}



.button{
display: flex;
justify-content: center;
text-align: center;
}

.guardar{
background-color: blue;
border-radius: 10%;
color:white;
}

Empty file added public/css/registroDeLote.css
Empty file.
Binary file added public/images/SCA_track.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
73 changes: 73 additions & 0 deletions public/images/caucafe logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit bf19b47

Please sign in to comment.