Skip to content

Commit

Permalink
fix(web-shell): Removed export from build script
Browse files Browse the repository at this point in the history
  • Loading branch information
sullivanpj committed Nov 14, 2022
1 parent e4ecce4 commit 7ce2241
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 47 deletions.
2 changes: 1 addition & 1 deletion apps/web/landing/ClientApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build && next export",
"build": "next build",
"lint": "next lint",
"lint-staged": "lint-staged",
"prettier": "prettier --write --ignore-unknown .",
Expand Down
53 changes: 25 additions & 28 deletions apps/web/shell/ClientApp/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { UserProvider } from "@auth0/nextjs-auth0";
import Link from "next/link";
import React from "react";
import "./globals.css";
Expand All @@ -12,35 +11,33 @@ export default function RootLayout({
<html lang="en">
<head />
<body className="bg-gray-1100">
<UserProvider>
<nav>
<div className="flex flex-row gap-2">
<Link
href="/"
className="rounded-lg bg-gray-900 text-primary hover:bg-gray-800">
Home
</Link>
<Link
href="/contact"
className="rounded-lg bg-gray-900 text-primary hover:bg-gray-800">
Contact
</Link>
<Link
href="/about"
className="rounded-lg bg-gray-900 text-primary hover:bg-gray-800">
About
</Link>
<nav>
<div className="flex flex-row gap-2">
<Link
href="/"
className="rounded-lg bg-gray-900 text-primary hover:bg-gray-800">
Home
</Link>
<Link
href="/contact"
className="rounded-lg bg-gray-900 text-primary hover:bg-gray-800">
Contact
</Link>
<Link
href="/about"
className="rounded-lg bg-gray-900 text-primary hover:bg-gray-800">
About
</Link>

<Link
href="/api/auth/login"
className="rounded-lg bg-gray-900 text-primary hover:bg-gray-800">
Login
</Link>
</div>
</nav>
<Link
href="/api/auth/login"
className="rounded-lg bg-gray-900 text-primary hover:bg-gray-800">
Login
</Link>
</div>
</nav>

<div className="lg:pl-72">{children}</div>
</UserProvider>
<div className="lg:pl-72">{children}</div>
</body>
</html>
);
Expand Down
20 changes: 4 additions & 16 deletions apps/web/shell/ClientApp/app/users/page.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,8 @@
import { useUser } from "@auth0/nextjs-auth0";

export default function Profile() {
const { user, error, isLoading } = useUser();

if (isLoading) return <div>Loading...</div>;
if (error) return <div>{error.message}</div>;

return (
user && (
<div>
{user.picture && (
<img src={user.picture} alt={user.name ?? "User Profile Image"} />
)}
<h2>{user.name}</h2>
<p>{user.email}</p>
</div>
)
<div>
<h2></h2>
<p></p>
</div>
);
}
2 changes: 1 addition & 1 deletion apps/web/shell/ClientApp/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const { DOCS_URL, API_URL } = process.env;
* @type {import('@nrwl/next/plugins/with-nx').WithNxOptions}
**/
const nextConfig = {
basePath: "/",
basePath: "",
distDir: "../../../../dist/web/shell/ClientApp",
nx: {
svgr: true,
Expand Down
2 changes: 1 addition & 1 deletion apps/web/shell/ClientApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build && next export",
"build": "next build",
"lint": "next lint",
"lint-staged": "lint-staged",
"prettier": "prettier --write --ignore-unknown .",
Expand Down

0 comments on commit 7ce2241

Please sign in to comment.