Skip to content

Commit

Permalink
feat: deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
yarre-uk committed Dec 29, 2023
1 parent 58070e4 commit e208e41
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 29 deletions.
51 changes: 51 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Simple workflow for deploying static content to GitHub Pages
name: Deploy static content to Pages

on:
# Runs on pushes targeting the default branch
push:
branches: ['main']

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets the GITHUB_TOKEN permissions to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow one concurrent deployment
concurrency:
group: 'pages'
cancel-in-progress: true

jobs:
# Single deploy job since we're just deploying
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Node
uses: actions/setup-node@v3
with:
node-version: 18
cache: 'npm'
- name: Install dependencies
run: npm install
- name: Build
run: npm run build
- name: Setup Pages
uses: actions/configure-pages@v3
- name: Upload artifact
uses: actions/upload-pages-artifact@v2
with:
# Upload dist repository
path: './dist'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"build": "vite build",
"preview": "vite preview",
"lint": "eslint --ext .js,.jsx,.ts,.tsx",
"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx --fix",
Expand Down
52 changes: 26 additions & 26 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
import { BrowserRouter, Route, Routes } from 'react-router-dom';
import { Route, Routes, useLocation } from 'react-router-dom';

import { ROUTE } from './constants';
import { ROUTE } from '@/constants';
import GlobalStyles from '@/globals';
import {
ChangePasswordContainer,
ForgotPasswordContainer,
SignInContainer,
SignUpContainer,
} from './modules/auth';
import { HomeContainer } from './modules/home';
import { LayoutContainer } from './modules/layout';
import { NotFoundContainer } from './modules/notFound';

import GlobalStyles from '@/globals';
} from '@/modules/auth';
import { HomeContainer } from '@/modules/home';
// import { LayoutContainer } from '@/modules/layout';
import { NotFoundContainer } from '@/modules/notFound';

const App = () => {
const location = useLocation();
console.log('location', location);

return (
<>
<GlobalStyles />
<BrowserRouter>
<Routes>
<Route path={ROUTE.HOME} element={<LayoutContainer />}>
<Route index element={<HomeContainer />} />
<Route path={ROUTE.SIGN_IN} element={<SignInContainer />} />
<Route path={ROUTE.SIGN_UP} element={<SignUpContainer />} />
<Route
path={ROUTE.FORGOT_PASSWORD}
element={<ForgotPasswordContainer />}
/>
<Route
path={ROUTE.CHANGE_PASSWORD}
element={<ChangePasswordContainer />}
/>
<Route path="/*" element={<NotFoundContainer />} />
</Route>
</Routes>
</BrowserRouter>
<Routes>
{/* <Route path={ROUTE.HOME} element={<LayoutContainer />}> */}
<Route index element={<HomeContainer />} />
<Route path={ROUTE.SIGN_IN} element={<SignInContainer />} />
<Route path={ROUTE.SIGN_UP} element={<SignUpContainer />} />
<Route
path={ROUTE.FORGOT_PASSWORD}
element={<ForgotPasswordContainer />}
/>
<Route
path={ROUTE.CHANGE_PASSWORD}
element={<ChangePasswordContainer />}
/>
<Route path="/*" element={<NotFoundContainer />} />
{/* </Route> */}
</Routes>
</>
);
};
Expand Down
5 changes: 4 additions & 1 deletion src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { HashRouter } from 'react-router-dom';

import App from './App';

ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
<App />,
<HashRouter>
<App />
</HashRouter>,
);
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,
"baseUrl": ".",
"paths": {
"@/*": ["./src/*"]
"@/*": ["src/*"]
},
"allowJs": true,
"incremental": true,
Expand Down
1 change: 1 addition & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ import tsconfigPaths from 'vite-tsconfig-paths';
// https://vitejs.dev/config/
export default defineConfig({
plugins: [react(), tsconfigPaths()],
base: '/manga-hub/#/',
});

0 comments on commit e208e41

Please sign in to comment.