Compare commits
1 Commits
master
...
update-dep
| Author | SHA1 | Date | |
|---|---|---|---|
|
48bb18e0ec |
@ -1,45 +0,0 @@
|
|||||||
name: Deploy
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
name: Build
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout repo
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: Install dependencies
|
|
||||||
run: echo y | npm exec -- pnpm install
|
|
||||||
- name: Build project
|
|
||||||
run: npm exec -- pnpm build
|
|
||||||
- name: Upload production-ready build files
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: dist
|
|
||||||
path: ./dist
|
|
||||||
|
|
||||||
deploy:
|
|
||||||
name: Deploy
|
|
||||||
needs: build
|
|
||||||
runs-on: host
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Download artifact
|
|
||||||
uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
name: dist
|
|
||||||
path: ./dist
|
|
||||||
|
|
||||||
# Deploy to local repo
|
|
||||||
- name: Move files to server
|
|
||||||
run: |
|
|
||||||
rm -rf /var/www/martials.no/*
|
|
||||||
cp -r dist/* /var/www/martials.no
|
|
||||||
59
.github/workflows/build.yml
vendored
Normal file
59
.github/workflows/build.yml
vendored
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
name: Deploy
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
name: Build
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout repo
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- uses: pnpm/action-setup@v4
|
||||||
|
with:
|
||||||
|
version: 8
|
||||||
|
|
||||||
|
- name: Setup Node
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: 18
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: pnpm install
|
||||||
|
|
||||||
|
- name: Build project
|
||||||
|
run: pnpm build
|
||||||
|
|
||||||
|
- name: Upload production-ready build files
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: production-files
|
||||||
|
path: ./dist
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
name: Deploy
|
||||||
|
needs: build
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: github.ref == 'refs/heads/master'
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Download artifact
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
|
with:
|
||||||
|
name: production-files
|
||||||
|
path: ./dist
|
||||||
|
|
||||||
|
# Deploy to local repo
|
||||||
|
- name: Deploy
|
||||||
|
uses: s0/git-publish-subdir-action@develop
|
||||||
|
env:
|
||||||
|
REPO: self
|
||||||
|
BRANCH: build
|
||||||
|
FOLDER: dist
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
2
.idea/jsLibraryMappings.xml
generated
2
.idea/jsLibraryMappings.xml
generated
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="JavaScriptLibraryMappings">
|
<component name="JavaScriptLibraryMappings">
|
||||||
<file url="PROJECT" libraries="{latest}" />
|
<includedPredefinedLibrary name="Node.js Core" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
1
.idea/martials.no.iml
generated
1
.idea/martials.no.iml
generated
@ -8,6 +8,5 @@
|
|||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" name="latest" level="application" />
|
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
@ -7,14 +7,9 @@
|
|||||||
<title>Hjem | Martials.no</title>
|
<title>Hjem | Martials.no</title>
|
||||||
<meta name="description" content="Hjemmeside for API og diverse" />
|
<meta name="description" content="Hjemmeside for API og diverse" />
|
||||||
<link rel="icon" type="image/x-icon" href="resources/code.svg" />
|
<link rel="icon" type="image/x-icon" href="resources/code.svg" />
|
||||||
<!-- 100% privacy-first analytics -->
|
|
||||||
<script data-collect-dnt="true" async defer src="https://scripts.simpleanalyticscdn.com/latest.js"></script>
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<noscript>
|
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||||
You need to enable JavaScript to run this app.
|
|
||||||
<img src="https://queue.simpleanalyticscdn.com/noscript.gif?collect-dnt=true" alt="" referrerpolicy="no-referrer-when-downgrade" />
|
|
||||||
</noscript>
|
|
||||||
<div id="root"></div>
|
<div id="root"></div>
|
||||||
|
|
||||||
<script src="/src/app.tsx" type="module"></script>
|
<script src="/src/app.tsx" type="module"></script>
|
||||||
|
|||||||
24
package.json
24
package.json
@ -11,22 +11,22 @@
|
|||||||
},
|
},
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"autoprefixer": "^10.4.17",
|
"autoprefixer": "^10.4.19",
|
||||||
"postcss": "^8.4.35",
|
"postcss": "^8.4.38",
|
||||||
"prettier": "3.2.5",
|
"prettier": "3.3.1",
|
||||||
"prettier-plugin-tailwindcss": "^0.5.11",
|
"prettier-plugin-tailwindcss": "^0.6.2",
|
||||||
"tailwindcss": "^3.4.1",
|
"tailwindcss": "^3.4.4",
|
||||||
"typescript": "^5.3.3",
|
"typescript": "^5.4.5",
|
||||||
"vite": "^5.1.4",
|
"vite": "^5.2.13",
|
||||||
"vite-plugin-solid": "^2.10.1"
|
"vite-plugin-solid": "^2.10.2"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@solidjs/router": "^0.12.4",
|
"@solidjs/router": "^0.13.5",
|
||||||
"@types/diff": "^5.0.9",
|
"@types/diff": "^5.2.1",
|
||||||
"diff": "^5.2.0",
|
"diff": "^5.2.0",
|
||||||
"solid-headless": "^0.13.1",
|
"solid-headless": "^0.13.1",
|
||||||
"solid-heroicons": "^3.2.4",
|
"solid-heroicons": "^3.2.4",
|
||||||
"solid-js": "^1.8.15",
|
"solid-js": "^1.8.17",
|
||||||
"xlsx": "^0.18.5"
|
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
2436
pnpm-lock.yaml
generated
2436
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,7 @@ import { Link } from "./link"
|
|||||||
const Footer: Component<SimpleProps> = ({ className }) => (
|
const Footer: Component<SimpleProps> = ({ className }) => (
|
||||||
<footer class={`container absolute bottom-0 py-5 text-center ${className}`}>
|
<footer class={`container absolute bottom-0 py-5 text-center ${className}`}>
|
||||||
<p>
|
<p>
|
||||||
Kildekode på <Link to={"https://git.martials.no/martials/old.martials.no"}>Gitea</Link>
|
Kildekode på <Link to={"https://github.com/h600878/martials.no"}>GitHub</Link>
|
||||||
</p>
|
</p>
|
||||||
</footer>
|
</footer>
|
||||||
)
|
)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user