Skip to content

conflic fix noscript/james d. perez jimenez #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Daniel476 wants to merge 18 commits into
base: master
Choose a base branch
from
Open

conflic fix noscript/james d. perez jimenez #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2ec494b
se anade a cross-env al yarn predeploy, deploy,start,build,test,eject
jperezdev Sep 26, 2025
f47fb2e
index.html simple changes
jperezdev Sep 26, 2025
764d8de
Initial commit - Axel Javier Rosario Cabrera
axeljavier12 Sep 26, 2025
27549a7
initial commit - James D. Perez Jimenez
jperezdev Sep 27, 2025
7ba245b
Commit inicial - configuración base del proyecto - FJGS
fgutierrezcr14 Sep 27, 2025
e4e5495
Un pequeño para el trabajo, ungran paso para el master, sigan así has…
davidjosevf Sep 28, 2025
a806770
Initial Commit - Rafael Colon Rosario
Sep 29, 2025
f4eb2a8
cambio de colores
jperezdev Oct 3, 2025
7c2623c
Cambio de colores Axel Javier Rosario Cabrera
axeljavier12 Oct 3, 2025
cf35a99
colores de theme
jperezdev Oct 4, 2025
e2d63b0
conflicto resuelto entre rama James-D.Perez-Jimenez y la rama commit-…
jperezdev Oct 4, 2025
3122349
Create SnapShotGrupo5
fgutierrezcr14 Oct 11, 2025
dbce446
Merge branch 'master' of https://github.com/Daniel476/SnapShotGrupo5
fgutierrezcr14 Oct 11, 2025
95161d5
noscript change
jperezdev Oct 12, 2025
1754784
Mejora del mensaje de Warning JS
fgutierrezcr14 Oct 12, 2025
1a64414
Mejora del mensaje de Warning JS
fgutierrezcr14 Oct 12, 2025
2b3345b
conflict/ James D. Perez Jimenez and Francisco Gutierrez
jperezdev Oct 12, 2025
2da44f7
conflict/James D. Perez Jimenez and Francisco Gutierrez
jperezdev Oct 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"react-scripts": "3.4.1"
},
"scripts": {
"predeploy": "npm run build",
"deploy": "gh-pages -d build",
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
"predeploy": "cross-env NODE_OPTIONS=--openssl-legacy-provider npm run build",
"deploy": "cross-env NODE_OPTIONS=--openssl-legacy-provider gh-pages -d build",
"start": "cross-env NODE_OPTIONS=--openssl-legacy-provider react-scripts start",
"build": "cross-env NODE_OPTIONS=--openssl-legacy-provider react-scripts build",
"test": "cross-env NODE_OPTIONS=--openssl-legacy-provider react-scripts test",
"eject": "cross-env NODE_OPTIONS=--openssl-legacy-provider react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
Expand All @@ -35,5 +35,8 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"cross-env": "^10.0.0"
}
}
6 changes: 3 additions & 3 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
/>
<meta name="theme-color" content="#000000" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<title>Snap Shot</title>
<title>OBS Business School Grupo 5</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<noscript>JavaScript needs to be enabled for this app to run once it is, everything works perfectly!</noscript>
<div id="root"></div>
<span class="forkongithub"><a href="https://github.com/Yog9/SnapShot">Fork me on GitHub</a></span>
<span class="forkongithub"><a href="https://www.obsbusiness.school/en/masters-online/master-in-devops-and-cloud-computing">OBS Business School Grupo 5</a></span>
</body>
</html>
2 changes: 1 addition & 1 deletion src/components/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Navigation from "./Navigation";
const Header = ({ history, handleSubmit }) => {
return (
<div>
<h1>SnapShot</h1>
<h1>OBS Business School Grupo 5</h1>
<Form history={history} handleSubmit={handleSubmit} />
<Navigation />
</div>
Expand Down
15 changes: 8 additions & 7 deletions src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
body {
text-align: center;
font-family: "Josefin Sans", Helvetica, Arial, sans-serif;
color: #3f4850;
background-color: #051c33;
color: #af957c;
}

.forkongithub a {
background: #000;
color: #fff;
color: #af957c;
text-decoration: none;
font-family: arial, sans-serif;
text-align: center;
Expand Down Expand Up @@ -44,13 +45,13 @@ h2 {
font-size: 2em;
margin: 52px 0 40px;
text-transform: capitalize;
color: #051c33;
color: #af957c;
}

h1 {
font-family: "Lobster", "Josefin Sans", Helvetica, Arial, sans-serif;
font-size: 4em;
color: #051c33;
color: #af957c;
}

ul {
Expand Down Expand Up @@ -88,7 +89,7 @@ a {
}

.active {
background-color: #051c33;
background-color: #af957c;
cursor: pointer;
}

Expand All @@ -110,15 +111,15 @@ input {

.main-nav a {
display: block;
background: #051c33;
background: #af957c;
border-radius: 3px;
padding: 5px;
color: #fff;
}

.main-nav .active,
.main-nav a:hover {
background-color: #051c33;
background-color: #af957c;
}

.photo-container ul {
Expand Down
Loading