Skip to content

[WIP] MaterialUI intergration #592

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.

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions app/assets/javascripts/application.js

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,17 @@
// const images = require.context('../images', true)
// const imagePath = (name) => images(name, true)

require("jquery")
require("@rails/ujs").start()

import React from 'react';
import ReactDOM from 'react-dom';

import User from "../classes/user"
import MainAppBar from "./mainAppBar"

document.addEventListener("DOMContentLoaded", function(event) {
ReactDOM.render(<MainAppBar />, document.querySelector('nav'));
});

if (App.currentUserData) {
App.currentUser = new User(App.currentUserData);
Expand Down
48 changes: 48 additions & 0 deletions app/javascript/packs/mainAppBar.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import React from 'react';
import ReactDOM from 'react-dom';

import { makeStyles } from '@material-ui/core/styles';

import AppBar from '@material-ui/core/AppBar';
import Button from '@material-ui/core/Button';
import IconButton from '@material-ui/core/IconButton';
import MenuIcon from '@material-ui/icons/Menu';
import Toolbar from '@material-ui/core/Toolbar';
import Typography from '@material-ui/core/Typography';

const useStyles = makeStyles((theme) => ({
root: {
flexGrow: 1,
},
menuButton: {
marginRight: theme.spacing(2),
},
navButton: {
marginLeft: theme.spacing(2),
},
title: {
flexGrow: 1,
},
}));

export default function mainAppBar() {
const classes = useStyles();

return (
<div className={classes.root}>
<AppBar position="static">
<Toolbar>
<IconButton edge="start" className={classes.menuButton} color="inherit" aria-label="menu">
<MenuIcon />
</IconButton>
<Typography variant="h6" className={classes.title}>
Rails Base 6
</Typography>
<Button color="inherit" variant="outlined" className={classes.navButton} onClick={ () => window.location.href = '/users/sign_in' }>Sign In</Button>
<Button color="inherit" variant="outlined" className={classes.navButton} onClick={ () => window.location.href = '/users/sign_up' }>Sign Up</Button>
</Toolbar>
</AppBar>
</div>
);
}

13 changes: 7 additions & 6 deletions app/views/application/_navigation.html.slim
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.title-bar data-hide-for="medium" data-responsive-toggle="navigation_menu"
button.menu-icon data-toggle="" type="button"
title-bar-title Menu
nav
/ .title-bar data-hide-for="medium" data-responsive-toggle="navigation_menu"
/ button.menu-icon data-toggle="" type="button"
/ title-bar-title Menu

nav.top-bar#navigation_menu
= render "navigation_main"
= render "navigation_user"
/ nav.top-bar#navigation_menu
/ = render "navigation_main"
/ = render "navigation_user"
14 changes: 7 additions & 7 deletions app/views/layouts/application.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,18 @@ html class="no-js" lang="en"
meta name="viewport" content="width=device-width, initial-scale=1.0"
meta name="robots" content="NOODP,NOYDIR"

link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"

= display_meta_tags site: "RailsBase", keywords: %w[title site]
= csrf_meta_tags

= stylesheet_link_tag :application

= javascript_tag "window.App = {}"
javascript:
window.App = {}
App.currentUserData = #{{current_user.to_json}};

= javascript_pack_tag :application

== analytics_init if GoogleAnalytics.valid_tracker?

Expand All @@ -24,9 +30,3 @@ html class="no-js" lang="en"
= yield

= render "footer"

javascript:
App.currentUserData = #{{current_user.to_json}};

= javascript_pack_tag :application
= javascript_include_tag :application
1 change: 1 addition & 0 deletions app/views/pages/home.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.cell
h2
= title("Home")
#nav
9 changes: 0 additions & 9 deletions config/webpack/environment.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
const { environment } = require('@rails/webpacker')

const webpack = require('webpack')

environment.plugins.prepend('Provide',
new webpack.ProvidePlugin({
$: 'jquery/src/jquery',
jQuery: 'jquery/src/jquery'
})
)

module.exports = environment
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"dependencies": {
"@babel/preset-react": "^7.10.1",
"@material-ui/core": "^4.10.2",
"@material-ui/icons": "^4.9.1",
"@rails/ujs": "^6.0.3-1",
"@rails/webpacker": "5.1.1",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"jquery": "^3.5.1",
"prop-types": "^15.7.2",
"react": "^16.13.1",
"react-dom": "^16.13.1"
Expand Down
Loading