Skip to content

Commit bde1a52

Browse files
Myhr86Myhr86
committed
Update code
1 parent 46743ee commit bde1a52

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1786
-33
lines changed

Diff for: ‎.env.development

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
REACT_APP_BASE_URL = https://skjaerseth.net/wpress/wp-json/

Diff for: ‎logo.png

5.51 KB
Loading

Diff for: ‎package-lock.json

+112-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,24 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6+
"@fortawesome/fontawesome-svg-core": "^1.3.0-beta2",
7+
"@fortawesome/free-brands-svg-icons": "^5.15.4",
8+
"@fortawesome/free-regular-svg-icons": "^6.0.0-beta2",
9+
"@fortawesome/free-solid-svg-icons": "^5.15.4",
10+
"@fortawesome/react-fontawesome": "^0.1.15",
11+
"@hookform/resolvers": "^1.3.5",
612
"@testing-library/jest-dom": "^5.14.1",
713
"@testing-library/react": "^11.2.7",
814
"@testing-library/user-event": "^12.8.3",
915
"axios": "^0.21.4",
16+
"babel-plugin-macros": "^3.1.0",
1017
"bootstrap": "^5.1.3",
1118
"node-sass": "^6.0.1",
1219
"react": "^17.0.2",
1320
"react-bootstrap": "^2.0.0-rc.0",
1421
"react-dom": "^17.0.2",
1522
"react-hook-form": "^6.15.4",
16-
"react-router": "^5.2.1",
23+
"react-router-dom": "^5.3.0",
1724
"react-scripts": "4.0.3",
1825
"web-vitals": "^1.1.2",
1926
"yup": "^0.32.9"

Diff for: ‎public/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<head>
44
<meta charset="utf-8" />
55
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
6+
<link rel="stylesheet" href="https://use.typekit.net/sba8dbd.css">
67
<meta name="viewport" content="width=device-width, initial-scale=1" />
78
<meta name="theme-color" content="#000000" />
89
<meta

Diff for: ‎src/App.js

+36-5
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,53 @@
11
import { BrowserRouter as Router, Switch, Route } from "react-router-dom";
22
import { AuthProvider } from "./context/AuthContext";
33
import HomePage from "./components/home/HomePage";
4-
import Nav from "./components/layout/Nav";
4+
import Contact from "./components/contact/Contact";
5+
import Hotels from "./components/hotels/Hotels";
6+
import LoginPage from "./components/login/LoginPage";
7+
import Header from "./components/layout/Header";
8+
import Container from 'react-bootstrap/Container'
9+
import ViewHotel from "./components/details/ViewHotel";
10+
import AdminPage from "./components/admin/AdminPage";
11+
import Row from "react-bootstrap/Row";
512
import "bootstrap/dist/css/bootstrap.min.css";
6-
import "./App.css";
13+
import "./style.scss";
14+
import { library } from '@fortawesome/fontawesome-svg-core'
15+
import { fab } from '@fortawesome/free-brands-svg-icons'
16+
import { faFacebook, faFontAwesome } from '@fortawesome/free-brands-svg-icons'
17+
import { faTwitter } from '@fortawesome/free-brands-svg-icons'
18+
import { faInstagram } from '@fortawesome/free-brands-svg-icons'
19+
20+
library.add(fab, faFacebook, faTwitter, faInstagram, faFontAwesome)
721

822
function App() {
923
return (
1024
<AuthProvider>
1125
<Router>
12-
<Nav />
13-
<div className="container">
26+
<Header />
27+
<Container fluid>
28+
<Row>
1429
<Switch>
1530
<Route exact path="/">
1631
<HomePage />
1732
</Route>
33+
<Route path="/admin" exact>
34+
<AdminPage />
35+
</Route>
36+
<Route path="/hotels">
37+
<Hotels />
38+
</Route>
39+
<Route path="/details/:id">
40+
<ViewHotel />
41+
</Route>
42+
<Route path="/contact">
43+
<Contact />
44+
</Route>
45+
<Route path="/login">
46+
<LoginPage />
47+
</Route>
1848
</Switch>
19-
</div>
49+
</Row>
50+
</Container>
2051
</Router>
2152
</AuthProvider>
2253
);

Diff for: ‎src/assets/img/bergenTornbLÅ.jpg renamed to ‎src/assets/img/bergenBlue.jpg

File renamed without changes.

Diff for: ‎src/assets/img/robert-bye-JvUVo08dndQ-unsplash.jpg renamed to ‎src/assets/img/hike.jpg

File renamed without changes.

Diff for: ‎src/assets/img/logo.png

5.51 KB
Loading

Diff for: ‎src/assets/img/markus-spiske-g5ZIXjzRGds-unsplash (1).jpg

-2.73 MB
Binary file not shown.

Diff for: ‎src/assets/img/nik-lanus-YMOHw3F1Hdk-unsplash.jpg renamed to ‎src/assets/img/pillow.jpg

File renamed without changes.

Diff for: ‎src/assets/img/millie-olsen-mNRPJW7ylrI-unsplash.jpg renamed to ‎src/assets/img/walk.jpg

File renamed without changes.

Diff for: ‎src/assets/styles/mixins/_breakpoints.scss

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
$grid-breakpoints: (
2+
xs: 0,
3+
sm: 576px,
4+
md: 768px,
5+
lg: 992px,
6+
xl: 1200px,
7+
xxl: 1600px
8+
)

Diff for: ‎src/assets/styles/partials/_colors.scss

-6
This file was deleted.

0 commit comments

Comments
 (0)