Skip to content

Commit

Permalink
Merge pull request #14 from tmccoy99/css3.0
Browse files Browse the repository at this point in the history
Css3.0
  • Loading branch information
tmccoy99 authored Jan 20, 2023
2 parents b01a917 + 011bb7f commit c600fee
Show file tree
Hide file tree
Showing 38 changed files with 337 additions and 78 deletions.
Binary file modified .DS_Store
Binary file not shown.
Binary file added public/.DS_Store
Binary file not shown.
52 changes: 52 additions & 0 deletions public/account.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
body {
background-color: lightblue;
font-family: 'Courier New', Courier, monospace;
text-align: center;
}

.container{
border: 4px solid white;
border-radius: 25px;
padding: 30px;
margin-top: 50px;
margin-left: 100px;
margin-right: 100px;
}

.approve_button{
display: inline-block;
}

.reject_button{
display: inline-block;
}

ul{
padding:0;
background:white;
font-family: 'Courier New', Courier, monospace;
font-size:15px;
text-transform:uppercase;
text-align: right;
}

li{
display:inline-block;
}

a{
display:block;
padding:10px;
color:black;
text-decoration:none;
}

h1 {
color: white;
text-align: center;
}

h2 {
color: white;
text-align: center;
}
43 changes: 43 additions & 0 deletions public/addaspace.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@

body {
background-color: lightblue;
font-family: 'Courier New', Courier, monospace;
text-align: center;
}

.addform{
border: 4px solid white;
border-radius: 25px;
padding: 30px;
margin: 20px
}

ul{
padding:0;
background:white;
font-family: 'Courier New', Courier, monospace;
font-size:15px;
text-transform:uppercase;
text-align: right;
}

li{
display:inline-block;
}

a{
display:block;
padding:10px;
color:black;
text-decoration:none;
}

h1 {
color: white;
text-align: center;
}

h2 {
color: white;
text-align: center;
}
53 changes: 53 additions & 0 deletions public/addavail.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
body {
background-color: lightblue;
font-family: 'Courier New', Courier, monospace;
text-align: center;
}

.add_avail_form{
border: 4px solid white;
border-radius: 25px;
padding: 30px;
margin-top: 50px;
margin-left: 100px;
margin-right: 100px;
}

.add_another_space{
border: 4px solid white;
border-radius: 25px;
margin-top: 10px;
margin-bottom: 10px;
padding-bottom: 20px;
display: inline-block;
}

ul{
padding:0;
background:white;
font-family: 'Courier New', Courier, monospace;
font-size:15px;
text-transform:uppercase;
text-align: right;
}

li{
display:inline-block;
}

a{
display:block;
padding:10px;
color:black;
text-decoration:none;
}

h1 {
color: white;
text-align: center;
}

h2 {
color: white;
text-align: center;
}
45 changes: 45 additions & 0 deletions public/bookings.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
body {
background-color: lightblue;
font-family: 'Courier New', Courier, monospace;
text-align: center;
}

.container{
border: 4px solid white;
border-radius: 25px;
padding: 30px;
margin-top: 50px;
margin-left: 100px;
margin-right: 100px;
}


ul{
padding:0;
background:white;
font-family: 'Courier New', Courier, monospace;
font-size:15px;
text-transform:uppercase;
text-align: right;
}

li{
display:inline-block;
}

a{
display:block;
padding:10px;
color:black;
text-decoration:none;
}

h1 {
color: white;
text-align: center;
}

h2 {
color: white;
text-align: center;
}
56 changes: 56 additions & 0 deletions public/homepage.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@

body {
background-color: lightblue;
font-family: 'Courier New', Courier, monospace;
text-align: center;
}

ul{
padding:0;
background:white;
font-family: 'Courier New', Courier, monospace;
font-size:15px;
text-transform:uppercase;
text-align: right;
}

li{
display:inline-block;
}

a{
display:block;
padding:10px;
color:black;
text-decoration:none;
}

h1 {
color: white;
text-align: center;
}

h2 {
color: white;
text-align: center;
}

.container {
display: grid;
grid-template-columns: auto;
grid-template-rows: auto;
gap: 100px 0px;
grid-template-areas:
". . ."
". . ."
". . .";
text-align: center;
padding: 20px;
}

.add-another-space{
border: 2px;
border-radius: 20px;
border-color: white;
}

Binary file added public/images/.DS_Store
Binary file not shown.
Binary file added public/images/image1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image13.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image14.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image15.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image17.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image18.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image19.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image20.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image21.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image22.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/image9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 7 additions & 3 deletions public/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,24 @@ h2 {
}

.container {
display: grid;
display: inline;
grid-template-columns: auto;
grid-template-rows: auto;
gap: 100px 0px;
grid-template-areas:
/* grid-template-areas:
". . ."
". . ."
". . .";
text-align: center;
text-align: center; */
padding: 20px;
}

.add-another-space{
border: 2px;
border-radius: 20px;
border-color: white;
}
.drag1{
height: 10px;
width: 20px;
}
41 changes: 21 additions & 20 deletions views/account_page.erb
Original file line number Diff line number Diff line change
@@ -1,39 +1,40 @@
<html>
<head>
<link rel="stylesheet" type="text/css" href="<%= url("/style.css")%>">
<link rel="stylesheet" type="text/css" href="<%= url("/account.css")%>">
</head>
<body>
<div class="navigation">
<ul>
<li><a href="/">Home</a></li>
<li><a href="/log-out">Logout</a></li>
<li><a href="/bookings">Your Bookings</a></li>
<li><a href="/account">Manage Account</a></li>

<li><a href="/log-out">Logout</a></li>
</ul>
</div>
<h1>Account Management</h1>

<div class="float-container">
<div class="float-child">
<a href="/bookings">Your Bookings</a><br>
</div>

<div class="float-child">
<% @requests.each do |request| %>
<%= request.title %>
<%= request.description %>
$<%= request.daily_rate %> per day
<h1>Account Management</h1>

<% @requests.each do |request| %>
<div class="container">
<%= request.title %>
<%= request.description %>
$<%= request.daily_rate %> per day
<br>
<br>
<div class="approve_button">
<form action="/approve-reject/<%= request.id %>&<%= true %>" method="post">
<label>Approve</label>
<input type="submit" name="approve" value="Approve">
</form>
<form action="/approve-reject/<%= request.id %>&<%= false %>" method="post">
<label>Reject</label>
<input type="submit" name="reject" value="Reject">
</form>
<% end %>
</div>

<div class="reject_button">
<form action="/approve-reject/<%= request.id %>&<%= false %>" method="post">
<label>Reject</label>
<input type="submit" name="reject" value="Reject">
</form>
</div>
</div>
</div>
<% end %>
</body>
</html>
Loading

0 comments on commit c600fee

Please sign in to comment.