Skip to content
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

Updates new deploy #5

Merged
merged 8 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from 6 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
11 changes: 0 additions & 11 deletions .env.production

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Lint & Build

on:
push:
branches: [main]
pull_request:

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Use Node.js from .nvmrc file
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
- run: npm ci
- run: npm run fmt:check
- run: npm run build
38 changes: 0 additions & 38 deletions .github/workflows/integrate.yml

This file was deleted.

6 changes: 6 additions & 0 deletions dprint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": "https://raw.githubusercontent.com/kontent-ai/dprint-config/main/dprint.json",
"includes": [
"src/**/*.{ts,tsx,js,jsx,json}"
]
}
175 changes: 175 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"test": "react-scripts test",
"eject": "react-scripts eject",
"predeploy": "npm run build",
"deploy": "gh-pages -d build"
"fmt": "dprint fmt",
"fmt:check": "dprint check"
},
"eslintConfig": {
"extends": "react-app"
Expand All @@ -44,6 +45,7 @@
]
},
"devDependencies": {
"dprint": "^0.46.2",
"gh-pages": "^2.0.1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that we can remove this dependency now.

}
}
}
28 changes: 13 additions & 15 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
import React from 'react';
import './App.css';
import { Route, Switch } from 'react-router-dom';
import { NavigationBar } from './components/NavigationBar';
import { ProductDetailsPage } from './components/Product/ProductDetailsPage';
import { ProductsPage } from './components/Product/ProductsPage';
import { ProductDetailsRoute, ProductsRoute, ProjectRoute } from './constants/routePaths';
import { WelcomePage } from './components/WelcomePage';
import { ProgressBar } from './components/ProgressBar';
import React from "react";
import "./App.css";
import { Route, Switch } from "react-router-dom";
import { NavigationBar } from "./components/NavigationBar";
import { ProductDetailsPage } from "./components/Product/ProductDetailsPage";
import { ProductsPage } from "./components/Product/ProductsPage";
import { ProductDetailsRoute, ProductsRoute, EnvironmentRoute } from "./constants/routePaths";
import { WelcomePage } from "./components/WelcomePage";
import { ProgressBar } from "./components/ProgressBar";

export class App extends React.PureComponent {
render() {
return (
<div className="app">
<ProgressBar/>
<ProgressBar />
<Route
path={ProjectRoute}
path={EnvironmentRoute}
component={NavigationBar}
/>
<div className="app__content-wrapper">
<Switch>
<Route
path={ProjectRoute}
path={EnvironmentRoute}
exact
component={WelcomePage}
/>
Expand All @@ -33,9 +33,7 @@ export class App extends React.PureComponent {
component={ProductsPage}
/>
<Route
render={() => (
<p>Ooops, missing page!</p>
)}
render={() => <p>Ooops, missing page!</p>}
/>
</Switch>
</div>
Expand Down
Loading