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.

Sign up for GitHub

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

issues #10

Closed
wants to merge 2 commits into from
Closed

issues #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96f0951
changes in stage.ts and branching.ts
GABRIEL-star-alt Apr 11, 2024
1bf8558
same changes but in new
GABRIEL-star-alt Apr 11, 2024
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
0 demo/.statik/CONFIG → .statik/CONFIG
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions .statik/HEAD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<<<<<<< HEAD
new
=======
main
>>>>>>> 3457ca10e2f33e8c1f9248a39dcb87b065f0d46a
1 change: 1 addition & 0 deletions .statik/SNAPSHOT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
QmNWcUuLpcDsDV7w86KEN53BQuKNvaCytVtbWXWuFgvrKL
1 change: 1 addition & 0 deletions .statik/heads/main
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
QmRHBHSTfLv9FN1DdRJaRzuTDs8RykC2wvxAipQ4SgkyqM
1 change: 1 addition & 0 deletions .statik/heads/new
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
QmWzRFhtmRVcggg7FKk3V7RAcf4iWs29UmngRHhWfTfPdz
0 demo/.statik/SNAPSHOT → .statik/statik-ignore
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,5 @@ $ statik help

jump <branch> Switch between branches

help [command] display help for command
help [command ] display help for command
```
1 change: 0 additions & 1 deletion demo/.statik/heads/main
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demo/.statik/heads/test
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion demo/a.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Updated A
Updated a
2 changes: 1 addition & 1 deletion demo/b/b.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
B
b
1 change: 1 addition & 0 deletions dist/.statik/CONFIG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"ipfs_node_url":"/ip4/127.0.0.1/tcp/5001"}
0 demo/.statik/HEAD → dist/.statik/HEAD
View file
Open in desktop
File renamed without changes.
Empty file added dist/.statik/SNAPSHOT
View file
Open in desktop
Empty file.
Empty file added dist/.statik/heads/main
View file
Open in desktop
Empty file.
105 changes: 80 additions & 25 deletions dist/vc/branching.js
View file
Open in desktop

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

34 changes: 21 additions & 13 deletions dist/vc/stage.js
View file
Open in desktop

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

34 changes: 17 additions & 17 deletions package-lock.json
View file
Open in desktop

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

18 changes: 12 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"description": "An IPFS based version control system with static file hosting features. Basic functions like repo initiation, staging, committing, and logging have been implemented. (Under active development)",
"exports": "./dist/index.js",
"scripts": {
"build": "npx tsc",
"start": "npx ts-node --esm src/index.ts",
"build": "tsc",
"start": "npx ts-node --esm dist/index.js",
"test": "echo \"Error: no test specified\" && exit 1"
},
"bin": {
Expand All @@ -15,19 +15,25 @@
"type": "git",
"url": "git+https://github.com/SANTHOSH17-DOT/statik"
},
"keywords": ["version-control","ipfs","p2p","web3","filestorage"],
"keywords": [
"version-control",
"ipfs",
"p2p",
"web3",
"filestorage"
],
"author": "Santhosh Murugaiah",
"license": "ISC",
"dependencies": {
"commander": "^11.0.0",
"figlet": "^1.6.0",
"ipfs-http-client": "^52.0.4-rc.4"
"ipfs-http-client": "^52.0.5"
},
"devDependencies": {
"@types/figlet": "^1.5.6",
"@types/node": "^20.8.2",
"ts-node": "^10.9.1",
"typescript": "^5.1.6"
"ts-node": "^10.9.2",
"typescript": "^5.3.3"
},
"type": "module"
}
2 changes: 1 addition & 1 deletion src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ program
.name("statik")
.version("1.1.0-alpha")
.description(figlet.textSync("Statik")+"\nAn IPFS based version control system with static file hosting features")
program.command("init <ipfs_node_url>").description("Initialize a new Statik repository")
program.command("init <ipfs_node_url>").description("Initialmknkjnkjlize a new Statik repository")
program.command("add [file_path]").description("Add a file to the Statik repository")
program.command("commit <message>").description("Commit changes to the Statik repository")
program.command("log").description("View the commit history of the current branch")
Expand Down
Loading
Loading