diff --git a/.DS_Store b/.DS_Store index 15b0d74..558bf94 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000..81c936c Binary files /dev/null and b/app/.DS_Store differ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.scss similarity index 71% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.scss index d05ea0f..f795f5d 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.scss @@ -13,3 +13,24 @@ *= require_tree . *= require_self */ + + + @font-face { + font-family: 'GlamourAbsolute_Extended'; + src: url('./fonts/GlamourAbsolute_Extended.otf') + } + + + + +.card{ + width: 246px !important; + float: left; + margin: 30px; + padding: 0px; +} + +.display-3 { + color: #e91e8f; + font-family: 'GlamourAbsolute_Extended'; +} diff --git a/app/assets/stylesheets/fonts/GlamourAbsolute_Extended.otf b/app/assets/stylesheets/fonts/GlamourAbsolute_Extended.otf new file mode 100644 index 0000000..586ec79 Binary files /dev/null and b/app/assets/stylesheets/fonts/GlamourAbsolute_Extended.otf differ diff --git a/app/assets/stylesheets/managers.scss b/app/assets/stylesheets/managers.scss index f5fa4e2..3300129 100644 --- a/app/assets/stylesheets/managers.scss +++ b/app/assets/stylesheets/managers.scss @@ -1,3 +1,4 @@ // Place all the styles related to the Managers controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: https://sass-lang.com/ + diff --git a/app/javascript/.DS_Store b/app/javascript/.DS_Store new file mode 100644 index 0000000..7ceb314 Binary files /dev/null and b/app/javascript/.DS_Store differ diff --git a/app/javascript/components/App.js b/app/javascript/components/App.js index 6c0f910..fd9e3eb 100644 --- a/app/javascript/components/App.js +++ b/app/javascript/components/App.js @@ -1,8 +1,10 @@ import React from "react" import { BrowserRouter as Router, Switch, Route, Link } from "react-router-dom" import { Container } from "reactstrap" -import ApartmentList from "../components/pages/ApartmentList" -import ApartmentNew from "../components/pages/ApartmentNew" +import Header from "./Header" +import Navigation from "./Navigation" +import ApartmentList from "./pages/ApartmentList" +import ApartmentNew from "./pages/ApartmentNew" class App extends React.Component { @@ -35,8 +37,8 @@ async componentDidMount () { return ( +
-
{logged_in &&
@@ -52,7 +54,6 @@ async componentDidMount () { Sign In
} -
{ + return ( +
+ +

Hello, world!

+

This is a simple hero unit, a simple Jumbotron-style component for calling extra attention to featured content or information.

+
+

It uses utility classes for typography and spacing to space content out within the larger container.

+

+ +

+ +
+ ); +}; + +export default Header; \ No newline at end of file diff --git a/app/javascript/components/Navigation.js b/app/javascript/components/Navigation.js new file mode 100644 index 0000000..e69de29 diff --git a/app/javascript/components/pages/ApartmentList.js b/app/javascript/components/pages/ApartmentList.js index 1c47c55..3ecb2c4 100644 --- a/app/javascript/components/pages/ApartmentList.js +++ b/app/javascript/components/pages/ApartmentList.js @@ -1,22 +1,28 @@ import React from 'react' -import { ListGroup } from 'reactstrap' +import { ListGroup, Button, Card, CardImg, CardText, CardBody, CardTitle, CardSubtitle } from "reactstrap"; const ApartmentList = (props) => { const { apartments } = props - return( - apartments.map((apartment, index) => { - return( - -

{ apartment.image }

-

{ apartment.address }

-

{ apartment.city }, { apartment.state } { apartment.zip_code }, { apartment.country }

-

Bedrooms: { apartment.bedrooms }

-

Bathrooms: { apartment.bathrooms }

-

Monthly Rent: { apartment.monthly_rent }

-

Manager: { apartment.manager_id }

- - ) - }) - ) + return ( + + { apartments.map((apartment, index) => { + return ( +
+ + + + + {apartment.address} + {apartment.city}, {apartment.state} + {apartment.manager_id} + + + + +
+ ); + })} + + ); } export default ApartmentList diff --git a/app/javascript/components/pages/ApartmentNew.js b/app/javascript/components/pages/ApartmentNew.js index 08f2c8d..d910367 100644 --- a/app/javascript/components/pages/ApartmentNew.js +++ b/app/javascript/components/pages/ApartmentNew.js @@ -154,14 +154,14 @@ const ApartmentNew = (props) => { - @@ -181,7 +181,7 @@ const ApartmentNew = (props) => { - diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index ea9367b..3314ccd 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -8,7 +8,6 @@ require("turbolinks").start() require("@rails/activestorage").start() require("channels") - // Uncomment to copy all static images under ../images to the output folder and reference // them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>) // or the `imagePath` JavaScript helper below. diff --git a/app/views/.DS_Store b/app/views/.DS_Store new file mode 100644 index 0000000..a77419d Binary files /dev/null and b/app/views/.DS_Store differ diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 0280d61..a160694 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -2,4 +2,5 @@ logged_in: user_signed_in?, sign_in_route: new_user_session_path, sign_out_route: destroy_user_session_path -}) %> \ No newline at end of file +}) %> + diff --git a/config/webpack/environment.js b/config/webpack/environment.js index d16d9af..3817afd 100644 --- a/config/webpack/environment.js +++ b/config/webpack/environment.js @@ -1,3 +1,9 @@ const { environment } = require('@rails/webpacker') +const webpack = require("webpack") +environment.plugins.append("Provide", new webpack.ProvidePlugin({ + $: 'jquery', + jQuery: 'jquery', + Popper: ['popper.js', 'default'] +})) module.exports = environment diff --git a/config/webpack/environment.js.save b/config/webpack/environment.js.save new file mode 100644 index 0000000..f199743 --- /dev/null +++ b/config/webpack/environment.js.save @@ -0,0 +1,10 @@ +const { environment } = require('@rails/webpacker') +const webpack = require("webpack") + +environment.plugins.append("Provide", new webpack.ProvidePlugin({ + $: 'jquery', + jQuery: 'jquery', + Popper: ['popper.js', 'default'] +})) +module.exports = environment + diff --git a/db/.DS_Store b/db/.DS_Store index ef5ba06..52f4629 100644 Binary files a/db/.DS_Store and b/db/.DS_Store differ diff --git a/package.json b/package.json index 9ffe77c..e0bf5a1 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,8 @@ "@rails/webpacker": "4.2.2", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", "bootstrap": "^4.5.0", + "jquery": "^3.5.1", + "popper.js": "^1.16.1", "prop-types": "^15.7.2", "react": "^16.13.1", "react-dom": "^16.13.1", diff --git a/public/.DS_Store b/public/.DS_Store new file mode 100644 index 0000000..6feb4be Binary files /dev/null and b/public/.DS_Store differ diff --git a/yarn.lock b/yarn.lock index 711015e..c8aac51 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4061,6 +4061,11 @@ jest-worker@^25.4.0: merge-stream "^2.0.0" supports-color "^7.0.0" +jquery@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5" + integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg== + js-base64@^2.1.8: version "2.6.2" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.2.tgz#cf9301bc5cc756892a9a6c8d7138322e5944fb0d" @@ -5230,7 +5235,7 @@ pnp-webpack-plugin@^1.5.0: dependencies: ts-pnp "^1.1.6" -popper.js@^1.14.4: +popper.js@^1.14.4, popper.js@^1.16.1: version "1.16.1" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==