mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-01-27 03:03:09 +00:00
Merge branch 'master' of https://github.com/naturalcrit/homebrewery into vitreum-to-vite
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import React from 'react';
|
||||
import createReactClass from 'create-react-class';
|
||||
import request from 'superagent';
|
||||
import Nav from './client/homebrew/navbar/nav.jsx';
|
||||
import Nav from './nav.jsx';
|
||||
|
||||
const Account = createReactClass({
|
||||
displayName : 'AccountNavItem',
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import './error-navitem.less';
|
||||
import React from 'react';
|
||||
import Nav from './client/homebrew/navbar/nav.jsx';
|
||||
import Nav from './nav.jsx';
|
||||
|
||||
const ErrorNavItem = ({ error = '', clearError })=>{
|
||||
const response = error.response;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import React from 'react';
|
||||
import dedent from 'dedent';
|
||||
|
||||
import Nav from './client/homebrew/navbar/nav.jsx';
|
||||
import Nav from './nav.jsx';
|
||||
|
||||
export default function(props){
|
||||
return <Nav.dropdown>
|
||||
|
||||
@@ -2,7 +2,7 @@ import React from 'react';
|
||||
import createReactClass from 'create-react-class';
|
||||
import Moment from 'moment';
|
||||
|
||||
import Nav from './client/homebrew/navbar/nav.jsx';
|
||||
import Nav from './nav.jsx';
|
||||
|
||||
|
||||
const MetadataNav = createReactClass({
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import './client/homebrew/navbar/navbar.less';
|
||||
import './navbar.less';
|
||||
import React, { useState, useRef, useEffect } from 'react';
|
||||
import createReactClass from 'create-react-class';
|
||||
import _ from 'lodash';
|
||||
import cx from 'classnames';
|
||||
|
||||
import NaturalCritIcon from './client/components/svg/naturalcrit-d20.svg.jsx';
|
||||
import NaturalCritIcon from '../../components/svg/naturalcrit-d20.svg.jsx';
|
||||
|
||||
const Nav = {
|
||||
base : createReactClass({
|
||||
|
||||
@@ -2,7 +2,7 @@ import './navbar.less';
|
||||
import React from 'react';
|
||||
import createReactClass from 'create-react-class';
|
||||
|
||||
import Nav from './client/homebrew/navbar/nav.jsx';
|
||||
import Nav from './nav.jsx';
|
||||
import PatreonNavItem from './patreon.navitem.jsx';
|
||||
|
||||
const Navbar = createReactClass({
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import React from 'react';
|
||||
import _ from 'lodash';
|
||||
import Nav from './client/homebrew/navbar/nav.jsx';
|
||||
import Nav from './nav.jsx';
|
||||
import { splitTextStyleAndMetadata } from '../../../shared/helpers.js';
|
||||
|
||||
const BREWKEY = 'HB_newPage_content';
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import Nav from './client/homebrew/navbar/nav.jsx';
|
||||
import Nav from './nav.jsx';
|
||||
|
||||
export default function(props){
|
||||
return <Nav.item
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import Nav from './client/homebrew/navbar/nav.jsx';
|
||||
import Nav from './nav.jsx';
|
||||
import { printCurrentBrew } from '../../../shared/helpers.js';
|
||||
|
||||
export default function(){
|
||||
|
||||
@@ -3,7 +3,7 @@ import createReactClass from 'create-react-class';
|
||||
import _ from 'lodash';
|
||||
import Moment from 'moment';
|
||||
|
||||
import Nav from './client/homebrew/navbar/nav.jsx';
|
||||
import Nav from './nav.jsx';
|
||||
|
||||
const EDIT_KEY = 'HB_nav_recentlyEdited';
|
||||
const VIEW_KEY = 'HB_nav_recentlyViewed';
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import React from 'react';
|
||||
import dedent from 'dedent';
|
||||
import Nav from './client/homebrew/navbar/nav.jsx';
|
||||
import Nav from './nav.jsx';
|
||||
|
||||
const getShareId = (brew)=>(
|
||||
brew.googleId && !brew.stubbed
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import React from 'react';
|
||||
|
||||
import Nav from './client/homebrew/navbar/nav.jsx';
|
||||
import Nav from './nav.jsx';
|
||||
|
||||
export default function (props) {
|
||||
return (
|
||||
|
||||
Reference in New Issue
Block a user