Skip to content

Commit

Permalink
testing some idea
Browse files Browse the repository at this point in the history
  • Loading branch information
katemat committed Jul 16, 2020
1 parent 5eb249a commit e2ae2d0
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 35 deletions.
62 changes: 33 additions & 29 deletions public/style2.css
Original file line number Diff line number Diff line change
@@ -1,45 +1,49 @@
.create-form-div, .update-form-div {
background-color: rgb(241, 237, 237);
box-shadow: 1px 0px 40px 0px rgba(78, 108, 246, 0.99);
min-width: 700px;
.create-form-div,
.update-form-div {
background-color: rgb(241, 237, 237);
box-shadow: 1px 0px 40px 0px rgba(78, 108, 246, 0.99);
min-width: 700px;
}

.create-form-div input, .update-form-div input{
height: 20px;
border-radius: 3px;
border: 0.5px solid rgb(180, 179, 179);
padding: 5px;
font-size: 1em;
.create-form-div input,
.update-form-div input {
height: 20px;
border-radius: 3px;
border: 0.5px solid rgb(180, 179, 179);
padding: 5px;
font-size: 1em;
}

.item-map {
border: 1px solid rgb(180, 179, 179);
border-radius: 3px;
border: 1px solid rgb(180, 179, 179);
border-radius: 3px;
height: 500px;
}

.create-btn, .update-btn {
width: 30%;
margin: 10px auto;
padding: 5px;
border: 1px solid black;
border-radius: 3px;
font-size: 1.25em;
background-color: aquamarine;
.create-btn,
.update-btn {
width: 30%;
margin: 10px auto;
padding: 5px;
border: 1px solid black;
border-radius: 3px;
font-size: 1.25em;
background-color: aquamarine;
}

.create-btn:hover, .update-btn:hover {
background-color: rgb(82, 199, 160);
cursor: pointer;
.create-btn:hover,
.update-btn:hover {
background-color: rgb(82, 199, 160);
cursor: pointer;
}

.selection {
height: 25px;
width: 310px;
margin: 0;
font-size: 1em;
height: 25px;
width: 310px;
margin: 0;
font-size: 1em;
}

.hidden {
display: none;
display: none;
}

12 changes: 6 additions & 6 deletions public/trashure-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ function showPosition(position, cb) {

// Fetches information to be displayed
const handlePinClick = function (e) {
const url = `https://trashure-app.herokuapp.com/api/trashure_items/${e.target.metadata.id}`;
// const url = `http://localhost:8080/api/trashure_items/${e.target.metadata.id}`;
// const url = `https://trashure-app.herokuapp.com/api/trashure_items/${e.target.metadata.id}`;
const url = `http://localhost:8080/api/trashure_items/${e.target.metadata.id}`;
axios.get(url).then((res) => {
res.data.forEach(function (data) {
document.querySelector('.description-of-item').classList.remove('hidden');
Expand All @@ -90,8 +90,8 @@ const handlePinClick = function (e) {

reverseGeocode(fakevent);

const url = `https://trashure-app.herokuapp.com/api/users/${data.owner_id}`;
// const url = `http://localhost:8080/api/users/${data.owner_id}`;
// const url = `https://trashure-app.herokuapp.com/api/users/${data.owner_id}`;
const url = `http://localhost:8080/api/users/${data.owner_id}`;
axios.get(url).then((res) => {
document.querySelector(
'.owner-of-item'
Expand Down Expand Up @@ -155,8 +155,8 @@ function getMap() {

var center = map.getCenter();

const url = 'https://trashure-app.herokuapp.com/api/trashure_items';
// const url = 'http://localhost:8080/api/trashure_items';
// const url = 'https://trashure-app.herokuapp.com/api/trashure_items';
const url = 'http://localhost:8080/api/trashure_items';

axios.get(url).then((res) => {
res.data.forEach(function (data) {
Expand Down

0 comments on commit e2ae2d0

Please sign in to comment.