Skip to content

Commit 821006b

Browse files
NuwanJNuwanJ
authored
Merge branch 'dependency_check' into dependabot/npm_and_yarn/scss-tokenizer-and-node-sass-0.4.3
2 parents 571d6e7 + b77a363 commit 821006b

44 files changed

Lines changed: 1252 additions & 729 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/code_formatting.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# name: Code Formatting
2+
# on:
3+
# pull_request:
4+
# branches: [main]
5+
6+
# # Enables a button on Actions tab
7+
# workflow_dispatch:
8+
9+
# jobs:
10+
# format:
11+
# runs-on: ubuntu-latest
12+
13+
# steps:
14+
# - name: checkout
15+
# uses: actions/checkout@master
16+
# with:
17+
# ref: main
18+
19+
# - uses: actions/setup-node@v2
20+
# with:
21+
# node-version: "14.x"
22+
23+
# - run: npm ci
24+
25+
# - run: npm run format
26+
27+
# - name: Commit changes
28+
# run: |
29+
# git config user.name github-actions
30+
# git config user.email github-actions@github.com
31+
# git add --all
32+
# git commit -m "Automatic Code Formatting" || echo "No changes to commit"
33+
# git push

‎.github/workflows/node.js.yml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ name: Webpack CI
55

66
on:
77
push:
8-
branches: [main, master]
9-
# pull_request:
10-
# branches: [main, master]
8+
branches: [main]
9+
10+
# Enables a button on Actions tab
11+
workflow_dispatch:
1112

1213
jobs:
1314
build:
1415
runs-on: ubuntu-latest
15-
1616
steps:
1717
- uses: actions/checkout@v2
1818
- name: Use Node.js 14.x
@@ -21,8 +21,6 @@ jobs:
2121
node-version: 14.x
2222
- run: npm ci
2323

24-
#- run: npm test
25-
2624
- name: Build the repository
2725
run: npm run build
2826

@@ -31,4 +29,3 @@ jobs:
3129
with:
3230
github_token: ${{ secrets.GITHUB_TOKEN }}
3331
publish_dir: ./build
34-
# https://github.com/peaceiris/actions-gh-pages

‎.gitignore‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ node_modules
77
gh-pages-actions
88
gh-pages-actions.pub
99

10-
src/public/js/app.js
11-
src/public/js/main.app.js
12-
src/public/js/vendors.app.js
10+
src/public/js/

.prettierrc renamed to .prettierrc.config

File renamed without changes.

‎.prettierrc.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"bracketSpacing": true,
3+
"printWidth": 90,
4+
"singleQuote": true,
5+
"arrowParens": "always",
6+
"semi": true,
7+
"tabWidth": 4,
8+
"trailingComma": "none"
9+
}

‎LICENSE‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2023 Pera Swarm
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎package-lock.json‎

Lines changed: 229 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
"build:dir": "copyfiles -a -u 2 src/public/assets/**/*.* build/",
2020
"build:js": "webpack --env NODE_ENV=prod --progress --color",
2121
"predeploy": "npm run build",
22-
"deploy": "gh-pages -d build"
22+
"deploy": "gh-pages -d build",
23+
"format": "prettier --write \"**/*.+(ts|js|jsx|json|yml|yaml|css|md)\""
2324
},
2425
"repository": {
2526
"type": "git",

‎postcss.config.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
module.exports = {
2-
plugins: [
3-
require('autoprefixer'),
4-
],
2+
plugins: [require('autoprefixer')]
53
};

‎src/html/index.html‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="UTF-8" />
5-
<title>Visualizer | Pera-Swarm</title>
6-
<link rel="icon" href="./favicon.ico" />
7-
</head>
83

9-
<body>
10-
<section id="appContainer" class="main">
11-
<div id="loading">Loading...</div>
12-
<div id="msg-box"><div id="msg-content"></div></div>
13-
</section>
14-
<script src="js/stats.min.js"></script>
15-
<script src="js/dat.gui.min.js"></script>
16-
</body>
17-
</html>
4+
<head>
5+
<meta charset="UTF-8" />
6+
<title>Visualizer | Pera-Swarm</title>
7+
<link rel="icon" href="https://pera-swarm.ce.pdn.ac.lk/assets/img/favicon.ico" />
8+
<link href="./css/main.css" rel="stylesheet">
9+
</head>
10+
11+
<body>
12+
<section id="appContainer" class="main">
13+
<div id="loading">Loading...</div>
14+
<div id="msg-box">
15+
<div id="msg-content"></div>
16+
</div>
17+
</section>
18+
<script src="./assets/js/stats.min.js"></script>
19+
<script src="./assets/js/dat.gui.min.js"></script>
20+
</body>
21+
22+
</html>

0 commit comments

Comments
 (0)