Skip to content

Commit 8d49e61

Browse files
moeiscoolmoeiscool
authored
Merge pull request #244 from moeiscool/dev
Atlantis
2 parents 882e375 + a0687f3 commit 8d49e61

Some content is hidden

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

43 files changed

+5108
-2625
lines changed

‎Dockerfile‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
FROM mhart/alpine-node:8
22

33
WORKDIR /opt/shinobi
4-
RUN apk add --update --no-cache ffmpeg python pkgconfig cairo-dev make g++ jpeg-dev
54

6-
COPY . /opt/shinobi
5+
# Install package dependencies
6+
RUN apk add --update --no-cache ffmpeg python pkgconfig cairo-dev make g++ jpeg-dev
77

8+
# Install NodeJS dependencies
9+
COPY package.json /opt/shinobi
810
RUN npm install && \
911
npm install canvas
1012

13+
# Copy code
14+
COPY . /opt/shinobi
15+
1116
VOLUME ["/opt/shinobi/videos"]
17+
1218
EXPOSE 8080
1319
ENTRYPOINT ["/opt/shinobi/docker-entrypoint.sh" ]

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ Currently Fast Install is supported on the following :
9494
```
9595
mkdir Shinobi
9696
cd Shinobi
97-
npm install shinobi
97+
sudo npm install shinobi
9898
mv node_modules/shinobi/* .
99-
npm start
99+
sudo npm start
100100
```
101101

102102
#### Elaborate Installs

‎camera.js‎

Lines changed: 164 additions & 126 deletions
Large diffs are not rendered by default.

‎index.html‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,32 @@
66
iframe{width:100%;height:100%;position:fixed;left:0;top:0;}</style>
77
</head>
88
<body>
9-
<iframe src="//shinobi.video"></iframe>
9+
<iframe src="https://shinobi.video"></iframe>
10+
<!--Follower ad-->
11+
<script
12+
src="https://code.jquery.com/jquery-3.2.1.min.js"
13+
integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
14+
crossorigin="anonymous"></script>
15+
<style>
16+
#follower{position:fixed;left:0;bottom:0;z-index:6;width:auto}
17+
#follower .end{position:absolute;top:0;right:0;color:#fff;text-shadow:0 0 15px #333;z-index:2;cursor:pointer}
18+
#follower .note{position:absolute;bottom:0;right:0;color:#fff;z-index:2;padding:5px;background:#333;}
19+
</style>
20+
<div id="follower" class="hidden-sm hidden-xs" style="display:none">
21+
<div class="end">X</div>
22+
<small class="note">Sorry for the Ads</small>
23+
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script> <!-- longdown --> <ins class="adsbygoogle" style="display:inline-block;width:160px;height:600px" data-ad-client="ca-pub-3391236677062948" data-ad-slot="4862030510"></ins> <script> (adsbygoogle = window.adsbygoogle || []).push({}); </script>
24+
</div>
25+
<script>
26+
$('#follower .note').click(function(){
27+
$('#follower .adsbygoogle').focus()
28+
})
29+
$('#follower .end').click(function(){
30+
$('#follower').remove()
31+
})
32+
setTimeout(function(){
33+
$('#follower').show()
34+
})
35+
</script>
1036
</body>
11-
</html>
37+
</html>

‎languages/ar.json‎

Lines changed: 497 additions & 0 deletions
Large diffs are not rendered by default.

‎languages/bn.json‎

Lines changed: 496 additions & 0 deletions
Large diffs are not rendered by default.

‎languages/de.json‎

Lines changed: 497 additions & 0 deletions
Large diffs are not rendered by default.

‎languages/en_CA.json‎

Lines changed: 500 additions & 0 deletions
Large diffs are not rendered by default.

‎languages/fr.json‎

Lines changed: 496 additions & 0 deletions
Large diffs are not rendered by default.

‎languages/ja.json‎

Lines changed: 496 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)