Skip to content

Commit 737c8ef

Browse files
committed
Update
2 parents ec2bd23 + 141ad49 commit 737c8ef

File tree

7 files changed

+62
-0
lines changed

7 files changed

+62
-0
lines changed

.github/workflows/static.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Simple workflow for deploying static content to GitHub Pages
2+
name: Deploy static content to Pages
3+
4+
on:
5+
# Runs on pushes targeting the default branch
6+
push:
7+
branches: ["master"]
8+
9+
# Allows you to run this workflow manually from the Actions tab
10+
workflow_dispatch:
11+
12+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
13+
permissions:
14+
contents: read
15+
pages: write
16+
id-token: write
17+
18+
# Allow one concurrent deployment
19+
concurrency:
20+
group: "pages"
21+
cancel-in-progress: true
22+
23+
jobs:
24+
# Single deploy job since we're just deploying
25+
deploy:
26+
environment:
27+
name: github-pages
28+
url: ${{ steps.deployment.outputs.page_url }}
29+
runs-on: ubuntu-latest
30+
steps:
31+
- name: Checkout
32+
uses: actions/checkout@v3
33+
- name: Setup Pages
34+
uses: actions/configure-pages@v2
35+
- name: Upload artifact
36+
uses: actions/upload-pages-artifact@v1
37+
with:
38+
# Upload entire repository
39+
path: '.'
40+
- name: Deploy to GitHub Pages
41+
id: deployment
42+
uses: actions/deploy-pages@v1

.index.html.swp

-12 KB
Binary file not shown.

assets/js/.index.js.swo

0 Bytes
Binary file not shown.

assets/js/index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@ const BubbleSort = {
1919
ctx.clearRect(0, 0, CH, CW)
2020
const lineSpacing = 10
2121
ctx.lineWidth = 5
22+
<<<<<<< HEAD
2223
for (let j = 1; j < this.seedValue.length; j++) {
24+
=======
25+
26+
for (let j = 0; j < this.seedValue.length; j++) {
27+
>>>>>>> 141ad495338db7854c07ee1ae9ffeeb6ebc6f429
2328
const y = j * lineSpacing
2429
ctx.beginPath()
2530
ctx.moveTo(y, CH)

assets/style/style.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
body{
2+
<<<<<<< HEAD
23
display:grid;
34
place-items:center;
45
min-height:100vh;
@@ -19,3 +20,12 @@ body{
1920
width: auto;
2021
height:auto;
2122
}
23+
=======
24+
background-color: gray;
25+
display: flex;
26+
justify-content: center;
27+
align-items: center;
28+
min-height: 100vh;
29+
overflow: hidden;
30+
}
31+
>>>>>>> 141ad495338db7854c07ee1ae9ffeeb6ebc6f429

index.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<link rel="stylesheet" href="./assets/style/style.css" />
99
</head>
1010
<body>
11+
<<<<<<< HEAD
1112
<div class="tab">
1213
<div class="inputField">
1314
<button class="tablinks" id="stopbutton">Stop Sorting</button> <br />
@@ -72,6 +73,10 @@
7273
<canvas id="cvs"></canvas>
7374
</div>
7475
<!-- The main section when all things will heppening -->
76+
=======
77+
<!-- The main section when all things will heppening -->
78+
<canvas id="cvs"></canvas>
79+
>>>>>>> 141ad495338db7854c07ee1ae9ffeeb6ebc6f429
7580
<script src="./assets/js/index.js"></script>
7681
</body>
7782
</html>

0 commit comments

Comments
 (0)